Merge branch '3.6-dev' into 3.7-dev
diff --git a/.asf.yaml b/.asf.yaml
index 434c9a4..73d2af2 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -3,6 +3,7 @@
   homepage: https://tinkerpop.apache.org/
   dependabot_alerts: false
   dependabot_updates: false
+  del_branch_on_merge: true
   labels:
     - tinkerpop
     - gremlin
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fdabcbb..d465ec7 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -24,11 +24,59 @@
     labels:
       - "javascript"
       - "dependencies"
+    ignore:
+      - dependency-name: "prettier"
+        update-types: ["version-update:semver-patch"]
   - package-ecosystem: "npm"
     directory: "/gremlint"
     schedule:
       interval: "daily"
     target-branch: "3.5-dev"
     labels:
-      - "javascript"
-      - "dependencies"
\ No newline at end of file
+      - "gremlint"
+      - "dependencies"
+    ignore:
+      - dependency-name: "prettier"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "@types/node"
+        update-types: [ "version-update:semver-patch" ]
+  - package-ecosystem: "npm"
+    directory: "/docs/gremlint"
+    schedule:
+      interval: "daily"
+    target-branch: "master"
+    labels:
+      - "gremlint"
+      - "dependencies"
+    ignore:
+      - dependency-name: "prettier"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "@types/*"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "styled-components"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "@testing-library/jest-dom"
+        update-types: [ "version-update:semver-patch" ]
+  - package-ecosystem: "gomod"
+    directory: "/gremlin-go"
+    schedule:
+      interval: "daily"
+    target-branch: "3.5-dev"
+    labels:
+      - "go"
+      - "dependencies"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "3.5-dev"
+    labels:
+      - "java"
+      - "dependencies"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "3.5-dev"
+    labels:
+      - "dependencies"
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 4143142..dc46674 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -14,6 +14,20 @@
           distribution: 'temurin'
       - name: Build with Maven
         run: mvn clean install -DskipTests -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+  java-jdk17:
+    name: mvn clean install - jdk17
+    timeout-minutes: 45
+    needs: smoke
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Build with Maven
+        run: mvn clean install -pl -:gremlin-javascript,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlin-go,-:gremlin-python -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
   java-jdk11:
     name: mvn clean install - jdk11
     timeout-minutes: 45
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index fd3ed28..d2c4a6a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,10 +2,10 @@
 
 on:
   push:
-    branches: [ "master", "3.5-dev", "3.6-dev" ]
+    branches: [ "master", "3.5-dev", "3.6-dev", "3.7-dev" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "3.5-dev", "3.6-dev" ]
+    branches: [ "master", "3.5-dev", "3.6-dev", "3.7-dev" ]
   schedule:
     - cron: '22 8 * * 1'
 
diff --git a/.mailmap b/.mailmap
index 892e4ec..27d9bc1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,3 +18,9 @@
 Stephen Mallette                 <spmallette@users.noreply.github.com>
 Stephen Mallette                 <spmva@genoprime.com>
 Stephen Mallette                 <spmva@genprime.com>
+Valentyn Kahamlyk                <vkagamlyk@users.noreply.github.com>
+Valentyn Kahamlyk                <valentynk@bitquilltech.com>
+Jorge Bay-Gondra                 <jorgebaygondra@gmail.com>
+Jorge Bay-Gondra                 <jorgebaygondra@gmail.com>
+
+
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1ee86f0..43f551f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -16,6 +16,302 @@
 ////
 = TinkerPop3 CHANGELOG
 
+== TinkerPop 3.7.0 (Gremfir Master of the Pan Flute)
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-zamfir.png[width=185]
+
+[[release-3-7-3]]
+=== TinkerPop 3.7.3 (NOT OFFICIALLY RELEASED YET)
+
+This release also includes changes from <<release-3-6-8, 3.6.8>>.
+
+
+
+[[release-3-7-2]]
+=== TinkerPop 3.7.2 (April 8, 2024)
+
+This release also includes changes from <<release-3-6-7, 3.6.7>>.
+
+* Deprecated `ltrim()` and `rTrim()` in favor of `l_trim()` and `r_trim` in Python.
+* Fixed bug in `onCreate` for `mergeV()` where use of the `Cardinality` functions was not properly handled.
+* Fixed multiple concurrent initially requests caused authentication to fail.
+
+==== Bugs
+
+* TINKERPOP-2132 Authentication when using multiple threads fails
+* TINKERPOP-2359 onShutDown not being called when docker container stopped
+* TINKERPOP-2913 Ensure that if tx.commit() is called remotely it does not hang for graphs without transactions
+* TINKERPOP-3012 Wrong hashCode implementation for DetachedVertexPropert
+* TINKERPOP-3022 JavaTranslator failing for has(String, null)
+* TINKERPOP-3025 l_trim() and r_trim() missing in python
+* TINKERPOP-3026 checkAdjacentVertices is misconfigured for python in SubgraphStrategy
+* TINKERPOP-3027 Pick.any should be any_()
+* TINKERPOP-3029 Gremlin.Net: Traversal enumeration fails on .NET 8
+* TINKERPOP-3031 Bad translation for g.tx()
+* TINKERPOP-3039 Java driver won't propagate with args when using aliased client directly
+* TINKERPOP-3049 onCreate for mergeV() doesn't handle Cardinality functions
+* TINKERPOP-3054 RequestId serialization broken in Python GLV
+* TINKERPOP-3056 mergeE is updating vertices in certain conditions
+* TINKERPOP-3061 Concurrent queries will break authentication on javascript driver
+
+==== Improvements
+
+* TINKERPOP-2456 Add missing tests for queries
+* TINKERPOP-2872 Inconsistency in comparing Elements in JavaScript tests
+* TINKERPOP-2995 Create Sample Applications in each GLV
+* TINKERPOP-3020 Incorrect tests
+* TINKERPOP-3021 Publish ARM64 Gremlin Console Images
+* TINKERPOP-3030 Update to .NET 8
+* TINKERPOP-3068 Make serviceName and mergedParams public for provider usage in CallStep
+
+[[release-3-7-1]]
+=== TinkerPop 3.7.1 (November 20, 2023)
+
+This release also includes changes from <<release-3-6-6, 3.6.6>> and <<release-3-5-8, 3.5.8>>.
+
+* Added the `asString()`, `length()`, `toLower()`, and `toUpper()` steps to perform `String` manipulations.
+* Added Gherkin parsing support for specific string results using `str[]`.
+* Added the `trim()`, `lTrim()`, `rTrim()`, and `reverse()` steps to perform `String` manipulations.
+* Added `replace()`, `split()` and `substring()` steps to perform `String` manipulations.
+* Added `Scope` to `asString()`, `length()`, `toLower()`, `toUpper()`, `trim()`, `lTrim()`, `rTrim()`, replace()`, `split()` and `substring()` to allow `String` manipulation inside incoming lists.
+* Update `concat()` to accept `Traversal` varargs.
+* Corrected `concat()` signatures in `gremlin-dotnet`, `Concat()` is now used instead of `Concat<object>()`. *(breaking)*
+* Update `concat()` to not special treat `inject` in arguments and use `TraversalUtil.apply` on it as with any other child traversals. *(breaking)*
+* Added `format()` step to perform `String` manipulations.
+* Checked graph features for meta-property support before trying to serialize them in `VertexPropertySerializer` for GraphBinary.
+* Fixed multiline query bug in console caused by upgrade to Groovy 4.
+* Added date manipulation steps `asDate`, `dateAdd` and `dateDiff`.
+* Added new data type `DT` to represent periods of time.
+* Added Gherkin support for Date.
+* Extended `datetime()` function to produce a current server date.
+* Added list filtering functions `all` and `any`.
+* Added list/set functions `conjoin`, `combine`, `difference`, `disjunct`, `intersect`, `merge`, and `product`.
+* Added getter for `isStart` on `UnionStep`.
+* Added `NullVariableResolver` that will quietly produce a `null` for each variable found when parsing with the grammar.
+* Changed the `@MultiMetaProperties` testing tag for Gherkin feature tests to instead be separate `@MetaProperties` and `@MultiProperties`.
+* Added `agent` parameter to `DriverRemoteConnection` options to allow a user-provided `http.Agent` implementation.
+* Fixed deserialization of element properties for GraphBinary.
+* Fixed bug in `union()` as a start step where the `Path` was including the starting dummy traverser.
+* Moved some TinkerGraph specific transaction tests from `TransactionMultiThreadedTest` to `TinkerTransactionGraphTest`
+* Fixed incorrect read operations in some cases for `TinkerTransactionGraph`.
+* Updated JavaScript tests to check equality on only id and class when comparing elements for consistency with other GLVs.
+* Improved performance for Element comparison by comparing hashCode() prior to doing more expensive checks.
+
+==== Bugs
+
+* TINKERPOP-2811 ElementIdStrategy doesn't replace all references of an element's id with the specified custom id property
+* TINKERPOP-2921 Filters not working when side-effect is used with group()
+* TINKERPOP-2976 InvalidOperationException: Collection was modified in GraphBinary serialization
+* TINKERPOP-2983 Upgrade Netty for Security Reasons
+* TINKERPOP-2996 Golang Translator in core does not properly translate list arguments
+* TINKERPOP-2999 3.7.0 Remote Console Sends Incomplete Queries
+* TINKERPOP-3000 Issue with union step when using path().by()
+* TINKERPOP-3001 Gremlin Console complains about missing serializers field
+* TINKERPOP-3004 Low performance for queries with a large number of element comparisons
+* TINKERPOP-3009 SubgraphStrategy produces excessive filtering when multiple labels are filtered upon
+* TINKERPOP-3010 Move TinkerGraph specific transaction testing
+* TINKERPOP-3013 Console not sending scripts to the server when :remote console is enabled
+* TINKERPOP-3014 Dependencny jcl-over-slf4j in gremlin-core is declared but unused due to dependency conflict.
+* TINKERPOP-3016 TinkerTransactionGraph can incorrectly handle some read operations.
+
+==== Improvements
+
+* TINKERPOP-2334 Add format() step
+* TINKERPOP-2672 Add String Manipulation Steps to Gremlin
+* TINKERPOP-2802 Support Adding Custom Serializer for Gremlin Go
+* TINKERPOP-2830 Handle User-Agent from HTTP Requests to server
+* TINKERPOP-2946 Resolve ordering issues in gherkin tests
+* TINKERPOP-2951 Add translator to the Go GLV
+* TINKERPOP-2964 Many TraversalParent's steps have a replaceLocalChild logic that can result in a new ChildTraversal having an ID that already exists.
+* TINKERPOP-2978 Add List Manipulation Steps to Gremlin
+* TINKERPOP-2979 Add Date Manipulation Steps to Gremlin
+* TINKERPOP-2982 Allow gremlin-driver usage over HTTP
+* TINKERPOP-2984 Replace Moq mocking library in .NET tests
+* TINKERPOP-2986 StarGraph shall drop edge properties when dropping edges
+* TINKERPOP-2988 Serialization error throws an Invalid OpProcessor exception when using stream() API
+* TINKERPOP-2991 Reformat Javadoc link in reference docs
+* TINKERPOP-2994 PartitionStrategy does not work with mergeV() and mergeE()
+* TINKERPOP-2998 UnionStep.isStart needs a public getter
+* TINKERPOP-3008 Update concat() to accept traversal varargs and remove special treatment of inject child traversals *(breaking)*
+
+[[release-3-7.0]]
+=== TinkerPop 3.7.0 (Release Date: July 31, 2023)
+
+This release also includes changes from <<release-3-6-5, 3.6.5>> and <<release-3-5-7, 3.5.7>>.
+
+* Allowed `mergeV()` and `property(Map)` to more easily define `Cardinality` values for properties for `onMatch` and `onCreate` options.
+* Removed `connectOnStartup` configuration option from gremlin-javascript.
+* Added marker interface `PBiPredicate` for predefined predicates.
+* Changed `Gremlin.version()` to read from the more specifically named `tinkerpop-version` attribute.
+* Added warning on vertex property cardinality mismatch when reading GraphML.
+* Added a `union()` start step.
+* Added the `concat()` step to perform `String` concatenations.
+* Added `TinkerTransactionGraph`, a reference implementation of transactional `TinkerGraph`
+* Replaced instances of Neo4j transaction graph with `TinkerTransactionGraph` for server, driver, and GLV integration tests
+* Bumped to `ws` 8.x for `gremlin-javascript`.
+* Added support for mid-traversal `E()`-steps to Gremlin core and GLV's.
+* Added nullable annotations to Gremlin.NET.
+* Bumped Objenesis to 3.3 in `gremlin-shaded`.
+* Moved Java serializer, message and token classes from `gremlin-driver` to a new `gremlin-util` module.
+* Moved `SimpleSocketServer` and its initializers to a new `gremlin-tools/gremlin-socket-server` module.
+* Configured `gremlin-socket-server` to build a docker image which can be used for testing GLV's. (Can be skipped with -DskipImageBuild)
+* Reduced dependency from `gremlin-server` onto `gremlin-driver` to a test scope only.
+* Added `RequestOptions` and `RequestOptionsBuilder` types to Go GLV to encapsulate per-request settings and bindings.
+* Added `SubmitWithOptions()` methods to `Client` and `DriverRemoteConnection` in Go GLV to pass `RequestOptions` to the server.
+* Changed default behavior for returning properties on graph elements for OLTP queries so that properties are now returned.
+* Detachment is no longer performed in `TraverserIterator`.
+* Prevented `ConcurentModificationException` when removing all labels from a `Step`.
+* Added `materializeProperties` request option to control properties serialization.
+* Modified serializers in to handle serialization and deserialization of properties.
+* Added functional properties to the graph structure components for .NET, GO and Python.
+* Modified the `GremlinScriptChecker` to extract the `materializeProperties` request option.
+* `Neo4jVertexProperty` no longer throw Exception for `properties()`, but return empty `Iterable`.
+* Modified the grammar to allow for parameters to be specified in Gremlin.
+* Modified `GremlinLangScriptEngine` to take bindings.
+* Removed deprecated `getInstance()` method for grammar `Visitor` implementations.
+* Renamed all `MessageSerializer` implementations that used the "d0" suffix to drop that convention.
+* Removed deprecated `GraphSONMessageSerializerGremlinV1d0` as this is now `GraphSONMessageSerializerV1` to be consistent with other naming.
+* Added `GraphSONUntypedMessageSerializerV1` which was formerly `GraphSONMessageSerializerV1d0` to be consistent with other naming.
+* Added `GraphSONUntypedMessageSerializerV3` which essentially matches the format of GraphSON 1.0 in its untyped form.
+* Removed `gremlin-io-test` and moved that IO type of testing to `gremlin-util`.
+* Bumped Groovy to 4.0.9.
+* Bumped GMavenPlus to 2.1.0.
+* Bumped Spark to 3.3.2.
+* Enabled building and testing with JDK 17.
+* Raised minimum node version for gremlin-javascript and gremlint to node 18
+
+==== Bugs
+
+* TINKERPOP-2526 Gremlin Console performance with incomplete multi-line scripts
+* TINKERPOP-2677 Upgrade to Groovy 3.x to fix XStream security vulnerability
+* TINKERPOP-2708 unhandledRejection upon connection failure *(breaking)*
+* TINKERPOP-2734 NullPointerException when calling Client chooseConnection()
+* TINKERPOP-2736 PluginAcceptror interface no more available in 3.5.3+ but referred in documentation
+* TINKERPOP-2741 GraphMLWriter error message is not properly formatted
+* TINKERPOP-2742 IO read may use wrong cardinality for property
+* TINKERPOP-2746 Medium security vulnerabilities on logback-core
+* TINKERPOP-2751 Transaction: tx.commit() hangs up in javascript client-lib
+* TINKERPOP-2754 Javascript client hangs if the server restarts
+* TINKERPOP-2765 Race condition during script creation when using UnifiedChannelizer
+* TINKERPOP-2767 Repeat Out Times traversal hangs indefinitely on first execution
+* TINKERPOP-2768 BranchStep pickToken should be integrated when added as a child option
+* TINKERPOP-2769 gremlin-server does not reply with a timeout response to all timed out requests
+* TINKERPOP-2771 Critical severity security vulnerabilty in commons-configuration 2.7
+* TINKERPOP-2775 Remove dependency on cloudflare CDN
+* TINKERPOP-2796 High severity security vulnerability found in snakeyaml
+* TINKERPOP-2801 Incorrect deprecation notice on gremlin-python
+* TINKERPOP-2803 Incorrect count() with sample() in TinkerGraph
+* TINKERPOP-2805 No results returned for multiple labels to select()
+* TINKERPOP-2809 High severity security vulnerability found in jackson databind
+* TINKERPOP-2815 Critical security vulnerability for apache commons-text
+* TINKERPOP-2816 Gherkin test issues for implementers
+* TINKERPOP-2817  "Could not find a type identifier for the class : class java.lang.Byte" occurs when dumping graph to graphson format
+* TINKERPOP-2820 gremlin-python _close_session race condition/FD leak
+* TINKERPOP-2826 Critical security vulnerability in ivy
+* TINKERPOP-2836 Github actions do not run java driver integration tests
+* TINKERPOP-2840 Test Failures on NonDex
+* TINKERPOP-2843 Security vulnerabilities found in netty version 4.1.77
+* TINKERPOP-2849 Incorrect implementation for GraphTraversalSource.With in gremlin-go
+* TINKERPOP-2855 Performance degradation in TinkerGraph 3.5.4 and 3.5.5
+* TINKERPOP-2856 math() step fails if variable name contains a keyword
+* TINKERPOP-2858 ConcurrentModificationException in ConnectiveStrategy
+* TINKERPOP-2861 Fix incorrect symlinks in source release zip
+* TINKERPOP-2863 HasId Step generates incorrect results when given a list of IDs mid-traversal
+* TINKERPOP-2870 mergeV requires key of 'new' to be quoted
+* TINKERPOP-2878 Incorrect handling of local operations when there are duplicate elements
+* TINKERPOP-2888 DefaultTraversal's applyStrategies performance decrease
+* TINKERPOP-2891 Inconsistent behavior when comparing a counted value with a negative value
+* TINKERPOP-2893 Incorrectly comparing a counted value with multiple predicates
+* TINKERPOP-2901 Incorrect result caused by has(key, predicate)
+* TINKERPOP-2902 Critical security vulnerability in snakeyaml
+* TINKERPOP-2905 gremlin-go gorillaTransporter.logHandler is not initialized correctly and leads to panic
+* TINKERPOP-2911 CountStrategy converts count().is(0) wrongly under ConnectiveStrategy
+* TINKERPOP-2918 Utils.GenerateUserAgent assumes Gremlin.Net.dll to be present when, in some environments, it is not.
+* TINKERPOP-2920 SubgraphStrategy failure when property key not present on vertex in by()
+* TINKERPOP-2922 GroovyTranslator produces a Map not parseable by the grammar
+* TINKERPOP-2925 mergeE() in javascript producing an error
+* TINKERPOP-2926 Gremlin-Java > An UnsupportedOperationException occurs on calling next() after a merge step with the option step modulator if the element does not exist
+* TINKERPOP-2928 element() not working in conjunction with edge properties
+* TINKERPOP-2937 Throw an error when trying to use a closed connection
+* TINKERPOP-2944 Memory leak in Gremlin.Net driver if CancellationToken is used
+* TINKERPOP-2945 TextP.regex() Serialization Failing in Java driver
+* TINKERPOP-2948 PRISMA security vulnerabilty for jackson-databind 2.14.0 *(breaking)*
+* TINKERPOP-2953 Static import for __.values() overriden by Column.values()
+* TINKERPOP-2957 mergeV with sideEffect not correctly updating properties
+* TINKERPOP-2958 ScheduledExecutorService for timeouts are never cancelled
+* TINKERPOP-2965 FilterRankingStrategy removing labels it shouldn't in certain conditions
+
+==== Improvements
+
+* TINKERPOP-1403 Provide support for GraphFilter.vertexProperties() *(breaking)*
+* TINKERPOP-2229 JavaScript GLV: Add GraphBinary Support
+* TINKERPOP-2348 Enable nullable checks
+* TINKERPOP-2373 Bump to Groovy 4.0
+* TINKERPOP-2471 Add logging to Gremlin.Net driver
+* TINKERPOP-2480 User agent for Gremlin drivers
+* TINKERPOP-2622 Enforce ordering semantics in feature tests
+* TINKERPOP-2631 GraphSON float serialization when ujson is used is imprecise
+* TINKERPOP-2633 Support Gremlin Console on Java 17
+* TINKERPOP-2693 Complete GraphBinary support in Python
+* TINKERPOP-2696 Refactor Gherkin test framework to better handle bindings
+* TINKERPOP-2703 Build on JDK17
+* TINKERPOP-2715 remove log4jv1 dependency
+* TINKERPOP-2723 Make GraphBinary the default serialization format for .NET and Python
+* TINKERPOP-2731 Bump to Spark 3.3.0
+* TINKERPOP-2737 Dockerized Build and Test Environments
+* TINKERPOP-2747 Add function callback hooks for gremlin-go authentication
+* TINKERPOP-2748 Medium security vulnerability on netty-all and netty-codec
+* TINKERPOP-2749 Support Windows Build
+* TINKERPOP-2761 Gremlin: use another manifest name for version
+* TINKERPOP-2762 getScopeKeys should respect the order of keys passed in Step
+* TINKERPOP-2764 AWS Neptune returns an inaccessible structured error response
+* TINKERPOP-2772 Add Spark utility to load vertices as RDD
+* TINKERPOP-2776 Add website analytics for TinkerPop apache site
+* TINKERPOP-2779 Floating ConnectedComponent Feature Failures for GitHub Actions on windows
+* TINKERPOP-2785 Inability to Mock Returned Result Types in Gremlin-Go Driver
+* TINKERPOP-2792 Better exception when JavaTranslator finds a method but not the overload
+* TINKERPOP-2794 Allow cancellation of Gremlin.Net async methods
+* TINKERPOP-2798 Add support for mid-traversal E()
+* TINKERPOP-2804 gherkin feature files should be on the classpath
+* TINKERPOP-2806 Provide method for provider plugins to get notified on script/query processing
+* TINKERPOP-2808 Improve Compatibility on ARM machines
+* TINKERPOP-2810 gremlinpython aiohttp dependency requirement too strict
+* TINKERPOP-2813 Improve driver usability for cases where NoHostAvailableException is currently thrown
+* TINKERPOP-2814 Add a SSL handshake timeout configuration to the driver
+* TINKERPOP-2818 exclude mockito-core in gremlin-core [compile scope] (import by jcabi-manifests)
+* TINKERPOP-2824 Properties on Elements *(breaking)*
+* TINKERPOP-2834 CloneVertexProgram optimization on SparkGraphComputer
+* TINKERPOP-2838 Add UserAgent GLV Tests
+* TINKERPOP-2841 Test and Fix Per Request Settings in Go
+* TINKERPOP-2842 Expand GremlinScriptChecker to include request id overrides
+* TINKERPOP-2844 Test and Fix Per Request Settings in Python
+* TINKERPOP-2850 Modifications to mergeV/E semantics
+* TINKERPOP-2852 Update Maven plugin for docker-images building for M1 compatibility
+* TINKERPOP-2853 Gremlin.Net driver should throw better exception message for unsupported GraphBinary type
+* TINKERPOP-2857 GraphSONRecordReader does not allow configure a GraphFilter during deserialization
+* TINKERPOP-2865 Add has steps injected by PartitionStrategy at the end of the filter
+* TINKERPOP-2873 Allow Union of Traversals
+* TINKERPOP-2890 Avoid exceptions on local scope based steps where possible
+* TINKERPOP-2899 SampleGlobalStep samples inefficiently with TraverserSet running into hash collisions
+* TINKERPOP-2912 Improve error message for addE() when traverser is incorrect
+* TINKERPOP-2919 Improve performance of FilterRankingStrategy for deeply nested traversals
+* TINKERPOP-2924 Refactor PropertyMapStep to be able to overwrite map method
+* TINKERPOP-2929 Introduce new marker interfaces to identify whether a step can perform write or delete or both
+* TINKERPOP-2931 Fix a few minor mergeV/E issues
+* TINKERPOP-2934 Optimize ObjectWritable for displaying content of Java Collection or Map to reduce OOM
+* TINKERPOP-2938 Revisit merge step feature tests
+* TINKERPOP-2939 The Merge onMatch map validation is during execution instead of construction
+* TINKERPOP-2941 DO NOT purge the output location if it has content in SparkGraphComputer
+* TINKERPOP-2947 Provide a plain text serializer for HTTP
+* TINKERPOP-2949 More strict handling of predicates
+* TINKERPOP-2954 Pass Gremlin Version from Maven to Java Without Manifests
+* TINKERPOP-2955 Support SSL in WebSocketClient
+* TINKERPOP-2959 Allow the grammar to support parameters
+* TINKERPOP-2963 Introduce new mimeType to return GraphSon-1.0 in text format
+* TINKERPOP-2967 Add untyped GraphSON 3.0 format
+* TINKERPOP-2975 Native transaction support for Tinkerpop
+* TINKERPOP-2977 Deprecate Neo4j-Gremlin
+
 == TinkerPop 3.6.0 (Tinkerheart)
 
 image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-victorian.png[width=185]
diff --git a/LICENSE b/LICENSE
index 1e747a9..56d9bf7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -209,5 +209,7 @@
 
      bootstrap 5.0.0 (http://getbootstrap.com/) - for details, see licenses/bootstrap
      jquery 1.11.0 (https://jquery.com/) - for details, see licenses/jquery
-     normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
-     prism.css/js 1.27.0 (http://prismjs.com) - for details, see licenses/prism
\ No newline at end of file
+     normalize.css 2.1.2 (https://necolas.github.io/normalize.css/) - for details, see licenses/normalize
+     prism.css/js 1.27.0 (https://prismjs.com/) - for details, see licenses/prism
+     wow.js 1.1.2 (https://wowjs.uk/) - for details, see licenses/wow
+     chai 5.0.0 (https://www.chaijs.com/) - for details, see licenses/chai
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index 7305842..7c5c3ee 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -140,8 +140,9 @@
 cd ${DIR_NAME}
 echo -n "* checking source files ... "
 find . -type f | xargs -n1 -I {} file {} --mime | grep 'charset=binary' | cut -f1 -d: |
-  grep -Pv '^\./docs/(static|(site/home))/(img|images|fonts)/((icons|logos|policy|resources|providers|community|use-cases|gremlin|download)/)?[^/]*\.(png|jpg|ico|pdf|eot|otf|woff|woff2|ttf)$' |
+  grep -Pv '^\./docs/(static|(site/home))/(img|images|fonts)/((icons|logos|policy|resources|providers|community|use-cases|gremlin|download|social)/)?[^/]*\.(png|jpg|ico|pdf|eot|otf|woff|woff2|ttf)$' |
   grep -Pv '^\./docs/gremlint/(src|public)/[^/]*\.(png|jpg|ico)$' |
+  grep -Pv '^\./docs/original/(ai/)?[^/]*\.(png|jpg|ico|ai)$' |
   grep -Pv '^./gremlin-dotnet/src/images/[^/]*\.(png|ico)$' |
   grep -Pv '^./gremlin-dotnet/.*\.snk$' |
   grep -Pv '^./gremlin-server/src/test/resources/[^/]*\.(p12|jks)$' |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 96a6f59..7d978b7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM ubuntu:focal
+FROM --platform=linux/amd64 ubuntu:focal
 
 LABEL maintainer="Daniel Kuppitz <me@gremlin.guru>"
 
diff --git a/docker/build/Dockerfile.template b/docker/build/Dockerfile.template
index cd15a06..cefc618 100644
--- a/docker/build/Dockerfile.template
+++ b/docker/build/Dockerfile.template
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM tinkerpop:hadoop-HADOOP_VERSION
+FROM --platform=linux/amd64 tinkerpop:hadoop-HADOOP_VERSION
 
 RUN mkdir -p /usr/src/tinkerpop
 WORKDIR /usr/src/tinkerpop
diff --git a/docker/gremlin-server/docker-entrypoint.sh b/docker/gremlin-server/docker-entrypoint.sh
index f11348e..fa87baf 100644
--- a/docker/gremlin-server/docker-entrypoint.sh
+++ b/docker/gremlin-server/docker-entrypoint.sh
@@ -23,21 +23,17 @@
 
 IP=$(hostname -i)
 
-INCLUDE_NEO4J=
-
 function usage {
   echo -e "\nUsage: `basename $0` <version> [OPTIONS]" \
           "\nStart Gremlin Server instances that match the Maven integration test environment." \
           "\n\nOptions are:\n" \
           "\n\t<version> This value is optional and if unspecified will build the current version" \
-          "\n\t-n, --neo4j              include Neo4j to make transactions testable" \
           "\n\t-h, --help               show this message" \
           "\n"
 }
 
 while [ ! -z "$1" ]; do
   case "$1" in
-    -n | --neo4j ) INCLUDE_NEO4J=true; shift ;;
     -h | --help ) usage; exit 0 ;;
     *) usage 1>&2; exit 1 ;;
   esac
@@ -51,10 +47,6 @@
 echo "ws://${IP}:45941/gremlin with basic authentication (stephen/password)"
 echo "ws://${IP}:45942/gremlin with kerberos authentication (stephen/password)"
 echo
-if [ ! -z "${INCLUDE_NEO4J}" ]; then
-  echo Installing Neo4j to the environment: transactions are testable on port 45940
-  echo
-fi
 echo "See docker/gremlin-server/docker-entrypoints.sh for transcripts per GLV."
 echo "#############################################################################"
 
@@ -65,15 +57,6 @@
 dos2unix /opt/gremlin-server/bin/gremlin-server.sh
 dos2unix /opt/gremlin-server/bin/gremlin-server.conf
 
-# dynamically installs Neo4j libraries so that we can test variants with transactions,
-# but only only port 45940 is configured with the neo4j graph as the neo4j-empty.properties
-# is statically pointing at a temp directory and that space can only be accessed by one
-# graph at a time
-if [ ! -z "${INCLUDE_NEO4J}" ]; then
-  sed -i 's/graphs: {/graphs: {\n  tx: conf\/neo4j-empty.properties,/' ${TINKERPOP_HOME}/conf/gremlin-server-integration.yaml
-  /opt/gremlin-server/bin/gremlin-server.sh install org.apache.tinkerpop neo4j-gremlin ${GREMLIN_SERVER_VERSION}
-fi
-
 /opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration.yaml &
 
 /opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration-secure.yaml &
diff --git a/docker/gremlin-server/gremlin-server-integration-krb5.yaml b/docker/gremlin-server/gremlin-server-integration-krb5.yaml
index e7205be..e2ca7f0 100644
--- a/docker/gremlin-server/gremlin-server-integration-krb5.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-krb5.yaml
@@ -24,7 +24,9 @@
   modern: conf/tinkergraph-empty.properties,
   crew: conf/tinkergraph-empty.properties,
   grateful: conf/tinkergraph-empty.properties,
-  sink: conf/tinkergraph-empty.properties}
+  sink: conf/tinkergraph-empty.properties,
+  tx: conf/tinkertransactiongraph-empty.properties
+}
 scriptEngines: {
   gremlin-lang : {},
   gremlin-groovy: {
@@ -34,11 +36,11 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
diff --git a/docker/gremlin-server/gremlin-server-integration-secure.yaml b/docker/gremlin-server/gremlin-server-integration-secure.yaml
index 52f7d08..09776d1 100644
--- a/docker/gremlin-server/gremlin-server-integration-secure.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-secure.yaml
@@ -24,7 +24,9 @@
   modern: conf/tinkergraph-empty.properties,
   crew: conf/tinkergraph-empty.properties,
   grateful: conf/tinkergraph-empty.properties,
-  sink: conf/tinkergraph-empty.properties}
+  sink: conf/tinkergraph-empty.properties,
+  tx: conf/tinkertransactiongraph-empty.properties
+}
 scriptEngines: {
   gremlin-lang : {},
   gremlin-groovy: {
@@ -34,11 +36,11 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
diff --git a/docker/gremlin-server/gremlin-server-integration.yaml b/docker/gremlin-server/gremlin-server-integration.yaml
index 3b80082..d039479 100644
--- a/docker/gremlin-server/gremlin-server-integration.yaml
+++ b/docker/gremlin-server/gremlin-server-integration.yaml
@@ -26,7 +26,8 @@
   modern: conf/tinkergraph-service.properties,
   crew: conf/tinkergraph-service.properties,
   grateful: conf/tinkergraph-service.properties,
-  sink: conf/tinkergraph-service.properties
+  sink: conf/tinkergraph-service.properties,
+  tx: conf/tinkertransactiongraph-service.properties
 }
 scriptEngines: {
   gremlin-lang : {},
@@ -37,11 +38,11 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
diff --git a/docker/gremlin-test-server/Dockerfile b/docker/gremlin-test-server/Dockerfile
index 4053a72..6802dca 100644
--- a/docker/gremlin-test-server/Dockerfile
+++ b/docker/gremlin-test-server/Dockerfile
@@ -37,5 +37,5 @@
 
 EXPOSE 45940-45942 4588
 
-ENTRYPOINT ["/opt/docker-entrypoint.sh", "-n"]
+ENTRYPOINT ["/opt/docker-entrypoint.sh"]
 CMD []
diff --git a/docker/hadoop/Dockerfile.template b/docker/hadoop/Dockerfile.template
index 89538d1..50ca536 100644
--- a/docker/hadoop/Dockerfile.template
+++ b/docker/hadoop/Dockerfile.template
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM tinkerpop:base
+FROM --platform=linux/amd64 tinkerpop:base
 
 LABEL maintainer="Daniel Kuppitz <me@gremlin.guru>"
 
diff --git a/docs/gremlint/package-lock.json b/docs/gremlint/package-lock.json
index 5c6e269..e370f99 100644
--- a/docs/gremlint/package-lock.json
+++ b/docs/gremlint/package-lock.json
@@ -10,70 +10,167 @@
       "license": "Apache-2.0",
       "dependencies": {
         "customize-cra": "^1.0.0",
-        "gremlint": "^3.5.2",
+        "gremlint": "^3.7.0",
         "react": "^17.0.2",
-        "react-app-rewired": "^2.1.11",
+        "react-app-rewired": "^2.2.1",
         "react-dom": "^17.0.2",
-        "react-scripts": "^5.0.0",
+        "react-scripts": "^5.0.1",
         "sharp-router": "^4.1.5",
-        "styled-components": "^5.3.3",
+        "styled-components": "^6.1.0",
         "typescript": "^4.7.3",
-        "web-vitals": "^2.1.3"
+        "web-vitals": "^3.5.0"
       },
       "devDependencies": {
-        "@testing-library/jest-dom": "^5.16.1",
-        "@testing-library/react": "^12.1.2",
-        "@testing-library/user-event": "^13.5.0",
-        "@types/jest": "^27.5.0",
-        "@types/node": "^17.0.8",
+        "@testing-library/jest-dom": "^6.1.0",
+        "@testing-library/react": "^12.1.5",
+        "@testing-library/user-event": "^14.5.1",
+        "@types/jest": "^29.5.4",
+        "@types/node": "^20.8.7",
         "@types/react": "^17.0.38",
         "@types/react-dom": "^17.0.11",
-        "@types/styled-components": "^5.1.20",
-        "gh-pages": "^3.1.0",
-        "prettier": "^2.7.0",
+        "@types/styled-components": "^5.1.26",
+        "gh-pages": "^6.0.0",
+        "prettier": "^3.0.1",
         "tslint": "^6.1.3",
         "tslint-config-prettier": "^1.18.0"
+      },
+      "engines": {
+        "node": "18"
+      }
+    },
+    "node_modules/@adobe/css-tools": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
+      "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==",
+      "dev": true
+    },
+    "node_modules/@alloc/quick-lru": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@babel/compat-data": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz",
-      "integrity": "sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
+      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
-      "integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.7",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helpers": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7",
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "json5": "^2.2.2",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -83,18 +180,10 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/core/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz",
-      "integrity": "sha512-kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
+      "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
       "dependencies": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
@@ -117,11 +206,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz",
-      "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dependencies": {
-        "@babel/types": "^7.21.4",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -131,35 +220,34 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
+      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz",
-      "integrity": "sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
+      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
       "dependencies": {
-        "@babel/compat-data": "^7.21.4",
-        "@babel/helper-validator-option": "^7.21.0",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
         "browserslist": "^4.21.3",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.0"
@@ -171,32 +259,20 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-    },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz",
-      "integrity": "sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -206,12 +282,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz",
-      "integrity": "sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^4.7.1"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -221,9 +298,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.17.7",
         "@babel/helper-plugin-utils": "^7.16.7",
@@ -237,226 +314,219 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
-      "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dependencies": {
-        "@babel/types": "^7.21.0"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
-      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dependencies": {
-        "@babel/types": "^7.21.4"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
-      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.2",
-        "@babel/types": "^7.21.2"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
-      "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
+      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.20.7",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dependencies": {
-        "@babel/types": "^7.20.2"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dependencies": {
-        "@babel/types": "^7.20.0"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
+      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
-      "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -528,9 +598,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz",
-      "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -539,11 +609,11 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -553,13 +623,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -568,29 +638,13 @@
         "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -599,92 +653,16 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz",
-      "integrity": "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz",
-      "integrity": "sha512-MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz",
+      "integrity": "sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/plugin-syntax-decorators": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/plugin-syntax-decorators": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -694,11 +672,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
@@ -709,11 +687,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
@@ -723,46 +701,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz",
-      "integrity": "sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==",
-      "dependencies": {
-        "@babel/compat-data": "^7.16.4",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
@@ -773,12 +718,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz",
-      "integrity": "sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -788,15 +733,9 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "engines": {
         "node": ">=6.9.0"
       },
@@ -805,12 +744,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=4"
@@ -867,11 +806,11 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz",
-      "integrity": "sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz",
+      "integrity": "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -903,11 +842,39 @@
       }
     },
     "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.21.4.tgz",
-      "integrity": "sha512-l9xd3N+XG4fZRxEP3vXdK6RW7vN1Uf5dxzRC/09wV86wqZ/YYQooBIGNsiRdfNR3/q2/5pPzV4B54J/9ctX5jw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz",
+      "integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -939,11 +906,11 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz",
-      "integrity": "sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
+      "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1047,11 +1014,11 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz",
-      "integrity": "sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
+      "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1060,12 +1027,44 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
+      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1075,13 +1074,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1091,11 +1090,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1105,11 +1104,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
+      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1118,18 +1117,50 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
+      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1140,11 +1171,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1154,11 +1186,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz",
-      "integrity": "sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
+      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1168,12 +1200,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1183,11 +1215,26 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1197,12 +1244,27 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1212,12 +1274,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz",
-      "integrity": "sha512-FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz",
+      "integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-flow": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-flow": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1227,11 +1289,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1241,13 +1303,28 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1257,11 +1334,26 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1271,11 +1363,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1285,13 +1377,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1301,13 +1392,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz",
-      "integrity": "sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-simple-access": "^7.20.2"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1317,15 +1408,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz",
-      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1335,12 +1425,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1350,11 +1440,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
-      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1364,11 +1455,59 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "dependencies": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1378,12 +1517,43 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1393,11 +1563,43 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1407,11 +1609,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1421,11 +1623,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-constant-elements": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz",
-      "integrity": "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
+      "integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1435,11 +1637,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
-      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
+      "integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1449,15 +1651,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz",
-      "integrity": "sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
+      "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-jsx": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-jsx": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1467,11 +1669,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
-      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
+      "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.16.7"
+        "@babel/plugin-transform-react-jsx": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1481,12 +1683,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
-      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
+      "integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1496,11 +1698,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz",
-      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
+      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
       "dependencies": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1510,11 +1713,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1524,15 +1727,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz",
-      "integrity": "sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
+      "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.21.4",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1542,35 +1745,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1580,12 +1760,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1595,11 +1775,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1609,11 +1789,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1623,11 +1803,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1637,14 +1817,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz",
-      "integrity": "sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz",
+      "integrity": "sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-typescript": "^7.20.0"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-typescript": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1654,11 +1834,26 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
+      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1668,12 +1863,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1682,37 +1877,41 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.8.tgz",
-      "integrity": "sha512-9rNKgVCdwHb3z1IlbMyft6yIXIeP3xz6vWvGaLHrJThuEIqWfHb0DNBH9VuTgnDfdbUDhkmkvMZS/YMCtP7Elg==",
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
       "dependencies": {
-        "@babel/compat-data": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.16.7",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.7",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
+      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "dependencies": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1722,44 +1921,61 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.16.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.16.7",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.8",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.20.2",
+        "@babel/types": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "core-js-compat": "^3.30.2",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1785,16 +2001,16 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz",
-      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
+      "integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-react-display-name": "^7.16.7",
-        "@babel/plugin-transform-react-jsx": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-transform-react-display-name": "^7.22.5",
+        "@babel/plugin-transform-react-jsx": "^7.22.5",
+        "@babel/plugin-transform-react-jsx-development": "^7.22.5",
+        "@babel/plugin-transform-react-pure-annotations": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1804,15 +2020,15 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz",
-      "integrity": "sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
+      "integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-validator-option": "^7.21.0",
-        "@babel/plugin-syntax-jsx": "^7.21.4",
-        "@babel/plugin-transform-modules-commonjs": "^7.21.2",
-        "@babel/plugin-transform-typescript": "^7.21.3"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-syntax-jsx": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-typescript": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1821,10 +2037,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
+    },
     "node_modules/@babel/runtime": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
-      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
+      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
       },
@@ -1833,31 +2054,31 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz",
-      "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dependencies": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.4",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.4",
-        "@babel/types": "^7.21.4",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1866,12 +2087,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz",
-      "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1888,28 +2109,288 @@
       "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
       "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
     },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+    "node_modules/@csstools/postcss-cascade-layers": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
       "dependencies": {
-        "@emotion/memoize": "0.7.4"
+        "@csstools/selector-specificity": "^2.0.2",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-nested-calc": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-stepped-value-functions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-text-decoration-shorthand": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-trigonometric-functions": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-unset-value": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
+      "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+      "dependencies": {
+        "@emotion/memoize": "^0.8.1"
       }
     },
     "node_modules/@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-    },
-    "node_modules/@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
     },
     "node_modules/@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
@@ -1926,30 +2407,33 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
-      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
-      "integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
+      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.2.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "espree": "^9.5.2",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/argparse": {
@@ -1958,9 +2442,9 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -1971,14 +2455,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -2001,19 +2477,39 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
-      "integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       },
       "engines": {
         "node": ">=10.10.0"
       }
     },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
     "node_modules/@humanwhocodes/object-schema": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -2051,57 +2547,112 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.6.tgz",
-      "integrity": "sha512-jauXyacQD33n47A44KrlOVeiXHEXDqapSdfb9kTekOchH/Pd18kBIO1+xxJQRLuG+LUuljFCwTG92ra4NW7SpA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
+      "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/console/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/console/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/core": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.7.tgz",
-      "integrity": "sha512-n181PurSJkVMS+kClIFSX/LLvw9ExSb+4IMtD6YnfxZVerw9ANYtW0bPrm0MJu2pfe9SY9FJ9FtQ+MdZkrZwjg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
+      "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/console": "^27.4.6",
-        "@jest/reporters": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/reporters": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
+        "ci-info": "^3.2.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.4.2",
-        "jest-config": "^27.4.7",
-        "jest-haste-map": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-resolve": "^27.4.6",
-        "jest-resolve-dependencies": "^27.4.6",
-        "jest-runner": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
-        "jest-watcher": "^27.4.6",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.5.0",
+        "jest-config": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.6.2",
+        "jest-resolve-dependencies": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "jest-watcher": "^29.6.2",
         "micromatch": "^4.0.4",
-        "rimraf": "^3.0.0",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -2112,82 +2663,504 @@
         }
       }
     },
-    "node_modules/@jest/environment": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.6.tgz",
-      "integrity": "sha512-E6t+RXPfATEEGVidr84WngLNWZ8ffCPky8RqqRK6u1Bn0LK92INe0MDttyPl/JOzaq92BmDzOeuqk09TvM22Sg==",
+    "node_modules/@jest/core/node_modules/@jest/transform": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "@types/node": "*",
-        "jest-mock": "^27.4.6"
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/core/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@jest/core/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-haste-map": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-resolve": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-validate": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/jest-worker": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.6.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/core/node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@jest/core/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/@jest/core/node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
+      "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "jest-mock": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/environment/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/environment/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/expect": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "expect": "^29.6.2",
+        "jest-snapshot": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
+      "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/expect-utils/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/fake-timers": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.6.tgz",
-      "integrity": "sha512-mfaethuYF8scV8ntPpiVGIHQgS0XIALbpY2jt2l7wb/bvq4Q5pDLk4EP4D7SAvYT1QrPOPVZAtbdGAOOyIgs7A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
+      "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/types": "^27.4.2",
-        "@sinonjs/fake-timers": "^8.0.1",
+        "@jest/types": "^29.6.1",
+        "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^27.4.6",
-        "jest-mock": "^27.4.6",
-        "jest-util": "^27.4.2"
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/fake-timers/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.6.tgz",
-      "integrity": "sha512-kAiwMGZ7UxrgPzu8Yv9uvWmXXxsy0GciNejlHvfPIfWkSxChzv6bgTS3YqBkGuHcis+ouMFI2696n2t+XYIeFw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
+      "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/environment": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "expect": "^27.4.6"
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "jest-mock": "^29.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/globals/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.6.tgz",
-      "integrity": "sha512-+Zo9gV81R14+PSq4wzee4GC2mhAN9i9a7qgJWL90Gpx7fHYkWpTBvwWNZUXvJByYR9tAVBdc8VxDWqfJyIUrIQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
+      "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.4",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^5.1.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-haste-map": "^27.4.6",
-        "jest-resolve": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-worker": "^27.4.6",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "slash": "^3.0.0",
-        "source-map": "^0.6.0",
         "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -2198,62 +3171,406 @@
         }
       }
     },
-    "node_modules/@jest/source-map": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
-      "integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
+    "node_modules/@jest/reporters/node_modules/@jest/transform": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "source-map": "^0.6.0"
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@jest/reporters/node_modules/jest-haste-map": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/jest-worker": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.6.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
+      "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
+      "dev": true,
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
+      "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.6.tgz",
-      "integrity": "sha512-fi9IGj3fkOrlMmhQqa/t9xum8jaJOOAi/lZlm6JXSc55rJMXKHxNDN1oCP39B0/DhNOa2OMupF9BcKZnNtXMOQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
+      "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/console": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-result/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.6.tgz",
-      "integrity": "sha512-3GL+nsf6E1PsyNsJuvPyIz+DwFuCtBdtvPpm/LMXVkBJbdFvQYCDpccYT56qq5BGniXWlE81n2qk1sdXfZebnw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
+      "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/test-result": "^27.4.6",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
-        "jest-runtime": "^27.4.6"
+        "@jest/test-result": "^29.6.2",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/jest-haste-map": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/jest-worker": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.6.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/test-sequencer/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
     "node_modules/@jest/transform": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.6.tgz",
-      "integrity": "sha512-9MsufmJC8t5JTpWEQJ0OcOOAXaH5ioaIX6uHVBLBMoCZPfKKQF+EqP8kACAvCZ0Y1h2Zr3uOccg8re+Dr5jxyw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-util": "^27.4.2",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -2264,10 +3581,18 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/@jest/transform/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@jest/types": {
-      "version": "27.4.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
-      "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -2336,6 +3661,11 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
       "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
+    },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -2397,17 +3727,17 @@
       }
     },
     "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz",
-      "integrity": "sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw==",
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
+      "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
       "dependencies": {
         "ansi-html-community": "^0.0.8",
         "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.8.1",
+        "core-js-pure": "^3.23.3",
         "error-stack-parser": "^2.0.6",
         "find-up": "^5.0.0",
         "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.0",
+        "loader-utils": "^2.0.4",
         "schema-utils": "^3.0.0",
         "source-map": "^0.7.3"
       },
@@ -2418,7 +3748,7 @@
         "@types/webpack": "4.x || 5.x",
         "react-refresh": ">=0.10.0 <1.0.0",
         "sockjs-client": "^1.4.0",
-        "type-fest": ">=0.17.0 <3.0.0",
+        "type-fest": ">=0.17.0 <4.0.0",
         "webpack": ">=4.43.0 <6.0.0",
         "webpack-dev-server": "3.x || 4.x",
         "webpack-hot-middleware": "2.x",
@@ -2502,18 +3832,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/@rollup/plugin-babel": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz",
-      "integrity": "sha512-9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
+      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
       "dependencies": {
         "@babel/helper-module-imports": "^7.10.4",
         "@rollup/pluginutils": "^3.1.0"
@@ -2552,9 +3874,9 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve/node_modules/builtin-modules": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
       "engines": {
         "node": ">=6"
       },
@@ -2596,24 +3918,36 @@
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
-      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.2.tgz",
+      "integrity": "sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw=="
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
     },
     "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
+      "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+        "@sinonjs/commons": "^3.0.0"
       }
     },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
@@ -2835,44 +4169,64 @@
       }
     },
     "node_modules/@testing-library/dom": {
-      "version": "8.11.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.1.tgz",
-      "integrity": "sha512-3KQDyx9r0RKYailW2MiYrSSKEfH0GTkI51UGEvJenvcoDoeRYs0PZpi2SXqtnMClQvCqdtTTpOfFETDTVADpAg==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
+      "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.1.3",
         "chalk": "^4.1.0",
         "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
+        "lz-string": "^1.5.0",
         "pretty-format": "^27.0.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
     "node_modules/@testing-library/jest-dom": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.1.tgz",
-      "integrity": "sha512-ajUJdfDIuTCadB79ukO+0l8O+QwN0LiSxDaYUTI4LndbbUsGi6rWU1SCexXzBA2NSjlVB9/vbkasQIL3tmPBjw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.1.0.tgz",
+      "integrity": "sha512-EUAg9pvOkzmGXUSyAPt0h6yAXHxsn+FMNS1o7OX8TErmldZML2ywt10lotZXx/a1PDiSnq0fGGyEV/ybKSLPWQ==",
       "dev": true,
       "dependencies": {
+        "@adobe/css-tools": "^4.0.1",
         "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
         "aria-query": "^5.0.0",
         "chalk": "^3.0.0",
-        "css": "^3.0.0",
         "css.escape": "^1.5.1",
         "dom-accessibility-api": "^0.5.6",
         "lodash": "^4.17.15",
         "redent": "^3.0.0"
       },
       "engines": {
-        "node": ">=8",
+        "node": ">=14",
         "npm": ">=6",
         "yarn": ">=1"
+      },
+      "peerDependencies": {
+        "@jest/globals": ">= 28",
+        "@types/jest": ">= 28",
+        "jest": ">= 28",
+        "vitest": ">= 0.32"
+      },
+      "peerDependenciesMeta": {
+        "@jest/globals": {
+          "optional": true
+        },
+        "@types/jest": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        },
+        "vitest": {
+          "optional": true
+        }
       }
     },
     "node_modules/@testing-library/jest-dom/node_modules/chalk": {
@@ -2889,32 +4243,49 @@
       }
     },
     "node_modules/@testing-library/react": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.2.tgz",
-      "integrity": "sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==",
+      "version": "12.1.5",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz",
+      "integrity": "sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.0.0"
+        "@testing-library/dom": "^8.0.0",
+        "@types/react-dom": "<18.0.0"
       },
       "engines": {
         "node": ">=12"
       },
       "peerDependencies": {
-        "react": "*",
-        "react-dom": "*"
+        "react": "<18.0.0",
+        "react-dom": "<18.0.0"
+      }
+    },
+    "node_modules/@testing-library/react/node_modules/@testing-library/dom": {
+      "version": "8.20.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
+      "integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.1.3",
+        "chalk": "^4.1.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.5.0",
+        "pretty-format": "^27.0.2"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/@testing-library/user-event": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
-      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
+      "version": "14.5.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.1.tgz",
+      "integrity": "sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==",
       "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5"
-      },
       "engines": {
-        "node": ">=10",
+        "node": ">=12",
         "npm": ">=6"
       },
       "peerDependencies": {
@@ -2938,18 +4309,18 @@
       }
     },
     "node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "node_modules/@types/babel__core": {
-      "version": "7.1.18",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
-      "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
+      "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
       "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
         "@types/babel__generator": "*",
         "@types/babel__template": "*",
         "@types/babel__traverse": "*"
@@ -2973,11 +4344,11 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
+      "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
       "dependencies": {
-        "@babel/types": "^7.3.0"
+        "@babel/types": "^7.20.7"
       }
     },
     "node_modules/@types/body-parser": {
@@ -3006,27 +4377,27 @@
       }
     },
     "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
       "dependencies": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
       }
     },
     "node_modules/@types/eslint": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
-      "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.2.tgz",
+      "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "node_modules/@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -3038,30 +4409,31 @@
       "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
     },
     "node_modules/@types/express": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+      "version": "4.17.17",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
       "dependencies": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
+        "@types/express-serve-static-core": "^4.17.33",
         "@types/qs": "*",
         "@types/serve-static": "*"
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.28",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-      "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
+      "version": "4.17.35",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
+      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
     "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+      "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -3082,9 +4454,9 @@
       "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.8",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
-      "integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
+      "version": "1.17.11",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
+      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -3111,19 +4483,45 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "27.5.2",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.2.tgz",
-      "integrity": "sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==",
+      "version": "29.5.4",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.4.tgz",
+      "integrity": "sha512-PhglGmhWeD46FYOVLt3X7TiWjzwuVGW9wG/4qocPevXMjCmrIc5b6db9WjeGE4QYVpUAWMDv3v0IiBwObY289A==",
       "dev": true,
       "dependencies": {
-        "jest-matcher-utils": "^27.0.0",
-        "pretty-format": "^27.0.0"
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
+    "node_modules/@types/jest/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@types/jest/node_modules/pretty-format": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
+      "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
@@ -3136,9 +4534,12 @@
       "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
     },
     "node_modules/@types/node": {
-      "version": "17.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
-      "integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
+      "version": "20.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
+      "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==",
+      "dependencies": {
+        "undici-types": "~5.25.1"
+      }
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -3146,14 +4547,14 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "node_modules/@types/prettier": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.3.tgz",
-      "integrity": "sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w=="
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA=="
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.4",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
     },
     "node_modules/@types/q": {
       "version": "1.5.5",
@@ -3171,9 +4572,9 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "node_modules/@types/react": {
-      "version": "17.0.38",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.38.tgz",
-      "integrity": "sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==",
+      "version": "17.0.62",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz",
+      "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==",
       "dev": true,
       "dependencies": {
         "@types/prop-types": "*",
@@ -3182,12 +4583,12 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "17.0.11",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz",
-      "integrity": "sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==",
+      "version": "17.0.20",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz",
+      "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==",
       "dev": true,
       "dependencies": {
-        "@types/react": "*"
+        "@types/react": "^17"
       }
     },
     "node_modules/@types/resolve": {
@@ -3199,19 +4600,28 @@
       }
     },
     "node_modules/@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
     },
     "node_modules/@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
+      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
     },
     "node_modules/@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw=="
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/serve-index": {
       "version": "1.9.1",
@@ -3222,11 +4632,11 @@
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.13.10",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz",
+      "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==",
       "dependencies": {
-        "@types/mime": "^1",
+        "@types/mime": "*",
         "@types/node": "*"
       }
     },
@@ -3244,9 +4654,9 @@
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
     },
     "node_modules/@types/styled-components": {
-      "version": "5.1.20",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.20.tgz",
-      "integrity": "sha512-TvpQceFwnxJJsAzR1aHsYpL5DxWMHRzM2/0EA6sGtRjV6DtJubmNxeoPMPiIPQzKEGNHccwObXO7Hug/iwm1Xw==",
+      "version": "5.1.26",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
+      "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
       "dev": true,
       "dependencies": {
         "@types/hoist-non-react-statics": "*",
@@ -3254,50 +4664,46 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/testing-library__jest-dom": {
-      "version": "5.14.2",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.2.tgz",
-      "integrity": "sha512-vehbtyHUShPxIa9SioxDwCvgxukDMH//icJG90sXQBUm5lJOHLT5kNeU9tnivhnA/TkOFMzGIXN2cTc4hY8/kg==",
-      "dev": true,
-      "dependencies": {
-        "@types/jest": "*"
-      }
+    "node_modules/@types/stylis": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz",
+      "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw=="
     },
     "node_modules/@types/trusted-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
-      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
+      "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="
     },
     "node_modules/@types/ws": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz",
-      "integrity": "sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "version": "16.0.5",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
+      "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "20.2.1",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
-      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz",
-      "integrity": "sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz",
+      "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==",
       "dependencies": {
         "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/type-utils": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/type-utils": "5.59.11",
+        "@typescript-eslint/utils": "5.59.11",
         "debug": "^4.3.4",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
@@ -3322,26 +4728,21 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dependencies": {
-        "ms": "2.1.2"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=10"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3352,12 +4753,17 @@
         "node": ">=10"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.1.tgz",
-      "integrity": "sha512-KVtKcHEizCIRx//LC9tBi6xp94ULKbU5StVHBVWURJQOVa2qw6HP28Hu7LmHrQM3p9I3q5Y2VR4wKllCJ3IWrw==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.11.tgz",
+      "integrity": "sha512-GkQGV0UF/V5Ra7gZMBmiD1WrYUFOJNvCZs+XQnUyJoxmqfWMXVNyB2NVCPRKefoQcpvTv9UpJyfCvsJFs8NzzQ==",
       "dependencies": {
-        "@typescript-eslint/utils": "5.59.1"
+        "@typescript-eslint/utils": "5.59.11"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3371,13 +4777,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.1.tgz",
-      "integrity": "sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz",
+      "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/typescript-estree": "5.59.11",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3396,29 +4802,13 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz",
-      "integrity": "sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
+      "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
       "dependencies": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1"
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/visitor-keys": "5.59.11"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3429,12 +4819,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz",
-      "integrity": "sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz",
+      "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@typescript-eslint/typescript-estree": "5.59.11",
+        "@typescript-eslint/utils": "5.59.11",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -3454,26 +4844,10 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.1.tgz",
-      "integrity": "sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
+      "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -3483,12 +4857,12 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz",
-      "integrity": "sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
+      "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
       "dependencies": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/visitor-keys": "5.59.11",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3516,22 +4890,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -3551,10 +4909,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3565,17 +4934,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.1.tgz",
-      "integrity": "sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz",
+      "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/typescript-estree": "5.59.11",
         "eslint-scope": "^5.1.1",
         "semver": "^7.3.7"
       },
@@ -3610,10 +4984,21 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3624,12 +5009,17 @@
         "node": ">=10"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz",
-      "integrity": "sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
+      "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
       "dependencies": {
-        "@typescript-eslint/types": "5.59.1",
+        "@typescript-eslint/types": "5.59.11",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -3641,133 +5031,133 @@
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz",
-      "integrity": "sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz",
-      "integrity": "sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz",
-      "integrity": "sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz",
-      "integrity": "sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz",
-      "integrity": "sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz",
-      "integrity": "sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz",
-      "integrity": "sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz",
-      "integrity": "sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz",
-      "integrity": "sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz",
-      "integrity": "sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz",
-      "integrity": "sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/helper-wasm-section": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-opt": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5",
-        "@webassemblyjs/wast-printer": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz",
-      "integrity": "sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz",
-      "integrity": "sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz",
-      "integrity": "sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz",
-      "integrity": "sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/ast": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -3782,9 +5172,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -3799,9 +5189,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3830,9 +5220,9 @@
       }
     },
     "node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -3845,27 +5235,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-node/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/acorn-walk": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
@@ -3905,18 +5274,6 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -3949,9 +5306,9 @@
       }
     },
     "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -3976,11 +5333,6 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -4028,10 +5380,15 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4041,9 +5398,9 @@
       }
     },
     "node_modules/arg": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
-      "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA=="
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
     },
     "node_modules/argparse": {
       "version": "1.0.10",
@@ -4061,39 +5418,6 @@
         "deep-equal": "^2.0.5"
       }
     },
-    "node_modules/aria-query/node_modules/deep-equal": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
-      "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "es-get-iterator": "^1.1.3",
-        "get-intrinsic": "^1.2.0",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.2",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/aria-query/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-    },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
@@ -4132,7 +5456,7 @@
     "node_modules/array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
       "dev": true,
       "dependencies": {
         "array-uniq": "^1.0.1"
@@ -4144,7 +5468,7 @@
     "node_modules/array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4184,6 +5508,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.reduce": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
+      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.tosorted": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
@@ -4199,7 +5541,7 @@
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
     "node_modules/ast-types-flow": {
       "version": "0.0.7",
@@ -4207,17 +5549,14 @@
       "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
     },
     "node_modules/async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
@@ -4227,26 +5566,24 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
     "node_modules/autoprefixer": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz",
-      "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
+      "version": "10.4.14",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
+      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        }
+      ],
       "dependencies": {
-        "browserslist": "^4.19.1",
-        "caniuse-lite": "^1.0.30001297",
-        "fraction.js": "^4.1.2",
+        "browserslist": "^4.21.5",
+        "caniuse-lite": "^1.0.30001464",
+        "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
         "postcss-value-parser": "^4.2.0"
@@ -4257,10 +5594,6 @@
       "engines": {
         "node": "^10 || ^12 || >=14"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
       "peerDependencies": {
         "postcss": "^8.1.0"
       }
@@ -4277,66 +5610,33 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
-      "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
+      "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axobject-query": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
-      "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
       "dependencies": {
-        "deep-equal": "^2.0.5"
+        "dequal": "^2.0.3"
       }
     },
-    "node_modules/axobject-query/node_modules/deep-equal": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
-      "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "es-get-iterator": "^1.1.3",
-        "get-intrinsic": "^1.2.0",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.2",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/axobject-query/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-    },
     "node_modules/babel-jest": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.6.tgz",
-      "integrity": "sha512-qZL0JT0HS1L+lOuH+xC2DVASR3nunZi/ozGhpgauJHgmI7f8rudxf6hUjEHympdQ/J64CdKmPkgfJ+A3U6QCrg==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
       "dependencies": {
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^27.4.0",
+        "babel-preset-jest": "^27.5.1",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -4347,12 +5647,12 @@
       }
     },
     "node_modules/babel-loader": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
       "dependencies": {
         "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
+        "loader-utils": "^2.0.0",
         "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
       },
@@ -4364,30 +5664,6 @@
         "webpack": ">=2"
       }
     },
-    "node_modules/babel-loader/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/babel-loader/node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/babel-loader/node_modules/schema-utils": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
@@ -4405,14 +5681,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -4429,9 +5697,9 @@
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
-      "integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -4465,12 +5733,12 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
+      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
       "dependencies": {
         "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
         "semver": "^6.1.1"
       },
       "peerDependencies": {
@@ -4478,47 +5746,28 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz",
-      "integrity": "sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
+      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.20.0"
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
+        "core-js-compat": "^3.30.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
+      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/babel-plugin-styled-components": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz",
-      "integrity": "sha512-7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.0",
-        "@babel/helper-module-imports": "^7.16.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.11"
-      },
-      "peerDependencies": {
-        "styled-components": ">= 2"
-      }
-    },
-    "node_modules/babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
-    },
     "node_modules/babel-plugin-transform-react-remove-prop-types": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
@@ -4547,11 +5796,11 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
-      "integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
       "dependencies": {
-        "babel-plugin-jest-hoist": "^27.4.0",
+        "babel-plugin-jest-hoist": "^27.5.1",
         "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
@@ -4592,7 +5841,7 @@
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
     },
     "node_modules/bfj": {
       "version": "7.0.2",
@@ -4668,14 +5917,6 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/body-parser/node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -4692,23 +5933,21 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+    "node_modules/bonjour-service": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
+      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
       "dependencies": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
+        "array-flatten": "^2.1.2",
         "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
       }
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
@@ -4736,9 +5975,9 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
     },
     "node_modules/browserslist": {
-      "version": "4.21.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "version": "4.21.9",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
+      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
       "funding": [
         {
           "type": "opencollective",
@@ -4747,13 +5986,17 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001449",
-        "electron-to-chromium": "^1.4.284",
-        "node-releases": "^2.0.8",
-        "update-browserslist-db": "^1.0.10"
+        "caniuse-lite": "^1.0.30001503",
+        "electron-to-chromium": "^1.4.431",
+        "node-releases": "^2.0.12",
+        "update-browserslist-db": "^1.0.11"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4775,15 +6018,10 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
-    "node_modules/buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-    },
     "node_modules/builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4792,7 +6030,7 @@
     "node_modules/bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -4846,9 +6084,12 @@
       }
     },
     "node_modules/camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
+      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/caniuse-api": {
       "version": "3.0.0",
@@ -4862,9 +6103,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001481",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz",
-      "integrity": "sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==",
+      "version": "1.0.30001503",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz",
+      "integrity": "sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -4912,14 +6153,20 @@
       }
     },
     "node_modules/check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ=="
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.2.tgz",
+      "integrity": "sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA=="
     },
     "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -4956,19 +6203,28 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
     },
     "node_modules/clean-css": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
-      "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
+      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
       "dependencies": {
         "source-map": "~0.6.0"
       },
@@ -4976,28 +6232,34 @@
         "node": ">= 10.0"
       }
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -5051,12 +6313,12 @@
     "node_modules/coa/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "node_modules/coa/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -5064,7 +6326,7 @@
     "node_modules/coa/node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
         "node": ">=4"
       }
@@ -5102,14 +6364,14 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
     },
     "node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
@@ -5143,7 +6405,7 @@
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
     },
     "node_modules/compressible": {
       "version": "2.0.18",
@@ -5184,12 +6446,17 @@
     "node_modules/compression/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/confusing-browser-globals": {
       "version": "1.0.11",
@@ -5197,9 +6464,9 @@
       "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
     },
     "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "engines": {
         "node": ">=0.8"
       }
@@ -5215,25 +6482,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/content-type": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
@@ -5243,12 +6491,9 @@
       }
     },
     "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "node_modules/cookie": {
       "version": "0.5.0",
@@ -5261,12 +6506,12 @@
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "node_modules/core-js": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
-      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
+      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -5274,9 +6519,9 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.30.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.1.tgz",
-      "integrity": "sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
+      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
       "dependencies": {
         "browserslist": "^4.21.5"
       },
@@ -5286,9 +6531,9 @@
       }
     },
     "node_modules/core-js-pure": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.3.tgz",
-      "integrity": "sha512-Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.31.0.tgz",
+      "integrity": "sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -5301,9 +6546,9 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -5336,23 +6581,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
     "node_modules/css-blank-pseudo": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.2.tgz",
-      "integrity": "sha512-hOb1LFjRR+8ocA071xUSmg5VslJ8NGo/I2qpUpdeAYyBVCgupS5O8SEVo4SxEMYyFBNodBkzG3T1iqW9HCXxew==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       },
       "bin": {
         "css-blank-pseudo": "dist/cli.cjs"
@@ -5361,37 +6595,34 @@
         "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/css-color-keywords": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=",
+      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/css-declaration-sorter": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz",
-      "integrity": "sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==",
-      "dependencies": {
-        "timsort": "^0.3.0"
-      },
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
+      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
       "engines": {
-        "node": ">= 10"
+        "node": "^10 || ^12 || >=14"
       },
       "peerDependencies": {
         "postcss": "^8.0.9"
       }
     },
     "node_modules/css-has-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.3.tgz",
-      "integrity": "sha512-0gDYWEKaGacwxCqvQ3Ypg6wGdD1AztbMm5h1JsactG2hP2eiflj808QITmuWBpE7sjSEVrAlZhPTVd/nNMj/hQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       },
       "bin": {
         "css-has-pseudo": "dist/cli.cjs"
@@ -5400,22 +6631,22 @@
         "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/css-loader": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
-      "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dependencies": {
         "icss-utils": "^5.1.0",
-        "postcss": "^8.2.15",
+        "postcss": "^8.4.21",
         "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
         "postcss-modules-scope": "^3.0.0",
         "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "semver": "^7.3.5"
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -5428,10 +6659,21 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/css-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5442,10 +6684,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/css-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/css-minimizer-webpack-plugin": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.3.1.tgz",
-      "integrity": "sha512-SHA7Hu/EiF0dOwdmV2+agvqYpG+ljlUa7Dvn1AVOmSH3N8KOERoaM9lGpstz9nGsoTjANGyUXdrxl/EwdMScRg==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
+      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
       "dependencies": {
         "cssnano": "^5.0.6",
         "jest-worker": "^27.0.2",
@@ -5465,6 +6712,9 @@
         "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
+        "@parcel/css": {
+          "optional": true
+        },
         "clean-css": {
           "optional": true
         },
@@ -5477,9 +6727,9 @@
       }
     },
     "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -5508,14 +6758,14 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -5525,10 +6775,18 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/css-prefers-color-scheme": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.2.tgz",
-      "integrity": "sha512-gv0KQBEM+q/XdoKyznovq3KW7ocO7k+FhPP+hQR1MenJdu0uPGS6IZa9PzlbqBeS6XcZJNAoqoFxlAUW461CrA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
       "bin": {
         "css-prefers-color-scheme": "dist/cli.cjs"
       },
@@ -5536,17 +6794,17 @@
         "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/css-select": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz",
-      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dependencies": {
         "boolbase": "^1.0.0",
-        "css-what": "^5.1.0",
-        "domhandler": "^4.3.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
         "domutils": "^2.8.0",
         "nth-check": "^2.0.1"
       },
@@ -5560,9 +6818,9 @@
       "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
     },
     "node_modules/css-to-react-native": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
-      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
       "dependencies": {
         "camelize": "^1.0.0",
         "css-color-keywords": "^1.0.0",
@@ -5581,10 +6839,18 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/css-what": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "engines": {
         "node": ">= 6"
       },
@@ -5595,13 +6861,23 @@
     "node_modules/css.escape": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
+      "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
       "dev": true
     },
     "node_modules/cssdb": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-5.1.0.tgz",
-      "integrity": "sha512-/vqjXhv1x9eGkE/zO6o8ZOI7dgdZbLVLUGyVRbPgk6YipXbW87YzUCcO+Jrmi5bwJlAH6oD+MNeZyRgXea1GZw=="
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.6.0.tgz",
+      "integrity": "sha512-Nna7rph8V0jC6+JBY4Vk4ndErUmfJfV6NJCaZdurL0omggabiy+QB2HCQtu5c/ACLZ0I7REv7A4QyPIoYzZx0w==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        }
+      ]
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
@@ -5615,11 +6891,11 @@
       }
     },
     "node_modules/cssnano": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.15.tgz",
-      "integrity": "sha512-ppZsS7oPpi2sfiyV5+i+NbB/3GtQ+ab2Vs1azrZaXWujUSN4o+WdTxlCZIMcT9yLW3VO/5yX3vpyDaQ1nIn8CQ==",
+      "version": "5.1.15",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
       "dependencies": {
-        "cssnano-preset-default": "^5.1.10",
+        "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       },
@@ -5635,39 +6911,39 @@
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "5.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.10.tgz",
-      "integrity": "sha512-BcpSzUVygHMOnp9uG5rfPzTOCb0GAHQkqtUQx8j1oMNF9A1Q8hziOOhiM4bdICpmrBIU85BE64RD5XGYsVQZNA==",
+      "version": "5.2.14",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
       "dependencies": {
-        "css-declaration-sorter": "^6.0.3",
-        "cssnano-utils": "^3.0.0",
-        "postcss-calc": "^8.2.0",
-        "postcss-colormin": "^5.2.3",
-        "postcss-convert-values": "^5.0.2",
-        "postcss-discard-comments": "^5.0.1",
-        "postcss-discard-duplicates": "^5.0.1",
-        "postcss-discard-empty": "^5.0.1",
-        "postcss-discard-overridden": "^5.0.2",
-        "postcss-merge-longhand": "^5.0.4",
-        "postcss-merge-rules": "^5.0.4",
-        "postcss-minify-font-values": "^5.0.2",
-        "postcss-minify-gradients": "^5.0.4",
-        "postcss-minify-params": "^5.0.3",
-        "postcss-minify-selectors": "^5.1.1",
-        "postcss-normalize-charset": "^5.0.1",
-        "postcss-normalize-display-values": "^5.0.2",
-        "postcss-normalize-positions": "^5.0.2",
-        "postcss-normalize-repeat-style": "^5.0.2",
-        "postcss-normalize-string": "^5.0.2",
-        "postcss-normalize-timing-functions": "^5.0.2",
-        "postcss-normalize-unicode": "^5.0.2",
-        "postcss-normalize-url": "^5.0.4",
-        "postcss-normalize-whitespace": "^5.0.2",
-        "postcss-ordered-values": "^5.0.3",
-        "postcss-reduce-initial": "^5.0.2",
-        "postcss-reduce-transforms": "^5.0.2",
-        "postcss-svgo": "^5.0.3",
-        "postcss-unique-selectors": "^5.0.2"
+        "css-declaration-sorter": "^6.3.1",
+        "cssnano-utils": "^3.1.0",
+        "postcss-calc": "^8.2.3",
+        "postcss-colormin": "^5.3.1",
+        "postcss-convert-values": "^5.1.3",
+        "postcss-discard-comments": "^5.1.2",
+        "postcss-discard-duplicates": "^5.1.0",
+        "postcss-discard-empty": "^5.1.1",
+        "postcss-discard-overridden": "^5.1.0",
+        "postcss-merge-longhand": "^5.1.7",
+        "postcss-merge-rules": "^5.1.4",
+        "postcss-minify-font-values": "^5.1.0",
+        "postcss-minify-gradients": "^5.1.1",
+        "postcss-minify-params": "^5.1.4",
+        "postcss-minify-selectors": "^5.2.1",
+        "postcss-normalize-charset": "^5.1.0",
+        "postcss-normalize-display-values": "^5.1.0",
+        "postcss-normalize-positions": "^5.1.1",
+        "postcss-normalize-repeat-style": "^5.1.1",
+        "postcss-normalize-string": "^5.1.0",
+        "postcss-normalize-timing-functions": "^5.1.0",
+        "postcss-normalize-unicode": "^5.1.1",
+        "postcss-normalize-url": "^5.1.0",
+        "postcss-normalize-whitespace": "^5.1.1",
+        "postcss-ordered-values": "^5.1.3",
+        "postcss-reduce-initial": "^5.1.2",
+        "postcss-reduce-transforms": "^5.1.0",
+        "postcss-svgo": "^5.1.0",
+        "postcss-unique-selectors": "^5.1.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14.0"
@@ -5677,9 +6953,9 @@
       }
     },
     "node_modules/cssnano-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.0.tgz",
-      "integrity": "sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -5715,6 +6991,14 @@
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
+    "node_modules/csso/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/cssom": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
@@ -5737,9 +7021,9 @@
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
     },
     "node_modules/csstype": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/customize-cra": {
       "version": "1.0.0",
@@ -5768,9 +7052,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5784,35 +7068,49 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
     "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
+      "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
     },
     "node_modules/deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
+      "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
       "dependencies": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.5",
         "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5824,9 +7122,9 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5865,73 +7163,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
-    },
-    "node_modules/del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/del/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/del/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/destroy": {
@@ -5985,22 +7238,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/detective": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
-      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
-      "dependencies": {
-        "acorn-node": "^1.6.1",
-        "defined": "^1.0.0",
-        "minimist": "^1.1.1"
-      },
-      "bin": {
-        "detective": "bin/detective.js"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -6016,11 +7253,12 @@
       }
     },
     "node_modules/diff-sequences": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
-      "integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "dev": true,
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/dir-glob": {
@@ -6042,23 +7280,17 @@
     "node_modules/dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
     },
     "node_modules/dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
+      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
       "dependencies": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "dependencies": {
-        "buffer-indexof": "^1.0.0"
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/doctrine": {
@@ -6073,9 +7305,9 @@
       }
     },
     "node_modules/dom-accessibility-api": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
-      "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
       "dev": true
     },
     "node_modules/dom-converter": {
@@ -6087,9 +7319,9 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -6100,9 +7332,9 @@
       }
     },
     "node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "funding": [
         {
           "type": "github",
@@ -6130,9 +7362,9 @@
       }
     },
     "node_modules/domhandler": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
-      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dependencies": {
         "domelementtype": "^2.2.0"
       },
@@ -6203,22 +7435,25 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.376",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.376.tgz",
-      "integrity": "sha512-TFeOKd98TpJzRHkr4Aorn16QkMnuCQuGAE6IZ0wYF+qkbSfMPqjplvRppR02tMUpVxZz8nyBNvVm9lIZsqrbPQ=="
+      "version": "1.4.433",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.433.tgz",
+      "integrity": "sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ=="
     },
     "node_modules/email-addresses": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz",
-      "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz",
+      "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==",
       "dev": true
     },
     "node_modules/emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/emittery?sponsor=1"
@@ -6246,9 +7481,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz",
-      "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -6274,11 +7509,11 @@
       }
     },
     "node_modules/error-stack-parser": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
-      "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
       "dependencies": {
-        "stackframe": "^1.1.1"
+        "stackframe": "^1.3.4"
       }
     },
     "node_modules/es-abstract": {
@@ -6328,6 +7563,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
+    },
     "node_modules/es-get-iterator": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
@@ -6347,15 +7587,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-get-iterator/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-    },
     "node_modules/es-module-lexer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
-      "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
     },
     "node_modules/es-set-tostringtag": {
       "version": "2.0.1",
@@ -6405,7 +7640,7 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
@@ -6419,14 +7654,13 @@
       }
     },
     "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
+        "esutils": "^2.0.2"
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
@@ -6439,93 +7673,59 @@
         "source-map": "~0.6.1"
       }
     },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
       "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/eslint": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz",
-      "integrity": "sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
       "dependencies": {
-        "@eslint/eslintrc": "^1.0.5",
-        "@humanwhocodes/config-array": "^0.9.2",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.43.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.0",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.2.0",
-        "espree": "^9.3.0",
-        "esquery": "^1.4.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.6.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "text-table": "^0.2.0"
       },
       "bin": {
         "eslint": "bin/eslint.js"
@@ -6582,22 +7782,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-      "dependencies": {
-        "is-core-module": "^2.11.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-module-utils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
@@ -6686,22 +7870,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-      "dependencies": {
-        "is-core-module": "^2.11.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-plugin-jest": {
       "version": "25.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
@@ -6821,9 +7989,9 @@
       }
     },
     "node_modules/eslint-plugin-testing-library": {
-      "version": "5.10.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.10.3.tgz",
-      "integrity": "sha512-0yhsKFsjHLud5PM+f2dWr9K3rqYzMy4cSHs3lcmFYMa1CdSzRvHGgXvsFarBjZ41gU8jhTdMIkg8jHLxGJqLqw==",
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.0.tgz",
+      "integrity": "sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==",
       "dependencies": {
         "@typescript-eslint/utils": "^5.58.0"
       },
@@ -6836,46 +8004,24 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-      "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "engines": {
-        "node": ">=10"
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -6884,15 +8030,15 @@
       }
     },
     "node_modules/eslint-webpack-plugin": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz",
-      "integrity": "sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
       "dependencies": {
-        "@types/eslint": "^7.28.2",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
+        "@types/eslint": "^7.29.0 || ^8.4.1",
+        "jest-worker": "^28.0.2",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "schema-utils": "^3.1.1"
+        "schema-utils": "^4.0.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -6906,15 +8052,106 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/eslint-webpack-plugin/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/jest-worker": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
+      "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "node_modules/eslint/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -6936,6 +8173,48 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -6948,16 +8227,19 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-      "integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+      "version": "9.5.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
+      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
       "dependencies": {
-        "acorn": "^8.7.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^3.1.0"
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esprima": {
@@ -6973,9 +8255,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -7061,23 +8343,78 @@
     "node_modules/exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/expect": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz",
-      "integrity": "sha512-1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
+      "dev": true,
       "dependencies": {
-        "@jest/types": "^27.4.2",
-        "jest-get-type": "^27.4.0",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6"
+        "@jest/expect-utils": "^29.6.2",
+        "@types/node": "*",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/expect/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/express": {
@@ -7124,7 +8461,7 @@
     "node_modules/express/node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
@@ -7134,45 +8471,10 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/express/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/express/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -7180,9 +8482,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -7213,12 +8515,12 @@
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -7235,9 +8537,9 @@
       }
     },
     "node_modules/fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "dependencies": {
         "bser": "2.1.1"
       }
@@ -7302,7 +8604,7 @@
     "node_modules/filename-reserved-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -7374,14 +8676,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/finalhandler/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/find-cache-dir": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
@@ -7423,14 +8717,14 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
-      "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "funding": [
         {
           "type": "individual",
@@ -7521,15 +8815,15 @@
         "node": ">=10"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dependencies": {
-        "universalify": "^2.0.0"
+        "yallist": "^4.0.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
@@ -7550,9 +8844,9 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -7571,13 +8865,10 @@
         "node": ">=6"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/form-data": {
       "version": "3.0.1",
@@ -7601,9 +8892,9 @@
       }
     },
     "node_modules/fraction.js": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz",
-      "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
       "engines": {
         "node": "*"
       },
@@ -7621,28 +8912,28 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=6 <7 || >=8"
+        "node": ">=14.14"
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
+      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "node_modules/fsevents": {
       "version": "2.3.2",
@@ -7679,11 +8970,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-    },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -7709,12 +8995,13 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       },
       "funding": {
@@ -7761,17 +9048,17 @@
       }
     },
     "node_modules/gh-pages": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.3.tgz",
-      "integrity": "sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.0.0.tgz",
+      "integrity": "sha512-FXZWJRsvP/fK2HJGY+Di6FRNHvqFF6gOIELaopDjXXgjeOYSNURcuYwEO/6bwuq6koP5Lnkvnr5GViXzuOB89g==",
       "dev": true,
       "dependencies": {
-        "async": "^2.6.1",
-        "commander": "^2.18.0",
-        "email-addresses": "^3.0.1",
+        "async": "^3.2.4",
+        "commander": "^11.0.0",
+        "email-addresses": "^5.0.0",
         "filenamify": "^4.3.0",
         "find-cache-dir": "^3.3.1",
-        "fs-extra": "^8.1.0",
+        "fs-extra": "^11.1.1",
         "globby": "^6.1.0"
       },
       "bin": {
@@ -7782,15 +9069,24 @@
         "node": ">=10"
       }
     },
+    "node_modules/gh-pages/node_modules/commander": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
+      "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       },
@@ -7877,7 +9173,7 @@
     "node_modules/globby": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
       "dev": true,
       "dependencies": {
         "array-union": "^1.0.1",
@@ -7902,21 +9198,26 @@
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
     },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+    },
     "node_modules/gremlint": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/gremlint/-/gremlint-3.5.2.tgz",
-      "integrity": "sha512-bXxxYIjYOmXbQds0tTwS2zWszhDpvxcmgFpskYG8SHVZHrkvFB5UsFDT7XaGESOT2S6bSm80BmZfhvd/k0HYfQ==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/gremlint/-/gremlint-3.7.0.tgz",
+      "integrity": "sha512-j0PMkFWONPEemiCg71K9ufugpfC+PpSERo0wC2LZE3Wwh8wF3Lc4WxmszmctSBrVpraVFjUIU1d09JIFjz5lEw==",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/gzip-size": {
@@ -8029,6 +9330,7 @@
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dev": true,
       "dependencies": {
         "react-is": "^16.7.0"
       }
@@ -8036,7 +9338,8 @@
     "node_modules/hoist-non-react-statics/node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
     },
     "node_modules/hoopy": {
       "version": "0.1.4",
@@ -8049,7 +9352,7 @@
     "node_modules/hpack.js": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dependencies": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -8057,10 +9360,15 @@
         "wbuf": "^1.1.0"
       }
     },
+    "node_modules/hpack.js/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
     "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -8071,6 +9379,11 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -8091,9 +9404,19 @@
       }
     },
     "node_modules/html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.6.tgz",
+      "integrity": "sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ]
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
@@ -8129,9 +9452,9 @@
       }
     },
     "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
+      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
       "dependencies": {
         "@types/html-minifier-terser": "^6.0.0",
         "html-minifier-terser": "^6.0.2",
@@ -8171,7 +9494,7 @@
     "node_modules/http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
@@ -8188,26 +9511,10 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/http-errors/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/http-parser-js": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz",
-      "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
@@ -8236,11 +9543,11 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
-      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dependencies": {
-        "@types/http-proxy": "^1.17.5",
+        "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
         "is-glob": "^4.0.1",
         "is-plain-obj": "^3.0.0",
@@ -8248,12 +9555,20 @@
       },
       "engines": {
         "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -8293,14 +9608,14 @@
       }
     },
     "node_modules/idb": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz",
-      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
+      "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="
     },
     "node_modules/identity-obj-proxy": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
+      "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
       "dependencies": {
         "harmony-reflect": "^1.4.6"
       },
@@ -8309,9 +9624,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "engines": {
         "node": ">= 4"
       }
@@ -8369,7 +9684,7 @@
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -8378,6 +9693,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8385,7 +9701,7 @@
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -8414,15 +9730,10 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
     "node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
       "engines": {
         "node": ">= 10"
       }
@@ -8458,7 +9769,7 @@
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
     },
     "node_modules/is-bigint": {
       "version": "1.0.4",
@@ -8509,9 +9820,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -8550,7 +9861,7 @@
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8593,7 +9904,7 @@
     "node_modules/is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
     },
     "node_modules/is-negative-zero": {
       "version": "2.0.2",
@@ -8631,19 +9942,11 @@
     "node_modules/is-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/is-path-inside": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
@@ -8686,7 +9989,7 @@
     "node_modules/is-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
+      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8778,7 +10081,7 @@
     "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
     },
     "node_modules/is-weakmap": {
       "version": "2.0.1",
@@ -8823,14 +10126,14 @@
       }
     },
     "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
     },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.0",
@@ -8841,9 +10144,9 @@
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -8856,18 +10159,62 @@
       }
     },
     "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
+        "make-dir": "^4.0.0",
         "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
+    "node_modules/istanbul-lib-report/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
@@ -8881,10 +10228,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/istanbul-reports": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
-      "integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -8894,14 +10249,14 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "version": "10.8.7",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
+      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
       "dependencies": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
       },
       "bin": {
         "jake": "bin/cli.js"
@@ -8910,25 +10265,24 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
-    },
     "node_modules/jest": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.7.tgz",
-      "integrity": "sha512-8heYvsx7nV/m8m24Vk26Y87g73Ba6ueUd0MWed/NXMhSZIm62U/llVbS0PJe1SHunbyXjJ/BqG1z9bFjGUIvTg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
+      "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/core": "^27.4.7",
+        "@jest/core": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.4.7"
+        "jest-cli": "^29.6.2"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -8940,70 +10294,192 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "27.4.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
-      "integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/types": "^27.4.2",
         "execa": "^5.0.0",
-        "throat": "^6.0.1"
+        "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/jest-circus": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.6.tgz",
-      "integrity": "sha512-UA7AI5HZrW4wRM72Ro80uRR2Fg+7nR0GESbSI/2M+ambbzVuA63mn5T1p3Z/wlhntzGpIG1xx78GP2YIkf6PhQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
+      "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/environment": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "expect": "^27.4.6",
+        "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.4.6",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "pretty-format": "^27.4.6",
+        "jest-each": "^29.6.2",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.6.2",
+        "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-circus/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-circus/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-circus/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-circus/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-cli": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.7.tgz",
-      "integrity": "sha512-zREYhvjjqe1KsGV15mdnxjThKNDgza1fhDT+iUsXWLCq3sxe9w5xnvyctcYVT5PcdLSjv7Y5dCwTS3FCF1tiuw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
+      "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/core": "^27.4.7",
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/core": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^27.4.7",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
+        "jest-config": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "prompts": "^2.0.1",
-        "yargs": "^16.2.0"
+        "yargs": "^17.3.1"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -9014,142 +10490,842 @@
         }
       }
     },
-    "node_modules/jest-config": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.7.tgz",
-      "integrity": "sha512-xz/o/KJJEedHMrIY9v2ParIoYSrSVY6IVeE4z5Z3i101GoA5XgfbJz+1C8EYPsv7u7f39dS8F9v46BHDhn0vlw==",
+    "node_modules/jest-cli/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@babel/core": "^7.8.0",
-        "@jest/test-sequencer": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "babel-jest": "^27.4.6",
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-cli/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-cli/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/jest-validate": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
+      "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "babel-jest": "^29.6.2",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-circus": "^27.4.6",
-        "jest-environment-jsdom": "^27.4.6",
-        "jest-environment-node": "^27.4.6",
-        "jest-get-type": "^27.4.0",
-        "jest-jasmine2": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-resolve": "^27.4.6",
-        "jest-runner": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.6.2",
+        "jest-environment-node": "^29.6.2",
+        "jest-get-type": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.4.6",
-        "slash": "^3.0.0"
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.6.2",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
       "peerDependencies": {
+        "@types/node": "*",
         "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
         "ts-node": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-diff": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz",
-      "integrity": "sha512-zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==",
+    "node_modules/jest-config/node_modules/@jest/transform": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
-        "diff-sequences": "^27.4.0",
-        "jest-get-type": "^27.4.0",
-        "pretty-format": "^27.4.6"
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-config/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-config/node_modules/babel-jest": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
+      "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/transform": "^29.6.2",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.5.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/babel-plugin-jest-hoist": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+      "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/babel-preset-jest": {
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+      "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^29.5.0",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/jest-config/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/jest-haste-map": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-config/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/jest-resolve": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/jest-validate": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/jest-worker": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.6.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-config/node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-config/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jest-config/node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
+      "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-docblock": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
-      "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-each": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.6.tgz",
-      "integrity": "sha512-n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
+      "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.4.0",
-        "jest-util": "^27.4.2",
-        "pretty-format": "^27.4.6"
+        "jest-get-type": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "pretty-format": "^29.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-each/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-each/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-environment-jsdom": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz",
-      "integrity": "sha512-o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
+      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
       "dependencies": {
-        "@jest/environment": "^27.4.6",
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
-        "jest-mock": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1",
         "jsdom": "^16.6.0"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-environment-node": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.6.tgz",
-      "integrity": "sha512-yfHlZ9m+kzTKZV0hVfhVu6GuDxKAYeFHrfulmy7Jxwsq4V7+ZK7f+c0XP/tbVDMQW7E4neG2u147hFkuVz0MlQ==",
+    "node_modules/jest-environment-jsdom/node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
       "dependencies": {
-        "@jest/environment": "^27.4.6",
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
-        "jest-mock": "^27.4.6",
-        "jest-util": "^27.4.2"
+        "jest-mock": "^27.5.1"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/jest-environment-jsdom/node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/@sinonjs/commons": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/jest-mock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
+      "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-environment-node/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/jest-get-type": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
-      "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-haste-map": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.6.tgz",
-      "integrity": "sha512-0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
       "dependencies": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^27.4.0",
-        "jest-serializer": "^27.4.0",
-        "jest-util": "^27.4.2",
-        "jest-worker": "^27.4.6",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
         "micromatch": "^4.0.4",
         "walker": "^1.0.7"
       },
@@ -9161,70 +11337,211 @@
       }
     },
     "node_modules/jest-jasmine2": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.6.tgz",
-      "integrity": "sha512-uAGNXF644I/whzhsf7/qf74gqy9OuhvJ0XYp8SDecX2ooGeaPnmJMjXjKt0mqh1Rl5dtRGxJgNrHlBQIBfS5Nw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
+      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
       "dependencies": {
-        "@jest/environment": "^27.4.6",
-        "@jest/source-map": "^27.4.0",
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^27.4.6",
+        "expect": "^27.5.1",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.4.6",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "pretty-format": "^27.4.6",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
         "throat": "^6.0.1"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.6.tgz",
-      "integrity": "sha512-kkaGixDf9R7CjHm2pOzfTxZTQQQ2gHTIWKY/JZSiYTc90bZp8kSZnUMS3uLAfwTZwc0tcMRoEX74e14LG1WapA==",
+    "node_modules/jest-jasmine2/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dependencies": {
-        "jest-get-type": "^27.4.0",
-        "pretty-format": "^27.4.6"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-matcher-utils": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz",
-      "integrity": "sha512-XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA==",
+    "node_modules/jest-jasmine2/node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "dependencies": {
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@sinonjs/commons": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/expect": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/jest-diff": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.4.6",
-        "jest-get-type": "^27.4.0",
-        "pretty-format": "^27.4.6"
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-message-util": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz",
-      "integrity": "sha512-0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA==",
+    "node_modules/jest-jasmine2/node_modules/jest-each": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.4.6",
+        "pretty-format": "^27.5.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -9232,22 +11549,367 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-mock": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.6.tgz",
-      "integrity": "sha512-kvojdYRkst8iVSZ1EJ+vc1RRD9llueBjKzXzeCytH3dMM7zvPV/ULcfI2nr0v0VUgm3Bjt3hBCQvOeaBz+ZTHw==",
+    "node_modules/jest-jasmine2/node_modules/jest-mock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
       "dependencies": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "@types/node": "*"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/jest-jasmine2/node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "dependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
+      "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-leak-detector/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-leak-detector/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-leak-detector/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
+      "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.6.2",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
+      "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
+      "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "jest-util": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-mock/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "engines": {
         "node": ">=6"
       },
@@ -9261,25 +11923,25 @@
       }
     },
     "node_modules/jest-regex-util": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
-      "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-resolve": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.6.tgz",
-      "integrity": "sha512-SFfITVApqtirbITKFAO7jOVN45UgFzcRdQanOFzjnbd+CACDoyeX7206JyU92l4cRr73+Qy/TlW51+4vHGt+zw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
       "dependencies": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
         "resolve": "^1.20.0",
         "resolve.exports": "^1.1.0",
         "slash": "^3.0.0"
@@ -9289,130 +11951,917 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.6.tgz",
-      "integrity": "sha512-W85uJZcFXEVZ7+MZqIPCscdjuctruNGXUZ3OHSXOfXR9ITgbUKeHj+uGcies+0SsvI5GtUfTw4dY7u9qjTvQOw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
+      "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/types": "^27.4.2",
-        "jest-regex-util": "^27.4.0",
-        "jest-snapshot": "^27.4.6"
+        "jest-regex-util": "^29.4.3",
+        "jest-snapshot": "^29.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-runner": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.6.tgz",
-      "integrity": "sha512-IDeFt2SG4DzqalYBZRgbbPmpwV3X0DcntjezPBERvnhwKGWTW7C5pbbA5lVkmvgteeNfdd/23gwqv3aiilpYPg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
+      "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/console": "^27.4.6",
-        "@jest/environment": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-docblock": "^27.4.0",
-        "jest-environment-jsdom": "^27.4.6",
-        "jest-environment-node": "^27.4.6",
-        "jest-haste-map": "^27.4.6",
-        "jest-leak-detector": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-resolve": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-worker": "^27.4.6",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.4.3",
+        "jest-environment-node": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-leak-detector": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-resolve": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-watcher": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@jest/transform": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-runner/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/jest-runner/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-haste-map": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-resolve": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-validate": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-worker": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.6.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-runner/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/jest-runtime": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.6.tgz",
-      "integrity": "sha512-eXYeoR/MbIpVDrjqy5d6cGCFOYBFFDeKaNWqTp0h6E74dK0zLHzASQXJpl5a2/40euBmKnprNLJ0Kh0LCndnWQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
+      "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/environment": "^27.4.6",
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/globals": "^27.4.6",
-        "@jest/source-map": "^27.4.0",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/globals": "^29.6.2",
+        "@jest/source-map": "^29.6.0",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
         "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-mock": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-resolve": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/transform": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/jest-runtime/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-haste-map": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-resolve": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+      "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-validate": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+      "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.4.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.6.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/jest-worker": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.6.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/resolve.exports": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/jest-serializer": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
-      "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
       "dependencies": {
         "@types/node": "*",
-        "graceful-fs": "^4.2.4"
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.6.tgz",
-      "integrity": "sha512-fafUCDLQfzuNP9IRcEqaFAMzEe7u5BF7mude51wyWv7VRex60WznZIC7DfKTgSIlJa8aFzYmXclmN328aqSDmQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
+      "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@babel/core": "^7.7.2",
+        "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.4.6",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.4.6",
-        "jest-get-type": "^27.4.0",
-        "jest-haste-map": "^27.4.6",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "expect": "^29.6.2",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.6.2",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.4.6",
-        "semver": "^7.3.2"
+        "pretty-format": "^29.6.2",
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@jest/transform": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+      "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^2.0.0",
+        "fast-json-stable-stringify": "^2.1.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/jest-snapshot/node_modules/jest-get-type": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-haste-map": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+      "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-regex-util": {
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+      "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/jest-worker": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+      "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.6.2",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/pretty-format": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+      "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -9423,16 +12872,56 @@
         "node": ">=10"
       }
     },
-    "node_modules/jest-util": {
-      "version": "27.4.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
-      "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+    "node_modules/jest-snapshot/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/types": "^27.4.2",
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       },
       "engines": {
@@ -9440,121 +12929,95 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.6.tgz",
-      "integrity": "sha512-872mEmCPVlBqbA5dToC57vA3yJaMRfIdpCoD3cyHWJOMx+SJwLNw0I71EkWs41oza/Er9Zno9XuTkRYCPDUJXQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
       "dependencies": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.4.0",
+        "jest-get-type": "^27.5.1",
         "leven": "^3.1.0",
-        "pretty-format": "^27.4.6"
+        "pretty-format": "^27.5.1"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-watch-typeahead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.0.0.tgz",
-      "integrity": "sha512-jxoszalAb394WElmiJTFBMzie/RDCF+W7Q29n5LzOPtcoQoHWfdUtHFkbhgf5NwWe8uMOxvKb/g7ea7CshfkTw==",
-      "dependencies": {
-        "ansi-escapes": "^4.3.1",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^27.0.0",
-        "jest-watcher": "^27.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/char-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.0.tgz",
-      "integrity": "sha512-oGu2QekBMXgyQNWPDRQ001bjvDnZe4/zBTz37TMbiKz1NbNiyiH5hRkobe7npRN6GfbGbxMYFck/vQ1r9c1VMA==",
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/string-length": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-      "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/jest-watcher": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.6.tgz",
-      "integrity": "sha512-yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
+      "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^27.4.2",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.6.2",
         "string-length": "^4.0.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/jest-util": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+      "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-worker": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz",
-      "integrity": "sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -9578,6 +13041,44 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/jest/node_modules/@jest/types": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+      "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jest/schemas": "^29.6.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
+      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -9669,7 +13170,7 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "node_modules/json5": {
       "version": "2.2.3",
@@ -9683,18 +13184,20 @@
       }
     },
     "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/jsonpointer": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz",
-      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9728,9 +13231,9 @@
       }
     },
     "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
       "engines": {
         "node": ">= 8"
       }
@@ -9748,6 +13251,15 @@
         "language-subtag-registry": "~0.3.2"
       }
     },
+    "node_modules/launch-editor": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
+      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+      "dependencies": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.7.3"
+      }
+    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -9769,9 +13281,9 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
       "engines": {
         "node": ">=10"
       }
@@ -9782,9 +13294,9 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "engines": {
         "node": ">=6.11.5"
       }
@@ -9821,17 +13333,17 @@
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
     "node_modules/lodash.flow": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
-      "integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o="
+      "integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="
     },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
@@ -9841,12 +13353,12 @@
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
     },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
@@ -9868,31 +13380,28 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "yallist": "^3.0.2"
       }
     },
     "node_modules/lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
     },
     "node_modules/magic-string": {
-      "version": "0.25.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
       "dependencies": {
-        "sourcemap-codec": "^1.4.4"
+        "sourcemap-codec": "^1.4.8"
       }
     },
     "node_modules/make-dir": {
@@ -9931,11 +13440,11 @@
       }
     },
     "node_modules/memfs": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
-      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dependencies": {
-        "fs-monkey": "1.0.3"
+        "fs-monkey": "^1.0.4"
       },
       "engines": {
         "node": ">= 4.0.0"
@@ -9944,7 +13453,7 @@
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -9962,18 +13471,18 @@
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
         "node": ">=8.6"
@@ -9991,19 +13500,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "mime-db": "1.51.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -10027,9 +13536,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz",
-      "integrity": "sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==",
+      "version": "2.7.6",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
+      "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
       "dependencies": {
         "schema-utils": "^4.0.0"
       },
@@ -10045,9 +13554,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -10076,14 +13585,14 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -10110,16 +13619,19 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dependencies": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       },
       "bin": {
         "mkdirp": "bin/cmd.js"
@@ -10131,26 +13643,37 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dependencies": {
-        "dns-packet": "^1.3.1",
+        "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
       },
       "bin": {
         "multicast-dns": "cli.js"
       }
     },
-    "node_modules/multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
     },
     "node_modules/nanoid": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -10161,7 +13684,7 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/natural-compare-lite": {
       "version": "1.4.0",
@@ -10191,9 +13714,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
-      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "engines": {
         "node": ">= 6.13.0"
       }
@@ -10201,12 +13724,12 @@
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
     },
     "node_modules/node-releases": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
+      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -10219,7 +13742,7 @@
     "node_modules/normalize-range": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10247,9 +13770,9 @@
       }
     },
     "node_modules/nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -10258,22 +13781,22 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
+      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object-hash": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
-      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
       "engines": {
         "node": ">= 6"
       }
@@ -10356,13 +13879,15 @@
       }
     },
     "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
+      "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
       "dependencies": {
+        "array.prototype.reduce": "^1.0.5",
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "safe-array-concat": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.8"
@@ -10426,7 +13951,7 @@
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dependencies": {
         "wrappy": "1"
       }
@@ -10446,9 +13971,9 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -10502,26 +14027,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/p-retry": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-      "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dependencies": {
-        "@types/retry": "^0.12.0",
+        "@types/retry": "0.12.0",
         "retry": "^0.13.1"
       },
       "engines": {
@@ -10606,7 +14117,7 @@
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10627,7 +14138,7 @@
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -10640,7 +14151,7 @@
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
@@ -10661,8 +14172,7 @@
     "node_modules/pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10670,7 +14180,7 @@
     "node_modules/pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -10679,7 +14189,7 @@
     "node_modules/pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "dev": true,
       "dependencies": {
         "pinkie": "^2.0.0"
@@ -10689,9 +14199,9 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
-      "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
       "engines": {
         "node": ">= 6"
       }
@@ -10760,53 +14270,49 @@
         "node": ">=4"
       }
     },
-    "node_modules/portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "dependencies": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
     "node_modules/postcss": {
-      "version": "8.4.5",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
-      "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "nanoid": "^3.1.30",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.1"
+        "source-map-js": "^1.0.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/postcss-attribute-case-insensitive": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz",
-      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.2"
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
       },
       "peerDependencies": {
-        "postcss": "^8.0.2"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-browser-comments": {
@@ -10822,65 +14328,91 @@
       }
     },
     "node_modules/postcss-calc": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.2.tgz",
-      "integrity": "sha512-B5R0UeB4zLJvxNt1FVCaDZULdzsKLPc6FhjFJ+xwFiq7VG4i9cuaJLxVjNtExNK8ocm3n2o4unXXLiVX1SCqxA==",
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0"
       },
       "peerDependencies": {
         "postcss": "^8.2.2"
       }
     },
+    "node_modules/postcss-clamp": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=7.6.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.6"
+      }
+    },
     "node_modules/postcss-color-functional-notation": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.1.tgz",
-      "integrity": "sha512-62OBIXCjRXpQZcFOYIXwXBlpAVWrYk8ek1rcjvMING4Q2cf0ipyN9qT+BhHA6HmftGSEnFQu2qgKO3gMscl3Rw==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-color-hex-alpha": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.2.tgz",
-      "integrity": "sha512-gyx8RgqSmGVK156NAdKcsfkY3KPGHhKqvHTL3hhveFrBBToguKFzhyiuk3cljH6L4fJ0Kv+JENuPXs1Wij27Zw==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-color-rebeccapurple": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz",
-      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-colormin": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.3.tgz",
-      "integrity": "sha512-dra4xoAjub2wha6RUXAgadHEn2lGxbj8drhFcIGLOMn914Eu7DkPUurugDXgstwttCYkJtZ/+PkWRWdp3UHRIA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
         "postcss-value-parser": "^4.2.0"
@@ -10893,11 +14425,12 @@
       }
     },
     "node_modules/postcss-convert-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz",
-      "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.21.4",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14.0"
@@ -10907,62 +14440,81 @@
       }
     },
     "node_modules/postcss-custom-media": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz",
-      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.2.tgz",
-      "integrity": "sha512-Zvd+k66PHBYYPiXtdjNVx2l54Y9kQC7K1eUHzBND97RW/ayNxfaPOW+9NL3r0nsVbX1asPLdkDj585Wg0NBJCA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
         "postcss": "^8.3"
       }
     },
-    "node_modules/postcss-custom-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz",
-      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
+    "node_modules/postcss-custom-properties": {
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
+      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.2"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.3.tgz",
-      "integrity": "sha512-qiPm+CNAlgXiMf0J5IbBBEXA9l/Q5HGsNGkL3znIwT2ZFRLGY9U2fTUpa4lqCUXQOxaLimpacHeQC80BD2qbDw==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
         "postcss": "^8.3"
       }
     },
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
     "node_modules/postcss-discard-comments": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz",
-      "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -10971,9 +14523,9 @@
       }
     },
     "node_modules/postcss-discard-duplicates": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz",
-      "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -10982,9 +14534,9 @@
       }
     },
     "node_modules/postcss-discard-empty": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz",
-      "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -10993,9 +14545,9 @@
       }
     },
     "node_modules/postcss-discard-overridden": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz",
-      "integrity": "sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -11004,23 +14556,28 @@
       }
     },
     "node_modules/postcss-double-position-gradients": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.4.tgz",
-      "integrity": "sha512-qz+s5vhKJlsHw8HjSs+HVk2QGFdRyC68KGRQGX3i+GcnUjhWhXQEmCXW6siOJkZ1giu0ddPwSO6I6JdVVVPoog==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
       "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-env-function": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.4.tgz",
-      "integrity": "sha512-0ltahRTPtXSIlEZFv7zIvdEib7HN0ZbUQxrxIKn8KbiRyhALo854I/CggU5lyZe6ZBvSTJ6Al2vkZecI2OhneQ==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11028,7 +14585,7 @@
         "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-flexbugs-fixes": {
@@ -11040,31 +14597,31 @@
       }
     },
     "node_modules/postcss-focus-visible": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.3.tgz",
-      "integrity": "sha512-ozOsg+L1U8S+rxSHnJJiET6dNLyADcPHhEarhhtCI9DBLGOPG/2i4ddVoFch9LzrBgb8uDaaRI4nuid2OM82ZA==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-focus-within": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.3.tgz",
-      "integrity": "sha512-fk9y2uFS6/Kpp7/A9Hz9Z4rlFQ8+tzgBcQCXAFSrXFGAbKx+4ZZOmmfHuYjCOMegPWoz0pnC6fNzi8j7Xyqp5Q==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-font-variant": {
@@ -11076,28 +14633,52 @@
       }
     },
     "node_modules/postcss-gap-properties": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.2.tgz",
-      "integrity": "sha512-EaMy/pbxtQnKDsnbEjdqlkCkROTQZzolcLKgIE+3b7EuJfJydH55cZeHfm+MtIezXRqhR80VKgaztO/vHq94Fw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-image-set-function": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.4.tgz",
-      "integrity": "sha512-BlEo9gSTj66lXjRNByvkMK9dEdEGFXRfGjKRi9fo8s0/P3oEk74cAoonl/utiM50E2OPVb/XSu+lWvdW4KtE/Q==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
       }
     },
     "node_modules/postcss-initial": {
@@ -11109,9 +14690,9 @@
       }
     },
     "node_modules/postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
@@ -11123,47 +14704,64 @@
         "url": "https://opencollective.com/postcss/"
       },
       "peerDependencies": {
-        "postcss": "^8.3.3"
+        "postcss": "^8.4.21"
       }
     },
     "node_modules/postcss-lab-function": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.0.3.tgz",
-      "integrity": "sha512-MH4tymWmefdZQ7uVG/4icfLjAQmH6o2NRYyVh2mKoB4RXJp9PjsyhZwhH4ouaCQHvg+qJVj3RzeAR1EQpIlXZA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
       "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-load-config": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz",
-      "integrity": "sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+      "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
       "dependencies": {
-        "lilconfig": "^2.0.4",
-        "yaml": "^1.10.2"
+        "lilconfig": "^2.0.5",
+        "yaml": "^2.1.1"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 14"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/postcss/"
       },
       "peerDependencies": {
+        "postcss": ">=8.0.9",
         "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
         "ts-node": {
           "optional": true
         }
       }
     },
+    "node_modules/postcss-load-config/node_modules/yaml": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/postcss-loader": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
@@ -11185,10 +14783,21 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/postcss-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -11199,15 +14808,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/postcss-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/postcss-logical": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.3.tgz",
-      "integrity": "sha512-P5NcHWYrif0vK8rgOy/T87vg0WRIj3HSknrvp1wzDbiBeoDPVmiVRmkown2eSQdpPveat/MC1ess5uhzZFVnqQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.4"
       }
     },
     "node_modules/postcss-media-minmax": {
@@ -11222,12 +14836,12 @@
       }
     },
     "node_modules/postcss-merge-longhand": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz",
-      "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0",
-        "stylehacks": "^5.0.1"
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^5.1.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14.0"
@@ -11237,13 +14851,13 @@
       }
     },
     "node_modules/postcss-merge-rules": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.4.tgz",
-      "integrity": "sha512-yOj7bW3NxlQxaERBB0lEY1sH5y+RzevjbdH4DBJurjKERNpknRByFNdNe+V72i5pIZL12woM9uGdS5xbSB+kDQ==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
         "postcss-selector-parser": "^6.0.5"
       },
       "engines": {
@@ -11254,9 +14868,9 @@
       }
     },
     "node_modules/postcss-minify-font-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.2.tgz",
-      "integrity": "sha512-R6MJZryq28Cw0AmnyhXrM7naqJZZLoa1paBltIzh2wM7yb4D45TLur+eubTQ4jCmZU9SGeZdWsc5KcSoqTMeTg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11268,12 +14882,12 @@
       }
     },
     "node_modules/postcss-minify-gradients": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.4.tgz",
-      "integrity": "sha512-RVwZA7NC4R4J76u8X0Q0j+J7ItKUWAeBUJ8oEEZWmtv3Xoh19uNJaJwzNpsydQjk6PkuhRrK+YwwMf+c+68EYg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
       "dependencies": {
         "colord": "^2.9.1",
-        "cssnano-utils": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
@@ -11284,13 +14898,12 @@
       }
     },
     "node_modules/postcss-minify-params": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.3.tgz",
-      "integrity": "sha512-NY92FUikE+wralaiVexFd5gwb7oJTIDhgTNeIw89i1Ymsgt4RWiPXfz3bg7hDy4NL6gepcThJwOYNtZO/eNi7Q==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
-        "browserslist": "^4.16.6",
-        "cssnano-utils": "^3.0.0",
+        "browserslist": "^4.21.4",
+        "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
@@ -11301,11 +14914,10 @@
       }
     },
     "node_modules/postcss-minify-selectors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.1.tgz",
-      "integrity": "sha512-TOzqOPXt91O2luJInaVPiivh90a2SIK5Nf1Ea7yEIM/5w+XA5BGrZGUSW8aEx9pJ/oNj7ZJBhjvigSiBV+bC1Q==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
         "postcss-selector-parser": "^6.0.5"
       },
       "engines": {
@@ -11327,9 +14939,9 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "dependencies": {
         "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
@@ -11371,11 +14983,11 @@
       }
     },
     "node_modules/postcss-nested": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz",
-      "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.6"
+        "postcss-selector-parser": "^6.0.11"
       },
       "engines": {
         "node": ">=12.0"
@@ -11389,17 +15001,22 @@
       }
     },
     "node_modules/postcss-nesting": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.2.tgz",
-      "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.8"
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-normalize": {
@@ -11420,9 +15037,9 @@
       }
     },
     "node_modules/postcss-normalize-charset": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz",
-      "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
@@ -11431,9 +15048,9 @@
       }
     },
     "node_modules/postcss-normalize-display-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz",
-      "integrity": "sha512-RxXoJPUR0shSjkMMzgEZDjGPrgXUVYyWA/YwQRicb48H15OClPuaDR7tYokLAlGZ2tCSENEN5WxjgxSD5m4cUw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11445,9 +15062,9 @@
       }
     },
     "node_modules/postcss-normalize-positions": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.2.tgz",
-      "integrity": "sha512-tqghWFVDp2btqFg1gYob1etPNxXLNh3uVeWgZE2AQGh6b2F8AK2Gj36v5Vhyh+APwIzNjmt6jwZ9pTBP+/OM8g==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11459,9 +15076,9 @@
       }
     },
     "node_modules/postcss-normalize-repeat-style": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.2.tgz",
-      "integrity": "sha512-/rIZn8X9bBzC7KvY4iKUhXUGW3MmbXwfPF23jC9wT9xTi7kAvgj8sEgwxjixBmoL6MVa4WOgxNz2hAR6wTK8tw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11473,9 +15090,9 @@
       }
     },
     "node_modules/postcss-normalize-string": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.2.tgz",
-      "integrity": "sha512-zaI1yzwL+a/FkIzUWMQoH25YwCYxi917J4pYm1nRXtdgiCdnlTkx5eRzqWEC64HtRa06WCJ9TIutpb6GmW4gFw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11487,9 +15104,9 @@
       }
     },
     "node_modules/postcss-normalize-timing-functions": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz",
-      "integrity": "sha512-Ao0PP6MoYsRU1LxeVUW740ioknvdIUmfr6uAA3xWlQJ9s69/Tupy8qwhuKG3xWfl+KvLMAP9p2WXF9cwuk/7Bg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11501,11 +15118,11 @@
       }
     },
     "node_modules/postcss-normalize-unicode": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.2.tgz",
-      "integrity": "sha512-3y/V+vjZ19HNcTizeqwrbZSUsE69ZMRHfiiyLAJb7C7hJtYmM4Gsbajy7gKagu97E8q5rlS9k8FhojA8cpGhWw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
@@ -11516,9 +15133,9 @@
       }
     },
     "node_modules/postcss-normalize-url": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz",
-      "integrity": "sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
       "dependencies": {
         "normalize-url": "^6.0.1",
         "postcss-value-parser": "^4.2.0"
@@ -11531,9 +15148,9 @@
       }
     },
     "node_modules/postcss-normalize-whitespace": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.2.tgz",
-      "integrity": "sha512-CXBx+9fVlzSgbk0IXA/dcZn9lXixnQRndnsPC5ht3HxlQ1bVh77KQDL1GffJx1LTzzfae8ftMulsjYmO2yegxA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11544,12 +15161,33 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
+      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
     "node_modules/postcss-ordered-values": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.3.tgz",
-      "integrity": "sha512-T9pDS+P9bWeFvqivXd5ACzQmrCmHjv3ZP+djn8E1UZY7iK79pFSm7i3WbKw2VSmFmdbMm8sQ12OPcNpzBo3Z2w==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
       "dependencies": {
-        "cssnano-utils": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
@@ -11560,14 +15198,21 @@
       }
     },
     "node_modules/postcss-overflow-shorthand": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.2.tgz",
-      "integrity": "sha512-odBMVt6PTX7jOE9UNvmnLrFzA9pXS44Jd5shFGGtSHY80QCuJF+14McSy0iavZggRZ9Oj//C9vOKQmexvyEJMg==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-page-break": {
@@ -11579,85 +15224,113 @@
       }
     },
     "node_modules/postcss-place": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.3.tgz",
-      "integrity": "sha512-tDQ3m+GYoOar+KoQgj+pwPAvGHAp/Sby6vrFiyrELrMKQJ4AejL0NcS0mm296OKKYA2SRg9ism/hlT/OLhBrdQ==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-preset-env": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.2.3.tgz",
-      "integrity": "sha512-Ok0DhLfwrcNGrBn8sNdy1uZqWRk/9FId0GiQ39W4ILop5GHtjJs8bu1MY9isPwHInpVEPWjb4CEcEaSbBLpfwA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
+      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
       "dependencies": {
-        "autoprefixer": "^10.4.2",
-        "browserslist": "^4.19.1",
-        "caniuse-lite": "^1.0.30001299",
-        "css-blank-pseudo": "^3.0.2",
-        "css-has-pseudo": "^3.0.3",
-        "css-prefers-color-scheme": "^6.0.2",
-        "cssdb": "^5.0.0",
-        "postcss-attribute-case-insensitive": "^5.0.0",
-        "postcss-color-functional-notation": "^4.2.1",
-        "postcss-color-hex-alpha": "^8.0.2",
-        "postcss-color-rebeccapurple": "^7.0.2",
-        "postcss-custom-media": "^8.0.0",
-        "postcss-custom-properties": "^12.1.2",
-        "postcss-custom-selectors": "^6.0.0",
-        "postcss-dir-pseudo-class": "^6.0.3",
-        "postcss-double-position-gradients": "^3.0.4",
-        "postcss-env-function": "^4.0.4",
-        "postcss-focus-visible": "^6.0.3",
-        "postcss-focus-within": "^5.0.3",
+        "@csstools/postcss-cascade-layers": "^1.1.1",
+        "@csstools/postcss-color-function": "^1.1.1",
+        "@csstools/postcss-font-format-keywords": "^1.0.1",
+        "@csstools/postcss-hwb-function": "^1.0.2",
+        "@csstools/postcss-ic-unit": "^1.0.1",
+        "@csstools/postcss-is-pseudo-class": "^2.0.7",
+        "@csstools/postcss-nested-calc": "^1.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.1",
+        "@csstools/postcss-oklab-function": "^1.1.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
+        "@csstools/postcss-stepped-value-functions": "^1.0.1",
+        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+        "@csstools/postcss-trigonometric-functions": "^1.0.2",
+        "@csstools/postcss-unset-value": "^1.0.2",
+        "autoprefixer": "^10.4.13",
+        "browserslist": "^4.21.4",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^7.1.0",
+        "postcss-attribute-case-insensitive": "^5.0.2",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^4.2.4",
+        "postcss-color-hex-alpha": "^8.0.4",
+        "postcss-color-rebeccapurple": "^7.1.1",
+        "postcss-custom-media": "^8.0.2",
+        "postcss-custom-properties": "^12.1.10",
+        "postcss-custom-selectors": "^6.0.3",
+        "postcss-dir-pseudo-class": "^6.0.5",
+        "postcss-double-position-gradients": "^3.1.2",
+        "postcss-env-function": "^4.0.6",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
         "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.2",
-        "postcss-image-set-function": "^4.0.4",
+        "postcss-gap-properties": "^3.0.5",
+        "postcss-image-set-function": "^4.0.7",
         "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.0.3",
-        "postcss-logical": "^5.0.3",
+        "postcss-lab-function": "^4.2.1",
+        "postcss-logical": "^5.0.4",
         "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.1.2",
-        "postcss-overflow-shorthand": "^3.0.2",
+        "postcss-nesting": "^10.2.0",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.4",
         "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.3",
-        "postcss-pseudo-class-any-link": "^7.0.2",
+        "postcss-place": "^7.0.5",
+        "postcss-pseudo-class-any-link": "^7.1.6",
         "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^5.0.0"
+        "postcss-selector-not": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.4"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-pseudo-class-any-link": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.0.2.tgz",
-      "integrity": "sha512-CG35J1COUH7OOBgpw5O+0koOLUd5N4vUGKUqSAuIe4GiuLHWU96Pqp+UPC8QITTd12zYAFx76pV7qWT/0Aj/TA==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.10"
       },
       "engines": {
         "node": "^12 || ^14 || >=16"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
       "peerDependencies": {
-        "postcss": "^8.3"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-reduce-initial": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz",
-      "integrity": "sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0"
       },
       "engines": {
@@ -11668,9 +15341,9 @@
       }
     },
     "node_modules/postcss-reduce-transforms": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.2.tgz",
-      "integrity": "sha512-25HeDeFsgiPSUx69jJXZn8I06tMxLQJJNF5h7i9gsUg8iP4KOOJ8EX8fj3seeoLt3SLU2YDD6UPnDYVGUO7DEA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
       "dependencies": {
         "postcss-value-parser": "^4.2.0"
       },
@@ -11690,20 +15363,27 @@
       }
     },
     "node_modules/postcss-selector-not": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz",
-      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
       },
       "peerDependencies": {
-        "postcss": "^8.1.0"
+        "postcss": "^8.2"
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
-      "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -11713,11 +15393,11 @@
       }
     },
     "node_modules/postcss-svgo": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz",
-      "integrity": "sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
       "dependencies": {
-        "postcss-value-parser": "^4.1.0",
+        "postcss-value-parser": "^4.2.0",
         "svgo": "^2.7.0"
       },
       "engines": {
@@ -11752,6 +15432,14 @@
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
+    "node_modules/postcss-svgo/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/postcss-svgo/node_modules/svgo": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
@@ -11773,11 +15461,10 @@
       }
     },
     "node_modules/postcss-unique-selectors": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz",
-      "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
       "dependencies": {
-        "alphanum-sort": "^1.0.2",
         "postcss-selector-parser": "^6.0.5"
       },
       "engines": {
@@ -11801,15 +15488,15 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz",
+      "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==",
       "dev": true,
       "bin": {
-        "prettier": "bin-prettier.js"
+        "prettier": "bin/prettier.cjs"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"
@@ -11836,9 +15523,9 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz",
-      "integrity": "sha512-NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -11859,15 +15546,20 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/pretty-format/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "node_modules/promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
       "dependencies": {
         "asap": "~2.0.6"
       }
@@ -11920,22 +15612,40 @@
       }
     },
     "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/pure-rand": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
+      "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "optional": true,
+      "peer": true
+    },
     "node_modules/q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
       "engines": {
         "node": ">=0.6.0",
         "teleport": ">=0.2.0"
@@ -11955,6 +15665,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -11974,17 +15689,6 @@
         }
       ]
     },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
@@ -12071,9 +15775,9 @@
       }
     },
     "node_modules/react-app-rewired": {
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.1.11.tgz",
-      "integrity": "sha512-zRIqJUPsCoPnfYtea3xgPbKR42vx0NoH5oo8R8FELXqzkjJHa39V6zD8CAdkLJoYL8V3JScWHAfKMZOzi1Ydmw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.2.1.tgz",
+      "integrity": "sha512-uFQWTErXeLDrMzOJHKp0h8P1z0LV9HzPGsJ6adOtGlA/B9WfT6Shh4j2tLTTGlXOfiVx6w6iWpp7SOC5pvk+gA==",
       "dependencies": {
         "semver": "^5.6.0"
       },
@@ -12085,9 +15789,9 @@
       }
     },
     "node_modules/react-app-rewired/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "bin": {
         "semver": "bin/semver"
       }
@@ -12237,9 +15941,9 @@
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
     "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/react-refresh": {
       "version": "0.11.0",
@@ -12321,10 +16025,298 @@
         }
       }
     },
+    "node_modules/react-scripts/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/core": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
+      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/reporters": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^27.5.1",
+        "jest-config": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-resolve-dependencies": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "jest-watcher": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "dependencies": {
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/reporters": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
+      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-haste-map": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^8.1.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/schemas": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
+      "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+      "dependencies": {
+        "@sinclair/typebox": "^0.24.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@jest/test-sequencer": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-runtime": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@sinclair/typebox": {
+      "version": "0.24.51",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
+      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
+    },
+    "node_modules/react-scripts/node_modules/@sinonjs/commons": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/@types/yargs": {
+      "version": "17.0.24",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/react-scripts/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/react-scripts/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
+    },
+    "node_modules/react-scripts/node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/emittery": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/react-scripts/node_modules/expect": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
     "node_modules/react-scripts/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -12334,21 +16326,650 @@
         "node": ">=12"
       }
     },
-    "node_modules/react-scripts/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+    "node_modules/react-scripts/node_modules/jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
+      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
       "dependencies": {
-        "universalify": "^2.0.0"
+        "@jest/core": "^27.5.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^27.5.1"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-changed-files": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "execa": "^5.0.0",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-circus": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-cli": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
+      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+      "dependencies": {
+        "@jest/core": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "prompts": "^2.0.1",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-config": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
+      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+      "dependencies": {
+        "@babel/core": "^7.8.0",
+        "@jest/test-sequencer": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "babel-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-jasmine2": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-diff": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-docblock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
+      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-each": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-environment-node": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-leak-detector": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+      "dependencies": {
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-mock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-resolve-dependencies": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-snapshot": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-runner": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
+      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-leak-detector": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "source-map-support": "^0.5.6",
+        "throat": "^6.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "dependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
+      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
+      "dependencies": {
+        "ansi-escapes": "^4.3.1",
+        "chalk": "^4.0.0",
+        "jest-regex-util": "^28.0.0",
+        "jest-watcher": "^28.0.0",
+        "slash": "^4.0.0",
+        "string-length": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "jest": "^27.0.0 || ^28.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/console": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
+      "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
+      "dependencies": {
+        "@jest/types": "^28.1.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^28.1.3",
+        "jest-util": "^28.1.3",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/console/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/test-result": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
+      "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
+      "dependencies": {
+        "@jest/console": "^28.1.3",
+        "@jest/types": "^28.1.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/@jest/types": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
+      "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
+      "dependencies": {
+        "@jest/schemas": "^28.1.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/emittery": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
+      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-message-util": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
+      "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^28.1.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^28.1.3",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-message-util/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-util": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
+      "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
+      "dependencies": {
+        "@jest/types": "^28.1.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-watcher": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
+      "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
+      "dependencies": {
+        "@jest/test-result": "^28.1.3",
+        "@jest/types": "^28.1.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.10.2",
+        "jest-util": "^28.1.3",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/pretty-format": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
+      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
+      "dependencies": {
+        "@jest/schemas": "^28.1.3",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/string-length": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+      "dependencies": {
+        "char-regex": "^2.0.0",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
+      "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/react-scripts/node_modules/jest-watcher": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
+      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+      "dependencies": {
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^27.5.1",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/react-scripts/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -12359,18 +16980,77 @@
         "node": ">=10"
       }
     },
-    "node_modules/react-scripts/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+    "node_modules/react-scripts/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/v8-to-istanbul": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/react-scripts/node_modules/v8-to-istanbul/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/react-scripts/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/react-scripts/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/react-scripts/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "dependencies": {
+        "pify": "^2.3.0"
       }
     },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -12421,9 +17101,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz",
-      "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -12437,9 +17117,9 @@
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "node_modules/regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
+      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
@@ -12465,42 +17145,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
     "node_modules/regexpu-core": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz",
-      "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "dependencies": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^9.0.0",
-        "regjsgen": "^0.5.2",
-        "regjsparser": "^0.7.0",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
-    },
     "node_modules/regjsparser": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz",
-      "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "dependencies": {
         "jsesc": "~0.5.0"
       },
@@ -12511,7 +17175,7 @@
     "node_modules/regjsparser/node_modules/jsesc": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
       "bin": {
         "jsesc": "bin/jsesc"
       }
@@ -12519,7 +17183,7 @@
     "node_modules/relateurl": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
       "engines": {
         "node": ">= 0.10"
       }
@@ -12539,7 +17203,7 @@
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12555,14 +17219,14 @@
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
     "node_modules/resolve": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
-      "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "dependencies": {
-        "is-core-module": "^2.8.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -12640,10 +17304,18 @@
         "url": "https://opencollective.com/postcss/"
       }
     },
+    "node_modules/resolve-url-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz",
+      "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==",
       "engines": {
         "node": ">=10"
       }
@@ -12680,9 +17352,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.64.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.64.0.tgz",
-      "integrity": "sha512-+c+lbw1lexBKSMb1yxGDVfJ+vchJH3qLbmavR+awDinTDA2C5Ug9u7lkOzj62SCu0PKUExsW36tpgW7Fmpn3yQ==",
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -12697,6 +17369,7 @@
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
       "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser",
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "jest-worker": "^26.2.1",
@@ -12750,10 +17423,41 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/safe-regex-test": {
       "version": "1.0.0",
@@ -12779,9 +17483,9 @@
       "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
     },
     "node_modules/sass-loader": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
-      "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
+      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
       "dependencies": {
         "klona": "^2.0.4",
         "neo-async": "^2.6.2"
@@ -12797,6 +17501,7 @@
         "fibers": ">= 3.1.0",
         "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
         "sass": "^1.3.0",
+        "sass-embedded": "*",
         "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
@@ -12808,6 +17513,9 @@
         },
         "sass": {
           "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
         }
       }
     },
@@ -12837,9 +17545,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
-      "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -12856,23 +17564,23 @@
     "node_modules/select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
     },
     "node_modules/selfsigned": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz",
-      "integrity": "sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
       "dependencies": {
-        "node-forge": "^1.2.0"
+        "node-forge": "^1"
       },
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -12913,27 +17621,11 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/send/node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
-    "node_modules/send/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/serialize-javascript": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
@@ -12945,7 +17637,7 @@
     "node_modules/serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dependencies": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -12967,10 +17659,18 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
@@ -12984,18 +17684,26 @@
     "node_modules/serve-index/node_modules/inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
     },
     "node_modules/serve-index/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
     },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/serve-static": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
@@ -13030,9 +17738,9 @@
       }
     },
     "node_modules/sharp-router/node_modules/@types/react": {
-      "version": "16.14.21",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz",
-      "integrity": "sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg==",
+      "version": "16.14.43",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.43.tgz",
+      "integrity": "sha512-7zdjv7jvoLLQg1tTvpQsm+hyNUMT2mPlNV1+d0I8fbGhkJl82spopMyBlu4wb1dviZAxpGdk5eHu/muacknnfw==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -13080,9 +17788,9 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
@@ -13113,25 +17821,25 @@
       "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
     },
     "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
-      "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
-      "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
+      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
       "dependencies": {
         "abab": "^2.0.5",
         "iconv-lite": "^0.6.3",
@@ -13148,17 +17856,6 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
-      }
-    },
     "node_modules/source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -13168,16 +17865,19 @@
         "source-map": "^0.6.0"
       }
     },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated"
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/sourcemap-codec": {
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
     },
     "node_modules/spdy": {
       "version": "4.0.2",
@@ -13210,17 +17910,18 @@
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "node_modules/stable": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
     },
     "node_modules/stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -13237,16 +17938,16 @@
       }
     },
     "node_modules/stackframe": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz",
-      "integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
     },
     "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/stop-iteration-iterator": {
@@ -13268,25 +17969,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -13468,16 +18150,16 @@
     "node_modules/strip-outer/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
+      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
       "engines": {
         "node": ">= 12.13.0"
       },
@@ -13490,23 +18172,22 @@
       }
     },
     "node_modules/styled-components": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.3.tgz",
-      "integrity": "sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.0.tgz",
+      "integrity": "sha512-VWNfYYBuXzuLS/QYEeoPgMErP26WL+dX9//rEh80B2mmlS1yRxRxuL5eax4m6ybYEUoHWlTy2XOU32767mlMkg==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.4.5",
-        "@emotion/is-prop-valid": "^0.8.8",
-        "@emotion/stylis": "^0.8.4",
-        "@emotion/unitless": "^0.7.4",
-        "babel-plugin-styled-components": ">= 1.12.0",
-        "css-to-react-native": "^3.0.0",
-        "hoist-non-react-statics": "^3.0.0",
+        "@emotion/is-prop-valid": "^1.2.1",
+        "@emotion/unitless": "^0.8.0",
+        "@types/stylis": "^4.0.2",
+        "css-to-react-native": "^3.2.0",
+        "csstype": "^3.1.2",
+        "postcss": "^8.4.31",
         "shallowequal": "^1.1.0",
-        "supports-color": "^5.5.0"
+        "stylis": "^4.3.0",
+        "tslib": "^2.5.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 16"
       },
       "funding": {
         "type": "opencollective",
@@ -13514,35 +18195,15 @@
       },
       "peerDependencies": {
         "react": ">= 16.8.0",
-        "react-dom": ">= 16.8.0",
-        "react-is": ">= 16.8.0"
-      }
-    },
-    "node_modules/styled-components/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/styled-components/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "react-dom": ">= 16.8.0"
       }
     },
     "node_modules/stylehacks": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
-      "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
       "dependencies": {
-        "browserslist": "^4.16.0",
+        "browserslist": "^4.21.4",
         "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
@@ -13552,6 +18213,59 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/stylis": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz",
+      "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ=="
+    },
+    "node_modules/sucrase": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+      "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "7.1.6",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sucrase/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/sucrase/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13564,9 +18278,9 @@
       }
     },
     "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
       "dependencies": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
@@ -13653,7 +18367,7 @@
     "node_modules/svgo/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "node_modules/svgo/node_modules/css-select": {
       "version": "2.1.0",
@@ -13703,7 +18417,7 @@
     "node_modules/svgo/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -13711,7 +18425,7 @@
     "node_modules/svgo/node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
         "node": ">=4"
       }
@@ -13741,41 +18455,40 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "node_modules/tailwindcss": {
-      "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.15.tgz",
-      "integrity": "sha512-bT2iy7FtjwgsXik4ZoJnHXR+SRCiGR1W95fVqpLZebr64m4ahwUwRbIAc5w5+2fzr1YF4Ct2eI7dojMRRl8sVQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
       "dependencies": {
-        "arg": "^5.0.1",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.2",
-        "color-name": "^1.1.4",
-        "cosmiconfig": "^7.0.1",
-        "detective": "^5.2.0",
+        "@alloc/quick-lru": "^5.2.0",
+        "arg": "^5.0.2",
+        "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.2.7",
+        "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
+        "jiti": "^1.18.2",
+        "lilconfig": "^2.1.0",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "object-hash": "^2.2.0",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.0",
-        "postcss-nested": "5.0.6",
-        "postcss-selector-parser": "^6.0.8",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.23",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.1",
+        "postcss-nested": "^6.0.1",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.21.0"
+        "resolve": "^1.22.2",
+        "sucrase": "^3.32.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
         "tailwindcss": "lib/cli.js"
       },
       "engines": {
-        "node": ">=12.13.0"
-      },
-      "peerDependencies": {
-        "autoprefixer": "^10.0.2",
-        "postcss": "^8.0.9"
+        "node": ">=14.0.0"
       }
     },
     "node_modules/tapable": {
@@ -13838,12 +18551,12 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
-      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz",
+      "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==",
       "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -13855,15 +18568,15 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz",
-      "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==",
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.1",
-        "terser": "^5.16.5"
+        "terser": "^5.16.8"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -13903,23 +18616,37 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+    },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
     },
     "node_modules/throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
+      "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="
     },
     "node_modules/thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
-    "node_modules/timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -13928,7 +18655,7 @@
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "engines": {
         "node": ">=4"
       }
@@ -13953,18 +18680,27 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/tr46": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
@@ -13979,7 +18715,7 @@
     "node_modules/trim-repeated": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
-      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
       "dev": true,
       "dependencies": {
         "escape-string-regexp": "^1.0.2"
@@ -13991,7 +18727,7 @@
     "node_modules/trim-repeated/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -14002,6 +18738,11 @@
       "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
     },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.14.2",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
@@ -14033,9 +18774,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/tslint": {
       "version": "6.1.3",
@@ -14118,13 +18859,13 @@
     "node_modules/tslint/node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
     "node_modules/tslint/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -14133,16 +18874,16 @@
     "node_modules/tslint/node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/tslint/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -14286,6 +19027,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/undici-types": {
+      "version": "5.25.3",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
+      "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -14307,17 +19053,17 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "engines": {
         "node": ">=4"
       }
@@ -14334,11 +19080,11 @@
       }
     },
     "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">= 10.0.0"
       }
     },
     "node_modules/unpipe": {
@@ -14352,7 +19098,7 @@
     "node_modules/unquote": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
     },
     "node_modules/upath": {
       "version": "1.2.0",
@@ -14400,29 +19146,43 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
       "dependencies": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/utila": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw="
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -14435,36 +19195,26 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
-    },
     "node_modules/v8-to-istanbul": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
+        "convert-source-map": "^1.6.0"
       },
       "engines": {
         "node": ">=10.12.0"
       }
     },
-    "node_modules/v8-to-istanbul/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -14473,6 +19223,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
       }
@@ -14517,9 +19268,9 @@
       }
     },
     "node_modules/web-vitals": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.3.tgz",
-      "integrity": "sha512-+ijpniAzcnQicXaXIN0/eHQAiV/jMt1oHGHTmz7VdAJPPkzzDhmoYPSpLgJTuFtUh+jCjxCoeTZPg7Ic+g8o7w=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.0.tgz",
+      "integrity": "sha512-f5YnCHVG9Y6uLCePD4tY8bO/Ge15NPEQWtvm3tPzDKygloiqtb4SVqRHBcrIAqo2ztqX5XueqDn97zHF0LdT6w=="
     },
     "node_modules/webidl-conversions": {
       "version": "6.1.0",
@@ -14530,9 +19281,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.81.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.81.0.tgz",
-      "integrity": "sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==",
+      "version": "5.87.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
+      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.0",
@@ -14540,10 +19291,10 @@
         "@webassemblyjs/wasm-edit": "^1.11.5",
         "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
+        "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.13.0",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -14553,7 +19304,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.2",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
@@ -14576,12 +19327,12 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz",
-      "integrity": "sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "dependencies": {
         "colorette": "^2.0.10",
-        "memfs": "^3.2.2",
+        "memfs": "^3.4.3",
         "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"
@@ -14598,9 +19349,9 @@
       }
     },
     "node_modules/webpack-dev-middleware/node_modules/ajv": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -14629,14 +19380,14 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -14647,39 +19398,40 @@
       }
     },
     "node_modules/webpack-dev-server": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz",
-      "integrity": "sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
         "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
         "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.2.2",
+        "@types/ws": "^8.5.5",
         "ansi-html-community": "^0.0.8",
-        "bonjour": "^3.5.0",
-        "chokidar": "^3.5.2",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
         "colorette": "^2.0.10",
         "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
+        "connect-history-api-fallback": "^2.0.0",
         "default-gateway": "^6.0.3",
-        "del": "^6.0.0",
-        "express": "^4.17.1",
+        "express": "^4.17.3",
         "graceful-fs": "^4.2.6",
         "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.0",
+        "http-proxy-middleware": "^2.0.3",
         "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
         "open": "^8.0.9",
         "p-retry": "^4.5.0",
-        "portfinder": "^1.0.28",
+        "rimraf": "^3.0.2",
         "schema-utils": "^4.0.0",
-        "selfsigned": "^2.0.0",
+        "selfsigned": "^2.1.1",
         "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
+        "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
-        "strip-ansi": "^7.0.0",
-        "webpack-dev-middleware": "^5.3.0",
-        "ws": "^8.1.0"
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.13.0"
       },
       "bin": {
         "webpack-dev-server": "bin/webpack-dev-server.js"
@@ -14687,19 +19439,26 @@
       "engines": {
         "node": ">= 12.13.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
       "peerDependencies": {
         "webpack": "^4.37.0 || ^5.0.0"
       },
       "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
         "webpack-cli": {
           "optional": true
         }
       }
     },
     "node_modules/webpack-dev-server/node_modules/ajv": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -14722,31 +19481,20 @@
         "ajv": "^8.8.2"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
@@ -14756,30 +19504,16 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
-      "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -14805,6 +19539,14 @@
         "webpack": "^4.44.2 || ^5.47.0"
       }
     },
+    "node_modules/webpack-manifest-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
@@ -14971,34 +19713,34 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/workbox-background-sync": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.4.2.tgz",
-      "integrity": "sha512-P7c8uG5X2k+DMICH9xeSA9eUlCOjHHYoB42Rq+RtUpuwBxUOflAXR1zdsMWj81LopE4gjKXlTw7BFd1BDAHo7g==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz",
+      "integrity": "sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==",
       "dependencies": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.4.2"
+        "idb": "^7.0.1",
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-broadcast-update": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.4.2.tgz",
-      "integrity": "sha512-qnBwQyE0+PWFFc/n4ISXINE49m44gbEreJUYt2ldGH3+CNrLmJ1egJOOyUqqu9R4Eb7QrXcmB34ClXG7S37LbA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.6.0.tgz",
+      "integrity": "sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==",
       "dependencies": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-build": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.4.2.tgz",
-      "integrity": "sha512-WMdYLhDIsuzViOTXDH+tJ1GijkFp5khSYolnxR/11zmfhNDtuo7jof72xPGFy+KRpsz6tug39RhivCj77qqO0w==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.6.0.tgz",
+      "integrity": "sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==",
       "dependencies": {
         "@apideck/better-ajv-errors": "^0.3.1",
         "@babel/core": "^7.11.1",
@@ -15018,35 +19760,34 @@
         "rollup": "^2.43.1",
         "rollup-plugin-terser": "^7.0.0",
         "source-map": "^0.8.0-beta.0",
-        "source-map-url": "^0.4.0",
         "stringify-object": "^3.3.0",
         "strip-comments": "^2.0.1",
         "tempy": "^0.6.0",
         "upath": "^1.2.0",
-        "workbox-background-sync": "6.4.2",
-        "workbox-broadcast-update": "6.4.2",
-        "workbox-cacheable-response": "6.4.2",
-        "workbox-core": "6.4.2",
-        "workbox-expiration": "6.4.2",
-        "workbox-google-analytics": "6.4.2",
-        "workbox-navigation-preload": "6.4.2",
-        "workbox-precaching": "6.4.2",
-        "workbox-range-requests": "6.4.2",
-        "workbox-recipes": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2",
-        "workbox-streams": "6.4.2",
-        "workbox-sw": "6.4.2",
-        "workbox-window": "6.4.2"
+        "workbox-background-sync": "6.6.0",
+        "workbox-broadcast-update": "6.6.0",
+        "workbox-cacheable-response": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-expiration": "6.6.0",
+        "workbox-google-analytics": "6.6.0",
+        "workbox-navigation-preload": "6.6.0",
+        "workbox-precaching": "6.6.0",
+        "workbox-range-requests": "6.6.0",
+        "workbox-recipes": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0",
+        "workbox-streams": "6.6.0",
+        "workbox-sw": "6.6.0",
+        "workbox-window": "6.6.0"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.2.tgz",
-      "integrity": "sha512-JdEazx7qiVqTBzzBl5rolRwl5cmhihjfIcpqRzIZjtT6b18liVmDn/VlWpqW4C/qP2hrFFMLRV1wlex8ZVBPTg==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
+      "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
       "dependencies": {
         "json-schema": "^0.4.0",
         "jsonpointer": "^5.0.0",
@@ -15060,9 +19801,9 @@
       }
     },
     "node_modules/workbox-build/node_modules/ajv": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -15093,17 +19834,6 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/workbox-build/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "node_modules/workbox-build/node_modules/source-map": {
       "version": "0.8.0-beta.0",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
@@ -15118,19 +19848,11 @@
     "node_modules/workbox-build/node_modules/tr46": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/workbox-build/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/workbox-build/node_modules/webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -15147,118 +19869,118 @@
       }
     },
     "node_modules/workbox-cacheable-response": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.4.2.tgz",
-      "integrity": "sha512-9FE1W/cKffk1AJzImxgEN0ceWpyz1tqNjZVtA3/LAvYL3AC5SbIkhc7ZCO82WmO9IjTfu8Vut2X/C7ViMSF7TA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.6.0.tgz",
+      "integrity": "sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==",
+      "deprecated": "workbox-background-sync@6.6.0",
       "dependencies": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-core": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.4.2.tgz",
-      "integrity": "sha512-1U6cdEYPcajRXiboSlpJx6U7TvhIKbxRRerfepAJu2hniKwJ3DHILjpU/zx3yvzSBCWcNJDoFalf7Vgd7ey/rw=="
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz",
+      "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ=="
     },
     "node_modules/workbox-expiration": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.4.2.tgz",
-      "integrity": "sha512-0hbpBj0tDnW+DZOUmwZqntB/8xrXOgO34i7s00Si/VlFJvvpRKg1leXdHHU8ykoSBd6+F2KDcMP3swoCi5guLw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.6.0.tgz",
+      "integrity": "sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==",
       "dependencies": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.4.2"
+        "idb": "^7.0.1",
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-google-analytics": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.4.2.tgz",
-      "integrity": "sha512-u+gxs3jXovPb1oul4CTBOb+T9fS1oZG+ZE6AzS7l40vnyfJV79DaLBvlpEZfXGv3CjMdV1sT/ltdOrKzo7HcGw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz",
+      "integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==",
       "dependencies": {
-        "workbox-background-sync": "6.4.2",
-        "workbox-core": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2"
+        "workbox-background-sync": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
       }
     },
     "node_modules/workbox-navigation-preload": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.4.2.tgz",
-      "integrity": "sha512-viyejlCtlKsbJCBHwhSBbWc57MwPXvUrc8P7d+87AxBGPU+JuWkT6nvBANgVgFz6FUhCvRC8aYt+B1helo166g==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.6.0.tgz",
+      "integrity": "sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==",
       "dependencies": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-precaching": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.4.2.tgz",
-      "integrity": "sha512-CZ6uwFN/2wb4noHVlALL7UqPFbLfez/9S2GAzGAb0Sk876ul9ukRKPJJ6gtsxfE2HSTwqwuyNVa6xWyeyJ1XSA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.6.0.tgz",
+      "integrity": "sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==",
       "dependencies": {
-        "workbox-core": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2"
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
       }
     },
     "node_modules/workbox-range-requests": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.4.2.tgz",
-      "integrity": "sha512-SowF3z69hr3Po/w7+xarWfzxJX/3Fo0uSG72Zg4g5FWWnHpq2zPvgbWerBZIa81zpJVUdYpMa3akJJsv+LaO1Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.6.0.tgz",
+      "integrity": "sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==",
       "dependencies": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-recipes": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.4.2.tgz",
-      "integrity": "sha512-/oVxlZFpAjFVbY+3PoGEXe8qyvtmqMrTdWhbOfbwokNFtUZ/JCtanDKgwDv9x3AebqGAoJRvQNSru0F4nG+gWA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.6.0.tgz",
+      "integrity": "sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==",
       "dependencies": {
-        "workbox-cacheable-response": "6.4.2",
-        "workbox-core": "6.4.2",
-        "workbox-expiration": "6.4.2",
-        "workbox-precaching": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2"
+        "workbox-cacheable-response": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-expiration": "6.6.0",
+        "workbox-precaching": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
       }
     },
     "node_modules/workbox-routing": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.4.2.tgz",
-      "integrity": "sha512-0ss/n9PAcHjTy4Ad7l2puuod4WtsnRYu9BrmHcu6Dk4PgWeJo1t5VnGufPxNtcuyPGQ3OdnMdlmhMJ57sSrrSw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz",
+      "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==",
       "dependencies": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-strategies": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.4.2.tgz",
-      "integrity": "sha512-YXh9E9dZGEO1EiPC3jPe2CbztO5WT8Ruj8wiYZM56XqEJp5YlGTtqRjghV+JovWOqkWdR+amJpV31KPWQUvn1Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz",
+      "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==",
       "dependencies": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/workbox-streams": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.4.2.tgz",
-      "integrity": "sha512-ROEGlZHGVEgpa5bOZefiJEVsi5PsFjJG9Xd+wnDbApsCO9xq9rYFopF+IRq9tChyYzhBnyk2hJxbQVWphz3sog==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.6.0.tgz",
+      "integrity": "sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==",
       "dependencies": {
-        "workbox-core": "6.4.2",
-        "workbox-routing": "6.4.2"
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0"
       }
     },
     "node_modules/workbox-sw": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.4.2.tgz",
-      "integrity": "sha512-A2qdu9TLktfIM5NE/8+yYwfWu+JgDaCkbo5ikrky2c7r9v2X6DcJ+zSLphNHHLwM/0eVk5XVf1mC5HGhYpMhhg=="
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.6.0.tgz",
+      "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ=="
     },
     "node_modules/workbox-webpack-plugin": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.4.2.tgz",
-      "integrity": "sha512-CiEwM6kaJRkx1cP5xHksn13abTzUqMHiMMlp5Eh/v4wRcedgDTyv6Uo8+Hg9MurRbHDosO5suaPyF9uwVr4/CQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.0.tgz",
+      "integrity": "sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==",
       "dependencies": {
         "fast-json-stable-stringify": "^2.1.0",
         "pretty-bytes": "^5.4.1",
-        "source-map-url": "^0.4.0",
         "upath": "^1.2.0",
         "webpack-sources": "^1.4.3",
-        "workbox-build": "6.4.2"
+        "workbox-build": "6.6.0"
       },
       "engines": {
         "node": ">=10.0.0"
@@ -15267,6 +19989,14 @@
         "webpack": "^4.4.0 || ^5.9.0"
       }
     },
+    "node_modules/workbox-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/workbox-webpack-plugin/node_modules/webpack-sources": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
@@ -15277,12 +20007,12 @@
       }
     },
     "node_modules/workbox-window": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.4.2.tgz",
-      "integrity": "sha512-KVyRKmrJg7iB+uym/B/CnEUEFG9CvnTU1Bq5xpXHbtgD9l+ShDekSl1wYpqw/O0JfeeQVOFb8CiNfvnwWwqnWQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.6.0.tgz",
+      "integrity": "sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==",
       "dependencies": {
         "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "node_modules/wrap-ansi": {
@@ -15304,7 +20034,7 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
@@ -15318,9 +20048,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
-      "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -15347,14 +20077,6 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -15364,9 +20086,9 @@
       }
     },
     "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/yaml": {
       "version": "1.10.2",
@@ -15377,28 +20099,34 @@
       }
     },
     "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
+        "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/yocto-queue": {
@@ -15414,52 +20142,117 @@
     }
   },
   "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+    "@adobe/css-tools": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
+      "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==",
+      "dev": true
+    },
+    "@alloc/quick-lru": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="
+    },
+    "@ampproject/remapping": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "@babel/compat-data": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz",
-      "integrity": "sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g=="
-    },
-    "@babel/core": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz",
-      "integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==",
+    "@babel/code-frame": {
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.7",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helpers": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
+    "@babel/compat-data": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
+      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA=="
+    },
+    "@babel/core": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
+      "requires": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.2",
+        "semver": "^6.3.0"
+      }
+    },
     "@babel/eslint-parser": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz",
-      "integrity": "sha512-kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
+      "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
       "requires": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
@@ -15474,88 +20267,74 @@
       }
     },
     "@babel/generator": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz",
-      "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "requires": {
-        "@babel/types": "^7.21.4",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
+      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz",
-      "integrity": "sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
+      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
       "requires": {
-        "@babel/compat-data": "^7.21.4",
-        "@babel/helper-validator-option": "^7.21.0",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
         "browserslist": "^4.21.3",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz",
-      "integrity": "sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-member-expression-to-functions": "^7.21.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz",
-      "integrity": "sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^4.7.1"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.0"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
       "requires": {
         "@babel/helper-compilation-targets": "^7.17.7",
         "@babel/helper-plugin-utils": "^7.16.7",
@@ -15566,169 +20345,162 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
     },
     "@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "requires": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
-      "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "requires": {
-        "@babel/types": "^7.21.0"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
-      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "requires": {
-        "@babel/types": "^7.21.4"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
-      "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.2",
-        "@babel/types": "^7.21.2"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
-      "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
+      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.20.7",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "requires": {
-        "@babel/types": "^7.20.2"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "requires": {
-        "@babel/types": "^7.20.0"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
-      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
+      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
       "requires": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helpers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
-      "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "requires": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "dependencies": {
@@ -15784,181 +20556,99 @@
       }
     },
     "@babel/parser": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz",
-      "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw=="
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz",
-      "integrity": "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz",
-      "integrity": "sha512-MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz",
+      "integrity": "sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-replace-supers": "^7.20.7",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/plugin-syntax-decorators": "^7.21.0"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/plugin-syntax-decorators": "^7.22.5"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz",
-      "integrity": "sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==",
-      "requires": {
-        "@babel/compat-data": "^7.16.4",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz",
-      "integrity": "sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "requires": {}
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -15994,11 +20684,11 @@
       }
     },
     "@babel/plugin-syntax-decorators": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz",
-      "integrity": "sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz",
+      "integrity": "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
@@ -16018,11 +20708,27 @@
       }
     },
     "@babel/plugin-syntax-flow": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.21.4.tgz",
-      "integrity": "sha512-l9xd3N+XG4fZRxEP3vXdK6RW7vN1Uf5dxzRC/09wV86wqZ/YYQooBIGNsiRdfNR3/q2/5pPzV4B54J/9ctX5jw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz",
+      "integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-syntax-import-assertions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-import-meta": {
@@ -16042,11 +20748,11 @@
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz",
-      "integrity": "sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
+      "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-logical-assignment-operators": {
@@ -16114,422 +20820,556 @@
       }
     },
     "@babel/plugin-syntax-typescript": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz",
-      "integrity": "sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
+      "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
+      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
+      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-class-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-class-static-block": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
+      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz",
-      "integrity": "sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
+      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz",
-      "integrity": "sha512-FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz",
+      "integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-flow": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-flow": "^7.22.5"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "requires": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-json-strings": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz",
-      "integrity": "sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-simple-access": "^7.20.2"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz",
-      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "requires": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
-      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "requires": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.5"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-private-methods": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-react-constant-elements": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz",
-      "integrity": "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz",
+      "integrity": "sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-react-display-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
-      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz",
+      "integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-react-jsx": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz",
-      "integrity": "sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
+      "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-jsx": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-jsx": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
-      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
+      "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
       "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.16.7"
+        "@babel/plugin-transform-react-jsx": "^7.22.5"
       }
     },
     "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
-      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz",
+      "integrity": "sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz",
-      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
+      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.1"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz",
-      "integrity": "sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
+      "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
       "requires": {
-        "@babel/helper-module-imports": "^7.21.4",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
         "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "babel-plugin-polyfill-corejs3": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-          "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
-          "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.3.3",
-            "core-js-compat": "^3.25.1"
-          }
-        },
-        "babel-plugin-polyfill-regenerator": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-          "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-          "requires": {
-            "@babel/helper-define-polyfill-provider": "^0.3.3"
-          }
-        }
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz",
-      "integrity": "sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz",
+      "integrity": "sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.21.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-typescript": "^7.20.0"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-typescript": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
+      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/preset-env": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.8.tgz",
-      "integrity": "sha512-9rNKgVCdwHb3z1IlbMyft6yIXIeP3xz6vWvGaLHrJThuEIqWfHb0DNBH9VuTgnDfdbUDhkmkvMZS/YMCtP7Elg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
+      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
       "requires": {
-        "@babel/compat-data": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.16.7",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.7",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -16539,44 +21379,61 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.16.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.16.7",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.8",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.20.2",
+        "@babel/types": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "core-js-compat": "^3.30.2",
         "semver": "^6.3.0"
       }
     },
@@ -16593,72 +21450,77 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz",
-      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz",
+      "integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-react-display-name": "^7.16.7",
-        "@babel/plugin-transform-react-jsx": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-transform-react-display-name": "^7.22.5",
+        "@babel/plugin-transform-react-jsx": "^7.22.5",
+        "@babel/plugin-transform-react-jsx-development": "^7.22.5",
+        "@babel/plugin-transform-react-pure-annotations": "^7.22.5"
       }
     },
     "@babel/preset-typescript": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz",
-      "integrity": "sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz",
+      "integrity": "sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-validator-option": "^7.21.0",
-        "@babel/plugin-syntax-jsx": "^7.21.4",
-        "@babel/plugin-transform-modules-commonjs": "^7.21.2",
-        "@babel/plugin-transform-typescript": "^7.21.3"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-syntax-jsx": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-typescript": "^7.22.5"
       }
     },
+    "@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
+    },
     "@babel/runtime": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
-      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
+      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
       "requires": {
         "regenerator-runtime": "^0.13.11"
       }
     },
     "@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz",
-      "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "requires": {
-        "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.4",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.4",
-        "@babel/types": "^7.21.4",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz",
-      "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "requires": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -16672,28 +21534,144 @@
       "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
       "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
     },
-    "@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+    "@csstools/postcss-cascade-layers": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
       "requires": {
-        "@emotion/memoize": "0.7.4"
+        "@csstools/selector-specificity": "^2.0.2",
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "@csstools/postcss-color-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-font-format-keywords": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-hwb-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-ic-unit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
+      "requires": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "@csstools/postcss-nested-calc": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-normalize-display-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-oklab-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-stepped-value-functions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-text-decoration-shorthand": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-trigonometric-functions": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "@csstools/postcss-unset-value": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
+      "requires": {}
+    },
+    "@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "requires": {}
+    },
+    "@emotion/is-prop-valid": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
+      "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+      "requires": {
+        "@emotion/memoize": "^0.8.1"
       }
     },
     "@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-    },
-    "@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+      "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
     },
     "@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+      "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
     },
     "@eslint-community/eslint-utils": {
       "version": "4.4.0",
@@ -16704,23 +21682,23 @@
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
-      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ=="
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ=="
     },
     "@eslint/eslintrc": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
-      "integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
+      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.2.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "espree": "^9.5.2",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
@@ -16730,18 +21708,13 @@
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
         "globals": {
-          "version": "13.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-          "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -16757,16 +21730,26 @@
         }
       }
     },
+    "@eslint/js": {
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg=="
+    },
     "@humanwhocodes/config-array": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz",
-      "integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       }
     },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
+    },
     "@humanwhocodes/object-schema": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -16797,177 +21780,888 @@
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
     },
     "@jest/console": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.6.tgz",
-      "integrity": "sha512-jauXyacQD33n47A44KrlOVeiXHEXDqapSdfb9kTekOchH/Pd18kBIO1+xxJQRLuG+LUuljFCwTG92ra4NW7SpA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.2.tgz",
+      "integrity": "sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
     "@jest/core": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.7.tgz",
-      "integrity": "sha512-n181PurSJkVMS+kClIFSX/LLvw9ExSb+4IMtD6YnfxZVerw9ANYtW0bPrm0MJu2pfe9SY9FJ9FtQ+MdZkrZwjg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.2.tgz",
+      "integrity": "sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/console": "^27.4.6",
-        "@jest/reporters": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/reporters": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
+        "ci-info": "^3.2.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.4.2",
-        "jest-config": "^27.4.7",
-        "jest-haste-map": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-resolve": "^27.4.6",
-        "jest-resolve-dependencies": "^27.4.6",
-        "jest-runner": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
-        "jest-watcher": "^27.4.6",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^29.5.0",
+        "jest-config": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.6.2",
+        "jest-resolve-dependencies": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
+        "jest-watcher": "^29.6.2",
         "micromatch": "^4.0.4",
-        "rimraf": "^3.0.0",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "@jest/transform": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+          "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@babel/core": "^7.11.6",
+            "@jest/types": "^29.6.1",
+            "@jridgewell/trace-mapping": "^0.3.18",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^2.0.0",
+            "fast-json-stable-stringify": "^2.1.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "write-file-atomic": "^4.0.2"
+          }
+        },
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-haste-map": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+          "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/graceful-fs": "^4.1.3",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "jest-worker": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.8"
+          }
+        },
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-resolve": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+          "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^29.6.2",
+            "jest-validate": "^29.6.2",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^2.0.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+          "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^29.4.3",
+            "leven": "^3.1.0",
+            "pretty-format": "^29.6.2"
+          }
+        },
+        "jest-worker": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "jest-util": "^29.6.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
+        "resolve.exports": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+          "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "write-file-atomic": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+          "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.7"
+          }
+        }
       }
     },
     "@jest/environment": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.6.tgz",
-      "integrity": "sha512-E6t+RXPfATEEGVidr84WngLNWZ8ffCPky8RqqRK6u1Bn0LK92INe0MDttyPl/JOzaq92BmDzOeuqk09TvM22Sg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.2.tgz",
+      "integrity": "sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^27.4.6"
+        "jest-mock": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        }
+      }
+    },
+    "@jest/expect": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "expect": "^29.6.2",
+        "jest-snapshot": "^29.6.2"
+      }
+    },
+    "@jest/expect-utils": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz",
+      "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^29.4.3"
+      },
+      "dependencies": {
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true
+        }
       }
     },
     "@jest/fake-timers": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.6.tgz",
-      "integrity": "sha512-mfaethuYF8scV8ntPpiVGIHQgS0XIALbpY2jt2l7wb/bvq4Q5pDLk4EP4D7SAvYT1QrPOPVZAtbdGAOOyIgs7A==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.2.tgz",
+      "integrity": "sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/types": "^27.4.2",
-        "@sinonjs/fake-timers": "^8.0.1",
+        "@jest/types": "^29.6.1",
+        "@sinonjs/fake-timers": "^10.0.2",
         "@types/node": "*",
-        "jest-message-util": "^27.4.6",
-        "jest-mock": "^27.4.6",
-        "jest-util": "^27.4.2"
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
     "@jest/globals": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.6.tgz",
-      "integrity": "sha512-kAiwMGZ7UxrgPzu8Yv9uvWmXXxsy0GciNejlHvfPIfWkSxChzv6bgTS3YqBkGuHcis+ouMFI2696n2t+XYIeFw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.2.tgz",
+      "integrity": "sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/environment": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "expect": "^27.4.6"
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "jest-mock": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        }
       }
     },
     "@jest/reporters": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.6.tgz",
-      "integrity": "sha512-+Zo9gV81R14+PSq4wzee4GC2mhAN9i9a7qgJWL90Gpx7fHYkWpTBvwWNZUXvJByYR9tAVBdc8VxDWqfJyIUrIQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.2.tgz",
+      "integrity": "sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.4",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^5.1.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-haste-map": "^27.4.6",
-        "jest-resolve": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-worker": "^27.4.6",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-worker": "^29.6.2",
         "slash": "^3.0.0",
-        "source-map": "^0.6.0",
         "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
+        "strip-ansi": "^6.0.0",
+        "v8-to-istanbul": "^9.0.1"
+      },
+      "dependencies": {
+        "@jest/transform": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+          "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@babel/core": "^7.11.6",
+            "@jest/types": "^29.6.1",
+            "@jridgewell/trace-mapping": "^0.3.18",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^2.0.0",
+            "fast-json-stable-stringify": "^2.1.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "write-file-atomic": "^4.0.2"
+          }
+        },
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-haste-map": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+          "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/graceful-fs": "^4.1.3",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "jest-worker": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.8"
+          }
+        },
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-worker": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "jest-util": "^29.6.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "write-file-atomic": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+          "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.7"
+          }
+        }
+      }
+    },
+    "@jest/schemas": {
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
+      "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
+      "dev": true,
+      "requires": {
+        "@sinclair/typebox": "^0.27.8"
       }
     },
     "@jest/source-map": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz",
-      "integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==",
+      "version": "29.6.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
+      "integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
+        "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "source-map": "^0.6.0"
+        "graceful-fs": "^4.2.9"
       }
     },
     "@jest/test-result": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.6.tgz",
-      "integrity": "sha512-fi9IGj3fkOrlMmhQqa/t9xum8jaJOOAi/lZlm6JXSc55rJMXKHxNDN1oCP39B0/DhNOa2OMupF9BcKZnNtXMOQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.2.tgz",
+      "integrity": "sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/console": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        }
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.6.tgz",
-      "integrity": "sha512-3GL+nsf6E1PsyNsJuvPyIz+DwFuCtBdtvPpm/LMXVkBJbdFvQYCDpccYT56qq5BGniXWlE81n2qk1sdXfZebnw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.2.tgz",
+      "integrity": "sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/test-result": "^27.4.6",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
-        "jest-runtime": "^27.4.6"
+        "@jest/test-result": "^29.6.2",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-haste-map": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+          "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/graceful-fs": "^4.1.3",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "jest-worker": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.8"
+          }
+        },
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-worker": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "jest-util": "^29.6.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@jest/transform": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.6.tgz",
-      "integrity": "sha512-9MsufmJC8t5JTpWEQJ0OcOOAXaH5ioaIX6uHVBLBMoCZPfKKQF+EqP8kACAvCZ0Y1h2Zr3uOccg8re+Dr5jxyw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-util": "^27.4.2",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
         "source-map": "^0.6.1",
         "write-file-atomic": "^3.0.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
       }
     },
     "@jest/types": {
-      "version": "27.4.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
-      "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -17026,6 +22720,11 @@
         }
       }
     },
+    "@leichtgewicht/ip-codec": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
+    },
     "@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -17074,17 +22773,17 @@
       }
     },
     "@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz",
-      "integrity": "sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw==",
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
+      "integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
       "requires": {
         "ansi-html-community": "^0.0.8",
         "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.8.1",
+        "core-js-pure": "^3.23.3",
         "error-stack-parser": "^2.0.6",
         "find-up": "^5.0.0",
         "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.0",
+        "loader-utils": "^2.0.4",
         "schema-utils": "^3.0.0",
         "source-map": "^0.7.3"
       },
@@ -17121,18 +22820,13 @@
           "requires": {
             "p-limit": "^3.0.2"
           }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
         }
       }
     },
     "@rollup/plugin-babel": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz",
-      "integrity": "sha512-9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
+      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
       "requires": {
         "@babel/helper-module-imports": "^7.10.4",
         "@rollup/pluginutils": "^3.1.0"
@@ -17152,9 +22846,9 @@
       },
       "dependencies": {
         "builtin-modules": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-          "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+          "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="
         }
       }
     },
@@ -17185,24 +22879,36 @@
       }
     },
     "@rushstack/eslint-patch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
-      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.2.tgz",
+      "integrity": "sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw=="
+    },
+    "@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
     },
     "@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
+      "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "type-detect": "4.0.8"
       }
     },
     "@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+      "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@sinonjs/commons": "^1.7.0"
+        "@sinonjs/commons": "^3.0.0"
       }
     },
     "@surma/rollup-plugin-off-main-thread": {
@@ -17326,32 +23032,32 @@
       }
     },
     "@testing-library/dom": {
-      "version": "8.11.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.1.tgz",
-      "integrity": "sha512-3KQDyx9r0RKYailW2MiYrSSKEfH0GTkI51UGEvJenvcoDoeRYs0PZpi2SXqtnMClQvCqdtTTpOfFETDTVADpAg==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
+      "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
       "dev": true,
+      "peer": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.1.3",
         "chalk": "^4.1.0",
         "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
+        "lz-string": "^1.5.0",
         "pretty-format": "^27.0.2"
       }
     },
     "@testing-library/jest-dom": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.1.tgz",
-      "integrity": "sha512-ajUJdfDIuTCadB79ukO+0l8O+QwN0LiSxDaYUTI4LndbbUsGi6rWU1SCexXzBA2NSjlVB9/vbkasQIL3tmPBjw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.1.0.tgz",
+      "integrity": "sha512-EUAg9pvOkzmGXUSyAPt0h6yAXHxsn+FMNS1o7OX8TErmldZML2ywt10lotZXx/a1PDiSnq0fGGyEV/ybKSLPWQ==",
       "dev": true,
       "requires": {
+        "@adobe/css-tools": "^4.0.1",
         "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
         "aria-query": "^5.0.0",
         "chalk": "^3.0.0",
-        "css": "^3.0.0",
         "css.escape": "^1.5.1",
         "dom-accessibility-api": "^0.5.6",
         "lodash": "^4.17.15",
@@ -17371,23 +23077,40 @@
       }
     },
     "@testing-library/react": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.2.tgz",
-      "integrity": "sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==",
+      "version": "12.1.5",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz",
+      "integrity": "sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.0.0"
+        "@testing-library/dom": "^8.0.0",
+        "@types/react-dom": "<18.0.0"
+      },
+      "dependencies": {
+        "@testing-library/dom": {
+          "version": "8.20.1",
+          "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
+          "integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/runtime": "^7.12.5",
+            "@types/aria-query": "^5.0.1",
+            "aria-query": "5.1.3",
+            "chalk": "^4.1.0",
+            "dom-accessibility-api": "^0.5.9",
+            "lz-string": "^1.5.0",
+            "pretty-format": "^27.0.2"
+          }
+        }
       }
     },
     "@testing-library/user-event": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
-      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
+      "version": "14.5.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.1.tgz",
+      "integrity": "sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==",
       "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5"
-      }
+      "requires": {}
     },
     "@tootallnate/once": {
       "version": "1.1.2",
@@ -17400,18 +23123,18 @@
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
     },
     "@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "@types/babel__core": {
-      "version": "7.1.18",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
-      "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
+      "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
       "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
         "@types/babel__generator": "*",
         "@types/babel__template": "*",
         "@types/babel__traverse": "*"
@@ -17435,11 +23158,11 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
-      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
+      "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
       "requires": {
-        "@babel/types": "^7.3.0"
+        "@babel/types": "^7.20.7"
       }
     },
     "@types/body-parser": {
@@ -17468,27 +23191,27 @@
       }
     },
     "@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
       "requires": {
         "@types/express-serve-static-core": "*",
         "@types/node": "*"
       }
     },
     "@types/eslint": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
-      "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
+      "version": "8.40.2",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.2.tgz",
+      "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==",
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
     "@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -17500,30 +23223,31 @@
       "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="
     },
     "@types/express": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+      "version": "4.17.17",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
       "requires": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
+        "@types/express-serve-static-core": "^4.17.33",
         "@types/qs": "*",
         "@types/serve-static": "*"
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.17.28",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-      "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
+      "version": "4.17.35",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
+      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
       "requires": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
     "@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+      "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
       "requires": {
         "@types/node": "*"
       }
@@ -17544,9 +23268,9 @@
       "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
     },
     "@types/http-proxy": {
-      "version": "1.17.8",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
-      "integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
+      "version": "1.17.11",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
+      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
       "requires": {
         "@types/node": "*"
       }
@@ -17573,19 +23297,38 @@
       }
     },
     "@types/jest": {
-      "version": "27.5.2",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.2.tgz",
-      "integrity": "sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==",
+      "version": "29.5.4",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.4.tgz",
+      "integrity": "sha512-PhglGmhWeD46FYOVLt3X7TiWjzwuVGW9wG/4qocPevXMjCmrIc5b6db9WjeGE4QYVpUAWMDv3v0IiBwObY289A==",
       "dev": true,
       "requires": {
-        "jest-matcher-utils": "^27.0.0",
-        "pretty-format": "^27.0.0"
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
+          "integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
     },
     "@types/json5": {
       "version": "0.0.29",
@@ -17598,9 +23341,12 @@
       "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
     },
     "@types/node": {
-      "version": "17.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz",
-      "integrity": "sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="
+      "version": "20.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
+      "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==",
+      "requires": {
+        "undici-types": "~5.25.1"
+      }
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -17608,14 +23354,14 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "@types/prettier": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.3.tgz",
-      "integrity": "sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w=="
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA=="
     },
     "@types/prop-types": {
-      "version": "15.7.4",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
     },
     "@types/q": {
       "version": "1.5.5",
@@ -17633,9 +23379,9 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "@types/react": {
-      "version": "17.0.38",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.38.tgz",
-      "integrity": "sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==",
+      "version": "17.0.62",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz",
+      "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==",
       "dev": true,
       "requires": {
         "@types/prop-types": "*",
@@ -17644,12 +23390,12 @@
       }
     },
     "@types/react-dom": {
-      "version": "17.0.11",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz",
-      "integrity": "sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==",
+      "version": "17.0.20",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz",
+      "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==",
       "dev": true,
       "requires": {
-        "@types/react": "*"
+        "@types/react": "^17"
       }
     },
     "@types/resolve": {
@@ -17661,19 +23407,28 @@
       }
     },
     "@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
     },
     "@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
+      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
     },
     "@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw=="
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="
+    },
+    "@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+      "requires": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
     },
     "@types/serve-index": {
       "version": "1.9.1",
@@ -17684,11 +23439,11 @@
       }
     },
     "@types/serve-static": {
-      "version": "1.13.10",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz",
+      "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==",
       "requires": {
-        "@types/mime": "^1",
+        "@types/mime": "*",
         "@types/node": "*"
       }
     },
@@ -17706,9 +23461,9 @@
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
     },
     "@types/styled-components": {
-      "version": "5.1.20",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.20.tgz",
-      "integrity": "sha512-TvpQceFwnxJJsAzR1aHsYpL5DxWMHRzM2/0EA6sGtRjV6DtJubmNxeoPMPiIPQzKEGNHccwObXO7Hug/iwm1Xw==",
+      "version": "5.1.26",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.26.tgz",
+      "integrity": "sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw==",
       "dev": true,
       "requires": {
         "@types/hoist-non-react-statics": "*",
@@ -17716,50 +23471,46 @@
         "csstype": "^3.0.2"
       }
     },
-    "@types/testing-library__jest-dom": {
-      "version": "5.14.2",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.2.tgz",
-      "integrity": "sha512-vehbtyHUShPxIa9SioxDwCvgxukDMH//icJG90sXQBUm5lJOHLT5kNeU9tnivhnA/TkOFMzGIXN2cTc4hY8/kg==",
-      "dev": true,
-      "requires": {
-        "@types/jest": "*"
-      }
+    "@types/stylis": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz",
+      "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw=="
     },
     "@types/trusted-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
-      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
+      "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="
     },
     "@types/ws": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz",
-      "integrity": "sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "version": "16.0.5",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
+      "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "20.2.1",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
-      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz",
-      "integrity": "sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz",
+      "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==",
       "requires": {
         "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/type-utils": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/type-utils": "5.59.11",
+        "@typescript-eslint/utils": "5.59.11",
         "debug": "^4.3.4",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
@@ -17768,95 +23519,80 @@
         "tsutils": "^3.21.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "requires": {
-            "ms": "2.1.2"
+            "yallist": "^4.0.0"
           }
         },
         "semver": {
-          "version": "7.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-          "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.1.tgz",
-      "integrity": "sha512-KVtKcHEizCIRx//LC9tBi6xp94ULKbU5StVHBVWURJQOVa2qw6HP28Hu7LmHrQM3p9I3q5Y2VR4wKllCJ3IWrw==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.11.tgz",
+      "integrity": "sha512-GkQGV0UF/V5Ra7gZMBmiD1WrYUFOJNvCZs+XQnUyJoxmqfWMXVNyB2NVCPRKefoQcpvTv9UpJyfCvsJFs8NzzQ==",
       "requires": {
-        "@typescript-eslint/utils": "5.59.1"
+        "@typescript-eslint/utils": "5.59.11"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.1.tgz",
-      "integrity": "sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz",
+      "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==",
       "requires": {
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/typescript-estree": "5.59.11",
         "debug": "^4.3.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz",
-      "integrity": "sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
+      "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
       "requires": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1"
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/visitor-keys": "5.59.11"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz",
-      "integrity": "sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz",
+      "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==",
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@typescript-eslint/typescript-estree": "5.59.11",
+        "@typescript-eslint/utils": "5.59.11",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.1.tgz",
-      "integrity": "sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg=="
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
+      "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA=="
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz",
-      "integrity": "sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
+      "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
       "requires": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/visitor-keys": "5.59.11",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -17869,14 +23605,6 @@
           "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
           "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
         },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "globby": {
           "version": "11.1.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -17890,27 +23618,40 @@
             "slash": "^3.0.0"
           }
         },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-          "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.1.tgz",
-      "integrity": "sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz",
+      "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==",
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/typescript-estree": "5.59.11",
         "eslint-scope": "^5.1.1",
         "semver": "^7.3.7"
       },
@@ -17929,153 +23670,166 @@
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
           "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
         },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-          "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz",
-      "integrity": "sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
+      "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
       "requires": {
-        "@typescript-eslint/types": "5.59.1",
+        "@typescript-eslint/types": "5.59.11",
         "eslint-visitor-keys": "^3.3.0"
       }
     },
     "@webassemblyjs/ast": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz",
-      "integrity": "sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz",
-      "integrity": "sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz",
-      "integrity": "sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz",
-      "integrity": "sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
     },
     "@webassemblyjs/helper-numbers": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz",
-      "integrity": "sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz",
-      "integrity": "sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz",
-      "integrity": "sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz",
-      "integrity": "sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz",
-      "integrity": "sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz",
-      "integrity": "sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ=="
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz",
-      "integrity": "sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/helper-wasm-section": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-opt": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5",
-        "@webassemblyjs/wast-printer": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz",
-      "integrity": "sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz",
-      "integrity": "sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz",
-      "integrity": "sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz",
-      "integrity": "sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/ast": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -18090,9 +23844,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
     "accepts": {
       "version": "1.3.8",
@@ -18104,9 +23858,9 @@
       }
     },
     "acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -18125,9 +23879,9 @@
       }
     },
     "acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
       "requires": {}
     },
     "acorn-jsx": {
@@ -18136,23 +23890,6 @@
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "requires": {}
     },
-    "acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-        }
-      }
-    },
     "acorn-walk": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
@@ -18180,15 +23917,6 @@
         "debug": "4"
       }
     },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
     "ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -18209,9 +23937,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -18232,11 +23960,6 @@
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "requires": {}
     },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
     "ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -18263,19 +23986,24 @@
         "color-convert": "^2.0.1"
       }
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
     "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
     "arg": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
-      "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA=="
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
     },
     "argparse": {
       "version": "1.0.10",
@@ -18291,38 +24019,6 @@
       "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "requires": {
         "deep-equal": "^2.0.5"
-      },
-      "dependencies": {
-        "deep-equal": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
-          "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
-          "requires": {
-            "array-buffer-byte-length": "^1.0.0",
-            "call-bind": "^1.0.2",
-            "es-get-iterator": "^1.1.3",
-            "get-intrinsic": "^1.2.0",
-            "is-arguments": "^1.1.1",
-            "is-array-buffer": "^3.0.2",
-            "is-date-object": "^1.0.5",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "isarray": "^2.0.5",
-            "object-is": "^1.1.5",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.4",
-            "regexp.prototype.flags": "^1.5.0",
-            "side-channel": "^1.0.4",
-            "which-boxed-primitive": "^1.0.2",
-            "which-collection": "^1.0.1",
-            "which-typed-array": "^1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-        }
       }
     },
     "array-buffer-byte-length": {
@@ -18354,7 +24050,7 @@
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
       "dev": true,
       "requires": {
         "array-uniq": "^1.0.1"
@@ -18363,7 +24059,7 @@
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
       "dev": true
     },
     "array.prototype.flat": {
@@ -18388,6 +24084,18 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
+    "array.prototype.reduce": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
+      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.7"
+      }
+    },
     "array.prototype.tosorted": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
@@ -18403,7 +24111,7 @@
     "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
     "ast-types-flow": {
       "version": "0.0.7",
@@ -18411,37 +24119,28 @@
       "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
     },
     "async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "requires": {
-        "lodash": "^4.17.14"
-      }
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
     },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
     "autoprefixer": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz",
-      "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
+      "version": "10.4.14",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
+      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
       "requires": {
-        "browserslist": "^4.19.1",
-        "caniuse-lite": "^1.0.30001297",
-        "fraction.js": "^4.1.2",
+        "browserslist": "^4.21.5",
+        "caniuse-lite": "^1.0.30001464",
+        "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
         "postcss-value-parser": "^4.2.0"
@@ -18453,94 +24152,44 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
     },
     "axe-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
-      "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ=="
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
+      "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g=="
     },
     "axobject-query": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
-      "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
       "requires": {
-        "deep-equal": "^2.0.5"
-      },
-      "dependencies": {
-        "deep-equal": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
-          "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
-          "requires": {
-            "array-buffer-byte-length": "^1.0.0",
-            "call-bind": "^1.0.2",
-            "es-get-iterator": "^1.1.3",
-            "get-intrinsic": "^1.2.0",
-            "is-arguments": "^1.1.1",
-            "is-array-buffer": "^3.0.2",
-            "is-date-object": "^1.0.5",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "isarray": "^2.0.5",
-            "object-is": "^1.1.5",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.4",
-            "regexp.prototype.flags": "^1.5.0",
-            "side-channel": "^1.0.4",
-            "which-boxed-primitive": "^1.0.2",
-            "which-collection": "^1.0.1",
-            "which-typed-array": "^1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-        }
+        "dequal": "^2.0.3"
       }
     },
     "babel-jest": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.6.tgz",
-      "integrity": "sha512-qZL0JT0HS1L+lOuH+xC2DVASR3nunZi/ozGhpgauJHgmI7f8rudxf6hUjEHympdQ/J64CdKmPkgfJ+A3U6QCrg==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
       "requires": {
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^27.4.0",
+        "babel-preset-jest": "^27.5.1",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
       }
     },
     "babel-loader": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
       "requires": {
         "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
+        "loader-utils": "^2.0.0",
         "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        },
         "schema-utils": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
@@ -18553,14 +24202,6 @@
         }
       }
     },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
     "babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -18574,9 +24215,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz",
-      "integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
       "requires": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -18601,48 +24242,32 @@
       "requires": {}
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
+      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
       "requires": {
         "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz",
-      "integrity": "sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
+      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.20.0"
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
+        "core-js-compat": "^3.30.1"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
+      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.0"
       }
     },
-    "babel-plugin-styled-components": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz",
-      "integrity": "sha512-7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.0",
-        "@babel/helper-module-imports": "^7.16.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.11"
-      }
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
-    },
     "babel-plugin-transform-react-remove-prop-types": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
@@ -18668,11 +24293,11 @@
       }
     },
     "babel-preset-jest": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz",
-      "integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
       "requires": {
-        "babel-plugin-jest-hoist": "^27.4.0",
+        "babel-plugin-jest-hoist": "^27.5.1",
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
@@ -18707,7 +24332,7 @@
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
     },
     "bfj": {
       "version": "7.0.2",
@@ -18767,11 +24392,6 @@
             "ms": "2.0.0"
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
         "iconv-lite": {
           "version": "0.4.24",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -18787,23 +24407,21 @@
         }
       }
     },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+    "bonjour-service": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
+      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
       "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
+        "array-flatten": "^2.1.2",
         "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
       }
     },
     "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
     "brace-expansion": {
       "version": "1.1.11",
@@ -18828,14 +24446,14 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
     },
     "browserslist": {
-      "version": "4.21.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
-      "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+      "version": "4.21.9",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
+      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
       "requires": {
-        "caniuse-lite": "^1.0.30001449",
-        "electron-to-chromium": "^1.4.284",
-        "node-releases": "^2.0.8",
-        "update-browserslist-db": "^1.0.10"
+        "caniuse-lite": "^1.0.30001503",
+        "electron-to-chromium": "^1.4.431",
+        "node-releases": "^2.0.12",
+        "update-browserslist-db": "^1.0.11"
       }
     },
     "bser": {
@@ -18851,21 +24469,16 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-    },
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
       "dev": true
     },
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
     },
     "call-bind": {
       "version": "1.0.2",
@@ -18901,9 +24514,9 @@
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
     },
     "camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
+      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ=="
     },
     "caniuse-api": {
       "version": "3.0.0",
@@ -18917,9 +24530,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001481",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz",
-      "integrity": "sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ=="
+      "version": "1.0.30001503",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz",
+      "integrity": "sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw=="
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
@@ -18941,14 +24554,14 @@
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
     },
     "check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ=="
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.2.tgz",
+      "integrity": "sha512-HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA=="
     },
     "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -18976,42 +24589,47 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
     },
     "ci-info": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
-      "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="
     },
     "cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
     },
     "clean-css": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
-      "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
+      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
       "requires": {
         "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
       }
     },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-    },
     "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
       }
     },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
     },
     "coa": {
       "version": "2.0.2",
@@ -19052,17 +24670,17 @@
         "color-name": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
         },
         "escape-string-regexp": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
         },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "supports-color": {
           "version": "5.5.0",
@@ -19093,14 +24711,14 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
     },
     "colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
     "combined-stream": {
       "version": "1.0.8",
@@ -19128,7 +24746,7 @@
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
     },
     "compressible": {
       "version": "2.0.18",
@@ -19163,14 +24781,19 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         }
       }
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "confusing-browser-globals": {
       "version": "1.0.11",
@@ -19178,9 +24801,9 @@
       "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
     },
     "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="
     },
     "content-disposition": {
       "version": "0.5.4",
@@ -19188,13 +24811,6 @@
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
         "safe-buffer": "5.2.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
       }
     },
     "content-type": {
@@ -19203,12 +24819,9 @@
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "cookie": {
       "version": "0.5.0",
@@ -19218,25 +24831,25 @@
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "core-js": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
-      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
+      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
     },
     "core-js-compat": {
-      "version": "3.30.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.1.tgz",
-      "integrity": "sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
+      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
       "requires": {
         "browserslist": "^4.21.5"
       }
     },
     "core-js-pure": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.3.tgz",
-      "integrity": "sha512-Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA=="
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.31.0.tgz",
+      "integrity": "sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg=="
     },
     "core-util-is": {
       "version": "1.0.3",
@@ -19244,9 +24857,9 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "requires": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -19270,75 +24883,75 @@
       "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
       "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
     },
-    "css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
     "css-blank-pseudo": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.2.tgz",
-      "integrity": "sha512-hOb1LFjRR+8ocA071xUSmg5VslJ8NGo/I2qpUpdeAYyBVCgupS5O8SEVo4SxEMYyFBNodBkzG3T1iqW9HCXxew==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
       "requires": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "css-color-keywords": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
+      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="
     },
     "css-declaration-sorter": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz",
-      "integrity": "sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==",
-      "requires": {
-        "timsort": "^0.3.0"
-      }
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
+      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
+      "requires": {}
     },
     "css-has-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.3.tgz",
-      "integrity": "sha512-0gDYWEKaGacwxCqvQ3Ypg6wGdD1AztbMm5h1JsactG2hP2eiflj808QITmuWBpE7sjSEVrAlZhPTVd/nNMj/hQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
       "requires": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "css-loader": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
-      "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "requires": {
         "icss-utils": "^5.1.0",
-        "postcss": "^8.2.15",
+        "postcss": "^8.4.21",
         "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
         "postcss-modules-scope": "^3.0.0",
         "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "semver": "^7.3.5"
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
       },
       "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "css-minimizer-webpack-plugin": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.3.1.tgz",
-      "integrity": "sha512-SHA7Hu/EiF0dOwdmV2+agvqYpG+ljlUa7Dvn1AVOmSH3N8KOERoaM9lGpstz9nGsoTjANGyUXdrxl/EwdMScRg==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
+      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
       "requires": {
         "cssnano": "^5.0.6",
         "jest-worker": "^27.0.2",
@@ -19349,9 +24962,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -19373,32 +24986,37 @@
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "ajv-keywords": "^5.1.0"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
     "css-prefers-color-scheme": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.2.tgz",
-      "integrity": "sha512-gv0KQBEM+q/XdoKyznovq3KW7ocO7k+FhPP+hQR1MenJdu0uPGS6IZa9PzlbqBeS6XcZJNAoqoFxlAUW461CrA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
       "requires": {}
     },
     "css-select": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz",
-      "integrity": "sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "requires": {
         "boolbase": "^1.0.0",
-        "css-what": "^5.1.0",
-        "domhandler": "^4.3.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
         "domutils": "^2.8.0",
         "nth-check": "^2.0.1"
       }
@@ -19409,9 +25027,9 @@
       "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
     },
     "css-to-react-native": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
-      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
       "requires": {
         "camelize": "^1.0.0",
         "css-color-keywords": "^1.0.0",
@@ -19425,23 +25043,30 @@
       "requires": {
         "mdn-data": "2.0.4",
         "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
       }
     },
     "css-what": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-      "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
     },
     "css.escape": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
+      "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
       "dev": true
     },
     "cssdb": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-5.1.0.tgz",
-      "integrity": "sha512-/vqjXhv1x9eGkE/zO6o8ZOI7dgdZbLVLUGyVRbPgk6YipXbW87YzUCcO+Jrmi5bwJlAH6oD+MNeZyRgXea1GZw=="
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.6.0.tgz",
+      "integrity": "sha512-Nna7rph8V0jC6+JBY4Vk4ndErUmfJfV6NJCaZdurL0omggabiy+QB2HCQtu5c/ACLZ0I7REv7A4QyPIoYzZx0w=="
     },
     "cssesc": {
       "version": "3.0.0",
@@ -19449,55 +25074,55 @@
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
     },
     "cssnano": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.15.tgz",
-      "integrity": "sha512-ppZsS7oPpi2sfiyV5+i+NbB/3GtQ+ab2Vs1azrZaXWujUSN4o+WdTxlCZIMcT9yLW3VO/5yX3vpyDaQ1nIn8CQ==",
+      "version": "5.1.15",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
       "requires": {
-        "cssnano-preset-default": "^5.1.10",
+        "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       }
     },
     "cssnano-preset-default": {
-      "version": "5.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.10.tgz",
-      "integrity": "sha512-BcpSzUVygHMOnp9uG5rfPzTOCb0GAHQkqtUQx8j1oMNF9A1Q8hziOOhiM4bdICpmrBIU85BE64RD5XGYsVQZNA==",
+      "version": "5.2.14",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
       "requires": {
-        "css-declaration-sorter": "^6.0.3",
-        "cssnano-utils": "^3.0.0",
-        "postcss-calc": "^8.2.0",
-        "postcss-colormin": "^5.2.3",
-        "postcss-convert-values": "^5.0.2",
-        "postcss-discard-comments": "^5.0.1",
-        "postcss-discard-duplicates": "^5.0.1",
-        "postcss-discard-empty": "^5.0.1",
-        "postcss-discard-overridden": "^5.0.2",
-        "postcss-merge-longhand": "^5.0.4",
-        "postcss-merge-rules": "^5.0.4",
-        "postcss-minify-font-values": "^5.0.2",
-        "postcss-minify-gradients": "^5.0.4",
-        "postcss-minify-params": "^5.0.3",
-        "postcss-minify-selectors": "^5.1.1",
-        "postcss-normalize-charset": "^5.0.1",
-        "postcss-normalize-display-values": "^5.0.2",
-        "postcss-normalize-positions": "^5.0.2",
-        "postcss-normalize-repeat-style": "^5.0.2",
-        "postcss-normalize-string": "^5.0.2",
-        "postcss-normalize-timing-functions": "^5.0.2",
-        "postcss-normalize-unicode": "^5.0.2",
-        "postcss-normalize-url": "^5.0.4",
-        "postcss-normalize-whitespace": "^5.0.2",
-        "postcss-ordered-values": "^5.0.3",
-        "postcss-reduce-initial": "^5.0.2",
-        "postcss-reduce-transforms": "^5.0.2",
-        "postcss-svgo": "^5.0.3",
-        "postcss-unique-selectors": "^5.0.2"
+        "css-declaration-sorter": "^6.3.1",
+        "cssnano-utils": "^3.1.0",
+        "postcss-calc": "^8.2.3",
+        "postcss-colormin": "^5.3.1",
+        "postcss-convert-values": "^5.1.3",
+        "postcss-discard-comments": "^5.1.2",
+        "postcss-discard-duplicates": "^5.1.0",
+        "postcss-discard-empty": "^5.1.1",
+        "postcss-discard-overridden": "^5.1.0",
+        "postcss-merge-longhand": "^5.1.7",
+        "postcss-merge-rules": "^5.1.4",
+        "postcss-minify-font-values": "^5.1.0",
+        "postcss-minify-gradients": "^5.1.1",
+        "postcss-minify-params": "^5.1.4",
+        "postcss-minify-selectors": "^5.2.1",
+        "postcss-normalize-charset": "^5.1.0",
+        "postcss-normalize-display-values": "^5.1.0",
+        "postcss-normalize-positions": "^5.1.1",
+        "postcss-normalize-repeat-style": "^5.1.1",
+        "postcss-normalize-string": "^5.1.0",
+        "postcss-normalize-timing-functions": "^5.1.0",
+        "postcss-normalize-unicode": "^5.1.1",
+        "postcss-normalize-url": "^5.1.0",
+        "postcss-normalize-whitespace": "^5.1.1",
+        "postcss-ordered-values": "^5.1.3",
+        "postcss-reduce-initial": "^5.1.2",
+        "postcss-reduce-transforms": "^5.1.0",
+        "postcss-svgo": "^5.1.0",
+        "postcss-unique-selectors": "^5.1.1"
       }
     },
     "cssnano-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.0.tgz",
-      "integrity": "sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
       "requires": {}
     },
     "csso": {
@@ -19521,6 +25146,11 @@
           "version": "2.0.14",
           "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
           "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -19545,9 +25175,9 @@
       }
     },
     "csstype": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "customize-cra": {
       "version": "1.0.0",
@@ -19573,40 +25203,50 @@
       }
     },
     "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
     },
     "decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
-    },
-    "decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
     "dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
+      "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {}
     },
     "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz",
+      "integrity": "sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ==",
       "requires": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.5",
         "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
       }
     },
     "deep-is": {
@@ -19615,9 +25255,9 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
     },
     "default-gateway": {
       "version": "6.0.3",
@@ -19641,55 +25281,20 @@
         "object-keys": "^1.1.1"
       }
     },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
-    },
-    "del": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
-      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
-      "requires": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-        },
-        "globby": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.9",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^3.0.0"
-          }
-        }
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+    },
+    "dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="
     },
     "destroy": {
       "version": "1.2.0",
@@ -19730,16 +25335,6 @@
         }
       }
     },
-    "detective": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
-      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
-      "requires": {
-        "acorn-node": "^1.6.1",
-        "defined": "^1.0.0",
-        "minimist": "^1.1.1"
-      }
-    },
     "didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -19752,9 +25347,10 @@
       "dev": true
     },
     "diff-sequences": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz",
-      "integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww=="
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "dev": true
     },
     "dir-glob": {
       "version": "3.0.1",
@@ -19772,23 +25368,14 @@
     "dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
     },
     "dns-packet": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
-      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz",
+      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
       "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "requires": {
-        "buffer-indexof": "^1.0.0"
+        "@leichtgewicht/ip-codec": "^2.0.1"
       }
     },
     "doctrine": {
@@ -19800,9 +25387,9 @@
       }
     },
     "dom-accessibility-api": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
-      "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
       "dev": true
     },
     "dom-converter": {
@@ -19814,9 +25401,9 @@
       }
     },
     "dom-serializer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "requires": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -19824,9 +25411,9 @@
       }
     },
     "domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
     },
     "domexception": {
       "version": "2.0.1",
@@ -19844,9 +25431,9 @@
       }
     },
     "domhandler": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
-      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "requires": {
         "domelementtype": "^2.2.0"
       }
@@ -19899,20 +25486,23 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.376",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.376.tgz",
-      "integrity": "sha512-TFeOKd98TpJzRHkr4Aorn16QkMnuCQuGAE6IZ0wYF+qkbSfMPqjplvRppR02tMUpVxZz8nyBNvVm9lIZsqrbPQ=="
+      "version": "1.4.433",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.433.tgz",
+      "integrity": "sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ=="
     },
     "email-addresses": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz",
-      "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz",
+      "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==",
       "dev": true
     },
     "emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "emoji-regex": {
       "version": "9.2.2",
@@ -19930,9 +25520,9 @@
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "enhanced-resolve": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz",
-      "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "requires": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -19952,11 +25542,11 @@
       }
     },
     "error-stack-parser": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
-      "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
       "requires": {
-        "stackframe": "^1.1.1"
+        "stackframe": "^1.3.4"
       }
     },
     "es-abstract": {
@@ -20000,6 +25590,11 @@
         "which-typed-array": "^1.1.9"
       }
     },
+    "es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
+    },
     "es-get-iterator": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
@@ -20014,19 +25609,12 @@
         "is-string": "^1.0.7",
         "isarray": "^2.0.5",
         "stop-iteration-iterator": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-        }
       }
     },
     "es-module-lexer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
-      "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
     },
     "es-set-tostringtag": {
       "version": "2.0.1",
@@ -20064,7 +25652,7 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
       "version": "4.0.0",
@@ -20072,94 +25660,68 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
     },
     "escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "requires": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
         "source-map": "~0.6.1"
       },
       "dependencies": {
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.6",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "word-wrap": "~1.2.3"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "optional": true
         }
       }
     },
     "eslint": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz",
-      "integrity": "sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
       "requires": {
-        "@eslint/eslintrc": "^1.0.5",
-        "@humanwhocodes/config-array": "^0.9.2",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.43.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.0",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.2.0",
-        "espree": "^9.3.0",
-        "esquery": "^1.4.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.6.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "text-table": "^0.2.0"
       },
       "dependencies": {
         "argparse": {
@@ -20167,10 +25729,19 @@
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
         "globals": {
-          "version": "13.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-          "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -20183,6 +25754,30 @@
             "argparse": "^2.0.1"
           }
         },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -20228,16 +25823,6 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
         }
       }
     },
@@ -20305,16 +25890,6 @@
           "requires": {
             "esutils": "^2.0.2"
           }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
         }
       }
     },
@@ -20398,62 +25973,102 @@
       "requires": {}
     },
     "eslint-plugin-testing-library": {
-      "version": "5.10.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.10.3.tgz",
-      "integrity": "sha512-0yhsKFsjHLud5PM+f2dWr9K3rqYzMy4cSHs3lcmFYMa1CdSzRvHGgXvsFarBjZ41gU8jhTdMIkg8jHLxGJqLqw==",
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.0.tgz",
+      "integrity": "sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==",
       "requires": {
         "@typescript-eslint/utils": "^5.58.0"
       }
     },
     "eslint-scope": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz",
-      "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       }
     },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+    "eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="
+    },
+    "eslint-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
       "requires": {
-        "eslint-visitor-keys": "^2.0.0"
+        "@types/eslint": "^7.29.0 || ^8.4.1",
+        "jest-worker": "^28.0.2",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0"
       },
       "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+        "ajv": {
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+          "requires": {
+            "fast-deep-equal": "^3.1.3"
+          }
+        },
+        "jest-worker": {
+          "version": "28.1.3",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
+          "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "schema-utils": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.9.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "eslint-visitor-keys": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ=="
-    },
-    "eslint-webpack-plugin": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz",
-      "integrity": "sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==",
-      "requires": {
-        "@types/eslint": "^7.28.2",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.1.1"
-      }
-    },
     "espree": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz",
-      "integrity": "sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==",
+      "version": "9.5.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
+      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
       "requires": {
-        "acorn": "^8.7.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^3.1.0"
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       }
     },
     "esprima": {
@@ -20462,9 +26077,9 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "requires": {
         "estraverse": "^5.1.0"
       }
@@ -20526,17 +26141,65 @@
     "exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw="
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
     },
     "expect": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz",
-      "integrity": "sha512-1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz",
+      "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==",
+      "dev": true,
       "requires": {
-        "@jest/types": "^27.4.2",
-        "jest-get-type": "^27.4.0",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6"
+        "@jest/expect-utils": "^29.6.2",
+        "@types/node": "*",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
     "express": {
@@ -20580,7 +26243,7 @@
         "array-flatten": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+          "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
         },
         "debug": {
           "version": "2.6.9",
@@ -20590,25 +26253,10 @@
             "ms": "2.0.0"
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -20618,9 +26266,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -20647,12 +26295,12 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "requires": {
         "reusify": "^1.0.4"
       }
@@ -20666,9 +26314,9 @@
       }
     },
     "fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "requires": {
         "bser": "2.1.1"
       }
@@ -20719,7 +26367,7 @@
     "filename-reserved-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==",
       "dev": true
     },
     "filenamify": {
@@ -20772,11 +26420,6 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
         }
       }
     },
@@ -20809,14 +26452,14 @@
       }
     },
     "flatted": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
-      "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
     },
     "follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
     "for-each": {
       "version": "0.3.3",
@@ -20869,13 +26512,12 @@
             "universalify": "^2.0.0"
           }
         },
-        "jsonfile": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^2.0.0"
+            "yallist": "^4.0.0"
           }
         },
         "schema-utils": {
@@ -20889,9 +26531,9 @@
           }
         },
         "semver": {
-          "version": "7.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-          "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -20901,10 +26543,10 @@
           "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
           "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
         },
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -20924,9 +26566,9 @@
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fraction.js": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz",
-      "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="
     },
     "fresh": {
       "version": "0.5.2",
@@ -20934,25 +26576,25 @@
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       }
     },
     "fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz",
+      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="
     },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "fsevents": {
       "version": "2.3.2",
@@ -20976,11 +26618,6 @@
         "functions-have-names": "^1.2.2"
       }
     },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-    },
     "functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -20997,12 +26634,13 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
     "get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       }
     },
@@ -21031,29 +26669,37 @@
       }
     },
     "gh-pages": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.3.tgz",
-      "integrity": "sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.0.0.tgz",
+      "integrity": "sha512-FXZWJRsvP/fK2HJGY+Di6FRNHvqFF6gOIELaopDjXXgjeOYSNURcuYwEO/6bwuq6koP5Lnkvnr5GViXzuOB89g==",
       "dev": true,
       "requires": {
-        "async": "^2.6.1",
-        "commander": "^2.18.0",
-        "email-addresses": "^3.0.1",
+        "async": "^3.2.4",
+        "commander": "^11.0.0",
+        "email-addresses": "^5.0.0",
         "filenamify": "^4.3.0",
         "find-cache-dir": "^3.3.1",
-        "fs-extra": "^8.1.0",
+        "fs-extra": "^11.1.1",
         "globby": "^6.1.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
+          "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
+          "dev": true
+        }
       }
     },
     "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       }
@@ -21115,7 +26761,7 @@
     "globby": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
       "dev": true,
       "requires": {
         "array-union": "^1.0.1",
@@ -21134,19 +26780,24 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
     },
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+    },
     "gremlint": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/gremlint/-/gremlint-3.5.2.tgz",
-      "integrity": "sha512-bXxxYIjYOmXbQds0tTwS2zWszhDpvxcmgFpskYG8SHVZHrkvFB5UsFDT7XaGESOT2S6bSm80BmZfhvd/k0HYfQ=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/gremlint/-/gremlint-3.7.0.tgz",
+      "integrity": "sha512-j0PMkFWONPEemiCg71K9ufugpfC+PpSERo0wC2LZE3Wwh8wF3Lc4WxmszmctSBrVpraVFjUIU1d09JIFjz5lEw=="
     },
     "gzip-size": {
       "version": "6.0.0",
@@ -21219,6 +26870,7 @@
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
       "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dev": true,
       "requires": {
         "react-is": "^16.7.0"
       },
@@ -21226,7 +26878,8 @@
         "react-is": {
           "version": "16.13.1",
           "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+          "dev": true
         }
       }
     },
@@ -21238,7 +26891,7 @@
     "hpack.js": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "requires": {
         "inherits": "^2.0.1",
         "obuf": "^1.0.0",
@@ -21246,10 +26899,15 @@
         "wbuf": "^1.1.0"
       },
       "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+        },
         "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "version": "2.3.8",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -21260,6 +26918,11 @@
             "util-deprecate": "~1.0.1"
           }
         },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        },
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -21279,9 +26942,9 @@
       }
     },
     "html-entities": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-      "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.6.tgz",
+      "integrity": "sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw=="
     },
     "html-escaper": {
       "version": "2.0.2",
@@ -21310,9 +26973,9 @@
       }
     },
     "html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
+      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
       "requires": {
         "@types/html-minifier-terser": "^6.0.0",
         "html-minifier-terser": "^6.0.2",
@@ -21335,7 +26998,7 @@
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
     },
     "http-errors": {
       "version": "2.0.0",
@@ -21347,24 +27010,12 @@
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "toidentifier": "1.0.1"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-        }
       }
     },
     "http-parser-js": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz",
-      "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
     },
     "http-proxy": {
       "version": "1.18.1",
@@ -21387,11 +27038,11 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz",
-      "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "requires": {
-        "@types/http-proxy": "^1.17.5",
+        "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
         "is-glob": "^4.0.1",
         "is-plain-obj": "^3.0.0",
@@ -21399,9 +27050,9 @@
       }
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "requires": {
         "agent-base": "6",
         "debug": "4"
@@ -21427,22 +27078,22 @@
       "requires": {}
     },
     "idb": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz",
-      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
+      "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="
     },
     "identity-obj-proxy": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
+      "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
       "requires": {
         "harmony-reflect": "^1.4.6"
       }
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
     },
     "immer": {
       "version": "9.0.21",
@@ -21477,17 +27128,18 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
     },
     "indent-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -21513,15 +27165,10 @@
         "side-channel": "^1.0.4"
       }
     },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
     "ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ=="
     },
     "is-arguments": {
       "version": "1.1.1",
@@ -21545,7 +27192,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
     },
     "is-bigint": {
       "version": "1.0.4",
@@ -21578,9 +27225,9 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -21601,7 +27248,7 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
@@ -21629,7 +27276,7 @@
     "is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
     },
     "is-negative-zero": {
       "version": "2.0.2",
@@ -21652,12 +27299,7 @@
     "is-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
+      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="
     },
     "is-path-inside": {
       "version": "3.0.3",
@@ -21686,7 +27328,7 @@
     "is-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk="
+      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="
     },
     "is-root": {
       "version": "2.1.0",
@@ -21742,7 +27384,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
     },
     "is-weakmap": {
       "version": "2.0.1",
@@ -21775,14 +27417,14 @@
       }
     },
     "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
     },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "istanbul-lib-coverage": {
       "version": "3.2.0",
@@ -21790,9 +27432,9 @@
       "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
     },
     "istanbul-lib-instrument": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "requires": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -21802,13 +27444,44 @@
       }
     },
     "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "requires": {
         "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
+        "make-dir": "^4.0.0",
         "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+          "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+          "requires": {
+            "semver": "^7.5.3"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
       }
     },
     "istanbul-lib-source-maps": {
@@ -21819,517 +27492,2298 @@
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
         "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
       }
     },
     "istanbul-reports": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
-      "integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "requires": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
       }
     },
     "jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "version": "10.8.7",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
+      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
       "requires": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "async": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
-        }
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
       }
     },
     "jest": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.7.tgz",
-      "integrity": "sha512-8heYvsx7nV/m8m24Vk26Y87g73Ba6ueUd0MWed/NXMhSZIm62U/llVbS0PJe1SHunbyXjJ/BqG1z9bFjGUIvTg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz",
+      "integrity": "sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/core": "^27.4.7",
+        "@jest/core": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.4.7"
+        "jest-cli": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        }
       }
     },
     "jest-changed-files": {
-      "version": "27.4.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz",
-      "integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==",
+      "version": "29.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+      "integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/types": "^27.4.2",
         "execa": "^5.0.0",
-        "throat": "^6.0.1"
+        "p-limit": "^3.1.0"
+      },
+      "dependencies": {
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        }
       }
     },
     "jest-circus": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.6.tgz",
-      "integrity": "sha512-UA7AI5HZrW4wRM72Ro80uRR2Fg+7nR0GESbSI/2M+ambbzVuA63mn5T1p3Z/wlhntzGpIG1xx78GP2YIkf6PhQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.2.tgz",
+      "integrity": "sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/environment": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/expect": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "expect": "^27.4.6",
+        "dedent": "^1.0.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.4.6",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "pretty-format": "^27.4.6",
+        "jest-each": "^29.6.2",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.6.2",
+        "pure-rand": "^6.0.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
+        "stack-utils": "^2.0.3"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "jest-cli": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.7.tgz",
-      "integrity": "sha512-zREYhvjjqe1KsGV15mdnxjThKNDgza1fhDT+iUsXWLCq3sxe9w5xnvyctcYVT5PcdLSjv7Y5dCwTS3FCF1tiuw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.2.tgz",
+      "integrity": "sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/core": "^27.4.7",
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/core": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^27.4.7",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
+        "jest-config": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "prompts": "^2.0.1",
-        "yargs": "^16.2.0"
+        "yargs": "^17.3.1"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+          "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^29.4.3",
+            "leven": "^3.1.0",
+            "pretty-format": "^29.6.2"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "jest-config": {
-      "version": "27.4.7",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.7.tgz",
-      "integrity": "sha512-xz/o/KJJEedHMrIY9v2ParIoYSrSVY6IVeE4z5Z3i101GoA5XgfbJz+1C8EYPsv7u7f39dS8F9v46BHDhn0vlw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.2.tgz",
+      "integrity": "sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@babel/core": "^7.8.0",
-        "@jest/test-sequencer": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "babel-jest": "^27.4.6",
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "babel-jest": "^29.6.2",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.4",
-        "jest-circus": "^27.4.6",
-        "jest-environment-jsdom": "^27.4.6",
-        "jest-environment-node": "^27.4.6",
-        "jest-get-type": "^27.4.0",
-        "jest-jasmine2": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-resolve": "^27.4.6",
-        "jest-runner": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.6.2",
+        "jest-environment-node": "^29.6.2",
+        "jest-get-type": "^29.4.3",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.6.2",
+        "jest-runner": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-validate": "^29.6.2",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.4.6",
-        "slash": "^3.0.0"
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.6.2",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "@jest/transform": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+          "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@babel/core": "^7.11.6",
+            "@jest/types": "^29.6.1",
+            "@jridgewell/trace-mapping": "^0.3.18",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^2.0.0",
+            "fast-json-stable-stringify": "^2.1.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "write-file-atomic": "^4.0.2"
+          }
+        },
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "babel-jest": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.2.tgz",
+          "integrity": "sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/transform": "^29.6.2",
+            "@types/babel__core": "^7.1.14",
+            "babel-plugin-istanbul": "^6.1.1",
+            "babel-preset-jest": "^29.5.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "slash": "^3.0.0"
+          }
+        },
+        "babel-plugin-jest-hoist": {
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+          "integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@babel/template": "^7.3.3",
+            "@babel/types": "^7.3.3",
+            "@types/babel__core": "^7.1.14",
+            "@types/babel__traverse": "^7.0.6"
+          }
+        },
+        "babel-preset-jest": {
+          "version": "29.5.0",
+          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+          "integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "babel-plugin-jest-hoist": "^29.5.0",
+            "babel-preset-current-node-syntax": "^1.0.0"
+          }
+        },
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-haste-map": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+          "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/graceful-fs": "^4.1.3",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "jest-worker": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.8"
+          }
+        },
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-resolve": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+          "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^29.6.2",
+            "jest-validate": "^29.6.2",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^2.0.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+          "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^29.4.3",
+            "leven": "^3.1.0",
+            "pretty-format": "^29.6.2"
+          }
+        },
+        "jest-worker": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "jest-util": "^29.6.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
+        "resolve.exports": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+          "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "write-file-atomic": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+          "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.7"
+          }
+        }
       }
     },
     "jest-diff": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz",
-      "integrity": "sha512-zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz",
+      "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==",
+      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^27.4.0",
-        "jest-get-type": "^27.4.0",
-        "pretty-format": "^27.4.6"
+        "diff-sequences": "^29.4.3",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "jest-docblock": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz",
-      "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==",
+      "version": "29.4.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+      "integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "detect-newline": "^3.0.0"
       }
     },
     "jest-each": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.6.tgz",
-      "integrity": "sha512-n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.2.tgz",
+      "integrity": "sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^29.6.1",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.4.0",
-        "jest-util": "^27.4.2",
-        "pretty-format": "^27.4.6"
+        "jest-get-type": "^29.4.3",
+        "jest-util": "^29.6.2",
+        "pretty-format": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "jest-environment-jsdom": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz",
-      "integrity": "sha512-o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
+      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
       "requires": {
-        "@jest/environment": "^27.4.6",
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
-        "jest-mock": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1",
         "jsdom": "^16.6.0"
+      },
+      "dependencies": {
+        "@jest/environment": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+          "requires": {
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1"
+          }
+        },
+        "@jest/fake-timers": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@sinonjs/fake-timers": "^8.0.1",
+            "@types/node": "*",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "@sinonjs/commons": {
+          "version": "1.8.6",
+          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+          "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+          "requires": {
+            "type-detect": "4.0.8"
+          }
+        },
+        "@sinonjs/fake-timers": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*"
+          }
+        }
       }
     },
     "jest-environment-node": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.6.tgz",
-      "integrity": "sha512-yfHlZ9m+kzTKZV0hVfhVu6GuDxKAYeFHrfulmy7Jxwsq4V7+ZK7f+c0XP/tbVDMQW7E4neG2u147hFkuVz0MlQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.2.tgz",
+      "integrity": "sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/environment": "^27.4.6",
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
-        "jest-mock": "^27.4.6",
-        "jest-util": "^27.4.2"
+        "jest-mock": "^29.6.2",
+        "jest-util": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
     "jest-get-type": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
-      "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
     },
     "jest-haste-map": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.6.tgz",
-      "integrity": "sha512-0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
       "requires": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "fsevents": "^2.3.2",
-        "graceful-fs": "^4.2.4",
-        "jest-regex-util": "^27.4.0",
-        "jest-serializer": "^27.4.0",
-        "jest-util": "^27.4.2",
-        "jest-worker": "^27.4.6",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
         "micromatch": "^4.0.4",
         "walker": "^1.0.7"
       }
     },
     "jest-jasmine2": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.6.tgz",
-      "integrity": "sha512-uAGNXF644I/whzhsf7/qf74gqy9OuhvJ0XYp8SDecX2ooGeaPnmJMjXjKt0mqh1Rl5dtRGxJgNrHlBQIBfS5Nw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
+      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
       "requires": {
-        "@jest/environment": "^27.4.6",
-        "@jest/source-map": "^27.4.0",
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^27.4.6",
+        "expect": "^27.5.1",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.4.6",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "pretty-format": "^27.4.6",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
         "throat": "^6.0.1"
+      },
+      "dependencies": {
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/environment": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+          "requires": {
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1"
+          }
+        },
+        "@jest/fake-timers": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@sinonjs/fake-timers": "^8.0.1",
+            "@types/node": "*",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "@jest/globals": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "expect": "^27.5.1"
+          }
+        },
+        "@jest/source-map": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+          "requires": {
+            "callsites": "^3.0.0",
+            "graceful-fs": "^4.2.9",
+            "source-map": "^0.6.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@sinonjs/commons": {
+          "version": "1.8.6",
+          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+          "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+          "requires": {
+            "type-detect": "4.0.8"
+          }
+        },
+        "@sinonjs/fake-timers": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "diff-sequences": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
+        },
+        "expect": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1"
+          }
+        },
+        "jest-diff": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+          "requires": {
+            "chalk": "^4.0.0",
+            "diff-sequences": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-each": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-matcher-utils": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+          "requires": {
+            "chalk": "^4.0.0",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*"
+          }
+        },
+        "jest-runtime": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/globals": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "cjs-module-lexer": "^1.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "execa": "^5.0.0",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-bom": "^4.0.0"
+          }
+        },
+        "jest-snapshot": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+          "requires": {
+            "@babel/core": "^7.7.2",
+            "@babel/generator": "^7.7.2",
+            "@babel/plugin-syntax-typescript": "^7.7.2",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.0.0",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__traverse": "^7.0.4",
+            "@types/prettier": "^2.1.5",
+            "babel-preset-current-node-syntax": "^1.0.0",
+            "chalk": "^4.0.0",
+            "expect": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "natural-compare": "^1.4.0",
+            "pretty-format": "^27.5.1",
+            "semver": "^7.3.2"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
       }
     },
     "jest-leak-detector": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.6.tgz",
-      "integrity": "sha512-kkaGixDf9R7CjHm2pOzfTxZTQQQ2gHTIWKY/JZSiYTc90bZp8kSZnUMS3uLAfwTZwc0tcMRoEX74e14LG1WapA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.2.tgz",
+      "integrity": "sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "jest-get-type": "^27.4.0",
-        "pretty-format": "^27.4.6"
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "jest-matcher-utils": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz",
-      "integrity": "sha512-XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz",
+      "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==",
+      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.4.6",
-        "jest-get-type": "^27.4.0",
-        "pretty-format": "^27.4.6"
+        "jest-diff": "^29.6.2",
+        "jest-get-type": "^29.4.3",
+        "pretty-format": "^29.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "jest-message-util": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz",
-      "integrity": "sha512-0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz",
+      "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^29.6.1",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.4.6",
+        "pretty-format": "^29.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        }
       }
     },
     "jest-mock": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.6.tgz",
-      "integrity": "sha512-kvojdYRkst8iVSZ1EJ+vc1RRD9llueBjKzXzeCytH3dMM7zvPV/ULcfI2nr0v0VUgm3Bjt3hBCQvOeaBz+ZTHw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.2.tgz",
+      "integrity": "sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/types": "^27.4.2",
-        "@types/node": "*"
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "jest-util": "^29.6.2"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
     "jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "requires": {}
     },
     "jest-regex-util": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
-      "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg=="
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
     },
     "jest-resolve": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.6.tgz",
-      "integrity": "sha512-SFfITVApqtirbITKFAO7jOVN45UgFzcRdQanOFzjnbd+CACDoyeX7206JyU92l4cRr73+Qy/TlW51+4vHGt+zw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
       "requires": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.4.2",
-        "jest-validate": "^27.4.6",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
         "resolve": "^1.20.0",
         "resolve.exports": "^1.1.0",
         "slash": "^3.0.0"
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.6.tgz",
-      "integrity": "sha512-W85uJZcFXEVZ7+MZqIPCscdjuctruNGXUZ3OHSXOfXR9ITgbUKeHj+uGcies+0SsvI5GtUfTw4dY7u9qjTvQOw==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.2.tgz",
+      "integrity": "sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/types": "^27.4.2",
-        "jest-regex-util": "^27.4.0",
-        "jest-snapshot": "^27.4.6"
+        "jest-regex-util": "^29.4.3",
+        "jest-snapshot": "^29.6.2"
+      },
+      "dependencies": {
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        }
       }
     },
     "jest-runner": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.6.tgz",
-      "integrity": "sha512-IDeFt2SG4DzqalYBZRgbbPmpwV3X0DcntjezPBERvnhwKGWTW7C5pbbA5lVkmvgteeNfdd/23gwqv3aiilpYPg==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.2.tgz",
+      "integrity": "sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/console": "^27.4.6",
-        "@jest/environment": "^27.4.6",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/console": "^29.6.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-docblock": "^27.4.0",
-        "jest-environment-jsdom": "^27.4.6",
-        "jest-environment-node": "^27.4.6",
-        "jest-haste-map": "^27.4.6",
-        "jest-leak-detector": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-resolve": "^27.4.6",
-        "jest-runtime": "^27.4.6",
-        "jest-util": "^27.4.2",
-        "jest-worker": "^27.4.6",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.4.3",
+        "jest-environment-node": "^29.6.2",
+        "jest-haste-map": "^29.6.2",
+        "jest-leak-detector": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-resolve": "^29.6.2",
+        "jest-runtime": "^29.6.2",
+        "jest-util": "^29.6.2",
+        "jest-watcher": "^29.6.2",
+        "jest-worker": "^29.6.2",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "dependencies": {
+        "@jest/transform": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+          "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@babel/core": "^7.11.6",
+            "@jest/types": "^29.6.1",
+            "@jridgewell/trace-mapping": "^0.3.18",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^2.0.0",
+            "fast-json-stable-stringify": "^2.1.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "write-file-atomic": "^4.0.2"
+          }
+        },
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-haste-map": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+          "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/graceful-fs": "^4.1.3",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "jest-worker": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.8"
+          }
+        },
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-resolve": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+          "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^29.6.2",
+            "jest-validate": "^29.6.2",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^2.0.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+          "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^29.4.3",
+            "leven": "^3.1.0",
+            "pretty-format": "^29.6.2"
+          }
+        },
+        "jest-worker": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "jest-util": "^29.6.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
+        "resolve.exports": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+          "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "source-map-support": {
+          "version": "0.5.13",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+          "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "write-file-atomic": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+          "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.7"
+          }
+        }
       }
     },
     "jest-runtime": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.6.tgz",
-      "integrity": "sha512-eXYeoR/MbIpVDrjqy5d6cGCFOYBFFDeKaNWqTp0h6E74dK0zLHzASQXJpl5a2/40euBmKnprNLJ0Kh0LCndnWQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.2.tgz",
+      "integrity": "sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@jest/environment": "^27.4.6",
-        "@jest/fake-timers": "^27.4.6",
-        "@jest/globals": "^27.4.6",
-        "@jest/source-map": "^27.4.0",
-        "@jest/test-result": "^27.4.6",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
+        "@jest/environment": "^29.6.2",
+        "@jest/fake-timers": "^29.6.2",
+        "@jest/globals": "^29.6.2",
+        "@jest/source-map": "^29.6.0",
+        "@jest/test-result": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
         "glob": "^7.1.3",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-mock": "^27.4.6",
-        "jest-regex-util": "^27.4.0",
-        "jest-resolve": "^27.4.6",
-        "jest-snapshot": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-mock": "^29.6.2",
+        "jest-regex-util": "^29.4.3",
+        "jest-resolve": "^29.6.2",
+        "jest-snapshot": "^29.6.2",
+        "jest-util": "^29.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
+      },
+      "dependencies": {
+        "@jest/transform": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+          "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@babel/core": "^7.11.6",
+            "@jest/types": "^29.6.1",
+            "@jridgewell/trace-mapping": "^0.3.18",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^2.0.0",
+            "fast-json-stable-stringify": "^2.1.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "write-file-atomic": "^4.0.2"
+          }
+        },
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-haste-map": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+          "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/graceful-fs": "^4.1.3",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "jest-worker": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.8"
+          }
+        },
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-resolve": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.2.tgz",
+          "integrity": "sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^29.6.2",
+            "jest-validate": "^29.6.2",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^2.0.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-validate": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.2.tgz",
+          "integrity": "sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "camelcase": "^6.2.0",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^29.4.3",
+            "leven": "^3.1.0",
+            "pretty-format": "^29.6.2"
+          }
+        },
+        "jest-worker": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "jest-util": "^29.6.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
+        "resolve.exports": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+          "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "write-file-atomic": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+          "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.7"
+          }
+        }
       }
     },
     "jest-serializer": {
-      "version": "27.4.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
-      "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
       "requires": {
         "@types/node": "*",
-        "graceful-fs": "^4.2.4"
+        "graceful-fs": "^4.2.9"
       }
     },
     "jest-snapshot": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.6.tgz",
-      "integrity": "sha512-fafUCDLQfzuNP9IRcEqaFAMzEe7u5BF7mude51wyWv7VRex60WznZIC7DfKTgSIlJa8aFzYmXclmN328aqSDmQ==",
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.2.tgz",
+      "integrity": "sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "@babel/core": "^7.7.2",
+        "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.6.2",
+        "@jest/transform": "^29.6.2",
+        "@jest/types": "^29.6.1",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.4.6",
-        "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.4.6",
-        "jest-get-type": "^27.4.0",
-        "jest-haste-map": "^27.4.6",
-        "jest-matcher-utils": "^27.4.6",
-        "jest-message-util": "^27.4.6",
-        "jest-util": "^27.4.2",
+        "expect": "^29.6.2",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.6.2",
+        "jest-get-type": "^29.4.3",
+        "jest-matcher-utils": "^29.6.2",
+        "jest-message-util": "^29.6.2",
+        "jest-util": "^29.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.4.6",
-        "semver": "^7.3.2"
+        "pretty-format": "^29.6.2",
+        "semver": "^7.5.3"
       },
       "dependencies": {
+        "@jest/transform": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.2.tgz",
+          "integrity": "sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@babel/core": "^7.11.6",
+            "@jest/types": "^29.6.1",
+            "@jridgewell/trace-mapping": "^0.3.18",
+            "babel-plugin-istanbul": "^6.1.1",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^2.0.0",
+            "fast-json-stable-stringify": "^2.1.0",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^29.6.2",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.4",
+            "slash": "^3.0.0",
+            "write-file-atomic": "^4.0.2"
+          }
+        },
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-get-type": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+          "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-haste-map": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.2.tgz",
+          "integrity": "sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/graceful-fs": "^4.1.3",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.9",
+            "jest-regex-util": "^29.4.3",
+            "jest-util": "^29.6.2",
+            "jest-worker": "^29.6.2",
+            "micromatch": "^4.0.4",
+            "walker": "^1.0.8"
+          }
+        },
+        "jest-regex-util": {
+          "version": "29.4.3",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+          "integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-worker": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.2.tgz",
+          "integrity": "sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@types/node": "*",
+            "jest-util": "^29.6.2",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "pretty-format": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz",
+          "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/schemas": "^29.6.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "write-file-atomic": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+          "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.7"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true,
+          "optional": true,
+          "peer": true
         }
       }
     },
     "jest-util": {
-      "version": "27.4.2",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
-      "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "requires": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.4",
+        "graceful-fs": "^4.2.9",
         "picomatch": "^2.2.3"
       }
     },
     "jest-validate": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.6.tgz",
-      "integrity": "sha512-872mEmCPVlBqbA5dToC57vA3yJaMRfIdpCoD3cyHWJOMx+SJwLNw0I71EkWs41oza/Er9Zno9XuTkRYCPDUJXQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
       "requires": {
-        "@jest/types": "^27.4.2",
+        "@jest/types": "^27.5.1",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.4.0",
+        "jest-get-type": "^27.5.1",
         "leven": "^3.1.0",
-        "pretty-format": "^27.4.6"
+        "pretty-format": "^27.5.1"
       }
     },
-    "jest-watch-typeahead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.0.0.tgz",
-      "integrity": "sha512-jxoszalAb394WElmiJTFBMzie/RDCF+W7Q29n5LzOPtcoQoHWfdUtHFkbhgf5NwWe8uMOxvKb/g7ea7CshfkTw==",
+    "jest-watcher": {
+      "version": "29.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.2.tgz",
+      "integrity": "sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "ansi-escapes": "^4.3.1",
+        "@jest/test-result": "^29.6.2",
+        "@jest/types": "^29.6.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-regex-util": "^27.0.0",
-        "jest-watcher": "^27.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
+        "emittery": "^0.13.1",
+        "jest-util": "^29.6.2",
+        "string-length": "^4.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-        },
-        "char-regex": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.0.tgz",
-          "integrity": "sha512-oGu2QekBMXgyQNWPDRQ001bjvDnZe4/zBTz37TMbiKz1NbNiyiH5hRkobe7npRN6GfbGbxMYFck/vQ1r9c1VMA=="
-        },
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
-        },
-        "string-length": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-          "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+        "@jest/types": {
+          "version": "29.6.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+          "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "char-regex": "^2.0.0",
-            "strip-ansi": "^7.0.1"
+            "@jest/schemas": "^29.6.0",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^17.0.8",
+            "chalk": "^4.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
-            "ansi-regex": "^6.0.1"
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "29.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz",
+          "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==",
+          "dev": true,
+          "optional": true,
+          "peer": true,
+          "requires": {
+            "@jest/types": "^29.6.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
           }
         }
       }
     },
-    "jest-watcher": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.6.tgz",
-      "integrity": "sha512-yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw==",
-      "requires": {
-        "@jest/test-result": "^27.4.6",
-        "@jest/types": "^27.4.2",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "jest-util": "^27.4.2",
-        "string-length": "^4.0.1"
-      }
-    },
     "jest-worker": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz",
-      "integrity": "sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "requires": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -22346,6 +29800,11 @@
         }
       }
     },
+    "jiti": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
+      "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -22417,7 +29876,7 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "json5": {
       "version": "2.2.3",
@@ -22425,18 +29884,18 @@
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
     },
     "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
       }
     },
     "jsonpointer": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz",
-      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="
     },
     "jsx-ast-utils": {
       "version": "3.3.3",
@@ -22458,9 +29917,9 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
     },
     "klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="
     },
     "language-subtag-registry": {
       "version": "0.3.22",
@@ -22475,6 +29934,15 @@
         "language-subtag-registry": "~0.3.2"
       }
     },
+    "launch-editor": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz",
+      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+      "requires": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.7.3"
+      }
+    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -22490,9 +29958,9 @@
       }
     },
     "lilconfig": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
     },
     "lines-and-columns": {
       "version": "1.2.4",
@@ -22500,9 +29968,9 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
     "loader-utils": {
       "version": "2.0.4",
@@ -22530,17 +29998,17 @@
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
     "lodash.flow": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
-      "integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o="
+      "integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="
     },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
     },
     "lodash.merge": {
       "version": "4.6.2",
@@ -22550,12 +30018,12 @@
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
     },
     "lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
     },
     "loose-envify": {
       "version": "1.4.0",
@@ -22574,25 +30042,25 @@
       }
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "requires": {
-        "yallist": "^4.0.0"
+        "yallist": "^3.0.2"
       }
     },
     "lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true
     },
     "magic-string": {
-      "version": "0.25.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
       "requires": {
-        "sourcemap-codec": "^1.4.4"
+        "sourcemap-codec": "^1.4.8"
       }
     },
     "make-dir": {
@@ -22622,17 +30090,17 @@
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "memfs": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
-      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "requires": {
-        "fs-monkey": "1.0.3"
+        "fs-monkey": "^1.0.4"
       }
     },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "merge-stream": {
       "version": "2.0.0",
@@ -22647,15 +30115,15 @@
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
     "mime": {
@@ -22664,16 +30132,16 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
-      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "mime-db": "1.51.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-fn": {
@@ -22688,17 +30156,17 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz",
-      "integrity": "sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==",
+      "version": "2.7.6",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
+      "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
       "requires": {
         "schema-utils": "^4.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -22720,14 +30188,14 @@
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "ajv-keywords": "^5.1.0"
           }
         }
       }
@@ -22746,16 +30214,16 @@
       }
     },
     "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
     },
     "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "requires": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       }
     },
     "ms": {
@@ -22764,28 +30232,33 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "requires": {
-        "dns-packet": "^1.3.1",
+        "dns-packet": "^5.2.2",
         "thunky": "^1.0.2"
       }
     },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
     },
     "nanoid": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
     },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "natural-compare-lite": {
       "version": "1.4.0",
@@ -22812,19 +30285,19 @@
       }
     },
     "node-forge": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
-      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
     },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
     },
     "node-releases": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
-      "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
+      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ=="
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -22834,7 +30307,7 @@
     "normalize-range": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
     },
     "normalize-url": {
       "version": "6.1.0",
@@ -22850,27 +30323,27 @@
       }
     },
     "nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "requires": {
         "boolbase": "^1.0.0"
       }
     },
     "nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
+      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
     },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "object-hash": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
-      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="
     },
     "object-inspect": {
       "version": "1.12.3",
@@ -22923,13 +30396,15 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
+      "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
       "requires": {
+        "array.prototype.reduce": "^1.0.5",
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "safe-array-concat": "^1.0.0"
       }
     },
     "object.hasown": {
@@ -22972,7 +30447,7 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "requires": {
         "wrappy": "1"
       }
@@ -22986,9 +30461,9 @@
       }
     },
     "open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "requires": {
         "define-lazy-prop": "^2.0.0",
         "is-docker": "^2.1.1",
@@ -23024,20 +30499,12 @@
         "p-limit": "^2.2.0"
       }
     },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
     "p-retry": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-      "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "requires": {
-        "@types/retry": "^0.12.0",
+        "@types/retry": "0.12.0",
         "retry": "^0.13.1"
       }
     },
@@ -23101,7 +30568,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
     },
     "path-key": {
       "version": "3.1.1",
@@ -23116,7 +30583,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "path-type": {
       "version": "4.0.0",
@@ -23126,7 +30593,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
     },
     "picocolors": {
       "version": "1.0.0",
@@ -23141,28 +30608,27 @@
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
       "dev": true
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "dev": true,
       "requires": {
         "pinkie": "^2.0.0"
       }
     },
     "pirates": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
-      "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw=="
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
     },
     "pkg-dir": {
       "version": "4.2.0",
@@ -23212,42 +30678,22 @@
         }
       }
     },
-    "portfinder": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-      "requires": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.5"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
     "postcss": {
-      "version": "8.4.5",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
-      "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "requires": {
-        "nanoid": "^3.1.30",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.1"
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-attribute-case-insensitive": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz",
-      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
       "requires": {
-        "postcss-selector-parser": "^6.0.2"
+        "postcss-selector-parser": "^6.0.10"
       }
     },
     "postcss-browser-comments": {
@@ -23257,123 +30703,135 @@
       "requires": {}
     },
     "postcss-calc": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.2.tgz",
-      "integrity": "sha512-B5R0UeB4zLJvxNt1FVCaDZULdzsKLPc6FhjFJ+xwFiq7VG4i9cuaJLxVjNtExNK8ocm3n2o4unXXLiVX1SCqxA==",
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
       "requires": {
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0"
+      }
+    },
+    "postcss-clamp": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-color-functional-notation": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.1.tgz",
-      "integrity": "sha512-62OBIXCjRXpQZcFOYIXwXBlpAVWrYk8ek1rcjvMING4Q2cf0ipyN9qT+BhHA6HmftGSEnFQu2qgKO3gMscl3Rw==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-color-hex-alpha": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.2.tgz",
-      "integrity": "sha512-gyx8RgqSmGVK156NAdKcsfkY3KPGHhKqvHTL3hhveFrBBToguKFzhyiuk3cljH6L4fJ0Kv+JENuPXs1Wij27Zw==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-color-rebeccapurple": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz",
-      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-colormin": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.3.tgz",
-      "integrity": "sha512-dra4xoAjub2wha6RUXAgadHEn2lGxbj8drhFcIGLOMn914Eu7DkPUurugDXgstwttCYkJtZ/+PkWRWdp3UHRIA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-convert-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz",
-      "integrity": "sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
       "requires": {
-        "postcss-value-parser": "^4.1.0"
+        "browserslist": "^4.21.4",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-custom-media": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz",
-      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
-      "requires": {}
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
     },
     "postcss-custom-properties": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.2.tgz",
-      "integrity": "sha512-Zvd+k66PHBYYPiXtdjNVx2l54Y9kQC7K1eUHzBND97RW/ayNxfaPOW+9NL3r0nsVbX1asPLdkDj585Wg0NBJCA==",
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
+      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-custom-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz",
-      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
       "requires": {
         "postcss-selector-parser": "^6.0.4"
       }
     },
     "postcss-dir-pseudo-class": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.3.tgz",
-      "integrity": "sha512-qiPm+CNAlgXiMf0J5IbBBEXA9l/Q5HGsNGkL3znIwT2ZFRLGY9U2fTUpa4lqCUXQOxaLimpacHeQC80BD2qbDw==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
       "requires": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.10"
       }
     },
     "postcss-discard-comments": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz",
-      "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
       "requires": {}
     },
     "postcss-discard-duplicates": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz",
-      "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
       "requires": {}
     },
     "postcss-discard-empty": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz",
-      "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
       "requires": {}
     },
     "postcss-discard-overridden": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz",
-      "integrity": "sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
       "requires": {}
     },
     "postcss-double-position-gradients": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.4.tgz",
-      "integrity": "sha512-qz+s5vhKJlsHw8HjSs+HVk2QGFdRyC68KGRQGX3i+GcnUjhWhXQEmCXW6siOJkZ1giu0ddPwSO6I6JdVVVPoog==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
       "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-env-function": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.4.tgz",
-      "integrity": "sha512-0ltahRTPtXSIlEZFv7zIvdEib7HN0ZbUQxrxIKn8KbiRyhALo854I/CggU5lyZe6ZBvSTJ6Al2vkZecI2OhneQ==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
@@ -23385,19 +30843,19 @@
       "requires": {}
     },
     "postcss-focus-visible": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.3.tgz",
-      "integrity": "sha512-ozOsg+L1U8S+rxSHnJJiET6dNLyADcPHhEarhhtCI9DBLGOPG/2i4ddVoFch9LzrBgb8uDaaRI4nuid2OM82ZA==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
       "requires": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-focus-within": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.3.tgz",
-      "integrity": "sha512-fk9y2uFS6/Kpp7/A9Hz9Z4rlFQ8+tzgBcQCXAFSrXFGAbKx+4ZZOmmfHuYjCOMegPWoz0pnC6fNzi8j7Xyqp5Q==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
       "requires": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.9"
       }
     },
     "postcss-font-variant": {
@@ -23407,19 +30865,29 @@
       "requires": {}
     },
     "postcss-gap-properties": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.2.tgz",
-      "integrity": "sha512-EaMy/pbxtQnKDsnbEjdqlkCkROTQZzolcLKgIE+3b7EuJfJydH55cZeHfm+MtIezXRqhR80VKgaztO/vHq94Fw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
       "requires": {}
     },
     "postcss-image-set-function": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.4.tgz",
-      "integrity": "sha512-BlEo9gSTj66lXjRNByvkMK9dEdEGFXRfGjKRi9fo8s0/P3oEk74cAoonl/utiM50E2OPVb/XSu+lWvdW4KtE/Q==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
+    "postcss-import": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "requires": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      }
+    },
     "postcss-initial": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
@@ -23427,28 +30895,36 @@
       "requires": {}
     },
     "postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "requires": {
         "camelcase-css": "^2.0.1"
       }
     },
     "postcss-lab-function": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.0.3.tgz",
-      "integrity": "sha512-MH4tymWmefdZQ7uVG/4icfLjAQmH6o2NRYyVh2mKoB4RXJp9PjsyhZwhH4ouaCQHvg+qJVj3RzeAR1EQpIlXZA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
       "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-load-config": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz",
-      "integrity": "sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+      "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
       "requires": {
-        "lilconfig": "^2.0.4",
-        "yaml": "^1.10.2"
+        "lilconfig": "^2.0.5",
+        "yaml": "^2.1.1"
+      },
+      "dependencies": {
+        "yaml": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+          "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ=="
+        }
       }
     },
     "postcss-loader": {
@@ -23461,20 +30937,33 @@
         "semver": "^7.3.5"
       },
       "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "postcss-logical": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.3.tgz",
-      "integrity": "sha512-P5NcHWYrif0vK8rgOy/T87vg0WRIj3HSknrvp1wzDbiBeoDPVmiVRmkown2eSQdpPveat/MC1ess5uhzZFVnqQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
       "requires": {}
     },
     "postcss-media-minmax": {
@@ -23484,60 +30973,58 @@
       "requires": {}
     },
     "postcss-merge-longhand": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.4.tgz",
-      "integrity": "sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
       "requires": {
-        "postcss-value-parser": "^4.1.0",
-        "stylehacks": "^5.0.1"
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^5.1.1"
       }
     },
     "postcss-merge-rules": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.4.tgz",
-      "integrity": "sha512-yOj7bW3NxlQxaERBB0lEY1sH5y+RzevjbdH4DBJurjKERNpknRByFNdNe+V72i5pIZL12woM9uGdS5xbSB+kDQ==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
         "postcss-selector-parser": "^6.0.5"
       }
     },
     "postcss-minify-font-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.2.tgz",
-      "integrity": "sha512-R6MJZryq28Cw0AmnyhXrM7naqJZZLoa1paBltIzh2wM7yb4D45TLur+eubTQ4jCmZU9SGeZdWsc5KcSoqTMeTg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-minify-gradients": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.4.tgz",
-      "integrity": "sha512-RVwZA7NC4R4J76u8X0Q0j+J7ItKUWAeBUJ8oEEZWmtv3Xoh19uNJaJwzNpsydQjk6PkuhRrK+YwwMf+c+68EYg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
       "requires": {
         "colord": "^2.9.1",
-        "cssnano-utils": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-minify-params": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.3.tgz",
-      "integrity": "sha512-NY92FUikE+wralaiVexFd5gwb7oJTIDhgTNeIw89i1Ymsgt4RWiPXfz3bg7hDy4NL6gepcThJwOYNtZO/eNi7Q==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "browserslist": "^4.16.6",
-        "cssnano-utils": "^3.0.0",
+        "browserslist": "^4.21.4",
+        "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-minify-selectors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.1.tgz",
-      "integrity": "sha512-TOzqOPXt91O2luJInaVPiivh90a2SIK5Nf1Ea7yEIM/5w+XA5BGrZGUSW8aEx9pJ/oNj7ZJBhjvigSiBV+bC1Q==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
       "requires": {
-        "alphanum-sort": "^1.0.2",
         "postcss-selector-parser": "^6.0.5"
       }
     },
@@ -23548,9 +31035,9 @@
       "requires": {}
     },
     "postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "requires": {
         "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
@@ -23574,19 +31061,20 @@
       }
     },
     "postcss-nested": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz",
-      "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
       "requires": {
-        "postcss-selector-parser": "^6.0.6"
+        "postcss-selector-parser": "^6.0.11"
       }
     },
     "postcss-nesting": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.2.tgz",
-      "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
       "requires": {
-        "postcss-selector-parser": "^6.0.8"
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
       }
     },
     "postcss-normalize": {
@@ -23600,91 +31088,99 @@
       }
     },
     "postcss-normalize-charset": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz",
-      "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
       "requires": {}
     },
     "postcss-normalize-display-values": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.2.tgz",
-      "integrity": "sha512-RxXoJPUR0shSjkMMzgEZDjGPrgXUVYyWA/YwQRicb48H15OClPuaDR7tYokLAlGZ2tCSENEN5WxjgxSD5m4cUw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-positions": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.2.tgz",
-      "integrity": "sha512-tqghWFVDp2btqFg1gYob1etPNxXLNh3uVeWgZE2AQGh6b2F8AK2Gj36v5Vhyh+APwIzNjmt6jwZ9pTBP+/OM8g==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-repeat-style": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.2.tgz",
-      "integrity": "sha512-/rIZn8X9bBzC7KvY4iKUhXUGW3MmbXwfPF23jC9wT9xTi7kAvgj8sEgwxjixBmoL6MVa4WOgxNz2hAR6wTK8tw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-string": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.2.tgz",
-      "integrity": "sha512-zaI1yzwL+a/FkIzUWMQoH25YwCYxi917J4pYm1nRXtdgiCdnlTkx5eRzqWEC64HtRa06WCJ9TIutpb6GmW4gFw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-timing-functions": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.2.tgz",
-      "integrity": "sha512-Ao0PP6MoYsRU1LxeVUW740ioknvdIUmfr6uAA3xWlQJ9s69/Tupy8qwhuKG3xWfl+KvLMAP9p2WXF9cwuk/7Bg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-unicode": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.2.tgz",
-      "integrity": "sha512-3y/V+vjZ19HNcTizeqwrbZSUsE69ZMRHfiiyLAJb7C7hJtYmM4Gsbajy7gKagu97E8q5rlS9k8FhojA8cpGhWw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-url": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.4.tgz",
-      "integrity": "sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
       "requires": {
         "normalize-url": "^6.0.1",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-whitespace": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.2.tgz",
-      "integrity": "sha512-CXBx+9fVlzSgbk0IXA/dcZn9lXixnQRndnsPC5ht3HxlQ1bVh77KQDL1GffJx1LTzzfae8ftMulsjYmO2yegxA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
+    "postcss-opacity-percentage": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
+      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
+      "requires": {}
+    },
     "postcss-ordered-values": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.3.tgz",
-      "integrity": "sha512-T9pDS+P9bWeFvqivXd5ACzQmrCmHjv3ZP+djn8E1UZY7iK79pFSm7i3WbKw2VSmFmdbMm8sQ12OPcNpzBo3Z2w==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
       "requires": {
-        "cssnano-utils": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-overflow-shorthand": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.2.tgz",
-      "integrity": "sha512-odBMVt6PTX7jOE9UNvmnLrFzA9pXS44Jd5shFGGtSHY80QCuJF+14McSy0iavZggRZ9Oj//C9vOKQmexvyEJMg==",
-      "requires": {}
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      }
     },
     "postcss-page-break": {
       "version": "3.0.4",
@@ -23693,74 +31189,90 @@
       "requires": {}
     },
     "postcss-place": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.3.tgz",
-      "integrity": "sha512-tDQ3m+GYoOar+KoQgj+pwPAvGHAp/Sby6vrFiyrELrMKQJ4AejL0NcS0mm296OKKYA2SRg9ism/hlT/OLhBrdQ==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-preset-env": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.2.3.tgz",
-      "integrity": "sha512-Ok0DhLfwrcNGrBn8sNdy1uZqWRk/9FId0GiQ39W4ILop5GHtjJs8bu1MY9isPwHInpVEPWjb4CEcEaSbBLpfwA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
+      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
       "requires": {
-        "autoprefixer": "^10.4.2",
-        "browserslist": "^4.19.1",
-        "caniuse-lite": "^1.0.30001299",
-        "css-blank-pseudo": "^3.0.2",
-        "css-has-pseudo": "^3.0.3",
-        "css-prefers-color-scheme": "^6.0.2",
-        "cssdb": "^5.0.0",
-        "postcss-attribute-case-insensitive": "^5.0.0",
-        "postcss-color-functional-notation": "^4.2.1",
-        "postcss-color-hex-alpha": "^8.0.2",
-        "postcss-color-rebeccapurple": "^7.0.2",
-        "postcss-custom-media": "^8.0.0",
-        "postcss-custom-properties": "^12.1.2",
-        "postcss-custom-selectors": "^6.0.0",
-        "postcss-dir-pseudo-class": "^6.0.3",
-        "postcss-double-position-gradients": "^3.0.4",
-        "postcss-env-function": "^4.0.4",
-        "postcss-focus-visible": "^6.0.3",
-        "postcss-focus-within": "^5.0.3",
+        "@csstools/postcss-cascade-layers": "^1.1.1",
+        "@csstools/postcss-color-function": "^1.1.1",
+        "@csstools/postcss-font-format-keywords": "^1.0.1",
+        "@csstools/postcss-hwb-function": "^1.0.2",
+        "@csstools/postcss-ic-unit": "^1.0.1",
+        "@csstools/postcss-is-pseudo-class": "^2.0.7",
+        "@csstools/postcss-nested-calc": "^1.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.1",
+        "@csstools/postcss-oklab-function": "^1.1.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
+        "@csstools/postcss-stepped-value-functions": "^1.0.1",
+        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+        "@csstools/postcss-trigonometric-functions": "^1.0.2",
+        "@csstools/postcss-unset-value": "^1.0.2",
+        "autoprefixer": "^10.4.13",
+        "browserslist": "^4.21.4",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^7.1.0",
+        "postcss-attribute-case-insensitive": "^5.0.2",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^4.2.4",
+        "postcss-color-hex-alpha": "^8.0.4",
+        "postcss-color-rebeccapurple": "^7.1.1",
+        "postcss-custom-media": "^8.0.2",
+        "postcss-custom-properties": "^12.1.10",
+        "postcss-custom-selectors": "^6.0.3",
+        "postcss-dir-pseudo-class": "^6.0.5",
+        "postcss-double-position-gradients": "^3.1.2",
+        "postcss-env-function": "^4.0.6",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
         "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.2",
-        "postcss-image-set-function": "^4.0.4",
+        "postcss-gap-properties": "^3.0.5",
+        "postcss-image-set-function": "^4.0.7",
         "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.0.3",
-        "postcss-logical": "^5.0.3",
+        "postcss-lab-function": "^4.2.1",
+        "postcss-logical": "^5.0.4",
         "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.1.2",
-        "postcss-overflow-shorthand": "^3.0.2",
+        "postcss-nesting": "^10.2.0",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.4",
         "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.3",
-        "postcss-pseudo-class-any-link": "^7.0.2",
+        "postcss-place": "^7.0.5",
+        "postcss-pseudo-class-any-link": "^7.1.6",
         "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^5.0.0"
+        "postcss-selector-not": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-pseudo-class-any-link": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.0.2.tgz",
-      "integrity": "sha512-CG35J1COUH7OOBgpw5O+0koOLUd5N4vUGKUqSAuIe4GiuLHWU96Pqp+UPC8QITTd12zYAFx76pV7qWT/0Aj/TA==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
       "requires": {
-        "postcss-selector-parser": "^6.0.8"
+        "postcss-selector-parser": "^6.0.10"
       }
     },
     "postcss-reduce-initial": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.2.tgz",
-      "integrity": "sha512-v/kbAAQ+S1V5v9TJvbGkV98V2ERPdU6XvMcKMjqAlYiJ2NtsHGlKYLPjWWcXlaTKNxooId7BGxeraK8qXvzKtw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0"
       }
     },
     "postcss-reduce-transforms": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.2.tgz",
-      "integrity": "sha512-25HeDeFsgiPSUx69jJXZn8I06tMxLQJJNF5h7i9gsUg8iP4KOOJ8EX8fj3seeoLt3SLU2YDD6UPnDYVGUO7DEA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
       "requires": {
         "postcss-value-parser": "^4.2.0"
       }
@@ -23772,28 +31284,28 @@
       "requires": {}
     },
     "postcss-selector-not": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz",
-      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
       "requires": {
-        "balanced-match": "^1.0.0"
+        "postcss-selector-parser": "^6.0.10"
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
-      "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "requires": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
       }
     },
     "postcss-svgo": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz",
-      "integrity": "sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
       "requires": {
-        "postcss-value-parser": "^4.1.0",
+        "postcss-value-parser": "^4.2.0",
         "svgo": "^2.7.0"
       },
       "dependencies": {
@@ -23816,6 +31328,11 @@
           "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
           "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
         },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
         "svgo": {
           "version": "2.8.0",
           "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
@@ -23833,11 +31350,10 @@
       }
     },
     "postcss-unique-selectors": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.2.tgz",
-      "integrity": "sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
       "requires": {
-        "alphanum-sort": "^1.0.2",
         "postcss-selector-parser": "^6.0.5"
       }
     },
@@ -23852,9 +31368,9 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
     },
     "prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz",
+      "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==",
       "dev": true
     },
     "pretty-bytes": {
@@ -23872,9 +31388,9 @@
       }
     },
     "pretty-format": {
-      "version": "27.4.6",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz",
-      "integrity": "sha512-NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "requires": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -23885,6 +31401,11 @@
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
           "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+        },
+        "react-is": {
+          "version": "17.0.2",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
         }
       }
     },
@@ -23894,9 +31415,9 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
       "requires": {
         "asap": "~2.0.6"
       }
@@ -23944,19 +31465,27 @@
       }
     },
     "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
+    },
+    "pure-rand": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
+      "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
     },
     "qs": {
       "version": "6.11.0",
@@ -23966,16 +31495,16 @@
         "side-channel": "^1.0.4"
       }
     },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
-    "quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
-    },
     "raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
@@ -24046,17 +31575,17 @@
       }
     },
     "react-app-rewired": {
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.1.11.tgz",
-      "integrity": "sha512-zRIqJUPsCoPnfYtea3xgPbKR42vx0NoH5oo8R8FELXqzkjJHa39V6zD8CAdkLJoYL8V3JScWHAfKMZOzi1Ydmw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.2.1.tgz",
+      "integrity": "sha512-uFQWTErXeLDrMzOJHKp0h8P1z0LV9HzPGsJ6adOtGlA/B9WfT6Shh4j2tLTTGlXOfiVx6w6iWpp7SOC5pvk+gA==",
       "requires": {
         "semver": "^5.6.0"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
         }
       }
     },
@@ -24165,9 +31694,9 @@
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
     "react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "react-refresh": {
       "version": "0.11.0",
@@ -24229,44 +31758,798 @@
         "workbox-webpack-plugin": "^6.4.1"
       },
       "dependencies": {
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/core": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
+          "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/reporters": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.0.0",
+            "emittery": "^0.8.1",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.9",
+            "jest-changed-files": "^27.5.1",
+            "jest-config": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-resolve-dependencies": "^27.5.1",
+            "jest-runner": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "jest-watcher": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "rimraf": "^3.0.0",
+            "slash": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@jest/environment": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+          "requires": {
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1"
+          }
+        },
+        "@jest/fake-timers": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@sinonjs/fake-timers": "^8.0.1",
+            "@types/node": "*",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "@jest/globals": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "expect": "^27.5.1"
+          }
+        },
+        "@jest/reporters": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
+          "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+          "requires": {
+            "@bcoe/v8-coverage": "^0.2.3",
+            "@jest/console": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "exit": "^0.1.2",
+            "glob": "^7.1.2",
+            "graceful-fs": "^4.2.9",
+            "istanbul-lib-coverage": "^3.0.0",
+            "istanbul-lib-instrument": "^5.1.0",
+            "istanbul-lib-report": "^3.0.0",
+            "istanbul-lib-source-maps": "^4.0.0",
+            "istanbul-reports": "^3.1.3",
+            "jest-haste-map": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.0",
+            "string-length": "^4.0.1",
+            "terminal-link": "^2.0.0",
+            "v8-to-istanbul": "^8.1.0"
+          }
+        },
+        "@jest/schemas": {
+          "version": "28.1.3",
+          "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
+          "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
+          "requires": {
+            "@sinclair/typebox": "^0.24.1"
+          }
+        },
+        "@jest/source-map": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+          "requires": {
+            "callsites": "^3.0.0",
+            "graceful-fs": "^4.2.9",
+            "source-map": "^0.6.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/test-sequencer": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+          "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+          "requires": {
+            "@jest/test-result": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-runtime": "^27.5.1"
+          }
+        },
+        "@sinclair/typebox": {
+          "version": "0.24.51",
+          "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
+          "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
+        },
+        "@sinonjs/commons": {
+          "version": "1.8.6",
+          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+          "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+          "requires": {
+            "type-detect": "4.0.8"
+          }
+        },
+        "@sinonjs/fake-timers": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "17.0.24",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+          "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+        },
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "dedent": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+          "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
+        },
+        "diff-sequences": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
+        },
+        "emittery": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
+        },
+        "expect": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1"
+          }
+        },
         "fs-extra": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
           "requires": {
             "graceful-fs": "^4.2.0",
             "jsonfile": "^6.0.1",
             "universalify": "^2.0.0"
           }
         },
-        "jsonfile": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+        "jest": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
+          "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
           "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^2.0.0"
+            "@jest/core": "^27.5.1",
+            "import-local": "^3.0.2",
+            "jest-cli": "^27.5.1"
+          }
+        },
+        "jest-changed-files": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+          "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "execa": "^5.0.0",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-circus": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
+          "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "co": "^4.6.0",
+            "dedent": "^0.7.0",
+            "expect": "^27.5.1",
+            "is-generator-fn": "^2.0.0",
+            "jest-each": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-cli": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
+          "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+          "requires": {
+            "@jest/core": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.9",
+            "import-local": "^3.0.2",
+            "jest-config": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "prompts": "^2.0.1",
+            "yargs": "^16.2.0"
+          }
+        },
+        "jest-config": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
+          "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+          "requires": {
+            "@babel/core": "^7.8.0",
+            "@jest/test-sequencer": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "babel-jest": "^27.5.1",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "deepmerge": "^4.2.2",
+            "glob": "^7.1.1",
+            "graceful-fs": "^4.2.9",
+            "jest-circus": "^27.5.1",
+            "jest-environment-jsdom": "^27.5.1",
+            "jest-environment-node": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-jasmine2": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-runner": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-validate": "^27.5.1",
+            "micromatch": "^4.0.4",
+            "parse-json": "^5.2.0",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-json-comments": "^3.1.1"
+          }
+        },
+        "jest-diff": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+          "requires": {
+            "chalk": "^4.0.0",
+            "diff-sequences": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-docblock": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
+          "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+          "requires": {
+            "detect-newline": "^3.0.0"
+          }
+        },
+        "jest-each": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "jest-get-type": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-environment-node": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+          "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "jest-mock": "^27.5.1",
+            "jest-util": "^27.5.1"
+          }
+        },
+        "jest-leak-detector": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+          "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+          "requires": {
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-matcher-utils": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+          "requires": {
+            "chalk": "^4.0.0",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "pretty-format": "^27.5.1"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*"
+          }
+        },
+        "jest-resolve-dependencies": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+          "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-snapshot": "^27.5.1"
+          }
+        },
+        "jest-runner": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
+          "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/environment": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "emittery": "^0.8.1",
+            "graceful-fs": "^4.2.9",
+            "jest-docblock": "^27.5.1",
+            "jest-environment-jsdom": "^27.5.1",
+            "jest-environment-node": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-leak-detector": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-runtime": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "jest-worker": "^27.5.1",
+            "source-map-support": "^0.5.6",
+            "throat": "^6.0.1"
+          }
+        },
+        "jest-runtime": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+          "requires": {
+            "@jest/environment": "^27.5.1",
+            "@jest/fake-timers": "^27.5.1",
+            "@jest/globals": "^27.5.1",
+            "@jest/source-map": "^27.5.1",
+            "@jest/test-result": "^27.5.1",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "chalk": "^4.0.0",
+            "cjs-module-lexer": "^1.0.0",
+            "collect-v8-coverage": "^1.0.0",
+            "execa": "^5.0.0",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.2.9",
+            "jest-haste-map": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-mock": "^27.5.1",
+            "jest-regex-util": "^27.5.1",
+            "jest-resolve": "^27.5.1",
+            "jest-snapshot": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0",
+            "strip-bom": "^4.0.0"
+          }
+        },
+        "jest-snapshot": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+          "requires": {
+            "@babel/core": "^7.7.2",
+            "@babel/generator": "^7.7.2",
+            "@babel/plugin-syntax-typescript": "^7.7.2",
+            "@babel/traverse": "^7.7.2",
+            "@babel/types": "^7.0.0",
+            "@jest/transform": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/babel__traverse": "^7.0.4",
+            "@types/prettier": "^2.1.5",
+            "babel-preset-current-node-syntax": "^1.0.0",
+            "chalk": "^4.0.0",
+            "expect": "^27.5.1",
+            "graceful-fs": "^4.2.9",
+            "jest-diff": "^27.5.1",
+            "jest-get-type": "^27.5.1",
+            "jest-haste-map": "^27.5.1",
+            "jest-matcher-utils": "^27.5.1",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "natural-compare": "^1.4.0",
+            "pretty-format": "^27.5.1",
+            "semver": "^7.3.2"
+          }
+        },
+        "jest-watch-typeahead": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
+          "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
+          "requires": {
+            "ansi-escapes": "^4.3.1",
+            "chalk": "^4.0.0",
+            "jest-regex-util": "^28.0.0",
+            "jest-watcher": "^28.0.0",
+            "slash": "^4.0.0",
+            "string-length": "^5.0.1",
+            "strip-ansi": "^7.0.1"
+          },
+          "dependencies": {
+            "@jest/console": {
+              "version": "28.1.3",
+              "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
+              "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
+              "requires": {
+                "@jest/types": "^28.1.3",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "jest-message-util": "^28.1.3",
+                "jest-util": "^28.1.3",
+                "slash": "^3.0.0"
+              },
+              "dependencies": {
+                "slash": {
+                  "version": "3.0.0",
+                  "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+                  "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+                }
+              }
+            },
+            "@jest/test-result": {
+              "version": "28.1.3",
+              "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
+              "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
+              "requires": {
+                "@jest/console": "^28.1.3",
+                "@jest/types": "^28.1.3",
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "collect-v8-coverage": "^1.0.0"
+              }
+            },
+            "@jest/types": {
+              "version": "28.1.3",
+              "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
+              "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
+              "requires": {
+                "@jest/schemas": "^28.1.3",
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "@types/istanbul-reports": "^3.0.0",
+                "@types/node": "*",
+                "@types/yargs": "^17.0.8",
+                "chalk": "^4.0.0"
+              }
+            },
+            "emittery": {
+              "version": "0.10.2",
+              "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
+              "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="
+            },
+            "jest-message-util": {
+              "version": "28.1.3",
+              "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
+              "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
+              "requires": {
+                "@babel/code-frame": "^7.12.13",
+                "@jest/types": "^28.1.3",
+                "@types/stack-utils": "^2.0.0",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "micromatch": "^4.0.4",
+                "pretty-format": "^28.1.3",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.3"
+              },
+              "dependencies": {
+                "slash": {
+                  "version": "3.0.0",
+                  "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+                  "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+                }
+              }
+            },
+            "jest-regex-util": {
+              "version": "28.0.2",
+              "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+              "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
+            },
+            "jest-util": {
+              "version": "28.1.3",
+              "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
+              "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
+              "requires": {
+                "@jest/types": "^28.1.3",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "graceful-fs": "^4.2.9",
+                "picomatch": "^2.2.3"
+              }
+            },
+            "jest-watcher": {
+              "version": "28.1.3",
+              "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
+              "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
+              "requires": {
+                "@jest/test-result": "^28.1.3",
+                "@jest/types": "^28.1.3",
+                "@types/node": "*",
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^4.0.0",
+                "emittery": "^0.10.2",
+                "jest-util": "^28.1.3",
+                "string-length": "^4.0.1"
+              },
+              "dependencies": {
+                "string-length": {
+                  "version": "4.0.2",
+                  "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+                  "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+                  "requires": {
+                    "char-regex": "^1.0.2",
+                    "strip-ansi": "^6.0.0"
+                  }
+                },
+                "strip-ansi": {
+                  "version": "6.0.1",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+                  "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+                  "requires": {
+                    "ansi-regex": "^5.0.1"
+                  }
+                }
+              }
+            },
+            "pretty-format": {
+              "version": "28.1.3",
+              "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
+              "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
+              "requires": {
+                "@jest/schemas": "^28.1.3",
+                "ansi-regex": "^5.0.1",
+                "ansi-styles": "^5.0.0",
+                "react-is": "^18.0.0"
+              }
+            },
+            "slash": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+              "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
+            },
+            "string-length": {
+              "version": "5.0.1",
+              "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+              "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+              "requires": {
+                "char-regex": "^2.0.0",
+                "strip-ansi": "^7.0.1"
+              },
+              "dependencies": {
+                "char-regex": {
+                  "version": "2.0.1",
+                  "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
+                  "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "7.1.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+              "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+              "requires": {
+                "ansi-regex": "^6.0.1"
+              },
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "6.0.1",
+                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+                  "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
+                }
+              }
+            }
+          }
+        },
+        "jest-watcher": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
+          "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+          "requires": {
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.0.0",
+            "jest-util": "^27.5.1",
+            "string-length": "^4.0.1"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
           }
         },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
         },
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "v8-to-istanbul": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+          "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.1",
+            "convert-source-map": "^1.6.0",
+            "source-map": "^0.7.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.4",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+              "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
+            }
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        },
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "20.2.9",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
         }
       }
     },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "requires": {
+        "pify": "^2.3.0"
+      }
+    },
     "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -24305,9 +32588,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz",
-      "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "requires": {
         "regenerate": "^1.4.2"
       }
@@ -24318,9 +32601,9 @@
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
+      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
       "requires": {
         "@babel/runtime": "^7.8.4"
       }
@@ -24340,33 +32623,23 @@
         "functions-have-names": "^1.2.3"
       }
     },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
-    },
     "regexpu-core": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz",
-      "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "requires": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^9.0.0",
-        "regjsgen": "^0.5.2",
-        "regjsparser": "^0.7.0",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       }
     },
-    "regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
-    },
     "regjsparser": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz",
-      "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "requires": {
         "jsesc": "~0.5.0"
       },
@@ -24374,14 +32647,14 @@
         "jsesc": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
         }
       }
     },
     "relateurl": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
     },
     "renderkid": {
       "version": "3.0.0",
@@ -24398,7 +32671,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -24408,14 +32681,14 @@
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
     "resolve": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
-      "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "requires": {
-        "is-core-module": "^2.8.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -24458,13 +32731,18 @@
             "picocolors": "^0.2.1",
             "source-map": "^0.6.1"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
     "resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz",
+      "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="
     },
     "retry": {
       "version": "0.13.1",
@@ -24485,9 +32763,9 @@
       }
     },
     "rollup": {
-      "version": "2.64.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.64.0.tgz",
-      "integrity": "sha512-+c+lbw1lexBKSMb1yxGDVfJ+vchJH3qLbmavR+awDinTDA2C5Ug9u7lkOzj62SCu0PKUExsW36tpgW7Fmpn3yQ==",
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
       "requires": {
         "fsevents": "~2.3.2"
       }
@@ -24531,10 +32809,21 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      }
+    },
     "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "safe-regex-test": {
       "version": "1.0.0",
@@ -24557,9 +32846,9 @@
       "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
     },
     "sass-loader": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
-      "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
+      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
       "requires": {
         "klona": "^2.0.4",
         "neo-async": "^2.6.2"
@@ -24588,9 +32877,9 @@
       }
     },
     "schema-utils": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
-      "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "requires": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -24600,20 +32889,20 @@
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
     },
     "selfsigned": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz",
-      "integrity": "sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
       "requires": {
-        "node-forge": "^1.2.0"
+        "node-forge": "^1"
       }
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
     },
     "send": {
       "version": "0.18.0",
@@ -24650,20 +32939,10 @@
             }
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
         "ms": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
         }
       }
     },
@@ -24678,7 +32957,7 @@
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "requires": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -24697,10 +32976,15 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
+        },
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
           "requires": {
             "depd": "~1.1.2",
             "inherits": "2.0.3",
@@ -24711,17 +32995,22 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
           "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
         }
       }
     },
@@ -24756,9 +33045,9 @@
       },
       "dependencies": {
         "@types/react": {
-          "version": "16.14.21",
-          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz",
-          "integrity": "sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg==",
+          "version": "16.14.43",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.43.tgz",
+          "integrity": "sha512-7zdjv7jvoLLQg1tTvpQsm+hyNUMT2mPlNV1+d0I8fbGhkJl82spopMyBlu4wb1dviZAxpGdk5eHu/muacknnfw==",
           "requires": {
             "@types/prop-types": "*",
             "@types/scheduler": "*",
@@ -24796,9 +33085,9 @@
       }
     },
     "signal-exit": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
-      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "sisteransi": {
       "version": "1.0.5",
@@ -24826,35 +33115,25 @@
       "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
     },
     "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
     },
     "source-map-js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
-      "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
     },
     "source-map-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
-      "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
+      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
       "requires": {
         "abab": "^2.0.5",
         "iconv-lite": "^0.6.3",
         "source-map-js": "^1.0.1"
       }
     },
-    "source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
-      }
-    },
     "source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -24862,13 +33141,15 @@
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
       }
     },
-    "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
-    },
     "sourcemap-codec": {
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
@@ -24902,7 +33183,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "stable": {
       "version": "0.1.8",
@@ -24910,9 +33191,9 @@
       "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
     },
     "stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "requires": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -24925,14 +33206,14 @@
       }
     },
     "stackframe": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz",
-      "integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
     },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "stop-iteration-iterator": {
       "version": "1.0.0",
@@ -24948,13 +33229,6 @@
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "requires": {
         "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
       }
     },
     "string-length": {
@@ -25092,58 +33366,81 @@
         "escape-string-regexp": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
           "dev": true
         }
       }
     },
     "style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
+      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==",
       "requires": {}
     },
     "styled-components": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.3.tgz",
-      "integrity": "sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.0.tgz",
+      "integrity": "sha512-VWNfYYBuXzuLS/QYEeoPgMErP26WL+dX9//rEh80B2mmlS1yRxRxuL5eax4m6ybYEUoHWlTy2XOU32767mlMkg==",
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.4.5",
-        "@emotion/is-prop-valid": "^0.8.8",
-        "@emotion/stylis": "^0.8.4",
-        "@emotion/unitless": "^0.7.4",
-        "babel-plugin-styled-components": ">= 1.12.0",
-        "css-to-react-native": "^3.0.0",
-        "hoist-non-react-statics": "^3.0.0",
+        "@emotion/is-prop-valid": "^1.2.1",
+        "@emotion/unitless": "^0.8.0",
+        "@types/stylis": "^4.0.2",
+        "css-to-react-native": "^3.2.0",
+        "csstype": "^3.1.2",
+        "postcss": "^8.4.31",
         "shallowequal": "^1.1.0",
-        "supports-color": "^5.5.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "stylis": "^4.3.0",
+        "tslib": "^2.5.0"
       }
     },
     "stylehacks": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
-      "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
       "requires": {
-        "browserslist": "^4.16.0",
+        "browserslist": "^4.21.4",
         "postcss-selector-parser": "^6.0.4"
       }
     },
+    "stylis": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz",
+      "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ=="
+    },
+    "sucrase": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+      "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "7.1.6",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
     "supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -25153,9 +33450,9 @@
       }
     },
     "supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
       "requires": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
@@ -25220,7 +33517,7 @@
         "color-name": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
         },
         "css-select": {
           "version": "2.1.0",
@@ -25266,12 +33563,12 @@
         "escape-string-regexp": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
         },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
         "nth-check": {
           "version": "1.0.2",
@@ -25297,30 +33594,33 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "tailwindcss": {
-      "version": "3.0.15",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.15.tgz",
-      "integrity": "sha512-bT2iy7FtjwgsXik4ZoJnHXR+SRCiGR1W95fVqpLZebr64m4ahwUwRbIAc5w5+2fzr1YF4Ct2eI7dojMRRl8sVQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+      "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
       "requires": {
-        "arg": "^5.0.1",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.2",
-        "color-name": "^1.1.4",
-        "cosmiconfig": "^7.0.1",
-        "detective": "^5.2.0",
+        "@alloc/quick-lru": "^5.2.0",
+        "arg": "^5.0.2",
+        "chokidar": "^3.5.3",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.2.7",
+        "fast-glob": "^3.2.12",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
+        "jiti": "^1.18.2",
+        "lilconfig": "^2.1.0",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "object-hash": "^2.2.0",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.0",
-        "postcss-nested": "5.0.6",
-        "postcss-selector-parser": "^6.0.8",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.23",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.1",
+        "postcss-nested": "^6.0.1",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.21.0"
+        "resolve": "^1.22.2",
+        "sucrase": "^3.32.0"
       }
     },
     "tapable": {
@@ -25361,26 +33661,26 @@
       }
     },
     "terser": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
-      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz",
+      "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==",
       "requires": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz",
-      "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==",
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.1",
-        "terser": "^5.16.5"
+        "terser": "^5.16.8"
       }
     },
     "test-exclude": {
@@ -25396,23 +33696,34 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+    },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
     },
     "throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
+      "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="
     },
     "thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
     "tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -25421,7 +33732,7 @@
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
     },
     "to-regex-range": {
       "version": "5.0.1",
@@ -25437,13 +33748,21 @@
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
     "tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
+        }
       }
     },
     "tr46": {
@@ -25457,7 +33776,7 @@
     "trim-repeated": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
-      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
@@ -25466,7 +33785,7 @@
         "escape-string-regexp": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
           "dev": true
         }
       }
@@ -25476,6 +33795,11 @@
       "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
     },
+    "ts-interface-checker": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+    },
     "tsconfig-paths": {
       "version": "3.14.2",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
@@ -25503,9 +33827,9 @@
       }
     },
     "tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "tslint": {
       "version": "6.1.3",
@@ -25560,25 +33884,25 @@
         "color-name": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
           "dev": true
         },
         "escape-string-regexp": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
           "dev": true
         },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
           "dev": true
         },
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
           "dev": true
         },
         "supports-color": {
@@ -25689,6 +34013,11 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "undici-types": {
+      "version": "5.25.3",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
+      "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -25704,14 +34033,14 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
     },
     "unique-string": {
       "version": "2.0.0",
@@ -25722,9 +34051,9 @@
       }
     },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
     "unpipe": {
       "version": "1.0.0",
@@ -25734,7 +34063,7 @@
     "unquote": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
     },
     "upath": {
       "version": "1.2.0",
@@ -25758,61 +34087,63 @@
         "punycode": "^2.1.0"
       }
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
       }
     },
     "utila": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw="
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
     },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
-    "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
-    },
     "v8-to-istanbul": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+      "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
+        "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-        }
+        "convert-source-map": "^1.6.0"
       }
     },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
@@ -25856,9 +34187,9 @@
       }
     },
     "web-vitals": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.3.tgz",
-      "integrity": "sha512-+ijpniAzcnQicXaXIN0/eHQAiV/jMt1oHGHTmz7VdAJPPkzzDhmoYPSpLgJTuFtUh+jCjxCoeTZPg7Ic+g8o7w=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.0.tgz",
+      "integrity": "sha512-f5YnCHVG9Y6uLCePD4tY8bO/Ge15NPEQWtvm3tPzDKygloiqtb4SVqRHBcrIAqo2ztqX5XueqDn97zHF0LdT6w=="
     },
     "webidl-conversions": {
       "version": "6.1.0",
@@ -25866,9 +34197,9 @@
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
     },
     "webpack": {
-      "version": "5.81.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.81.0.tgz",
-      "integrity": "sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==",
+      "version": "5.87.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz",
+      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.0",
@@ -25876,10 +34207,10 @@
         "@webassemblyjs/wasm-edit": "^1.11.5",
         "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
+        "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.13.0",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -25889,7 +34220,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.2",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
@@ -25913,21 +34244,21 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz",
-      "integrity": "sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "requires": {
         "colorette": "^2.0.10",
-        "memfs": "^3.2.2",
+        "memfs": "^3.4.3",
         "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -25949,58 +34280,59 @@
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "ajv-keywords": "^5.1.0"
           }
         }
       }
     },
     "webpack-dev-server": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz",
-      "integrity": "sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
       "requires": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
         "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
         "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.2.2",
+        "@types/ws": "^8.5.5",
         "ansi-html-community": "^0.0.8",
-        "bonjour": "^3.5.0",
-        "chokidar": "^3.5.2",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
         "colorette": "^2.0.10",
         "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
+        "connect-history-api-fallback": "^2.0.0",
         "default-gateway": "^6.0.3",
-        "del": "^6.0.0",
-        "express": "^4.17.1",
+        "express": "^4.17.3",
         "graceful-fs": "^4.2.6",
         "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.0",
+        "http-proxy-middleware": "^2.0.3",
         "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
         "open": "^8.0.9",
         "p-retry": "^4.5.0",
-        "portfinder": "^1.0.28",
+        "rimraf": "^3.0.2",
         "schema-utils": "^4.0.0",
-        "selfsigned": "^2.0.0",
+        "selfsigned": "^2.1.1",
         "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
+        "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
-        "strip-ansi": "^7.0.0",
-        "webpack-dev-middleware": "^5.3.0",
-        "ws": "^8.1.0"
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.13.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -26016,39 +34348,26 @@
             "fast-deep-equal": "^3.1.3"
           }
         },
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-        },
         "json-schema-traverse": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "requires": {
-            "ansi-regex": "^6.0.1"
+            "ajv-keywords": "^5.1.0"
           }
         },
         "ws": {
-          "version": "8.4.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
-          "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+          "version": "8.13.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
           "requires": {}
         }
       }
@@ -26062,6 +34381,11 @@
         "webpack-sources": "^2.2.0"
       },
       "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
         "webpack-sources": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
@@ -26176,31 +34500,31 @@
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
     },
     "workbox-background-sync": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.4.2.tgz",
-      "integrity": "sha512-P7c8uG5X2k+DMICH9xeSA9eUlCOjHHYoB42Rq+RtUpuwBxUOflAXR1zdsMWj81LopE4gjKXlTw7BFd1BDAHo7g==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz",
+      "integrity": "sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==",
       "requires": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.4.2"
+        "idb": "^7.0.1",
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-broadcast-update": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.4.2.tgz",
-      "integrity": "sha512-qnBwQyE0+PWFFc/n4ISXINE49m44gbEreJUYt2ldGH3+CNrLmJ1egJOOyUqqu9R4Eb7QrXcmB34ClXG7S37LbA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.6.0.tgz",
+      "integrity": "sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==",
       "requires": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-build": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.4.2.tgz",
-      "integrity": "sha512-WMdYLhDIsuzViOTXDH+tJ1GijkFp5khSYolnxR/11zmfhNDtuo7jof72xPGFy+KRpsz6tug39RhivCj77qqO0w==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.6.0.tgz",
+      "integrity": "sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==",
       "requires": {
         "@apideck/better-ajv-errors": "^0.3.1",
         "@babel/core": "^7.11.1",
@@ -26220,32 +34544,31 @@
         "rollup": "^2.43.1",
         "rollup-plugin-terser": "^7.0.0",
         "source-map": "^0.8.0-beta.0",
-        "source-map-url": "^0.4.0",
         "stringify-object": "^3.3.0",
         "strip-comments": "^2.0.1",
         "tempy": "^0.6.0",
         "upath": "^1.2.0",
-        "workbox-background-sync": "6.4.2",
-        "workbox-broadcast-update": "6.4.2",
-        "workbox-cacheable-response": "6.4.2",
-        "workbox-core": "6.4.2",
-        "workbox-expiration": "6.4.2",
-        "workbox-google-analytics": "6.4.2",
-        "workbox-navigation-preload": "6.4.2",
-        "workbox-precaching": "6.4.2",
-        "workbox-range-requests": "6.4.2",
-        "workbox-recipes": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2",
-        "workbox-streams": "6.4.2",
-        "workbox-sw": "6.4.2",
-        "workbox-window": "6.4.2"
+        "workbox-background-sync": "6.6.0",
+        "workbox-broadcast-update": "6.6.0",
+        "workbox-cacheable-response": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-expiration": "6.6.0",
+        "workbox-google-analytics": "6.6.0",
+        "workbox-navigation-preload": "6.6.0",
+        "workbox-precaching": "6.6.0",
+        "workbox-range-requests": "6.6.0",
+        "workbox-recipes": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0",
+        "workbox-streams": "6.6.0",
+        "workbox-sw": "6.6.0",
+        "workbox-window": "6.6.0"
       },
       "dependencies": {
         "@apideck/better-ajv-errors": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.2.tgz",
-          "integrity": "sha512-JdEazx7qiVqTBzzBl5rolRwl5cmhihjfIcpqRzIZjtT6b18liVmDn/VlWpqW4C/qP2hrFFMLRV1wlex8ZVBPTg==",
+          "version": "0.3.6",
+          "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
+          "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
           "requires": {
             "json-schema": "^0.4.0",
             "jsonpointer": "^5.0.0",
@@ -26253,9 +34576,9 @@
           }
         },
         "ajv": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -26279,15 +34602,6 @@
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
         },
-        "jsonfile": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-          "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^2.0.0"
-          }
-        },
         "source-map": {
           "version": "0.8.0-beta.0",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
@@ -26299,16 +34613,11 @@
         "tr46": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-          "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+          "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
           "requires": {
             "punycode": "^2.1.0"
           }
         },
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
-        },
         "webidl-conversions": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -26327,120 +34636,124 @@
       }
     },
     "workbox-cacheable-response": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.4.2.tgz",
-      "integrity": "sha512-9FE1W/cKffk1AJzImxgEN0ceWpyz1tqNjZVtA3/LAvYL3AC5SbIkhc7ZCO82WmO9IjTfu8Vut2X/C7ViMSF7TA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.6.0.tgz",
+      "integrity": "sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==",
       "requires": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-core": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.4.2.tgz",
-      "integrity": "sha512-1U6cdEYPcajRXiboSlpJx6U7TvhIKbxRRerfepAJu2hniKwJ3DHILjpU/zx3yvzSBCWcNJDoFalf7Vgd7ey/rw=="
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz",
+      "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ=="
     },
     "workbox-expiration": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.4.2.tgz",
-      "integrity": "sha512-0hbpBj0tDnW+DZOUmwZqntB/8xrXOgO34i7s00Si/VlFJvvpRKg1leXdHHU8ykoSBd6+F2KDcMP3swoCi5guLw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.6.0.tgz",
+      "integrity": "sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==",
       "requires": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.4.2"
+        "idb": "^7.0.1",
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-google-analytics": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.4.2.tgz",
-      "integrity": "sha512-u+gxs3jXovPb1oul4CTBOb+T9fS1oZG+ZE6AzS7l40vnyfJV79DaLBvlpEZfXGv3CjMdV1sT/ltdOrKzo7HcGw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz",
+      "integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==",
       "requires": {
-        "workbox-background-sync": "6.4.2",
-        "workbox-core": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2"
+        "workbox-background-sync": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
       }
     },
     "workbox-navigation-preload": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.4.2.tgz",
-      "integrity": "sha512-viyejlCtlKsbJCBHwhSBbWc57MwPXvUrc8P7d+87AxBGPU+JuWkT6nvBANgVgFz6FUhCvRC8aYt+B1helo166g==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.6.0.tgz",
+      "integrity": "sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==",
       "requires": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-precaching": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.4.2.tgz",
-      "integrity": "sha512-CZ6uwFN/2wb4noHVlALL7UqPFbLfez/9S2GAzGAb0Sk876ul9ukRKPJJ6gtsxfE2HSTwqwuyNVa6xWyeyJ1XSA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.6.0.tgz",
+      "integrity": "sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==",
       "requires": {
-        "workbox-core": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2"
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
       }
     },
     "workbox-range-requests": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.4.2.tgz",
-      "integrity": "sha512-SowF3z69hr3Po/w7+xarWfzxJX/3Fo0uSG72Zg4g5FWWnHpq2zPvgbWerBZIa81zpJVUdYpMa3akJJsv+LaO1Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.6.0.tgz",
+      "integrity": "sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==",
       "requires": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-recipes": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.4.2.tgz",
-      "integrity": "sha512-/oVxlZFpAjFVbY+3PoGEXe8qyvtmqMrTdWhbOfbwokNFtUZ/JCtanDKgwDv9x3AebqGAoJRvQNSru0F4nG+gWA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.6.0.tgz",
+      "integrity": "sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==",
       "requires": {
-        "workbox-cacheable-response": "6.4.2",
-        "workbox-core": "6.4.2",
-        "workbox-expiration": "6.4.2",
-        "workbox-precaching": "6.4.2",
-        "workbox-routing": "6.4.2",
-        "workbox-strategies": "6.4.2"
+        "workbox-cacheable-response": "6.6.0",
+        "workbox-core": "6.6.0",
+        "workbox-expiration": "6.6.0",
+        "workbox-precaching": "6.6.0",
+        "workbox-routing": "6.6.0",
+        "workbox-strategies": "6.6.0"
       }
     },
     "workbox-routing": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.4.2.tgz",
-      "integrity": "sha512-0ss/n9PAcHjTy4Ad7l2puuod4WtsnRYu9BrmHcu6Dk4PgWeJo1t5VnGufPxNtcuyPGQ3OdnMdlmhMJ57sSrrSw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz",
+      "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==",
       "requires": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-strategies": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.4.2.tgz",
-      "integrity": "sha512-YXh9E9dZGEO1EiPC3jPe2CbztO5WT8Ruj8wiYZM56XqEJp5YlGTtqRjghV+JovWOqkWdR+amJpV31KPWQUvn1Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz",
+      "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==",
       "requires": {
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "workbox-streams": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.4.2.tgz",
-      "integrity": "sha512-ROEGlZHGVEgpa5bOZefiJEVsi5PsFjJG9Xd+wnDbApsCO9xq9rYFopF+IRq9tChyYzhBnyk2hJxbQVWphz3sog==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.6.0.tgz",
+      "integrity": "sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==",
       "requires": {
-        "workbox-core": "6.4.2",
-        "workbox-routing": "6.4.2"
+        "workbox-core": "6.6.0",
+        "workbox-routing": "6.6.0"
       }
     },
     "workbox-sw": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.4.2.tgz",
-      "integrity": "sha512-A2qdu9TLktfIM5NE/8+yYwfWu+JgDaCkbo5ikrky2c7r9v2X6DcJ+zSLphNHHLwM/0eVk5XVf1mC5HGhYpMhhg=="
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.6.0.tgz",
+      "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ=="
     },
     "workbox-webpack-plugin": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.4.2.tgz",
-      "integrity": "sha512-CiEwM6kaJRkx1cP5xHksn13abTzUqMHiMMlp5Eh/v4wRcedgDTyv6Uo8+Hg9MurRbHDosO5suaPyF9uwVr4/CQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.0.tgz",
+      "integrity": "sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==",
       "requires": {
         "fast-json-stable-stringify": "^2.1.0",
         "pretty-bytes": "^5.4.1",
-        "source-map-url": "^0.4.0",
         "upath": "^1.2.0",
         "webpack-sources": "^1.4.3",
-        "workbox-build": "6.4.2"
+        "workbox-build": "6.6.0"
       },
       "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
         "webpack-sources": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
@@ -26453,12 +34766,12 @@
       }
     },
     "workbox-window": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.4.2.tgz",
-      "integrity": "sha512-KVyRKmrJg7iB+uym/B/CnEUEFG9CvnTU1Bq5xpXHbtgD9l+ShDekSl1wYpqw/O0JfeeQVOFb8CiNfvnwWwqnWQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.6.0.tgz",
+      "integrity": "sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==",
       "requires": {
         "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.4.2"
+        "workbox-core": "6.6.0"
       }
     },
     "wrap-ansi": {
@@ -26474,7 +34787,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "write-file-atomic": {
       "version": "3.0.3",
@@ -26488,9 +34801,9 @@
       }
     },
     "ws": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
-      "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
       "requires": {}
     },
     "xml-name-validator": {
@@ -26503,20 +34816,15 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-    },
     "y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "yaml": {
       "version": "1.10.2",
@@ -26524,23 +34832,29 @@
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     },
     "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
+        "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "yargs-parser": "^21.1.1"
       }
     },
     "yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "yocto-queue": {
       "version": "0.1.0",
diff --git a/docs/gremlint/package.json b/docs/gremlint/package.json
index eadc75e..220e1e4 100644
--- a/docs/gremlint/package.json
+++ b/docs/gremlint/package.json
@@ -5,15 +5,15 @@
   "private": true,
   "dependencies": {
     "customize-cra": "^1.0.0",
-    "gremlint": "^3.5.2",
+    "gremlint": "^3.7.0",
     "react": "^17.0.2",
-    "react-app-rewired": "^2.1.11",
+    "react-app-rewired": "^2.2.1",
     "react-dom": "^17.0.2",
-    "react-scripts": "^5.0.0",
+    "react-scripts": "^5.0.1",
     "sharp-router": "^4.1.5",
-    "styled-components": "^5.3.3",
+    "styled-components": "^6.1.0",
     "typescript": "^4.7.3",
-    "web-vitals": "^2.1.3"
+    "web-vitals": "^3.5.0"
   },
   "scripts": {
     "predeploy": "npm run build",
@@ -44,17 +44,20 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.1",
-    "@testing-library/react": "^12.1.2",
-    "@testing-library/user-event": "^13.5.0",
-    "@types/jest": "^27.5.0",
-    "@types/node": "^17.0.8",
+    "@testing-library/jest-dom": "^6.1.0",
+    "@testing-library/react": "^12.1.5",
+    "@testing-library/user-event": "^14.5.1",
+    "@types/jest": "^29.5.4",
+    "@types/node": "^20.8.7",
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
-    "@types/styled-components": "^5.1.20",
-    "gh-pages": "^3.1.0",
-    "prettier": "^2.7.0",
+    "@types/styled-components": "^5.1.26",
+    "gh-pages": "^6.0.0",
+    "prettier": "^3.0.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
+  },
+  "engines": {
+    "node": "18"
   }
 }
diff --git a/docs/gremlint/src/components/Footer.tsx b/docs/gremlint/src/components/Footer.tsx
index 20207dc..4983de7 100644
--- a/docs/gremlint/src/components/Footer.tsx
+++ b/docs/gremlint/src/components/Footer.tsx
@@ -36,7 +36,7 @@
   <CenteredContainer>
     <FooterContent>
       <p>Gremlint version: {gremlintVersion}</p>
-      <p>Copyright © 2015-2022 The Apache Software Foundation.</p>
+      <p>Copyright © 2015-2023 The Apache Software Foundation.</p>
     </FooterContent>
   </CenteredContainer>
 );
diff --git a/docs/original/README b/docs/original/README
new file mode 100644
index 0000000..711beb5
--- /dev/null
+++ b/docs/original/README
@@ -0,0 +1 @@
+This directory holds original sized images that may have been re-sized for the website or other purposes.
\ No newline at end of file
diff --git a/docs/original/TinkerpopFuture-01-Home.png b/docs/original/TinkerpopFuture-01-Home.png
new file mode 100644
index 0000000..a7c719b
--- /dev/null
+++ b/docs/original/TinkerpopFuture-01-Home.png
Binary files differ
diff --git a/docs/original/TinkerpopFuture-02-Gremlin.png b/docs/original/TinkerpopFuture-02-Gremlin.png
new file mode 100644
index 0000000..c96fb99
--- /dev/null
+++ b/docs/original/TinkerpopFuture-02-Gremlin.png
Binary files differ
diff --git a/docs/original/TinkerpopFuture-03-Downloads.png b/docs/original/TinkerpopFuture-03-Downloads.png
new file mode 100644
index 0000000..5c1b6fd
--- /dev/null
+++ b/docs/original/TinkerpopFuture-03-Downloads.png
Binary files differ
diff --git a/docs/original/TinkerpopFuture-04-Providers.png b/docs/original/TinkerpopFuture-04-Providers.png
new file mode 100644
index 0000000..661373c
--- /dev/null
+++ b/docs/original/TinkerpopFuture-04-Providers.png
Binary files differ
diff --git a/docs/original/TinkerpopFuture-05-Community.png b/docs/original/TinkerpopFuture-05-Community.png
new file mode 100644
index 0000000..29d736c
--- /dev/null
+++ b/docs/original/TinkerpopFuture-05-Community.png
Binary files differ
diff --git a/docs/original/TinkerpopFuture-06-UseCases.png b/docs/original/TinkerpopFuture-06-UseCases.png
new file mode 100644
index 0000000..388c260
--- /dev/null
+++ b/docs/original/TinkerpopFuture-06-UseCases.png
Binary files differ
diff --git a/docs/original/ai/blueprints-character-1.ai b/docs/original/ai/blueprints-character-1.ai
new file mode 100644
index 0000000..89cc1e9
--- /dev/null
+++ b/docs/original/ai/blueprints-character-1.ai
Binary files differ
diff --git a/docs/original/ai/blueprints-character-2.ai b/docs/original/ai/blueprints-character-2.ai
new file mode 100644
index 0000000..dfc7c71
--- /dev/null
+++ b/docs/original/ai/blueprints-character-2.ai
Binary files differ
diff --git a/docs/original/ai/blueprints-character-3.ai b/docs/original/ai/blueprints-character-3.ai
new file mode 100644
index 0000000..21cbc7f
--- /dev/null
+++ b/docs/original/ai/blueprints-character-3.ai
Binary files differ
diff --git a/docs/original/ai/frames-character-1.ai b/docs/original/ai/frames-character-1.ai
new file mode 100644
index 0000000..cc4c831
--- /dev/null
+++ b/docs/original/ai/frames-character-1.ai
Binary files differ
diff --git a/docs/original/ai/frames-character-2.ai b/docs/original/ai/frames-character-2.ai
new file mode 100644
index 0000000..ce14786
--- /dev/null
+++ b/docs/original/ai/frames-character-2.ai
Binary files differ
diff --git a/docs/original/ai/frames-character-3.ai b/docs/original/ai/frames-character-3.ai
new file mode 100644
index 0000000..0c3eecd
--- /dev/null
+++ b/docs/original/ai/frames-character-3.ai
Binary files differ
diff --git a/docs/original/ai/furnace-character-1.ai b/docs/original/ai/furnace-character-1.ai
new file mode 100644
index 0000000..a091b5c
--- /dev/null
+++ b/docs/original/ai/furnace-character-1.ai
Binary files differ
diff --git a/docs/original/ai/furnace-character-2.ai b/docs/original/ai/furnace-character-2.ai
new file mode 100644
index 0000000..ebcfc20
--- /dev/null
+++ b/docs/original/ai/furnace-character-2.ai
Binary files differ
diff --git a/docs/original/ai/furnace-character-3.ai b/docs/original/ai/furnace-character-3.ai
new file mode 100644
index 0000000..e65c125
--- /dev/null
+++ b/docs/original/ai/furnace-character-3.ai
Binary files differ
diff --git a/docs/original/ai/gremlin-character-1.ai b/docs/original/ai/gremlin-character-1.ai
new file mode 100644
index 0000000..c7492b1
--- /dev/null
+++ b/docs/original/ai/gremlin-character-1.ai
Binary files differ
diff --git a/docs/original/ai/gremlin-character-2.ai b/docs/original/ai/gremlin-character-2.ai
new file mode 100644
index 0000000..0311bd9
--- /dev/null
+++ b/docs/original/ai/gremlin-character-2.ai
Binary files differ
diff --git a/docs/original/ai/pipes-character-1.ai b/docs/original/ai/pipes-character-1.ai
new file mode 100644
index 0000000..7d4ea10
--- /dev/null
+++ b/docs/original/ai/pipes-character-1.ai
Binary files differ
diff --git a/docs/original/ai/pipes-character-2.ai b/docs/original/ai/pipes-character-2.ai
new file mode 100644
index 0000000..a8eb41d
--- /dev/null
+++ b/docs/original/ai/pipes-character-2.ai
Binary files differ
diff --git a/docs/original/ai/pipes-character-3.ai b/docs/original/ai/pipes-character-3.ai
new file mode 100644
index 0000000..9234c8d
--- /dev/null
+++ b/docs/original/ai/pipes-character-3.ai
Binary files differ
diff --git a/docs/original/ai/rexster-character-1.ai b/docs/original/ai/rexster-character-1.ai
new file mode 100644
index 0000000..853732c
--- /dev/null
+++ b/docs/original/ai/rexster-character-1.ai
Binary files differ
diff --git a/docs/original/ai/rexster-character-2.ai b/docs/original/ai/rexster-character-2.ai
new file mode 100644
index 0000000..289cb79
--- /dev/null
+++ b/docs/original/ai/rexster-character-2.ai
Binary files differ
diff --git a/docs/original/ai/rexster-character-3.ai b/docs/original/ai/rexster-character-3.ai
new file mode 100644
index 0000000..44615e4
--- /dev/null
+++ b/docs/original/ai/rexster-character-3.ai
Binary files differ
diff --git a/docs/original/gremlin-twitch.png b/docs/original/gremlin-twitch.png
new file mode 100644
index 0000000..ceaa844
--- /dev/null
+++ b/docs/original/gremlin-twitch.png
Binary files differ
diff --git a/docs/original/twitch-channel-rules.png b/docs/original/twitch-channel-rules.png
new file mode 100644
index 0000000..dc281ca
--- /dev/null
+++ b/docs/original/twitch-channel-rules.png
Binary files differ
diff --git a/docs/site/home/benefits-use-cases.html b/docs/site/home/benefits-use-cases.html
index 7f617c9..9faf1ef 100644
--- a/docs/site/home/benefits-use-cases.html
+++ b/docs/site/home/benefits-use-cases.html
@@ -20,21 +20,32 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link href="img/favicon.png" rel="shortcut icon"/>
-    <title>Apache TinkerPop</title>
+    <title>Apache TinkerPop: Benefits and Use Cases</title>
     <meta name="description" content="">
     <meta name="keywords" content="">
     <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"
-          integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+    <link href="css/font-awesome.css" rel="stylesheet"/>
     <link href="css/custome.css" rel="stylesheet">
     <link href="css/responsive.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.css"
-          integrity="sha512-K2J6Yt6ElUYEMPcTr0wm555AAyiqkgYiUgPIW18FT88/aYSNDk0EvGjsln/TEu3ee/jaHf0xoXzFppSbBtUXbQ=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Raleway:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <link href="css/animate.css" rel="stylesheet"/>
+    <link href="css/fonts.css" rel="stylesheet">
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* We explicitly disable cookie tracking to avoid privacy issues */
+        _paq.push(['disableCookies']);
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function() {
+            var u="https://analytics.apache.org/";
+            _paq.push(['setTrackerUrl', u+'matomo.php']);
+            _paq.push(['setSiteId', '27']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
 </head>
 <body>
 <!-- header -->
@@ -58,6 +69,21 @@
                         <li class="nav-item">
                             <a class="nav-link" href="download.html">Download</a>
                         </li>
+
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Tools
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                                <li><a class="dropdown-item" href="providers.html">Graph Systems</a></li>
+                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a class="dropdown-item" href="https://gremlify.com/">Gremlify: Try Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://tinkerpop.apache.org/gremlint">Gremlint: Lint Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://www.gremlator.com/">Gremlator: Translate Gremlin</a></li>
+                            </ul>
+                        </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -80,6 +106,7 @@
                             </ul>
 
                         </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -109,48 +136,31 @@
 
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button"
-                               data-bs-toggle="dropdown" aria-expanded="false">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                                 Community
                             </a>
                             <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users">User
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org">Developer
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item" href="https://discord.gg/ndMpKZcBEE" target="_blank"><img
-                                        src="img/discord_logo.png" class="nav-icon">Join us on Discord</a></li>
-                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/">Issue
-                                    Tracker</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a>
-                                </li>
-                                <li><a class="dropdown-item" href="providers.html">Data System Support</a></li>
-                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a>
-                                </li>
-                                <li>
-                                    <hr class="dropdown-divider">
-                                </li>
-                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img
-                                        src="img/github-logo.png" class="nav-icon">GitHub</a></li>
-                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img
-                                        src="img/twitter-logo.png" class="nav-icon">Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon"/>Discord</a></li>
+                                <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon"/>Answer Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon"/>Stack Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon"/>User Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon"/>Developer Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon"/>Issue Tracker</a></li>
+                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon"/>GitHub</a></li>
+                                <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon"/>Twitch</a></li>
+                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon"/>Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon"/>YouTube</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
                             </ul>
-
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="https://tinkerpop.apache.org/gremlint/">Gremlint</a>
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button"
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown5" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
                                 Apache Software
                             </a>
-                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown5">
                                 <li><a class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
                                 <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
                                 <li><a class="dropdown-item"
@@ -314,9 +324,9 @@
         <div class="row d-flex justify-content-center">
             <div class="col-md-8 col-lg-6">
                 <div class="ju-box">
-                    <h2 class="ft-40 text-blue bold">Join Us on</h2>
-                    <p class="bold">Join us on our Discord Chat</p>
-                    <a href="https://discord.gg/ndMpKZcBEE"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+                    <h2 class="ft-40 text-blue bold">Join Us</h2>
+                    <p class="bold">Join us on our Discord Server</p>
+                    <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
                 </div>
             </div>
         </div>
@@ -330,15 +340,13 @@
             <div class="row">
                 <div class="col-md-4">
                     <div class="bold ft-25">Apache TinkerPop™</div>
-                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases
-                        (OLTP) and graph analytic systems (OLAP).</p>
+                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
                     <ul class="list-unstyled list-inline hover-op-low">
-                        <li class="list-inline-item"><a href="https://discord.gg/ndMpKZcBEE"><img
-                                src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img
-                                src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img
-                                src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
                     </ul>
                 </div>
                 <div class="col-md-4 ft-links">
@@ -349,6 +357,7 @@
                                 <li><a href="index.html">Home</a></li>
                                 <li><a href="download.html">Downloads</a></li>
                                 <li><a href="https://tinkerpop.apache.org/docs/current">Documentation</a></li>
+                                <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html" target="_blank">Privacy Policy</a></li>
                             </ul>
                         </div>
                         <div class="col-lg-6">
@@ -373,7 +382,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-12">
-                    Copyright © 2015-2022 The Apache Software Foundation
+                    Copyright © 2015-2023 The Apache Software Foundation
                 </div>
             </div>
         </div>
@@ -381,9 +390,7 @@
 </footer>
 <script src="js/jquery-1.11.1.js"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js"
-        integrity="sha512-Eak/29OTpb36LLo2r47IpVzPBLXnAMPAVypbSZiZ4Qkf8p/7S/XRG5xp7OKWPPYfJT6metI+IORkR5G8F900+g=="
-        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="js/wow.min.js"></script>
 <script src="js/my.js"></script>
 </body>
 </html>
diff --git a/docs/site/home/community.html b/docs/site/home/community.html
index 890fc2f..1fdf1ee 100644
--- a/docs/site/home/community.html
+++ b/docs/site/home/community.html
@@ -19,22 +19,33 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link href="img/favicon.png" rel="shortcut icon"/>
-    <title>Apache TinkerPop</title>
+    <title>Apache TinkerPop: Community</title>
     <meta name="description" content="">
     <meta name="keywords" content="">
     <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"
-          integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+    <link href="css/font-awesome.css" rel="stylesheet"/>
     <link href="css/custome.css" rel="stylesheet">
     <link href="css/responsive.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.css"
-          integrity="sha512-K2J6Yt6ElUYEMPcTr0wm555AAyiqkgYiUgPIW18FT88/aYSNDk0EvGjsln/TEu3ee/jaHf0xoXzFppSbBtUXbQ=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+    <link href="css/animate.css" rel="stylesheet"/>
+    <link href="css/fonts.css" rel="stylesheet">
     <link href="css/prism.css" rel="stylesheet">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Raleway:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* We explicitly disable cookie tracking to avoid privacy issues */
+        _paq.push(['disableCookies']);
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function() {
+            var u="https://analytics.apache.org/";
+            _paq.push(['setTrackerUrl', u+'matomo.php']);
+            _paq.push(['setSiteId', '27']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
 </head>
 <body>
 <!-- header -->
@@ -58,6 +69,21 @@
                         <li class="nav-item">
                             <a class="nav-link" href="download.html">Download</a>
                         </li>
+
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Tools
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                                <li><a class="dropdown-item" href="providers.html">Graph Systems</a></li>
+                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a class="dropdown-item" href="https://gremlify.com/">Gremlify: Try Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://tinkerpop.apache.org/gremlint">Gremlint: Lint Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://www.gremlator.com/">Gremlator: Translate Gremlin</a></li>
+                            </ul>
+                        </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -80,6 +106,7 @@
                             </ul>
 
                         </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -109,48 +136,31 @@
 
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button"
-                               data-bs-toggle="dropdown" aria-expanded="false">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                                 Community
                             </a>
                             <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users">User
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org">Developer
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item" href="https://discord.gg/ndMpKZcBEE" target="_blank"><img
-                                        src="img/discord_logo.png" class="nav-icon">Join us on Discord</a></li>
-                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/">Issue
-                                    Tracker</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a>
-                                </li>
-                                <li><a class="dropdown-item" href="providers.html">Data System Support</a></li>
-                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a>
-                                </li>
-                                <li>
-                                    <hr class="dropdown-divider">
-                                </li>
-                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img
-                                        src="img/github-logo.png" class="nav-icon">GitHub</a></li>
-                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img
-                                        src="img/twitter-logo.png" class="nav-icon">Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon"/>Discord</a></li>
+                                <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon"/>Answer Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon"/>Stack Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon"/>User Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon"/>Developer Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon"/>Issue Tracker</a></li>
+                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon"/>GitHub</a></li>
+                                <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon"/>Twitch</a></li>
+                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon"/>Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon"/>YouTube</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
                             </ul>
-
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="https://tinkerpop.apache.org/gremlint/">Gremlint</a>
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button"
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown5" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
                                 Apache Software
                             </a>
-                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown5">
                                 <li><a class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
                                 <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
                                 <li><a class="dropdown-item"
@@ -237,8 +247,8 @@
 
 
                     <!-- clojure -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingOne">
+                    <div class="accordion-item" id="lang-clojure">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
                                 <img src="img/community/clojure.png" class="img-fluid me-3" alt="img">Clojure
@@ -271,8 +281,8 @@
                     </div>
 
                     <!-- elixer -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="headingTwo">
+                    <div class="accordion-item" id="lang-elixer">
+                        <h2 class="accordion-header" >
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
                                 <img src="img/community/elixer.png" class="img-fluid me-3" alt="img">Elixer
@@ -302,8 +312,8 @@
                     </div>
 
                     <!-- go -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading3">
+                    <div class="accordion-item" id="lang-go">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse3" aria-expanded="false" aria-controls="collapse3">
                                 <img src="img/community/go.png" class="img-fluid me-3" alt="img">Go
@@ -338,7 +348,7 @@
                                             </div>
                                             <div class="col-md-12 mb-4 mb-lg-0 col-lg-6 text-center">
                                                 <div class="code-box">
-                                                    <code class="language-go-module">COMING SOON</code>
+                                                    <code class="language-go-module">go get github.com/apache/tinkerpop/gremlin-go/v3&#64;v3.7.0</code>
                                                 </div>
                                                 <p class="medium black">Go Module</p>
                                             </div>
@@ -347,7 +357,7 @@
                                   </div>
 
                                   <div class="mt-4 text-center text-blue ft-17">
-                                      <a href="https://github.com/apache/tinkerpop/blob/master/gremlin-go/README.md"
+                                      <a href="https://tinkerpop.apache.org/docs/current/reference/#gremlin-go"
                                          target="_blank"><u>Learn More</u></a>
                                   </div>
 
@@ -375,8 +385,8 @@
                     </div>
 
                     <!-- groovy -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading4">
+                    <div class="accordion-item" id="lang-groovy">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse4" aria-expanded="false" aria-controls="collapse4">
                                 <img src="img/community/groovy.png" class="img-fluid me-3" alt="img">Groovy
@@ -410,7 +420,7 @@
                                             <div class="col-md-12 mb-4 mb-lg-0 col-lg-6 text-center">
                                                 <div class="code-box">
                                                     <code class="language-groovy">implementation
-                                                        'org.apache.tinkerpop:gremlin-groovy:3.6.0'</code>
+                                                        'org.apache.tinkerpop:gremlin-groovy:3.7.0'</code>
                                                 </div>
                                                 <p class="medium black">Gradle</p>
                                             </div>
@@ -428,8 +438,8 @@
                     </div>
 
                     <!-- haskell -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading5">
+                    <div class="accordion-item" id="lang-haskell">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse5" aria-expanded="false" aria-controls="collapse5">
                                 <img src="img/community/haskell.png" class="img-fluid me-3" alt="img">Haskell
@@ -459,8 +469,8 @@
                     </div>
 
                     <!-- java -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading6">
+                    <div class="accordion-item" id="lang-java">
+                        <h2 class="accordion-header">
                             <button class="accordion-button " type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse6" aria-expanded="true" aria-controls="collapse6">
                                 <img src="img/community/java.png" class="img-fluid me-3" alt="img">Java
@@ -470,7 +480,7 @@
                                         src="img/community/tool.png" class="img-fluid " alt="img"></div>
                             </button>
                         </h2>
-                        <div id="collapse6" class="accordion-collapse collapse show" aria-labelledby="heading6"
+                        <div id="collapse6" class="accordion-collapse collapse" aria-labelledby="heading6"
                              data-bs-parent="#accordionExample">
                             <div class="accordion-body">
                                 <div class="d-flex align-items-start">
@@ -498,7 +508,7 @@
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.tinkerpop&lt;/groupId&gt;
   &lt;artifactId&gt;gremlin-driver&lt;/artifactId&gt;
-  &lt;version&gt;3.6.0&lt;/version&gt;
+  &lt;version&gt;3.7.0&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
                                                 </div>
                                                 <p class="medium black">Maven</p>
@@ -521,7 +531,10 @@
                                         <p class="ft-17 mb-2">
                                             Third-Party Libraries and Tools
                                         </p>
-                                        <p class="ft-17">- <a class="text-blue" href="http://syncleus.com/Ferma/"
+                                        <p class="ft-17">- <a class="text-blue" href="https://github.com/eclipse/jnosql"
+                                                              target="_blank">Eclipse JNoSQL</a>: An Object Graph Mapper (OGM)
+                                            for Apache TinkerPop.
+                                            <br>- <a class="text-blue" href="http://syncleus.com/Ferma/"
                                                               target="_blank">Ferma</a>: An Object Graph Mapper (OGM)
                                             for Apache TinkerPop.
                                             <br>- <a class="text-blue" href="https://github.com/karthicks/gremlin-ogm"
@@ -542,8 +555,8 @@
                     </div>
 
                     <!-- javascript -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading7">
+                    <div class="accordion-item" id="lang-javascript">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse7" aria-expanded="false" aria-controls="collapse7">
                                 <img src="img/community/javascript.png" class="img-fluid me-3" alt="img">Javascript
@@ -612,11 +625,9 @@
                                                               target="_blank">gremlin-orm</a>: Gremlin ORM for Node.js.
                                             <br>- <a class="text-blue"
                                                      href="https://github.com/jbmusso/gremlin-template-string"
-                                                     target="_blank">gremlin-template-string</a>: A Gremlin language
-                                            builder.
-                                            <br>- <a class="text-blue" href="https://github.com/RedSeal-co/ts-tinkerpop"
-                                                     target="_blank">ts-tinkerpop</a>: A helper library for Typescript
-                                            applications via node-java.
+                                                     target="_blank">gremlin-template-string</a>: A Gremlin language builder.
+                                            <br>- <a class="text-blue" href="https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/gremlin"
+                                                     target="_blank">DefinitelyTyped</a>: Gremlin in the repository for high quality TypeScript type definitions.
                                         </p>
                                     </div>
                                 </div>
@@ -626,8 +637,8 @@
                     </div>
 
                     <!-- kotlin -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading8">
+                    <div class="accordion-item" id="lang-kotlin">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse8" aria-expanded="false" aria-controls="collapse8">
                                 <img src="img/community/kotlin.png" class="img-fluid me-3" alt="img">Kotlin
@@ -658,8 +669,8 @@
 
 
                     <!-- c# -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading9">
+                    <div class="accordion-item" id="lang-csharp">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse9" aria-expanded="false" aria-controls="collapse9">
                                 <img src="img/community/c-sharp-logo-png.png" class="img-fluid me-3" alt="img">.NET
@@ -690,7 +701,7 @@
                                             </div>
                                             <div class="col-md-12 mb-4 mb-lg-0 col-lg-6 text-center">
                                                 <div class="code-box">
-                                                    <pre><code class="language-plain">dotnet add package Gremlin.Net --version 3.6.0</code></pre>
+                                                    <pre><code class="language-plain">dotnet add package Gremlin.Net --version 3.7.0</code></pre>
                                                 </div>
                                                 <p class="medium black">NuGet</p>
                                             </div>
@@ -723,8 +734,8 @@
                     </div>
 
                     <!-- python -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading10">
+                    <div class="accordion-item" id="lang-python">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse10" aria-expanded="false" aria-controls="collapse10">
                                 <img src="img/community/python.png" class="img-fluid me-3" alt="img">Python
@@ -809,8 +820,8 @@
                     </div>
 
                     <!-- php -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading11">
+                    <div class="accordion-item" id="lang-php">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse11" aria-expanded="false" aria-controls="collapse11">
                                 <img src="img/community/php.png" class="img-fluid me-3" alt="img">PHP
@@ -840,8 +851,8 @@
                     </div>
 
                     <!-- ruby -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading12">
+                    <div class="accordion-item" id="lang-ruby">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse12" aria-expanded="false" aria-controls="collapse12">
                                 <img src="img/community/ruby.png" class="img-fluid me-3" alt="img">Ruby
@@ -876,8 +887,8 @@
 
 
                     <!-- rust -->
-                    <div class="accordion-item">
-                        <h2 class="accordion-header" id="heading13">
+                    <div class="accordion-item" id="lang-rust">
+                        <h2 class="accordion-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                     data-bs-target="#collapse13" aria-expanded="false" aria-controls="collapse13">
                                 <img src="img/community/rust.png" class="img-fluid me-3" alt="img">Rust
@@ -908,8 +919,8 @@
                 </div>
 
                 <!-- scala -->
-                <div class="accordion-item">
-                    <h2 class="accordion-header" id="heading14">
+                <div class="accordion-item" id="lang-scala">
+                    <h2 class="accordion-header">
                         <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                 data-bs-target="#collapse14" aria-expanded="false" aria-controls="collapse14">
                             <img src="img/community/scala.png" class="img-fluid me-3" alt="img">Scala
@@ -946,11 +957,12 @@
                         </div>
                     </div>
                 </div>
+
                 <h2 class="ft-25 black bold mt-5 mb-4">Docker</h2>
 
                 <!-- docker -->
-                <div class="accordion-item">
-                    <h2 class="accordion-header" id="heading15">
+                <div class="accordion-item" id="docker">
+                    <h2 class="accordion-header">
                         <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                 data-bs-target="#collapse15" aria-expanded="false" aria-controls="collapse15">
                             <img src="img/community/docker.png" class="img-fluid me-3" alt="img">Docker
@@ -996,8 +1008,9 @@
 
                 <!-- compilers/transpilers -->
                 <h2 class="ft-25 black bold mt-5 mb-4">Compilers and Transpilers</h2>
-                <div class="accordion-item">
-                    <h2 class="accordion-header" id="heading16">
+
+                <div class="accordion-item" id="pilers">
+                    <h2 class="accordion-header">
                         <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                 data-bs-target="#collapse16" aria-expanded="false" aria-controls="collapse16">
                             <img src="img/community/compiler.png" class="img-fluid me-3" alt="img">Compilers and
@@ -1038,8 +1051,9 @@
 
                 <!-- poweredby -->
                 <h2 class="ft-25 black bold mt-5 mb-4">Powered By</h2>
-                <div class="accordion-item">
-                    <h2 class="accordion-header" id="heading17">
+
+                <div class="accordion-item" id="powered-by">
+                    <h2 class="accordion-header">
                         <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                                 data-bs-target="#collapse17" aria-expanded="false" aria-controls="collapse17">
                             <img src="img/community/powered-by.png" class="img-fluid me-3" alt="img">Powered By
@@ -1067,6 +1081,9 @@
                                         your graph structure and intuitive results visualization options. It is
                                         compatible with Apache TinkerPop-enabled graph databases over Gremlin Server
                                         protocol.
+                                        <br>- <a class="text-blue" href="https://graph.build/"
+                                                 target="_blank">graph.build</a>: graph.build is a graph data
+                                        production platform and it works with any database that supports Gremlin. 
                                         <br>- <a class="text-blue"
                                                  href="https://bricaud.github.io/graphexp/graphexp.html"
                                                  target="_blank">Graphexp</a>: Interactive visualization of the Gremlin
@@ -1077,6 +1094,9 @@
                                         <br>- <a class="text-blue" href="https://github.com/bechbd/gremlin-ide"
                                                  target="_blank">gremlin-ide</a>: An IDE for Apache TinkerPop-enabled
                                         databases using React and Electron.
+                                        <br>- <a class="text-blue" href="https://www.gremlator.com/"
+                                                 target="_blank">Gremlator</a>: A helpful tool that translates Gremlin
+                                        written in one programming language to the format of another.
                                         <br>- <a class="text-blue" href="https://gremlify.com/"
                                                  target="_blank">gremlify</a>: A Gremlin workspace for queries and
                                         visualization.
@@ -1102,11 +1122,7 @@
                                         any TinkerPop-enabled graph system. Linkurious provides enterprise-ready
                                         security (authentication, access rights, audit) and flexibility (API,
                                         linkurious.js JS graph visualization library) to help software architects
-                                        successfully deploy graph capabilities within their organizations.
-                                        <br>- <a class="text-blue"
-                                                 href="ttps://customer.precisely.com/s/article/Spectrum-Technology-Platform-Data-Hub-Module"
-                                                 target="_blank">Precisely Spectrum Data Hub Module</a>: Uses Gremlin
-                                        OLTP to query Neo4j-powered master data management based graph database.
+                                        successfully deploy graph capabilities within their organizations.                                        
                                         <br>- <a class="text-blue" href="https://www.stackstate.com/" target="_blank">StackState</a>:
                                         Monitoring and AIOps allowing users to utilize Gremlin for analytical functions.
                                         <br>- <a class="text-blue" href="https://github.com/aws/graph-notebook"
@@ -1137,9 +1153,9 @@
         <div class="row d-flex justify-content-center">
             <div class="col-md-8 col-lg-6">
                 <div class="ju-box">
-                    <h2 class="ft-40 text-blue bold">Join Us on</h2>
-                    <p class="bold">Join us on our Discord Chat</p>
-                    <a href="https://discord.gg/ndMpKZcBEE"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+                    <h2 class="ft-40 text-blue bold">Join Us</h2>
+                    <p class="bold">Join us on our Discord Server</p>
+                    <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
                 </div>
             </div>
         </div>
@@ -1153,15 +1169,13 @@
             <div class="row">
                 <div class="col-md-4">
                     <div class="bold ft-25">Apache TinkerPop™</div>
-                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases
-                        (OLTP) and graph analytic systems (OLAP).</p>
+                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
                     <ul class="list-unstyled list-inline hover-op-low">
-                        <li class="list-inline-item"><a href="https://discord.gg/ndMpKZcBEE"><img
-                                src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img
-                                src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img
-                                src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
                     </ul>
                 </div>
                 <div class="col-md-4 ft-links">
@@ -1172,6 +1186,7 @@
                                 <li><a href="index.html">Home</a></li>
                                 <li><a href="download.html">Downloads</a></li>
                                 <li><a href="https://tinkerpop.apache.org/docs/current">Documentation</a></li>
+                                <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html" target="_blank">Privacy Policy</a></li>
                             </ul>
                         </div>
                         <div class="col-lg-6">
@@ -1196,7 +1211,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-12">
-                    Copyright © 2015-2022 The Apache Software Foundation
+                    Copyright © 2015-2023 The Apache Software Foundation
                 </div>
             </div>
         </div>
@@ -1204,10 +1219,14 @@
 </footer>
 <script src="js/jquery-1.11.1.js"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js"
-        integrity="sha512-Eak/29OTpb36LLo2r47IpVzPBLXnAMPAVypbSZiZ4Qkf8p/7S/XRG5xp7OKWPPYfJT6metI+IORkR5G8F900+g=="
-        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="js/wow.min.js"></script>
 <script src="js/my.js"></script>
 <script src="js/prism.js"></script>
+<script>
+    jQuery(document).ready(function($) {
+        const hash = window.location.hash;
+        if (hash) $(hash + " > h2 > button.accordion-button").click();
+    });
+</script>
 </body>
 </html>
diff --git a/docs/site/home/css/animate.css b/docs/site/home/css/animate.css
new file mode 100644
index 0000000..188e78f
--- /dev/null
+++ b/docs/site/home/css/animate.css
@@ -0,0 +1,3340 @@
+@charset "UTF-8";
+
+/*!
+ * animate.css -http://daneden.me/animate
+ * Version - 3.5.0
+ * Licensed under the MIT license - http://opensource.org/licenses/MIT
+ *
+ * Copyright (c) 2016 Daniel Eden
+ */
+
+.animated {
+  -webkit-animation-duration: 1s;
+  animation-duration: 1s;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+.animated.infinite {
+  -webkit-animation-iteration-count: infinite;
+  animation-iteration-count: infinite;
+}
+
+.animated.hinge {
+  -webkit-animation-duration: 2s;
+  animation-duration: 2s;
+}
+
+.animated.flipOutX,
+.animated.flipOutY,
+.animated.bounceIn,
+.animated.bounceOut {
+  -webkit-animation-duration: .75s;
+  animation-duration: .75s;
+}
+
+@-webkit-keyframes bounce {
+  from, 20%, 53%, 80%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    -webkit-transform: translate3d(0,0,0);
+    transform: translate3d(0,0,0);
+  }
+
+  40%, 43% {
+    -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    -webkit-transform: translate3d(0, -30px, 0);
+    transform: translate3d(0, -30px, 0);
+  }
+
+  70% {
+    -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    -webkit-transform: translate3d(0, -15px, 0);
+    transform: translate3d(0, -15px, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0,-4px,0);
+    transform: translate3d(0,-4px,0);
+  }
+}
+
+@keyframes bounce {
+  from, 20%, 53%, 80%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    -webkit-transform: translate3d(0,0,0);
+    transform: translate3d(0,0,0);
+  }
+
+  40%, 43% {
+    -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    -webkit-transform: translate3d(0, -30px, 0);
+    transform: translate3d(0, -30px, 0);
+  }
+
+  70% {
+    -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+    -webkit-transform: translate3d(0, -15px, 0);
+    transform: translate3d(0, -15px, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0,-4px,0);
+    transform: translate3d(0,-4px,0);
+  }
+}
+
+.bounce {
+  -webkit-animation-name: bounce;
+  animation-name: bounce;
+  -webkit-transform-origin: center bottom;
+  transform-origin: center bottom;
+}
+
+@-webkit-keyframes flash {
+  from, 50%, to {
+    opacity: 1;
+  }
+
+  25%, 75% {
+    opacity: 0;
+  }
+}
+
+@keyframes flash {
+  from, 50%, to {
+    opacity: 1;
+  }
+
+  25%, 75% {
+    opacity: 0;
+  }
+}
+
+.flash {
+  -webkit-animation-name: flash;
+  animation-name: flash;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes pulse {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  50% {
+    -webkit-transform: scale3d(1.05, 1.05, 1.05);
+    transform: scale3d(1.05, 1.05, 1.05);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes pulse {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  50% {
+    -webkit-transform: scale3d(1.05, 1.05, 1.05);
+    transform: scale3d(1.05, 1.05, 1.05);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+.pulse {
+  -webkit-animation-name: pulse;
+  animation-name: pulse;
+}
+
+@-webkit-keyframes rubberBand {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  30% {
+    -webkit-transform: scale3d(1.25, 0.75, 1);
+    transform: scale3d(1.25, 0.75, 1);
+  }
+
+  40% {
+    -webkit-transform: scale3d(0.75, 1.25, 1);
+    transform: scale3d(0.75, 1.25, 1);
+  }
+
+  50% {
+    -webkit-transform: scale3d(1.15, 0.85, 1);
+    transform: scale3d(1.15, 0.85, 1);
+  }
+
+  65% {
+    -webkit-transform: scale3d(.95, 1.05, 1);
+    transform: scale3d(.95, 1.05, 1);
+  }
+
+  75% {
+    -webkit-transform: scale3d(1.05, .95, 1);
+    transform: scale3d(1.05, .95, 1);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes rubberBand {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  30% {
+    -webkit-transform: scale3d(1.25, 0.75, 1);
+    transform: scale3d(1.25, 0.75, 1);
+  }
+
+  40% {
+    -webkit-transform: scale3d(0.75, 1.25, 1);
+    transform: scale3d(0.75, 1.25, 1);
+  }
+
+  50% {
+    -webkit-transform: scale3d(1.15, 0.85, 1);
+    transform: scale3d(1.15, 0.85, 1);
+  }
+
+  65% {
+    -webkit-transform: scale3d(.95, 1.05, 1);
+    transform: scale3d(.95, 1.05, 1);
+  }
+
+  75% {
+    -webkit-transform: scale3d(1.05, .95, 1);
+    transform: scale3d(1.05, .95, 1);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+.rubberBand {
+  -webkit-animation-name: rubberBand;
+  animation-name: rubberBand;
+}
+
+@-webkit-keyframes shake {
+  from, to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  10%, 30%, 50%, 70%, 90% {
+    -webkit-transform: translate3d(-10px, 0, 0);
+    transform: translate3d(-10px, 0, 0);
+  }
+
+  20%, 40%, 60%, 80% {
+    -webkit-transform: translate3d(10px, 0, 0);
+    transform: translate3d(10px, 0, 0);
+  }
+}
+
+@keyframes shake {
+  from, to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  10%, 30%, 50%, 70%, 90% {
+    -webkit-transform: translate3d(-10px, 0, 0);
+    transform: translate3d(-10px, 0, 0);
+  }
+
+  20%, 40%, 60%, 80% {
+    -webkit-transform: translate3d(10px, 0, 0);
+    transform: translate3d(10px, 0, 0);
+  }
+}
+
+.shake {
+  -webkit-animation-name: shake;
+  animation-name: shake;
+}
+
+@-webkit-keyframes headShake {
+  0% {
+    -webkit-transform: translateX(0);
+    transform: translateX(0);
+  }
+
+  6.5% {
+    -webkit-transform: translateX(-6px) rotateY(-9deg);
+    transform: translateX(-6px) rotateY(-9deg);
+  }
+
+  18.5% {
+    -webkit-transform: translateX(5px) rotateY(7deg);
+    transform: translateX(5px) rotateY(7deg);
+  }
+
+  31.5% {
+    -webkit-transform: translateX(-3px) rotateY(-5deg);
+    transform: translateX(-3px) rotateY(-5deg);
+  }
+
+  43.5% {
+    -webkit-transform: translateX(2px) rotateY(3deg);
+    transform: translateX(2px) rotateY(3deg);
+  }
+
+  50% {
+    -webkit-transform: translateX(0);
+    transform: translateX(0);
+  }
+}
+
+@keyframes headShake {
+  0% {
+    -webkit-transform: translateX(0);
+    transform: translateX(0);
+  }
+
+  6.5% {
+    -webkit-transform: translateX(-6px) rotateY(-9deg);
+    transform: translateX(-6px) rotateY(-9deg);
+  }
+
+  18.5% {
+    -webkit-transform: translateX(5px) rotateY(7deg);
+    transform: translateX(5px) rotateY(7deg);
+  }
+
+  31.5% {
+    -webkit-transform: translateX(-3px) rotateY(-5deg);
+    transform: translateX(-3px) rotateY(-5deg);
+  }
+
+  43.5% {
+    -webkit-transform: translateX(2px) rotateY(3deg);
+    transform: translateX(2px) rotateY(3deg);
+  }
+
+  50% {
+    -webkit-transform: translateX(0);
+    transform: translateX(0);
+  }
+}
+
+.headShake {
+  -webkit-animation-timing-function: ease-in-out;
+  animation-timing-function: ease-in-out;
+  -webkit-animation-name: headShake;
+  animation-name: headShake;
+}
+
+@-webkit-keyframes swing {
+  20% {
+    -webkit-transform: rotate3d(0, 0, 1, 15deg);
+    transform: rotate3d(0, 0, 1, 15deg);
+  }
+
+  40% {
+    -webkit-transform: rotate3d(0, 0, 1, -10deg);
+    transform: rotate3d(0, 0, 1, -10deg);
+  }
+
+  60% {
+    -webkit-transform: rotate3d(0, 0, 1, 5deg);
+    transform: rotate3d(0, 0, 1, 5deg);
+  }
+
+  80% {
+    -webkit-transform: rotate3d(0, 0, 1, -5deg);
+    transform: rotate3d(0, 0, 1, -5deg);
+  }
+
+  to {
+    -webkit-transform: rotate3d(0, 0, 1, 0deg);
+    transform: rotate3d(0, 0, 1, 0deg);
+  }
+}
+
+@keyframes swing {
+  20% {
+    -webkit-transform: rotate3d(0, 0, 1, 15deg);
+    transform: rotate3d(0, 0, 1, 15deg);
+  }
+
+  40% {
+    -webkit-transform: rotate3d(0, 0, 1, -10deg);
+    transform: rotate3d(0, 0, 1, -10deg);
+  }
+
+  60% {
+    -webkit-transform: rotate3d(0, 0, 1, 5deg);
+    transform: rotate3d(0, 0, 1, 5deg);
+  }
+
+  80% {
+    -webkit-transform: rotate3d(0, 0, 1, -5deg);
+    transform: rotate3d(0, 0, 1, -5deg);
+  }
+
+  to {
+    -webkit-transform: rotate3d(0, 0, 1, 0deg);
+    transform: rotate3d(0, 0, 1, 0deg);
+  }
+}
+
+.swing {
+  -webkit-transform-origin: top center;
+  transform-origin: top center;
+  -webkit-animation-name: swing;
+  animation-name: swing;
+}
+
+@-webkit-keyframes tada {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  10%, 20% {
+    -webkit-transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg);
+    transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg);
+  }
+
+  30%, 50%, 70%, 90% {
+    -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+    transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+  }
+
+  40%, 60%, 80% {
+    -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+    transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes tada {
+  from {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+
+  10%, 20% {
+    -webkit-transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg);
+    transform: scale3d(.9, .9, .9) rotate3d(0, 0, 1, -3deg);
+  }
+
+  30%, 50%, 70%, 90% {
+    -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+    transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+  }
+
+  40%, 60%, 80% {
+    -webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+    transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+  }
+
+  to {
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+.tada {
+  -webkit-animation-name: tada;
+  animation-name: tada;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes wobble {
+  from {
+    -webkit-transform: none;
+    transform: none;
+  }
+
+  15% {
+    -webkit-transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+    transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+  }
+
+  30% {
+    -webkit-transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+    transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+  }
+
+  45% {
+    -webkit-transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+    transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+  }
+
+  60% {
+    -webkit-transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+    transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+  }
+
+  75% {
+    -webkit-transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+    transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes wobble {
+  from {
+    -webkit-transform: none;
+    transform: none;
+  }
+
+  15% {
+    -webkit-transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+    transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+  }
+
+  30% {
+    -webkit-transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+    transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+  }
+
+  45% {
+    -webkit-transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+    transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+  }
+
+  60% {
+    -webkit-transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+    transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+  }
+
+  75% {
+    -webkit-transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+    transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.wobble {
+  -webkit-animation-name: wobble;
+  animation-name: wobble;
+}
+
+@-webkit-keyframes jello {
+  from, 11.1%, to {
+    -webkit-transform: none;
+    transform: none;
+  }
+
+  22.2% {
+    -webkit-transform: skewX(-12.5deg) skewY(-12.5deg);
+    transform: skewX(-12.5deg) skewY(-12.5deg);
+  }
+
+  33.3% {
+    -webkit-transform: skewX(6.25deg) skewY(6.25deg);
+    transform: skewX(6.25deg) skewY(6.25deg);
+  }
+
+  44.4% {
+    -webkit-transform: skewX(-3.125deg) skewY(-3.125deg);
+    transform: skewX(-3.125deg) skewY(-3.125deg);
+  }
+
+  55.5% {
+    -webkit-transform: skewX(1.5625deg) skewY(1.5625deg);
+    transform: skewX(1.5625deg) skewY(1.5625deg);
+  }
+
+  66.6% {
+    -webkit-transform: skewX(-0.78125deg) skewY(-0.78125deg);
+    transform: skewX(-0.78125deg) skewY(-0.78125deg);
+  }
+
+  77.7% {
+    -webkit-transform: skewX(0.390625deg) skewY(0.390625deg);
+    transform: skewX(0.390625deg) skewY(0.390625deg);
+  }
+
+  88.8% {
+    -webkit-transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
+    transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
+  }
+}
+
+@keyframes jello {
+  from, 11.1%, to {
+    -webkit-transform: none;
+    transform: none;
+  }
+
+  22.2% {
+    -webkit-transform: skewX(-12.5deg) skewY(-12.5deg);
+    transform: skewX(-12.5deg) skewY(-12.5deg);
+  }
+
+  33.3% {
+    -webkit-transform: skewX(6.25deg) skewY(6.25deg);
+    transform: skewX(6.25deg) skewY(6.25deg);
+  }
+
+  44.4% {
+    -webkit-transform: skewX(-3.125deg) skewY(-3.125deg);
+    transform: skewX(-3.125deg) skewY(-3.125deg);
+  }
+
+  55.5% {
+    -webkit-transform: skewX(1.5625deg) skewY(1.5625deg);
+    transform: skewX(1.5625deg) skewY(1.5625deg);
+  }
+
+  66.6% {
+    -webkit-transform: skewX(-0.78125deg) skewY(-0.78125deg);
+    transform: skewX(-0.78125deg) skewY(-0.78125deg);
+  }
+
+  77.7% {
+    -webkit-transform: skewX(0.390625deg) skewY(0.390625deg);
+    transform: skewX(0.390625deg) skewY(0.390625deg);
+  }
+
+  88.8% {
+    -webkit-transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
+    transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
+  }
+}
+
+.jello {
+  -webkit-animation-name: jello;
+  animation-name: jello;
+  -webkit-transform-origin: center;
+  transform-origin: center;
+}
+
+@-webkit-keyframes bounceIn {
+  from, 20%, 40%, 60%, 80%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  0% {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+
+  20% {
+    -webkit-transform: scale3d(1.1, 1.1, 1.1);
+    transform: scale3d(1.1, 1.1, 1.1);
+  }
+
+  40% {
+    -webkit-transform: scale3d(.9, .9, .9);
+    transform: scale3d(.9, .9, .9);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(1.03, 1.03, 1.03);
+    transform: scale3d(1.03, 1.03, 1.03);
+  }
+
+  80% {
+    -webkit-transform: scale3d(.97, .97, .97);
+    transform: scale3d(.97, .97, .97);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes bounceIn {
+  from, 20%, 40%, 60%, 80%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  0% {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+
+  20% {
+    -webkit-transform: scale3d(1.1, 1.1, 1.1);
+    transform: scale3d(1.1, 1.1, 1.1);
+  }
+
+  40% {
+    -webkit-transform: scale3d(.9, .9, .9);
+    transform: scale3d(.9, .9, .9);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(1.03, 1.03, 1.03);
+    transform: scale3d(1.03, 1.03, 1.03);
+  }
+
+  80% {
+    -webkit-transform: scale3d(.97, .97, .97);
+    transform: scale3d(.97, .97, .97);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: scale3d(1, 1, 1);
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+.bounceIn {
+  -webkit-animation-name: bounceIn;
+  animation-name: bounceIn;
+}
+
+@-webkit-keyframes bounceInDown {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  0% {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -3000px, 0);
+    transform: translate3d(0, -3000px, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 25px, 0);
+    transform: translate3d(0, 25px, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(0, -10px, 0);
+    transform: translate3d(0, -10px, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0, 5px, 0);
+    transform: translate3d(0, 5px, 0);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes bounceInDown {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  0% {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -3000px, 0);
+    transform: translate3d(0, -3000px, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 25px, 0);
+    transform: translate3d(0, 25px, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(0, -10px, 0);
+    transform: translate3d(0, -10px, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0, 5px, 0);
+    transform: translate3d(0, 5px, 0);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.bounceInDown {
+  -webkit-animation-name: bounceInDown;
+  animation-name: bounceInDown;
+}
+
+@-webkit-keyframes bounceInLeft {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  0% {
+    opacity: 0;
+    -webkit-transform: translate3d(-3000px, 0, 0);
+    transform: translate3d(-3000px, 0, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(25px, 0, 0);
+    transform: translate3d(25px, 0, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(-10px, 0, 0);
+    transform: translate3d(-10px, 0, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(5px, 0, 0);
+    transform: translate3d(5px, 0, 0);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes bounceInLeft {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  0% {
+    opacity: 0;
+    -webkit-transform: translate3d(-3000px, 0, 0);
+    transform: translate3d(-3000px, 0, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(25px, 0, 0);
+    transform: translate3d(25px, 0, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(-10px, 0, 0);
+    transform: translate3d(-10px, 0, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(5px, 0, 0);
+    transform: translate3d(5px, 0, 0);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.bounceInLeft {
+  -webkit-animation-name: bounceInLeft;
+  animation-name: bounceInLeft;
+}
+
+@-webkit-keyframes bounceInRight {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(3000px, 0, 0);
+    transform: translate3d(3000px, 0, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(-25px, 0, 0);
+    transform: translate3d(-25px, 0, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(10px, 0, 0);
+    transform: translate3d(10px, 0, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(-5px, 0, 0);
+    transform: translate3d(-5px, 0, 0);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes bounceInRight {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(3000px, 0, 0);
+    transform: translate3d(3000px, 0, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(-25px, 0, 0);
+    transform: translate3d(-25px, 0, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(10px, 0, 0);
+    transform: translate3d(10px, 0, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(-5px, 0, 0);
+    transform: translate3d(-5px, 0, 0);
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.bounceInRight {
+  -webkit-animation-name: bounceInRight;
+  animation-name: bounceInRight;
+}
+
+@-webkit-keyframes bounceInUp {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 3000px, 0);
+    transform: translate3d(0, 3000px, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, -20px, 0);
+    transform: translate3d(0, -20px, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(0, 10px, 0);
+    transform: translate3d(0, 10px, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0, -5px, 0);
+    transform: translate3d(0, -5px, 0);
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+@keyframes bounceInUp {
+  from, 60%, 75%, 90%, to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+    animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 3000px, 0);
+    transform: translate3d(0, 3000px, 0);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, -20px, 0);
+    transform: translate3d(0, -20px, 0);
+  }
+
+  75% {
+    -webkit-transform: translate3d(0, 10px, 0);
+    transform: translate3d(0, 10px, 0);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0, -5px, 0);
+    transform: translate3d(0, -5px, 0);
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.bounceInUp {
+  -webkit-animation-name: bounceInUp;
+  animation-name: bounceInUp;
+}
+
+@-webkit-keyframes bounceOut {
+  20% {
+    -webkit-transform: scale3d(.9, .9, .9);
+    transform: scale3d(.9, .9, .9);
+  }
+
+  50%, 55% {
+    opacity: 1;
+    -webkit-transform: scale3d(1.1, 1.1, 1.1);
+    transform: scale3d(1.1, 1.1, 1.1);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+}
+
+@keyframes bounceOut {
+  20% {
+    -webkit-transform: scale3d(.9, .9, .9);
+    transform: scale3d(.9, .9, .9);
+  }
+
+  50%, 55% {
+    opacity: 1;
+    -webkit-transform: scale3d(1.1, 1.1, 1.1);
+    transform: scale3d(1.1, 1.1, 1.1);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+}
+
+.bounceOut {
+  -webkit-animation-name: bounceOut;
+  animation-name: bounceOut;
+}
+
+@-webkit-keyframes bounceOutDown {
+  20% {
+    -webkit-transform: translate3d(0, 10px, 0);
+    transform: translate3d(0, 10px, 0);
+  }
+
+  40%, 45% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, -20px, 0);
+    transform: translate3d(0, -20px, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 2000px, 0);
+    transform: translate3d(0, 2000px, 0);
+  }
+}
+
+@keyframes bounceOutDown {
+  20% {
+    -webkit-transform: translate3d(0, 10px, 0);
+    transform: translate3d(0, 10px, 0);
+  }
+
+  40%, 45% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, -20px, 0);
+    transform: translate3d(0, -20px, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 2000px, 0);
+    transform: translate3d(0, 2000px, 0);
+  }
+}
+
+.bounceOutDown {
+  -webkit-animation-name: bounceOutDown;
+  animation-name: bounceOutDown;
+}
+
+@-webkit-keyframes bounceOutLeft {
+  20% {
+    opacity: 1;
+    -webkit-transform: translate3d(20px, 0, 0);
+    transform: translate3d(20px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(-2000px, 0, 0);
+    transform: translate3d(-2000px, 0, 0);
+  }
+}
+
+@keyframes bounceOutLeft {
+  20% {
+    opacity: 1;
+    -webkit-transform: translate3d(20px, 0, 0);
+    transform: translate3d(20px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(-2000px, 0, 0);
+    transform: translate3d(-2000px, 0, 0);
+  }
+}
+
+.bounceOutLeft {
+  -webkit-animation-name: bounceOutLeft;
+  animation-name: bounceOutLeft;
+}
+
+@-webkit-keyframes bounceOutRight {
+  20% {
+    opacity: 1;
+    -webkit-transform: translate3d(-20px, 0, 0);
+    transform: translate3d(-20px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(2000px, 0, 0);
+    transform: translate3d(2000px, 0, 0);
+  }
+}
+
+@keyframes bounceOutRight {
+  20% {
+    opacity: 1;
+    -webkit-transform: translate3d(-20px, 0, 0);
+    transform: translate3d(-20px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(2000px, 0, 0);
+    transform: translate3d(2000px, 0, 0);
+  }
+}
+
+.bounceOutRight {
+  -webkit-animation-name: bounceOutRight;
+  animation-name: bounceOutRight;
+}
+
+@-webkit-keyframes bounceOutUp {
+  20% {
+    -webkit-transform: translate3d(0, -10px, 0);
+    transform: translate3d(0, -10px, 0);
+  }
+
+  40%, 45% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 20px, 0);
+    transform: translate3d(0, 20px, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -2000px, 0);
+    transform: translate3d(0, -2000px, 0);
+  }
+}
+
+@keyframes bounceOutUp {
+  20% {
+    -webkit-transform: translate3d(0, -10px, 0);
+    transform: translate3d(0, -10px, 0);
+  }
+
+  40%, 45% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 20px, 0);
+    transform: translate3d(0, 20px, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -2000px, 0);
+    transform: translate3d(0, -2000px, 0);
+  }
+}
+
+.bounceOutUp {
+  -webkit-animation-name: bounceOutUp;
+  animation-name: bounceOutUp;
+}
+
+@-webkit-keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+
+.fadeIn {
+  -webkit-animation-name: fadeIn;
+  animation-name: fadeIn;
+}
+
+@-webkit-keyframes fadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInDown {
+  -webkit-animation-name: fadeInDown;
+  animation-name: fadeInDown;
+}
+
+@-webkit-keyframes fadeInDownBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -2000px, 0);
+    transform: translate3d(0, -2000px, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInDownBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -2000px, 0);
+    transform: translate3d(0, -2000px, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInDownBig {
+  -webkit-animation-name: fadeInDownBig;
+  animation-name: fadeInDownBig;
+}
+
+@-webkit-keyframes fadeInLeft {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInLeft {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInLeft {
+  -webkit-animation-name: fadeInLeft;
+  animation-name: fadeInLeft;
+}
+
+@-webkit-keyframes fadeInLeftBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-2000px, 0, 0);
+    transform: translate3d(-2000px, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInLeftBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-2000px, 0, 0);
+    transform: translate3d(-2000px, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInLeftBig {
+  -webkit-animation-name: fadeInLeftBig;
+  animation-name: fadeInLeftBig;
+}
+
+@-webkit-keyframes fadeInRight {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInRight {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInRight {
+  -webkit-animation-name: fadeInRight;
+  animation-name: fadeInRight;
+}
+
+@-webkit-keyframes fadeInRightBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(2000px, 0, 0);
+    transform: translate3d(2000px, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInRightBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(2000px, 0, 0);
+    transform: translate3d(2000px, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInRightBig {
+  -webkit-animation-name: fadeInRightBig;
+  animation-name: fadeInRightBig;
+}
+
+@-webkit-keyframes fadeInUp {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInUp {
+  -webkit-animation-name: fadeInUp;
+  animation-name: fadeInUp;
+}
+
+@-webkit-keyframes fadeInUpBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 2000px, 0);
+    transform: translate3d(0, 2000px, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes fadeInUpBig {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 2000px, 0);
+    transform: translate3d(0, 2000px, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.fadeInUpBig {
+  -webkit-animation-name: fadeInUpBig;
+  animation-name: fadeInUpBig;
+}
+
+@-webkit-keyframes fadeOut {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes fadeOut {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+  }
+}
+
+.fadeOut {
+  -webkit-animation-name: fadeOut;
+  animation-name: fadeOut;
+}
+
+@-webkit-keyframes fadeOutDown {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+  }
+}
+
+@keyframes fadeOutDown {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+  }
+}
+
+.fadeOutDown {
+  -webkit-animation-name: fadeOutDown;
+  animation-name: fadeOutDown;
+}
+
+@-webkit-keyframes fadeOutDownBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 2000px, 0);
+    transform: translate3d(0, 2000px, 0);
+  }
+}
+
+@keyframes fadeOutDownBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 2000px, 0);
+    transform: translate3d(0, 2000px, 0);
+  }
+}
+
+.fadeOutDownBig {
+  -webkit-animation-name: fadeOutDownBig;
+  animation-name: fadeOutDownBig;
+}
+
+@-webkit-keyframes fadeOutLeft {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+}
+
+@keyframes fadeOutLeft {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+}
+
+.fadeOutLeft {
+  -webkit-animation-name: fadeOutLeft;
+  animation-name: fadeOutLeft;
+}
+
+@-webkit-keyframes fadeOutLeftBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(-2000px, 0, 0);
+    transform: translate3d(-2000px, 0, 0);
+  }
+}
+
+@keyframes fadeOutLeftBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(-2000px, 0, 0);
+    transform: translate3d(-2000px, 0, 0);
+  }
+}
+
+.fadeOutLeftBig {
+  -webkit-animation-name: fadeOutLeftBig;
+  animation-name: fadeOutLeftBig;
+}
+
+@-webkit-keyframes fadeOutRight {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+  }
+}
+
+@keyframes fadeOutRight {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+  }
+}
+
+.fadeOutRight {
+  -webkit-animation-name: fadeOutRight;
+  animation-name: fadeOutRight;
+}
+
+@-webkit-keyframes fadeOutRightBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(2000px, 0, 0);
+    transform: translate3d(2000px, 0, 0);
+  }
+}
+
+@keyframes fadeOutRightBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(2000px, 0, 0);
+    transform: translate3d(2000px, 0, 0);
+  }
+}
+
+.fadeOutRightBig {
+  -webkit-animation-name: fadeOutRightBig;
+  animation-name: fadeOutRightBig;
+}
+
+@-webkit-keyframes fadeOutUp {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+}
+
+@keyframes fadeOutUp {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+}
+
+.fadeOutUp {
+  -webkit-animation-name: fadeOutUp;
+  animation-name: fadeOutUp;
+}
+
+@-webkit-keyframes fadeOutUpBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -2000px, 0);
+    transform: translate3d(0, -2000px, 0);
+  }
+}
+
+@keyframes fadeOutUpBig {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -2000px, 0);
+    transform: translate3d(0, -2000px, 0);
+  }
+}
+
+.fadeOutUpBig {
+  -webkit-animation-name: fadeOutUpBig;
+  animation-name: fadeOutUpBig;
+}
+
+@-webkit-keyframes flip {
+  from {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -360deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -360deg);
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
+  }
+
+  40% {
+    -webkit-transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -190deg);
+    transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -190deg);
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
+  }
+
+  50% {
+    -webkit-transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -170deg);
+    transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -170deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  80% {
+    -webkit-transform: perspective(400px) scale3d(.95, .95, .95);
+    transform: perspective(400px) scale3d(.95, .95, .95);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  to {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+}
+
+@keyframes flip {
+  from {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -360deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -360deg);
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
+  }
+
+  40% {
+    -webkit-transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -190deg);
+    transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -190deg);
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
+  }
+
+  50% {
+    -webkit-transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -170deg);
+    transform: perspective(400px) translate3d(0, 0, 150px) rotate3d(0, 1, 0, -170deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  80% {
+    -webkit-transform: perspective(400px) scale3d(.95, .95, .95);
+    transform: perspective(400px) scale3d(.95, .95, .95);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  to {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+}
+
+.animated.flip {
+  -webkit-backface-visibility: visible;
+  backface-visibility: visible;
+  -webkit-animation-name: flip;
+  animation-name: flip;
+}
+
+@-webkit-keyframes flipInX {
+  from {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+    opacity: 0;
+  }
+
+  40% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  60% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+    opacity: 1;
+  }
+
+  80% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+  }
+
+  to {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+}
+
+@keyframes flipInX {
+  from {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+    opacity: 0;
+  }
+
+  40% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  60% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+    opacity: 1;
+  }
+
+  80% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+  }
+
+  to {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+}
+
+.flipInX {
+  -webkit-backface-visibility: visible !important;
+  backface-visibility: visible !important;
+  -webkit-animation-name: flipInX;
+  animation-name: flipInX;
+}
+
+@-webkit-keyframes flipInY {
+  from {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+    opacity: 0;
+  }
+
+  40% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -20deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -20deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  60% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 10deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, 10deg);
+    opacity: 1;
+  }
+
+  80% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -5deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -5deg);
+  }
+
+  to {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+}
+
+@keyframes flipInY {
+  from {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+    opacity: 0;
+  }
+
+  40% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -20deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -20deg);
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+  }
+
+  60% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 10deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, 10deg);
+    opacity: 1;
+  }
+
+  80% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -5deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -5deg);
+  }
+
+  to {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+}
+
+.flipInY {
+  -webkit-backface-visibility: visible !important;
+  backface-visibility: visible !important;
+  -webkit-animation-name: flipInY;
+  animation-name: flipInY;
+}
+
+@-webkit-keyframes flipOutX {
+  from {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+
+  30% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    opacity: 0;
+  }
+}
+
+@keyframes flipOutX {
+  from {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+
+  30% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    opacity: 0;
+  }
+}
+
+.flipOutX {
+  -webkit-animation-name: flipOutX;
+  animation-name: flipOutX;
+  -webkit-backface-visibility: visible !important;
+  backface-visibility: visible !important;
+}
+
+@-webkit-keyframes flipOutY {
+  from {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+
+  30% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -15deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -15deg);
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    opacity: 0;
+  }
+}
+
+@keyframes flipOutY {
+  from {
+    -webkit-transform: perspective(400px);
+    transform: perspective(400px);
+  }
+
+  30% {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, -15deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, -15deg);
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+    opacity: 0;
+  }
+}
+
+.flipOutY {
+  -webkit-backface-visibility: visible !important;
+  backface-visibility: visible !important;
+  -webkit-animation-name: flipOutY;
+  animation-name: flipOutY;
+}
+
+@-webkit-keyframes lightSpeedIn {
+  from {
+    -webkit-transform: translate3d(100%, 0, 0) skewX(-30deg);
+    transform: translate3d(100%, 0, 0) skewX(-30deg);
+    opacity: 0;
+  }
+
+  60% {
+    -webkit-transform: skewX(20deg);
+    transform: skewX(20deg);
+    opacity: 1;
+  }
+
+  80% {
+    -webkit-transform: skewX(-5deg);
+    transform: skewX(-5deg);
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+@keyframes lightSpeedIn {
+  from {
+    -webkit-transform: translate3d(100%, 0, 0) skewX(-30deg);
+    transform: translate3d(100%, 0, 0) skewX(-30deg);
+    opacity: 0;
+  }
+
+  60% {
+    -webkit-transform: skewX(20deg);
+    transform: skewX(20deg);
+    opacity: 1;
+  }
+
+  80% {
+    -webkit-transform: skewX(-5deg);
+    transform: skewX(-5deg);
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+.lightSpeedIn {
+  -webkit-animation-name: lightSpeedIn;
+  animation-name: lightSpeedIn;
+  -webkit-animation-timing-function: ease-out;
+  animation-timing-function: ease-out;
+}
+
+@-webkit-keyframes lightSpeedOut {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: translate3d(100%, 0, 0) skewX(30deg);
+    transform: translate3d(100%, 0, 0) skewX(30deg);
+    opacity: 0;
+  }
+}
+
+@keyframes lightSpeedOut {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: translate3d(100%, 0, 0) skewX(30deg);
+    transform: translate3d(100%, 0, 0) skewX(30deg);
+    opacity: 0;
+  }
+}
+
+.lightSpeedOut {
+  -webkit-animation-name: lightSpeedOut;
+  animation-name: lightSpeedOut;
+  -webkit-animation-timing-function: ease-in;
+  animation-timing-function: ease-in;
+}
+
+@-webkit-keyframes rotateIn {
+  from {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    -webkit-transform: rotate3d(0, 0, 1, -200deg);
+    transform: rotate3d(0, 0, 1, -200deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+@keyframes rotateIn {
+  from {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    -webkit-transform: rotate3d(0, 0, 1, -200deg);
+    transform: rotate3d(0, 0, 1, -200deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+.rotateIn {
+  -webkit-animation-name: rotateIn;
+  animation-name: rotateIn;
+}
+
+@-webkit-keyframes rotateInDownLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -45deg);
+    transform: rotate3d(0, 0, 1, -45deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+@keyframes rotateInDownLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -45deg);
+    transform: rotate3d(0, 0, 1, -45deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+.rotateInDownLeft {
+  -webkit-animation-name: rotateInDownLeft;
+  animation-name: rotateInDownLeft;
+}
+
+@-webkit-keyframes rotateInDownRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 45deg);
+    transform: rotate3d(0, 0, 1, 45deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+@keyframes rotateInDownRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 45deg);
+    transform: rotate3d(0, 0, 1, 45deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+.rotateInDownRight {
+  -webkit-animation-name: rotateInDownRight;
+  animation-name: rotateInDownRight;
+}
+
+@-webkit-keyframes rotateInUpLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 45deg);
+    transform: rotate3d(0, 0, 1, 45deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+@keyframes rotateInUpLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 45deg);
+    transform: rotate3d(0, 0, 1, 45deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+.rotateInUpLeft {
+  -webkit-animation-name: rotateInUpLeft;
+  animation-name: rotateInUpLeft;
+}
+
+@-webkit-keyframes rotateInUpRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -90deg);
+    transform: rotate3d(0, 0, 1, -90deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+@keyframes rotateInUpRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -90deg);
+    transform: rotate3d(0, 0, 1, -90deg);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: none;
+    transform: none;
+    opacity: 1;
+  }
+}
+
+.rotateInUpRight {
+  -webkit-animation-name: rotateInUpRight;
+  animation-name: rotateInUpRight;
+}
+
+@-webkit-keyframes rotateOut {
+  from {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    -webkit-transform: rotate3d(0, 0, 1, 200deg);
+    transform: rotate3d(0, 0, 1, 200deg);
+    opacity: 0;
+  }
+}
+
+@keyframes rotateOut {
+  from {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: center;
+    transform-origin: center;
+    -webkit-transform: rotate3d(0, 0, 1, 200deg);
+    transform: rotate3d(0, 0, 1, 200deg);
+    opacity: 0;
+  }
+}
+
+.rotateOut {
+  -webkit-animation-name: rotateOut;
+  animation-name: rotateOut;
+}
+
+@-webkit-keyframes rotateOutDownLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 45deg);
+    transform: rotate3d(0, 0, 1, 45deg);
+    opacity: 0;
+  }
+}
+
+@keyframes rotateOutDownLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 45deg);
+    transform: rotate3d(0, 0, 1, 45deg);
+    opacity: 0;
+  }
+}
+
+.rotateOutDownLeft {
+  -webkit-animation-name: rotateOutDownLeft;
+  animation-name: rotateOutDownLeft;
+}
+
+@-webkit-keyframes rotateOutDownRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -45deg);
+    transform: rotate3d(0, 0, 1, -45deg);
+    opacity: 0;
+  }
+}
+
+@keyframes rotateOutDownRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -45deg);
+    transform: rotate3d(0, 0, 1, -45deg);
+    opacity: 0;
+  }
+}
+
+.rotateOutDownRight {
+  -webkit-animation-name: rotateOutDownRight;
+  animation-name: rotateOutDownRight;
+}
+
+@-webkit-keyframes rotateOutUpLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -45deg);
+    transform: rotate3d(0, 0, 1, -45deg);
+    opacity: 0;
+  }
+}
+
+@keyframes rotateOutUpLeft {
+  from {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: left bottom;
+    transform-origin: left bottom;
+    -webkit-transform: rotate3d(0, 0, 1, -45deg);
+    transform: rotate3d(0, 0, 1, -45deg);
+    opacity: 0;
+  }
+}
+
+.rotateOutUpLeft {
+  -webkit-animation-name: rotateOutUpLeft;
+  animation-name: rotateOutUpLeft;
+}
+
+@-webkit-keyframes rotateOutUpRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 90deg);
+    transform: rotate3d(0, 0, 1, 90deg);
+    opacity: 0;
+  }
+}
+
+@keyframes rotateOutUpRight {
+  from {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform-origin: right bottom;
+    transform-origin: right bottom;
+    -webkit-transform: rotate3d(0, 0, 1, 90deg);
+    transform: rotate3d(0, 0, 1, 90deg);
+    opacity: 0;
+  }
+}
+
+.rotateOutUpRight {
+  -webkit-animation-name: rotateOutUpRight;
+  animation-name: rotateOutUpRight;
+}
+
+@-webkit-keyframes hinge {
+  0% {
+    -webkit-transform-origin: top left;
+    transform-origin: top left;
+    -webkit-animation-timing-function: ease-in-out;
+    animation-timing-function: ease-in-out;
+  }
+
+  20%, 60% {
+    -webkit-transform: rotate3d(0, 0, 1, 80deg);
+    transform: rotate3d(0, 0, 1, 80deg);
+    -webkit-transform-origin: top left;
+    transform-origin: top left;
+    -webkit-animation-timing-function: ease-in-out;
+    animation-timing-function: ease-in-out;
+  }
+
+  40%, 80% {
+    -webkit-transform: rotate3d(0, 0, 1, 60deg);
+    transform: rotate3d(0, 0, 1, 60deg);
+    -webkit-transform-origin: top left;
+    transform-origin: top left;
+    -webkit-animation-timing-function: ease-in-out;
+    animation-timing-function: ease-in-out;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 700px, 0);
+    transform: translate3d(0, 700px, 0);
+    opacity: 0;
+  }
+}
+
+@keyframes hinge {
+  0% {
+    -webkit-transform-origin: top left;
+    transform-origin: top left;
+    -webkit-animation-timing-function: ease-in-out;
+    animation-timing-function: ease-in-out;
+  }
+
+  20%, 60% {
+    -webkit-transform: rotate3d(0, 0, 1, 80deg);
+    transform: rotate3d(0, 0, 1, 80deg);
+    -webkit-transform-origin: top left;
+    transform-origin: top left;
+    -webkit-animation-timing-function: ease-in-out;
+    animation-timing-function: ease-in-out;
+  }
+
+  40%, 80% {
+    -webkit-transform: rotate3d(0, 0, 1, 60deg);
+    transform: rotate3d(0, 0, 1, 60deg);
+    -webkit-transform-origin: top left;
+    transform-origin: top left;
+    -webkit-animation-timing-function: ease-in-out;
+    animation-timing-function: ease-in-out;
+    opacity: 1;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 700px, 0);
+    transform: translate3d(0, 700px, 0);
+    opacity: 0;
+  }
+}
+
+.hinge {
+  -webkit-animation-name: hinge;
+  animation-name: hinge;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes rollIn {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg);
+    transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes rollIn {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg);
+    transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+  }
+}
+
+.rollIn {
+  -webkit-animation-name: rollIn;
+  animation-name: rollIn;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes rollOut {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg);
+    transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg);
+  }
+}
+
+@keyframes rollOut {
+  from {
+    opacity: 1;
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg);
+    transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg);
+  }
+}
+
+.rollOut {
+  -webkit-animation-name: rollOut;
+  animation-name: rollOut;
+}
+
+@-webkit-keyframes zoomIn {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+
+  50% {
+    opacity: 1;
+  }
+}
+
+@keyframes zoomIn {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+
+  50% {
+    opacity: 1;
+  }
+}
+
+.zoomIn {
+  -webkit-animation-name: zoomIn;
+  animation-name: zoomIn;
+}
+
+@-webkit-keyframes zoomInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, -1000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, -1000px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+@keyframes zoomInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, -1000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, -1000px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+.zoomInDown {
+  -webkit-animation-name: zoomInDown;
+  animation-name: zoomInDown;
+}
+
+@-webkit-keyframes zoomInLeft {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(-1000px, 0, 0);
+    transform: scale3d(.1, .1, .1) translate3d(-1000px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(10px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(10px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+@keyframes zoomInLeft {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(-1000px, 0, 0);
+    transform: scale3d(.1, .1, .1) translate3d(-1000px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(10px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(10px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+.zoomInLeft {
+  -webkit-animation-name: zoomInLeft;
+  animation-name: zoomInLeft;
+}
+
+@-webkit-keyframes zoomInRight {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(1000px, 0, 0);
+    transform: scale3d(.1, .1, .1) translate3d(1000px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(-10px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(-10px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+@keyframes zoomInRight {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(1000px, 0, 0);
+    transform: scale3d(.1, .1, .1) translate3d(1000px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(-10px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(-10px, 0, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+.zoomInRight {
+  -webkit-animation-name: zoomInRight;
+  animation-name: zoomInRight;
+}
+
+@-webkit-keyframes zoomInUp {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+@keyframes zoomInUp {
+  from {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+.zoomInUp {
+  -webkit-animation-name: zoomInUp;
+  animation-name: zoomInUp;
+}
+
+@-webkit-keyframes zoomOut {
+  from {
+    opacity: 1;
+  }
+
+  50% {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes zoomOut {
+  from {
+    opacity: 1;
+  }
+
+  50% {
+    opacity: 0;
+    -webkit-transform: scale3d(.3, .3, .3);
+    transform: scale3d(.3, .3, .3);
+  }
+
+  to {
+    opacity: 0;
+  }
+}
+
+.zoomOut {
+  -webkit-animation-name: zoomOut;
+  animation-name: zoomOut;
+}
+
+@-webkit-keyframes zoomOutDown {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, 2000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, 2000px, 0);
+    -webkit-transform-origin: center bottom;
+    transform-origin: center bottom;
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+@keyframes zoomOutDown {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, 2000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, 2000px, 0);
+    -webkit-transform-origin: center bottom;
+    transform-origin: center bottom;
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+.zoomOutDown {
+  -webkit-animation-name: zoomOutDown;
+  animation-name: zoomOutDown;
+}
+
+@-webkit-keyframes zoomOutLeft {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(42px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(42px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale(.1) translate3d(-2000px, 0, 0);
+    transform: scale(.1) translate3d(-2000px, 0, 0);
+    -webkit-transform-origin: left center;
+    transform-origin: left center;
+  }
+}
+
+@keyframes zoomOutLeft {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(42px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(42px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale(.1) translate3d(-2000px, 0, 0);
+    transform: scale(.1) translate3d(-2000px, 0, 0);
+    -webkit-transform-origin: left center;
+    transform-origin: left center;
+  }
+}
+
+.zoomOutLeft {
+  -webkit-animation-name: zoomOutLeft;
+  animation-name: zoomOutLeft;
+}
+
+@-webkit-keyframes zoomOutRight {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(-42px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(-42px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale(.1) translate3d(2000px, 0, 0);
+    transform: scale(.1) translate3d(2000px, 0, 0);
+    -webkit-transform-origin: right center;
+    transform-origin: right center;
+  }
+}
+
+@keyframes zoomOutRight {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(-42px, 0, 0);
+    transform: scale3d(.475, .475, .475) translate3d(-42px, 0, 0);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale(.1) translate3d(2000px, 0, 0);
+    transform: scale(.1) translate3d(2000px, 0, 0);
+    -webkit-transform-origin: right center;
+    transform-origin: right center;
+  }
+}
+
+.zoomOutRight {
+  -webkit-animation-name: zoomOutRight;
+  animation-name: zoomOutRight;
+}
+
+@-webkit-keyframes zoomOutUp {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, -2000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, -2000px, 0);
+    -webkit-transform-origin: center bottom;
+    transform-origin: center bottom;
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+@keyframes zoomOutUp {
+  40% {
+    opacity: 1;
+    -webkit-transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    transform: scale3d(.475, .475, .475) translate3d(0, 60px, 0);
+    -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+    animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190);
+  }
+
+  to {
+    opacity: 0;
+    -webkit-transform: scale3d(.1, .1, .1) translate3d(0, -2000px, 0);
+    transform: scale3d(.1, .1, .1) translate3d(0, -2000px, 0);
+    -webkit-transform-origin: center bottom;
+    transform-origin: center bottom;
+    -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+    animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  }
+}
+
+.zoomOutUp {
+  -webkit-animation-name: zoomOutUp;
+  animation-name: zoomOutUp;
+}
+
+@-webkit-keyframes slideInDown {
+  from {
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+@keyframes slideInDown {
+  from {
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.slideInDown {
+  -webkit-animation-name: slideInDown;
+  animation-name: slideInDown;
+}
+
+@-webkit-keyframes slideInLeft {
+  from {
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+@keyframes slideInLeft {
+  from {
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.slideInLeft {
+  -webkit-animation-name: slideInLeft;
+  animation-name: slideInLeft;
+}
+
+@-webkit-keyframes slideInRight {
+  from {
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+@keyframes slideInRight {
+  from {
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.slideInRight {
+  -webkit-animation-name: slideInRight;
+  animation-name: slideInRight;
+}
+
+@-webkit-keyframes slideInUp {
+  from {
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+@keyframes slideInUp {
+  from {
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+    visibility: visible;
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.slideInUp {
+  -webkit-animation-name: slideInUp;
+  animation-name: slideInUp;
+}
+
+@-webkit-keyframes slideOutDown {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+  }
+}
+
+@keyframes slideOutDown {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(0, 100%, 0);
+    transform: translate3d(0, 100%, 0);
+  }
+}
+
+.slideOutDown {
+  -webkit-animation-name: slideOutDown;
+  animation-name: slideOutDown;
+}
+
+@-webkit-keyframes slideOutLeft {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+}
+
+@keyframes slideOutLeft {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+}
+
+.slideOutLeft {
+  -webkit-animation-name: slideOutLeft;
+  animation-name: slideOutLeft;
+}
+
+@-webkit-keyframes slideOutRight {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+  }
+}
+
+@keyframes slideOutRight {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+  }
+}
+
+.slideOutRight {
+  -webkit-animation-name: slideOutRight;
+  animation-name: slideOutRight;
+}
+
+@-webkit-keyframes slideOutUp {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+}
+
+@keyframes slideOutUp {
+  from {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+
+  to {
+    visibility: hidden;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+}
+
+.slideOutUp {
+  -webkit-animation-name: slideOutUp;
+  animation-name: slideOutUp;
+}
diff --git a/docs/site/home/css/custome.css b/docs/site/home/css/custome.css
index 39d9991..15735a4 100644
--- a/docs/site/home/css/custome.css
+++ b/docs/site/home/css/custome.css
@@ -44,6 +44,9 @@
 .text-blue{
     color: #147AA4;
 }
+.text-orange{
+    color: #f08d49;
+}
 .hover-op-low li{
     transition: all 0.2s ease-in-out;
 }
diff --git a/docs/site/home/css/font-awesome.css b/docs/site/home/css/font-awesome.css
new file mode 100644
index 0000000..ee906a8
--- /dev/null
+++ b/docs/site/home/css/font-awesome.css
@@ -0,0 +1,2337 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+/* FONT PATH
+ * -------------------------- */
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+.fa {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+/* makes the font 33% larger relative to the icon container */
+.fa-lg {
+  font-size: 1.33333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
+}
+.fa-2x {
+  font-size: 2em;
+}
+.fa-3x {
+  font-size: 3em;
+}
+.fa-4x {
+  font-size: 4em;
+}
+.fa-5x {
+  font-size: 5em;
+}
+.fa-fw {
+  width: 1.28571429em;
+  text-align: center;
+}
+.fa-ul {
+  padding-left: 0;
+  margin-left: 2.14285714em;
+  list-style-type: none;
+}
+.fa-ul > li {
+  position: relative;
+}
+.fa-li {
+  position: absolute;
+  left: -2.14285714em;
+  width: 2.14285714em;
+  top: 0.14285714em;
+  text-align: center;
+}
+.fa-li.fa-lg {
+  left: -1.85714286em;
+}
+.fa-border {
+  padding: .2em .25em .15em;
+  border: solid 0.08em #eeeeee;
+  border-radius: .1em;
+}
+.fa-pull-left {
+  float: left;
+}
+.fa-pull-right {
+  float: right;
+}
+.fa.fa-pull-left {
+  margin-right: .3em;
+}
+.fa.fa-pull-right {
+  margin-left: .3em;
+}
+/* Deprecated as of 4.4.0 */
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.fa.pull-left {
+  margin-right: .3em;
+}
+.fa.pull-right {
+  margin-left: .3em;
+}
+.fa-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+  animation: fa-spin 2s infinite linear;
+}
+.fa-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+  animation: fa-spin 1s infinite steps(8);
+}
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+.fa-rotate-90 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
+  -webkit-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  transform: rotate(90deg);
+}
+.fa-rotate-180 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
+  -webkit-transform: rotate(180deg);
+  -ms-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
+.fa-rotate-270 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
+  -webkit-transform: rotate(270deg);
+  -ms-transform: rotate(270deg);
+  transform: rotate(270deg);
+}
+.fa-flip-horizontal {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
+  -webkit-transform: scale(-1, 1);
+  -ms-transform: scale(-1, 1);
+  transform: scale(-1, 1);
+}
+.fa-flip-vertical {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+  -webkit-transform: scale(1, -1);
+  -ms-transform: scale(1, -1);
+  transform: scale(1, -1);
+}
+:root .fa-rotate-90,
+:root .fa-rotate-180,
+:root .fa-rotate-270,
+:root .fa-flip-horizontal,
+:root .fa-flip-vertical {
+  filter: none;
+}
+.fa-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.fa-stack-1x {
+  line-height: inherit;
+}
+.fa-stack-2x {
+  font-size: 2em;
+}
+.fa-inverse {
+  color: #ffffff;
+}
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+.fa-glass:before {
+  content: "\f000";
+}
+.fa-music:before {
+  content: "\f001";
+}
+.fa-search:before {
+  content: "\f002";
+}
+.fa-envelope-o:before {
+  content: "\f003";
+}
+.fa-heart:before {
+  content: "\f004";
+}
+.fa-star:before {
+  content: "\f005";
+}
+.fa-star-o:before {
+  content: "\f006";
+}
+.fa-user:before {
+  content: "\f007";
+}
+.fa-film:before {
+  content: "\f008";
+}
+.fa-th-large:before {
+  content: "\f009";
+}
+.fa-th:before {
+  content: "\f00a";
+}
+.fa-th-list:before {
+  content: "\f00b";
+}
+.fa-check:before {
+  content: "\f00c";
+}
+.fa-remove:before,
+.fa-close:before,
+.fa-times:before {
+  content: "\f00d";
+}
+.fa-search-plus:before {
+  content: "\f00e";
+}
+.fa-search-minus:before {
+  content: "\f010";
+}
+.fa-power-off:before {
+  content: "\f011";
+}
+.fa-signal:before {
+  content: "\f012";
+}
+.fa-gear:before,
+.fa-cog:before {
+  content: "\f013";
+}
+.fa-trash-o:before {
+  content: "\f014";
+}
+.fa-home:before {
+  content: "\f015";
+}
+.fa-file-o:before {
+  content: "\f016";
+}
+.fa-clock-o:before {
+  content: "\f017";
+}
+.fa-road:before {
+  content: "\f018";
+}
+.fa-download:before {
+  content: "\f019";
+}
+.fa-arrow-circle-o-down:before {
+  content: "\f01a";
+}
+.fa-arrow-circle-o-up:before {
+  content: "\f01b";
+}
+.fa-inbox:before {
+  content: "\f01c";
+}
+.fa-play-circle-o:before {
+  content: "\f01d";
+}
+.fa-rotate-right:before,
+.fa-repeat:before {
+  content: "\f01e";
+}
+.fa-refresh:before {
+  content: "\f021";
+}
+.fa-list-alt:before {
+  content: "\f022";
+}
+.fa-lock:before {
+  content: "\f023";
+}
+.fa-flag:before {
+  content: "\f024";
+}
+.fa-headphones:before {
+  content: "\f025";
+}
+.fa-volume-off:before {
+  content: "\f026";
+}
+.fa-volume-down:before {
+  content: "\f027";
+}
+.fa-volume-up:before {
+  content: "\f028";
+}
+.fa-qrcode:before {
+  content: "\f029";
+}
+.fa-barcode:before {
+  content: "\f02a";
+}
+.fa-tag:before {
+  content: "\f02b";
+}
+.fa-tags:before {
+  content: "\f02c";
+}
+.fa-book:before {
+  content: "\f02d";
+}
+.fa-bookmark:before {
+  content: "\f02e";
+}
+.fa-print:before {
+  content: "\f02f";
+}
+.fa-camera:before {
+  content: "\f030";
+}
+.fa-font:before {
+  content: "\f031";
+}
+.fa-bold:before {
+  content: "\f032";
+}
+.fa-italic:before {
+  content: "\f033";
+}
+.fa-text-height:before {
+  content: "\f034";
+}
+.fa-text-width:before {
+  content: "\f035";
+}
+.fa-align-left:before {
+  content: "\f036";
+}
+.fa-align-center:before {
+  content: "\f037";
+}
+.fa-align-right:before {
+  content: "\f038";
+}
+.fa-align-justify:before {
+  content: "\f039";
+}
+.fa-list:before {
+  content: "\f03a";
+}
+.fa-dedent:before,
+.fa-outdent:before {
+  content: "\f03b";
+}
+.fa-indent:before {
+  content: "\f03c";
+}
+.fa-video-camera:before {
+  content: "\f03d";
+}
+.fa-photo:before,
+.fa-image:before,
+.fa-picture-o:before {
+  content: "\f03e";
+}
+.fa-pencil:before {
+  content: "\f040";
+}
+.fa-map-marker:before {
+  content: "\f041";
+}
+.fa-adjust:before {
+  content: "\f042";
+}
+.fa-tint:before {
+  content: "\f043";
+}
+.fa-edit:before,
+.fa-pencil-square-o:before {
+  content: "\f044";
+}
+.fa-share-square-o:before {
+  content: "\f045";
+}
+.fa-check-square-o:before {
+  content: "\f046";
+}
+.fa-arrows:before {
+  content: "\f047";
+}
+.fa-step-backward:before {
+  content: "\f048";
+}
+.fa-fast-backward:before {
+  content: "\f049";
+}
+.fa-backward:before {
+  content: "\f04a";
+}
+.fa-play:before {
+  content: "\f04b";
+}
+.fa-pause:before {
+  content: "\f04c";
+}
+.fa-stop:before {
+  content: "\f04d";
+}
+.fa-forward:before {
+  content: "\f04e";
+}
+.fa-fast-forward:before {
+  content: "\f050";
+}
+.fa-step-forward:before {
+  content: "\f051";
+}
+.fa-eject:before {
+  content: "\f052";
+}
+.fa-chevron-left:before {
+  content: "\f053";
+}
+.fa-chevron-right:before {
+  content: "\f054";
+}
+.fa-plus-circle:before {
+  content: "\f055";
+}
+.fa-minus-circle:before {
+  content: "\f056";
+}
+.fa-times-circle:before {
+  content: "\f057";
+}
+.fa-check-circle:before {
+  content: "\f058";
+}
+.fa-question-circle:before {
+  content: "\f059";
+}
+.fa-info-circle:before {
+  content: "\f05a";
+}
+.fa-crosshairs:before {
+  content: "\f05b";
+}
+.fa-times-circle-o:before {
+  content: "\f05c";
+}
+.fa-check-circle-o:before {
+  content: "\f05d";
+}
+.fa-ban:before {
+  content: "\f05e";
+}
+.fa-arrow-left:before {
+  content: "\f060";
+}
+.fa-arrow-right:before {
+  content: "\f061";
+}
+.fa-arrow-up:before {
+  content: "\f062";
+}
+.fa-arrow-down:before {
+  content: "\f063";
+}
+.fa-mail-forward:before,
+.fa-share:before {
+  content: "\f064";
+}
+.fa-expand:before {
+  content: "\f065";
+}
+.fa-compress:before {
+  content: "\f066";
+}
+.fa-plus:before {
+  content: "\f067";
+}
+.fa-minus:before {
+  content: "\f068";
+}
+.fa-asterisk:before {
+  content: "\f069";
+}
+.fa-exclamation-circle:before {
+  content: "\f06a";
+}
+.fa-gift:before {
+  content: "\f06b";
+}
+.fa-leaf:before {
+  content: "\f06c";
+}
+.fa-fire:before {
+  content: "\f06d";
+}
+.fa-eye:before {
+  content: "\f06e";
+}
+.fa-eye-slash:before {
+  content: "\f070";
+}
+.fa-warning:before,
+.fa-exclamation-triangle:before {
+  content: "\f071";
+}
+.fa-plane:before {
+  content: "\f072";
+}
+.fa-calendar:before {
+  content: "\f073";
+}
+.fa-random:before {
+  content: "\f074";
+}
+.fa-comment:before {
+  content: "\f075";
+}
+.fa-magnet:before {
+  content: "\f076";
+}
+.fa-chevron-up:before {
+  content: "\f077";
+}
+.fa-chevron-down:before {
+  content: "\f078";
+}
+.fa-retweet:before {
+  content: "\f079";
+}
+.fa-shopping-cart:before {
+  content: "\f07a";
+}
+.fa-folder:before {
+  content: "\f07b";
+}
+.fa-folder-open:before {
+  content: "\f07c";
+}
+.fa-arrows-v:before {
+  content: "\f07d";
+}
+.fa-arrows-h:before {
+  content: "\f07e";
+}
+.fa-bar-chart-o:before,
+.fa-bar-chart:before {
+  content: "\f080";
+}
+.fa-twitter-square:before {
+  content: "\f081";
+}
+.fa-facebook-square:before {
+  content: "\f082";
+}
+.fa-camera-retro:before {
+  content: "\f083";
+}
+.fa-key:before {
+  content: "\f084";
+}
+.fa-gears:before,
+.fa-cogs:before {
+  content: "\f085";
+}
+.fa-comments:before {
+  content: "\f086";
+}
+.fa-thumbs-o-up:before {
+  content: "\f087";
+}
+.fa-thumbs-o-down:before {
+  content: "\f088";
+}
+.fa-star-half:before {
+  content: "\f089";
+}
+.fa-heart-o:before {
+  content: "\f08a";
+}
+.fa-sign-out:before {
+  content: "\f08b";
+}
+.fa-linkedin-square:before {
+  content: "\f08c";
+}
+.fa-thumb-tack:before {
+  content: "\f08d";
+}
+.fa-external-link:before {
+  content: "\f08e";
+}
+.fa-sign-in:before {
+  content: "\f090";
+}
+.fa-trophy:before {
+  content: "\f091";
+}
+.fa-github-square:before {
+  content: "\f092";
+}
+.fa-upload:before {
+  content: "\f093";
+}
+.fa-lemon-o:before {
+  content: "\f094";
+}
+.fa-phone:before {
+  content: "\f095";
+}
+.fa-square-o:before {
+  content: "\f096";
+}
+.fa-bookmark-o:before {
+  content: "\f097";
+}
+.fa-phone-square:before {
+  content: "\f098";
+}
+.fa-twitter:before {
+  content: "\f099";
+}
+.fa-facebook-f:before,
+.fa-facebook:before {
+  content: "\f09a";
+}
+.fa-github:before {
+  content: "\f09b";
+}
+.fa-unlock:before {
+  content: "\f09c";
+}
+.fa-credit-card:before {
+  content: "\f09d";
+}
+.fa-feed:before,
+.fa-rss:before {
+  content: "\f09e";
+}
+.fa-hdd-o:before {
+  content: "\f0a0";
+}
+.fa-bullhorn:before {
+  content: "\f0a1";
+}
+.fa-bell:before {
+  content: "\f0f3";
+}
+.fa-certificate:before {
+  content: "\f0a3";
+}
+.fa-hand-o-right:before {
+  content: "\f0a4";
+}
+.fa-hand-o-left:before {
+  content: "\f0a5";
+}
+.fa-hand-o-up:before {
+  content: "\f0a6";
+}
+.fa-hand-o-down:before {
+  content: "\f0a7";
+}
+.fa-arrow-circle-left:before {
+  content: "\f0a8";
+}
+.fa-arrow-circle-right:before {
+  content: "\f0a9";
+}
+.fa-arrow-circle-up:before {
+  content: "\f0aa";
+}
+.fa-arrow-circle-down:before {
+  content: "\f0ab";
+}
+.fa-globe:before {
+  content: "\f0ac";
+}
+.fa-wrench:before {
+  content: "\f0ad";
+}
+.fa-tasks:before {
+  content: "\f0ae";
+}
+.fa-filter:before {
+  content: "\f0b0";
+}
+.fa-briefcase:before {
+  content: "\f0b1";
+}
+.fa-arrows-alt:before {
+  content: "\f0b2";
+}
+.fa-group:before,
+.fa-users:before {
+  content: "\f0c0";
+}
+.fa-chain:before,
+.fa-link:before {
+  content: "\f0c1";
+}
+.fa-cloud:before {
+  content: "\f0c2";
+}
+.fa-flask:before {
+  content: "\f0c3";
+}
+.fa-cut:before,
+.fa-scissors:before {
+  content: "\f0c4";
+}
+.fa-copy:before,
+.fa-files-o:before {
+  content: "\f0c5";
+}
+.fa-paperclip:before {
+  content: "\f0c6";
+}
+.fa-save:before,
+.fa-floppy-o:before {
+  content: "\f0c7";
+}
+.fa-square:before {
+  content: "\f0c8";
+}
+.fa-navicon:before,
+.fa-reorder:before,
+.fa-bars:before {
+  content: "\f0c9";
+}
+.fa-list-ul:before {
+  content: "\f0ca";
+}
+.fa-list-ol:before {
+  content: "\f0cb";
+}
+.fa-strikethrough:before {
+  content: "\f0cc";
+}
+.fa-underline:before {
+  content: "\f0cd";
+}
+.fa-table:before {
+  content: "\f0ce";
+}
+.fa-magic:before {
+  content: "\f0d0";
+}
+.fa-truck:before {
+  content: "\f0d1";
+}
+.fa-pinterest:before {
+  content: "\f0d2";
+}
+.fa-pinterest-square:before {
+  content: "\f0d3";
+}
+.fa-google-plus-square:before {
+  content: "\f0d4";
+}
+.fa-google-plus:before {
+  content: "\f0d5";
+}
+.fa-money:before {
+  content: "\f0d6";
+}
+.fa-caret-down:before {
+  content: "\f0d7";
+}
+.fa-caret-up:before {
+  content: "\f0d8";
+}
+.fa-caret-left:before {
+  content: "\f0d9";
+}
+.fa-caret-right:before {
+  content: "\f0da";
+}
+.fa-columns:before {
+  content: "\f0db";
+}
+.fa-unsorted:before,
+.fa-sort:before {
+  content: "\f0dc";
+}
+.fa-sort-down:before,
+.fa-sort-desc:before {
+  content: "\f0dd";
+}
+.fa-sort-up:before,
+.fa-sort-asc:before {
+  content: "\f0de";
+}
+.fa-envelope:before {
+  content: "\f0e0";
+}
+.fa-linkedin:before {
+  content: "\f0e1";
+}
+.fa-rotate-left:before,
+.fa-undo:before {
+  content: "\f0e2";
+}
+.fa-legal:before,
+.fa-gavel:before {
+  content: "\f0e3";
+}
+.fa-dashboard:before,
+.fa-tachometer:before {
+  content: "\f0e4";
+}
+.fa-comment-o:before {
+  content: "\f0e5";
+}
+.fa-comments-o:before {
+  content: "\f0e6";
+}
+.fa-flash:before,
+.fa-bolt:before {
+  content: "\f0e7";
+}
+.fa-sitemap:before {
+  content: "\f0e8";
+}
+.fa-umbrella:before {
+  content: "\f0e9";
+}
+.fa-paste:before,
+.fa-clipboard:before {
+  content: "\f0ea";
+}
+.fa-lightbulb-o:before {
+  content: "\f0eb";
+}
+.fa-exchange:before {
+  content: "\f0ec";
+}
+.fa-cloud-download:before {
+  content: "\f0ed";
+}
+.fa-cloud-upload:before {
+  content: "\f0ee";
+}
+.fa-user-md:before {
+  content: "\f0f0";
+}
+.fa-stethoscope:before {
+  content: "\f0f1";
+}
+.fa-suitcase:before {
+  content: "\f0f2";
+}
+.fa-bell-o:before {
+  content: "\f0a2";
+}
+.fa-coffee:before {
+  content: "\f0f4";
+}
+.fa-cutlery:before {
+  content: "\f0f5";
+}
+.fa-file-text-o:before {
+  content: "\f0f6";
+}
+.fa-building-o:before {
+  content: "\f0f7";
+}
+.fa-hospital-o:before {
+  content: "\f0f8";
+}
+.fa-ambulance:before {
+  content: "\f0f9";
+}
+.fa-medkit:before {
+  content: "\f0fa";
+}
+.fa-fighter-jet:before {
+  content: "\f0fb";
+}
+.fa-beer:before {
+  content: "\f0fc";
+}
+.fa-h-square:before {
+  content: "\f0fd";
+}
+.fa-plus-square:before {
+  content: "\f0fe";
+}
+.fa-angle-double-left:before {
+  content: "\f100";
+}
+.fa-angle-double-right:before {
+  content: "\f101";
+}
+.fa-angle-double-up:before {
+  content: "\f102";
+}
+.fa-angle-double-down:before {
+  content: "\f103";
+}
+.fa-angle-left:before {
+  content: "\f104";
+}
+.fa-angle-right:before {
+  content: "\f105";
+}
+.fa-angle-up:before {
+  content: "\f106";
+}
+.fa-angle-down:before {
+  content: "\f107";
+}
+.fa-desktop:before {
+  content: "\f108";
+}
+.fa-laptop:before {
+  content: "\f109";
+}
+.fa-tablet:before {
+  content: "\f10a";
+}
+.fa-mobile-phone:before,
+.fa-mobile:before {
+  content: "\f10b";
+}
+.fa-circle-o:before {
+  content: "\f10c";
+}
+.fa-quote-left:before {
+  content: "\f10d";
+}
+.fa-quote-right:before {
+  content: "\f10e";
+}
+.fa-spinner:before {
+  content: "\f110";
+}
+.fa-circle:before {
+  content: "\f111";
+}
+.fa-mail-reply:before,
+.fa-reply:before {
+  content: "\f112";
+}
+.fa-github-alt:before {
+  content: "\f113";
+}
+.fa-folder-o:before {
+  content: "\f114";
+}
+.fa-folder-open-o:before {
+  content: "\f115";
+}
+.fa-smile-o:before {
+  content: "\f118";
+}
+.fa-frown-o:before {
+  content: "\f119";
+}
+.fa-meh-o:before {
+  content: "\f11a";
+}
+.fa-gamepad:before {
+  content: "\f11b";
+}
+.fa-keyboard-o:before {
+  content: "\f11c";
+}
+.fa-flag-o:before {
+  content: "\f11d";
+}
+.fa-flag-checkered:before {
+  content: "\f11e";
+}
+.fa-terminal:before {
+  content: "\f120";
+}
+.fa-code:before {
+  content: "\f121";
+}
+.fa-mail-reply-all:before,
+.fa-reply-all:before {
+  content: "\f122";
+}
+.fa-star-half-empty:before,
+.fa-star-half-full:before,
+.fa-star-half-o:before {
+  content: "\f123";
+}
+.fa-location-arrow:before {
+  content: "\f124";
+}
+.fa-crop:before {
+  content: "\f125";
+}
+.fa-code-fork:before {
+  content: "\f126";
+}
+.fa-unlink:before,
+.fa-chain-broken:before {
+  content: "\f127";
+}
+.fa-question:before {
+  content: "\f128";
+}
+.fa-info:before {
+  content: "\f129";
+}
+.fa-exclamation:before {
+  content: "\f12a";
+}
+.fa-superscript:before {
+  content: "\f12b";
+}
+.fa-subscript:before {
+  content: "\f12c";
+}
+.fa-eraser:before {
+  content: "\f12d";
+}
+.fa-puzzle-piece:before {
+  content: "\f12e";
+}
+.fa-microphone:before {
+  content: "\f130";
+}
+.fa-microphone-slash:before {
+  content: "\f131";
+}
+.fa-shield:before {
+  content: "\f132";
+}
+.fa-calendar-o:before {
+  content: "\f133";
+}
+.fa-fire-extinguisher:before {
+  content: "\f134";
+}
+.fa-rocket:before {
+  content: "\f135";
+}
+.fa-maxcdn:before {
+  content: "\f136";
+}
+.fa-chevron-circle-left:before {
+  content: "\f137";
+}
+.fa-chevron-circle-right:before {
+  content: "\f138";
+}
+.fa-chevron-circle-up:before {
+  content: "\f139";
+}
+.fa-chevron-circle-down:before {
+  content: "\f13a";
+}
+.fa-html5:before {
+  content: "\f13b";
+}
+.fa-css3:before {
+  content: "\f13c";
+}
+.fa-anchor:before {
+  content: "\f13d";
+}
+.fa-unlock-alt:before {
+  content: "\f13e";
+}
+.fa-bullseye:before {
+  content: "\f140";
+}
+.fa-ellipsis-h:before {
+  content: "\f141";
+}
+.fa-ellipsis-v:before {
+  content: "\f142";
+}
+.fa-rss-square:before {
+  content: "\f143";
+}
+.fa-play-circle:before {
+  content: "\f144";
+}
+.fa-ticket:before {
+  content: "\f145";
+}
+.fa-minus-square:before {
+  content: "\f146";
+}
+.fa-minus-square-o:before {
+  content: "\f147";
+}
+.fa-level-up:before {
+  content: "\f148";
+}
+.fa-level-down:before {
+  content: "\f149";
+}
+.fa-check-square:before {
+  content: "\f14a";
+}
+.fa-pencil-square:before {
+  content: "\f14b";
+}
+.fa-external-link-square:before {
+  content: "\f14c";
+}
+.fa-share-square:before {
+  content: "\f14d";
+}
+.fa-compass:before {
+  content: "\f14e";
+}
+.fa-toggle-down:before,
+.fa-caret-square-o-down:before {
+  content: "\f150";
+}
+.fa-toggle-up:before,
+.fa-caret-square-o-up:before {
+  content: "\f151";
+}
+.fa-toggle-right:before,
+.fa-caret-square-o-right:before {
+  content: "\f152";
+}
+.fa-euro:before,
+.fa-eur:before {
+  content: "\f153";
+}
+.fa-gbp:before {
+  content: "\f154";
+}
+.fa-dollar:before,
+.fa-usd:before {
+  content: "\f155";
+}
+.fa-rupee:before,
+.fa-inr:before {
+  content: "\f156";
+}
+.fa-cny:before,
+.fa-rmb:before,
+.fa-yen:before,
+.fa-jpy:before {
+  content: "\f157";
+}
+.fa-ruble:before,
+.fa-rouble:before,
+.fa-rub:before {
+  content: "\f158";
+}
+.fa-won:before,
+.fa-krw:before {
+  content: "\f159";
+}
+.fa-bitcoin:before,
+.fa-btc:before {
+  content: "\f15a";
+}
+.fa-file:before {
+  content: "\f15b";
+}
+.fa-file-text:before {
+  content: "\f15c";
+}
+.fa-sort-alpha-asc:before {
+  content: "\f15d";
+}
+.fa-sort-alpha-desc:before {
+  content: "\f15e";
+}
+.fa-sort-amount-asc:before {
+  content: "\f160";
+}
+.fa-sort-amount-desc:before {
+  content: "\f161";
+}
+.fa-sort-numeric-asc:before {
+  content: "\f162";
+}
+.fa-sort-numeric-desc:before {
+  content: "\f163";
+}
+.fa-thumbs-up:before {
+  content: "\f164";
+}
+.fa-thumbs-down:before {
+  content: "\f165";
+}
+.fa-youtube-square:before {
+  content: "\f166";
+}
+.fa-youtube:before {
+  content: "\f167";
+}
+.fa-xing:before {
+  content: "\f168";
+}
+.fa-xing-square:before {
+  content: "\f169";
+}
+.fa-youtube-play:before {
+  content: "\f16a";
+}
+.fa-dropbox:before {
+  content: "\f16b";
+}
+.fa-stack-overflow:before {
+  content: "\f16c";
+}
+.fa-instagram:before {
+  content: "\f16d";
+}
+.fa-flickr:before {
+  content: "\f16e";
+}
+.fa-adn:before {
+  content: "\f170";
+}
+.fa-bitbucket:before {
+  content: "\f171";
+}
+.fa-bitbucket-square:before {
+  content: "\f172";
+}
+.fa-tumblr:before {
+  content: "\f173";
+}
+.fa-tumblr-square:before {
+  content: "\f174";
+}
+.fa-long-arrow-down:before {
+  content: "\f175";
+}
+.fa-long-arrow-up:before {
+  content: "\f176";
+}
+.fa-long-arrow-left:before {
+  content: "\f177";
+}
+.fa-long-arrow-right:before {
+  content: "\f178";
+}
+.fa-apple:before {
+  content: "\f179";
+}
+.fa-windows:before {
+  content: "\f17a";
+}
+.fa-android:before {
+  content: "\f17b";
+}
+.fa-linux:before {
+  content: "\f17c";
+}
+.fa-dribbble:before {
+  content: "\f17d";
+}
+.fa-skype:before {
+  content: "\f17e";
+}
+.fa-foursquare:before {
+  content: "\f180";
+}
+.fa-trello:before {
+  content: "\f181";
+}
+.fa-female:before {
+  content: "\f182";
+}
+.fa-male:before {
+  content: "\f183";
+}
+.fa-gittip:before,
+.fa-gratipay:before {
+  content: "\f184";
+}
+.fa-sun-o:before {
+  content: "\f185";
+}
+.fa-moon-o:before {
+  content: "\f186";
+}
+.fa-archive:before {
+  content: "\f187";
+}
+.fa-bug:before {
+  content: "\f188";
+}
+.fa-vk:before {
+  content: "\f189";
+}
+.fa-weibo:before {
+  content: "\f18a";
+}
+.fa-renren:before {
+  content: "\f18b";
+}
+.fa-pagelines:before {
+  content: "\f18c";
+}
+.fa-stack-exchange:before {
+  content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+  content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+  content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+  content: "\f191";
+}
+.fa-dot-circle-o:before {
+  content: "\f192";
+}
+.fa-wheelchair:before {
+  content: "\f193";
+}
+.fa-vimeo-square:before {
+  content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+  content: "\f195";
+}
+.fa-plus-square-o:before {
+  content: "\f196";
+}
+.fa-space-shuttle:before {
+  content: "\f197";
+}
+.fa-slack:before {
+  content: "\f198";
+}
+.fa-envelope-square:before {
+  content: "\f199";
+}
+.fa-wordpress:before {
+  content: "\f19a";
+}
+.fa-openid:before {
+  content: "\f19b";
+}
+.fa-institution:before,
+.fa-bank:before,
+.fa-university:before {
+  content: "\f19c";
+}
+.fa-mortar-board:before,
+.fa-graduation-cap:before {
+  content: "\f19d";
+}
+.fa-yahoo:before {
+  content: "\f19e";
+}
+.fa-google:before {
+  content: "\f1a0";
+}
+.fa-reddit:before {
+  content: "\f1a1";
+}
+.fa-reddit-square:before {
+  content: "\f1a2";
+}
+.fa-stumbleupon-circle:before {
+  content: "\f1a3";
+}
+.fa-stumbleupon:before {
+  content: "\f1a4";
+}
+.fa-delicious:before {
+  content: "\f1a5";
+}
+.fa-digg:before {
+  content: "\f1a6";
+}
+.fa-pied-piper-pp:before {
+  content: "\f1a7";
+}
+.fa-pied-piper-alt:before {
+  content: "\f1a8";
+}
+.fa-drupal:before {
+  content: "\f1a9";
+}
+.fa-joomla:before {
+  content: "\f1aa";
+}
+.fa-language:before {
+  content: "\f1ab";
+}
+.fa-fax:before {
+  content: "\f1ac";
+}
+.fa-building:before {
+  content: "\f1ad";
+}
+.fa-child:before {
+  content: "\f1ae";
+}
+.fa-paw:before {
+  content: "\f1b0";
+}
+.fa-spoon:before {
+  content: "\f1b1";
+}
+.fa-cube:before {
+  content: "\f1b2";
+}
+.fa-cubes:before {
+  content: "\f1b3";
+}
+.fa-behance:before {
+  content: "\f1b4";
+}
+.fa-behance-square:before {
+  content: "\f1b5";
+}
+.fa-steam:before {
+  content: "\f1b6";
+}
+.fa-steam-square:before {
+  content: "\f1b7";
+}
+.fa-recycle:before {
+  content: "\f1b8";
+}
+.fa-automobile:before,
+.fa-car:before {
+  content: "\f1b9";
+}
+.fa-cab:before,
+.fa-taxi:before {
+  content: "\f1ba";
+}
+.fa-tree:before {
+  content: "\f1bb";
+}
+.fa-spotify:before {
+  content: "\f1bc";
+}
+.fa-deviantart:before {
+  content: "\f1bd";
+}
+.fa-soundcloud:before {
+  content: "\f1be";
+}
+.fa-database:before {
+  content: "\f1c0";
+}
+.fa-file-pdf-o:before {
+  content: "\f1c1";
+}
+.fa-file-word-o:before {
+  content: "\f1c2";
+}
+.fa-file-excel-o:before {
+  content: "\f1c3";
+}
+.fa-file-powerpoint-o:before {
+  content: "\f1c4";
+}
+.fa-file-photo-o:before,
+.fa-file-picture-o:before,
+.fa-file-image-o:before {
+  content: "\f1c5";
+}
+.fa-file-zip-o:before,
+.fa-file-archive-o:before {
+  content: "\f1c6";
+}
+.fa-file-sound-o:before,
+.fa-file-audio-o:before {
+  content: "\f1c7";
+}
+.fa-file-movie-o:before,
+.fa-file-video-o:before {
+  content: "\f1c8";
+}
+.fa-file-code-o:before {
+  content: "\f1c9";
+}
+.fa-vine:before {
+  content: "\f1ca";
+}
+.fa-codepen:before {
+  content: "\f1cb";
+}
+.fa-jsfiddle:before {
+  content: "\f1cc";
+}
+.fa-life-bouy:before,
+.fa-life-buoy:before,
+.fa-life-saver:before,
+.fa-support:before,
+.fa-life-ring:before {
+  content: "\f1cd";
+}
+.fa-circle-o-notch:before {
+  content: "\f1ce";
+}
+.fa-ra:before,
+.fa-resistance:before,
+.fa-rebel:before {
+  content: "\f1d0";
+}
+.fa-ge:before,
+.fa-empire:before {
+  content: "\f1d1";
+}
+.fa-git-square:before {
+  content: "\f1d2";
+}
+.fa-git:before {
+  content: "\f1d3";
+}
+.fa-y-combinator-square:before,
+.fa-yc-square:before,
+.fa-hacker-news:before {
+  content: "\f1d4";
+}
+.fa-tencent-weibo:before {
+  content: "\f1d5";
+}
+.fa-qq:before {
+  content: "\f1d6";
+}
+.fa-wechat:before,
+.fa-weixin:before {
+  content: "\f1d7";
+}
+.fa-send:before,
+.fa-paper-plane:before {
+  content: "\f1d8";
+}
+.fa-send-o:before,
+.fa-paper-plane-o:before {
+  content: "\f1d9";
+}
+.fa-history:before {
+  content: "\f1da";
+}
+.fa-circle-thin:before {
+  content: "\f1db";
+}
+.fa-header:before {
+  content: "\f1dc";
+}
+.fa-paragraph:before {
+  content: "\f1dd";
+}
+.fa-sliders:before {
+  content: "\f1de";
+}
+.fa-share-alt:before {
+  content: "\f1e0";
+}
+.fa-share-alt-square:before {
+  content: "\f1e1";
+}
+.fa-bomb:before {
+  content: "\f1e2";
+}
+.fa-soccer-ball-o:before,
+.fa-futbol-o:before {
+  content: "\f1e3";
+}
+.fa-tty:before {
+  content: "\f1e4";
+}
+.fa-binoculars:before {
+  content: "\f1e5";
+}
+.fa-plug:before {
+  content: "\f1e6";
+}
+.fa-slideshare:before {
+  content: "\f1e7";
+}
+.fa-twitch:before {
+  content: "\f1e8";
+}
+.fa-yelp:before {
+  content: "\f1e9";
+}
+.fa-newspaper-o:before {
+  content: "\f1ea";
+}
+.fa-wifi:before {
+  content: "\f1eb";
+}
+.fa-calculator:before {
+  content: "\f1ec";
+}
+.fa-paypal:before {
+  content: "\f1ed";
+}
+.fa-google-wallet:before {
+  content: "\f1ee";
+}
+.fa-cc-visa:before {
+  content: "\f1f0";
+}
+.fa-cc-mastercard:before {
+  content: "\f1f1";
+}
+.fa-cc-discover:before {
+  content: "\f1f2";
+}
+.fa-cc-amex:before {
+  content: "\f1f3";
+}
+.fa-cc-paypal:before {
+  content: "\f1f4";
+}
+.fa-cc-stripe:before {
+  content: "\f1f5";
+}
+.fa-bell-slash:before {
+  content: "\f1f6";
+}
+.fa-bell-slash-o:before {
+  content: "\f1f7";
+}
+.fa-trash:before {
+  content: "\f1f8";
+}
+.fa-copyright:before {
+  content: "\f1f9";
+}
+.fa-at:before {
+  content: "\f1fa";
+}
+.fa-eyedropper:before {
+  content: "\f1fb";
+}
+.fa-paint-brush:before {
+  content: "\f1fc";
+}
+.fa-birthday-cake:before {
+  content: "\f1fd";
+}
+.fa-area-chart:before {
+  content: "\f1fe";
+}
+.fa-pie-chart:before {
+  content: "\f200";
+}
+.fa-line-chart:before {
+  content: "\f201";
+}
+.fa-lastfm:before {
+  content: "\f202";
+}
+.fa-lastfm-square:before {
+  content: "\f203";
+}
+.fa-toggle-off:before {
+  content: "\f204";
+}
+.fa-toggle-on:before {
+  content: "\f205";
+}
+.fa-bicycle:before {
+  content: "\f206";
+}
+.fa-bus:before {
+  content: "\f207";
+}
+.fa-ioxhost:before {
+  content: "\f208";
+}
+.fa-angellist:before {
+  content: "\f209";
+}
+.fa-cc:before {
+  content: "\f20a";
+}
+.fa-shekel:before,
+.fa-sheqel:before,
+.fa-ils:before {
+  content: "\f20b";
+}
+.fa-meanpath:before {
+  content: "\f20c";
+}
+.fa-buysellads:before {
+  content: "\f20d";
+}
+.fa-connectdevelop:before {
+  content: "\f20e";
+}
+.fa-dashcube:before {
+  content: "\f210";
+}
+.fa-forumbee:before {
+  content: "\f211";
+}
+.fa-leanpub:before {
+  content: "\f212";
+}
+.fa-sellsy:before {
+  content: "\f213";
+}
+.fa-shirtsinbulk:before {
+  content: "\f214";
+}
+.fa-simplybuilt:before {
+  content: "\f215";
+}
+.fa-skyatlas:before {
+  content: "\f216";
+}
+.fa-cart-plus:before {
+  content: "\f217";
+}
+.fa-cart-arrow-down:before {
+  content: "\f218";
+}
+.fa-diamond:before {
+  content: "\f219";
+}
+.fa-ship:before {
+  content: "\f21a";
+}
+.fa-user-secret:before {
+  content: "\f21b";
+}
+.fa-motorcycle:before {
+  content: "\f21c";
+}
+.fa-street-view:before {
+  content: "\f21d";
+}
+.fa-heartbeat:before {
+  content: "\f21e";
+}
+.fa-venus:before {
+  content: "\f221";
+}
+.fa-mars:before {
+  content: "\f222";
+}
+.fa-mercury:before {
+  content: "\f223";
+}
+.fa-intersex:before,
+.fa-transgender:before {
+  content: "\f224";
+}
+.fa-transgender-alt:before {
+  content: "\f225";
+}
+.fa-venus-double:before {
+  content: "\f226";
+}
+.fa-mars-double:before {
+  content: "\f227";
+}
+.fa-venus-mars:before {
+  content: "\f228";
+}
+.fa-mars-stroke:before {
+  content: "\f229";
+}
+.fa-mars-stroke-v:before {
+  content: "\f22a";
+}
+.fa-mars-stroke-h:before {
+  content: "\f22b";
+}
+.fa-neuter:before {
+  content: "\f22c";
+}
+.fa-genderless:before {
+  content: "\f22d";
+}
+.fa-facebook-official:before {
+  content: "\f230";
+}
+.fa-pinterest-p:before {
+  content: "\f231";
+}
+.fa-whatsapp:before {
+  content: "\f232";
+}
+.fa-server:before {
+  content: "\f233";
+}
+.fa-user-plus:before {
+  content: "\f234";
+}
+.fa-user-times:before {
+  content: "\f235";
+}
+.fa-hotel:before,
+.fa-bed:before {
+  content: "\f236";
+}
+.fa-viacoin:before {
+  content: "\f237";
+}
+.fa-train:before {
+  content: "\f238";
+}
+.fa-subway:before {
+  content: "\f239";
+}
+.fa-medium:before {
+  content: "\f23a";
+}
+.fa-yc:before,
+.fa-y-combinator:before {
+  content: "\f23b";
+}
+.fa-optin-monster:before {
+  content: "\f23c";
+}
+.fa-opencart:before {
+  content: "\f23d";
+}
+.fa-expeditedssl:before {
+  content: "\f23e";
+}
+.fa-battery-4:before,
+.fa-battery:before,
+.fa-battery-full:before {
+  content: "\f240";
+}
+.fa-battery-3:before,
+.fa-battery-three-quarters:before {
+  content: "\f241";
+}
+.fa-battery-2:before,
+.fa-battery-half:before {
+  content: "\f242";
+}
+.fa-battery-1:before,
+.fa-battery-quarter:before {
+  content: "\f243";
+}
+.fa-battery-0:before,
+.fa-battery-empty:before {
+  content: "\f244";
+}
+.fa-mouse-pointer:before {
+  content: "\f245";
+}
+.fa-i-cursor:before {
+  content: "\f246";
+}
+.fa-object-group:before {
+  content: "\f247";
+}
+.fa-object-ungroup:before {
+  content: "\f248";
+}
+.fa-sticky-note:before {
+  content: "\f249";
+}
+.fa-sticky-note-o:before {
+  content: "\f24a";
+}
+.fa-cc-jcb:before {
+  content: "\f24b";
+}
+.fa-cc-diners-club:before {
+  content: "\f24c";
+}
+.fa-clone:before {
+  content: "\f24d";
+}
+.fa-balance-scale:before {
+  content: "\f24e";
+}
+.fa-hourglass-o:before {
+  content: "\f250";
+}
+.fa-hourglass-1:before,
+.fa-hourglass-start:before {
+  content: "\f251";
+}
+.fa-hourglass-2:before,
+.fa-hourglass-half:before {
+  content: "\f252";
+}
+.fa-hourglass-3:before,
+.fa-hourglass-end:before {
+  content: "\f253";
+}
+.fa-hourglass:before {
+  content: "\f254";
+}
+.fa-hand-grab-o:before,
+.fa-hand-rock-o:before {
+  content: "\f255";
+}
+.fa-hand-stop-o:before,
+.fa-hand-paper-o:before {
+  content: "\f256";
+}
+.fa-hand-scissors-o:before {
+  content: "\f257";
+}
+.fa-hand-lizard-o:before {
+  content: "\f258";
+}
+.fa-hand-spock-o:before {
+  content: "\f259";
+}
+.fa-hand-pointer-o:before {
+  content: "\f25a";
+}
+.fa-hand-peace-o:before {
+  content: "\f25b";
+}
+.fa-trademark:before {
+  content: "\f25c";
+}
+.fa-registered:before {
+  content: "\f25d";
+}
+.fa-creative-commons:before {
+  content: "\f25e";
+}
+.fa-gg:before {
+  content: "\f260";
+}
+.fa-gg-circle:before {
+  content: "\f261";
+}
+.fa-tripadvisor:before {
+  content: "\f262";
+}
+.fa-odnoklassniki:before {
+  content: "\f263";
+}
+.fa-odnoklassniki-square:before {
+  content: "\f264";
+}
+.fa-get-pocket:before {
+  content: "\f265";
+}
+.fa-wikipedia-w:before {
+  content: "\f266";
+}
+.fa-safari:before {
+  content: "\f267";
+}
+.fa-chrome:before {
+  content: "\f268";
+}
+.fa-firefox:before {
+  content: "\f269";
+}
+.fa-opera:before {
+  content: "\f26a";
+}
+.fa-internet-explorer:before {
+  content: "\f26b";
+}
+.fa-tv:before,
+.fa-television:before {
+  content: "\f26c";
+}
+.fa-contao:before {
+  content: "\f26d";
+}
+.fa-500px:before {
+  content: "\f26e";
+}
+.fa-amazon:before {
+  content: "\f270";
+}
+.fa-calendar-plus-o:before {
+  content: "\f271";
+}
+.fa-calendar-minus-o:before {
+  content: "\f272";
+}
+.fa-calendar-times-o:before {
+  content: "\f273";
+}
+.fa-calendar-check-o:before {
+  content: "\f274";
+}
+.fa-industry:before {
+  content: "\f275";
+}
+.fa-map-pin:before {
+  content: "\f276";
+}
+.fa-map-signs:before {
+  content: "\f277";
+}
+.fa-map-o:before {
+  content: "\f278";
+}
+.fa-map:before {
+  content: "\f279";
+}
+.fa-commenting:before {
+  content: "\f27a";
+}
+.fa-commenting-o:before {
+  content: "\f27b";
+}
+.fa-houzz:before {
+  content: "\f27c";
+}
+.fa-vimeo:before {
+  content: "\f27d";
+}
+.fa-black-tie:before {
+  content: "\f27e";
+}
+.fa-fonticons:before {
+  content: "\f280";
+}
+.fa-reddit-alien:before {
+  content: "\f281";
+}
+.fa-edge:before {
+  content: "\f282";
+}
+.fa-credit-card-alt:before {
+  content: "\f283";
+}
+.fa-codiepie:before {
+  content: "\f284";
+}
+.fa-modx:before {
+  content: "\f285";
+}
+.fa-fort-awesome:before {
+  content: "\f286";
+}
+.fa-usb:before {
+  content: "\f287";
+}
+.fa-product-hunt:before {
+  content: "\f288";
+}
+.fa-mixcloud:before {
+  content: "\f289";
+}
+.fa-scribd:before {
+  content: "\f28a";
+}
+.fa-pause-circle:before {
+  content: "\f28b";
+}
+.fa-pause-circle-o:before {
+  content: "\f28c";
+}
+.fa-stop-circle:before {
+  content: "\f28d";
+}
+.fa-stop-circle-o:before {
+  content: "\f28e";
+}
+.fa-shopping-bag:before {
+  content: "\f290";
+}
+.fa-shopping-basket:before {
+  content: "\f291";
+}
+.fa-hashtag:before {
+  content: "\f292";
+}
+.fa-bluetooth:before {
+  content: "\f293";
+}
+.fa-bluetooth-b:before {
+  content: "\f294";
+}
+.fa-percent:before {
+  content: "\f295";
+}
+.fa-gitlab:before {
+  content: "\f296";
+}
+.fa-wpbeginner:before {
+  content: "\f297";
+}
+.fa-wpforms:before {
+  content: "\f298";
+}
+.fa-envira:before {
+  content: "\f299";
+}
+.fa-universal-access:before {
+  content: "\f29a";
+}
+.fa-wheelchair-alt:before {
+  content: "\f29b";
+}
+.fa-question-circle-o:before {
+  content: "\f29c";
+}
+.fa-blind:before {
+  content: "\f29d";
+}
+.fa-audio-description:before {
+  content: "\f29e";
+}
+.fa-volume-control-phone:before {
+  content: "\f2a0";
+}
+.fa-braille:before {
+  content: "\f2a1";
+}
+.fa-assistive-listening-systems:before {
+  content: "\f2a2";
+}
+.fa-asl-interpreting:before,
+.fa-american-sign-language-interpreting:before {
+  content: "\f2a3";
+}
+.fa-deafness:before,
+.fa-hard-of-hearing:before,
+.fa-deaf:before {
+  content: "\f2a4";
+}
+.fa-glide:before {
+  content: "\f2a5";
+}
+.fa-glide-g:before {
+  content: "\f2a6";
+}
+.fa-signing:before,
+.fa-sign-language:before {
+  content: "\f2a7";
+}
+.fa-low-vision:before {
+  content: "\f2a8";
+}
+.fa-viadeo:before {
+  content: "\f2a9";
+}
+.fa-viadeo-square:before {
+  content: "\f2aa";
+}
+.fa-snapchat:before {
+  content: "\f2ab";
+}
+.fa-snapchat-ghost:before {
+  content: "\f2ac";
+}
+.fa-snapchat-square:before {
+  content: "\f2ad";
+}
+.fa-pied-piper:before {
+  content: "\f2ae";
+}
+.fa-first-order:before {
+  content: "\f2b0";
+}
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
+.fa-google-plus-circle:before,
+.fa-google-plus-official:before {
+  content: "\f2b3";
+}
+.fa-fa:before,
+.fa-font-awesome:before {
+  content: "\f2b4";
+}
+.fa-handshake-o:before {
+  content: "\f2b5";
+}
+.fa-envelope-open:before {
+  content: "\f2b6";
+}
+.fa-envelope-open-o:before {
+  content: "\f2b7";
+}
+.fa-linode:before {
+  content: "\f2b8";
+}
+.fa-address-book:before {
+  content: "\f2b9";
+}
+.fa-address-book-o:before {
+  content: "\f2ba";
+}
+.fa-vcard:before,
+.fa-address-card:before {
+  content: "\f2bb";
+}
+.fa-vcard-o:before,
+.fa-address-card-o:before {
+  content: "\f2bc";
+}
+.fa-user-circle:before {
+  content: "\f2bd";
+}
+.fa-user-circle-o:before {
+  content: "\f2be";
+}
+.fa-user-o:before {
+  content: "\f2c0";
+}
+.fa-id-badge:before {
+  content: "\f2c1";
+}
+.fa-drivers-license:before,
+.fa-id-card:before {
+  content: "\f2c2";
+}
+.fa-drivers-license-o:before,
+.fa-id-card-o:before {
+  content: "\f2c3";
+}
+.fa-quora:before {
+  content: "\f2c4";
+}
+.fa-free-code-camp:before {
+  content: "\f2c5";
+}
+.fa-telegram:before {
+  content: "\f2c6";
+}
+.fa-thermometer-4:before,
+.fa-thermometer:before,
+.fa-thermometer-full:before {
+  content: "\f2c7";
+}
+.fa-thermometer-3:before,
+.fa-thermometer-three-quarters:before {
+  content: "\f2c8";
+}
+.fa-thermometer-2:before,
+.fa-thermometer-half:before {
+  content: "\f2c9";
+}
+.fa-thermometer-1:before,
+.fa-thermometer-quarter:before {
+  content: "\f2ca";
+}
+.fa-thermometer-0:before,
+.fa-thermometer-empty:before {
+  content: "\f2cb";
+}
+.fa-shower:before {
+  content: "\f2cc";
+}
+.fa-bathtub:before,
+.fa-s15:before,
+.fa-bath:before {
+  content: "\f2cd";
+}
+.fa-podcast:before {
+  content: "\f2ce";
+}
+.fa-window-maximize:before {
+  content: "\f2d0";
+}
+.fa-window-minimize:before {
+  content: "\f2d1";
+}
+.fa-window-restore:before {
+  content: "\f2d2";
+}
+.fa-times-rectangle:before,
+.fa-window-close:before {
+  content: "\f2d3";
+}
+.fa-times-rectangle-o:before,
+.fa-window-close-o:before {
+  content: "\f2d4";
+}
+.fa-bandcamp:before {
+  content: "\f2d5";
+}
+.fa-grav:before {
+  content: "\f2d6";
+}
+.fa-etsy:before {
+  content: "\f2d7";
+}
+.fa-imdb:before {
+  content: "\f2d8";
+}
+.fa-ravelry:before {
+  content: "\f2d9";
+}
+.fa-eercast:before {
+  content: "\f2da";
+}
+.fa-microchip:before {
+  content: "\f2db";
+}
+.fa-snowflake-o:before {
+  content: "\f2dc";
+}
+.fa-superpowers:before {
+  content: "\f2dd";
+}
+.fa-wpexplorer:before {
+  content: "\f2de";
+}
+.fa-meetup:before {
+  content: "\f2e0";
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}
diff --git a/docs/site/home/css/fonts.css b/docs/site/home/css/fonts.css
new file mode 100644
index 0000000..9a63156
--- /dev/null
+++ b/docs/site/home/css/fonts.css
@@ -0,0 +1,180 @@
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Raleway';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url(../fonts/raleway.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/docs/site/home/download.html b/docs/site/home/download.html
index 773a625..6f75155 100644
--- a/docs/site/home/download.html
+++ b/docs/site/home/download.html
@@ -19,118 +19,166 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <link href="img/favicon.png" rel="shortcut icon" />
-        <title>Apache TinkerPop</title>
+        <title>Apache TinkerPop: Downloads</title>
         <meta name="description" content="">
         <meta name="keywords" content="">
-        <link href="css/bootstrap.min.css" rel="stylesheet"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link href="css/bootstrap.min.css" rel="stylesheet">
+        <link href="css/font-awesome.css" rel="stylesheet"/>
         <link href="css/custome.css" rel="stylesheet">
         <link href="css/responsive.css" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.css" integrity="sha512-K2J6Yt6ElUYEMPcTr0wm555AAyiqkgYiUgPIW18FT88/aYSNDk0EvGjsln/TEu3ee/jaHf0xoXzFppSbBtUXbQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-        <link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Raleway:wght@400;500;600;700&display=swap" rel="stylesheet">
+        <link href="css/animate.css" rel="stylesheet"/>
+        <link href="css/fonts.css" rel="stylesheet">
+        <!-- Matomo -->
+        <script>
+            var _paq = window._paq = window._paq || [];
+            /* We explicitly disable cookie tracking to avoid privacy issues */
+            _paq.push(['disableCookies']);
+            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['trackPageView']);
+            _paq.push(['enableLinkTracking']);
+            (function() {
+                var u="https://analytics.apache.org/";
+                _paq.push(['setTrackerUrl', u+'matomo.php']);
+                _paq.push(['setSiteId', '27']);
+                var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+                g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            })();
+        </script>
+        <!-- End Matomo Code -->
     </head>
     <body>
-      <!-- header -->
-         <div class="header">
-            <div class="container">
-              <nav class="navbar navbar-expand-lg  ">
-                  <div class="container-fluid">
+    <!-- header -->
+    <div class="header">
+        <div class="container">
+            <nav class="navbar navbar-expand-lg  ">
+                <div class="container-fluid">
                     <a class="navbar-brand" href="index.html">
                         <img src="img/logo.png" class="img-fluid" alt="img">
                     </a>
-                    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-                      <span class="fa fa-bars"></span>
+                    <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
+                            data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
+                            aria-expanded="false" aria-label="Toggle navigation">
+                        <span class="fa fa-bars"></span>
                     </button>
                     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                      <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
-                        <li class="nav-item">
-                          <a class="nav-link active" aria-current="page" href="index.html">Home</a>
-                        </li>
-                        <li class="nav-item">
-                          <a class="nav-link" href="download.html">Download</a>
-                        </li>
-                          <li class="nav-item dropdown">
-                              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                Documentation
-                              </a>
-                              <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
-                                 <li class="dropdown-header">Latest Documentation</li>
-                                 <li><a href="https://tinkerpop.apache.org/docs/current" class="dropdown-item">Documentation Index</a></li>
-                                 <li><a href="https://tinkerpop.apache.org/docs/current/reference" class="dropdown-item">Reference</a></li>
-                                 <li><a href="https://tinkerpop.apache.org/docs/current/dev/provider" class="dropdown-item">Provider</a></li>
-                                 <li><a href="https://tinkerpop.apache.org/docs/current/dev/developer" class="dropdown-item">Developer</a></li>
-                                 <li><a href="https://tinkerpop.apache.org/docs/current/upgrade" class="dropdown-item">Upgrade Information</a></li>
-                                 <li><a href="https://tinkerpop.apache.org/javadocs/current/core/" class="dropdown-item">Core Javadoc API</a></li>
-                                 <li><a href="https://tinkerpop.apache.org/javadocs/current/full/" class="dropdown-item">Full Javadoc API</a></li>
-                                 <li><hr class="dropdown-divider"></li>
-                                 <li><a href="https://tinkerpop.apache.org/docs/" class="dropdown-item">Documentation Archives</a></li>
-                                 <li><a href="https://tinkerpop.apache.org/javadocs/" class="dropdown-item">Javadoc Archives</a></li>
-                                 <li><hr class="dropdown-divider"></li>
-                                 <li><a href="https://tinkerpop.apache.org/docs/current/index.html#publications" class="dropdown-item">Publications</a></li>
-                              </ul>
-                              
+                        <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
+                            <li class="nav-item">
+                                <a class="nav-link active" aria-current="page" href="index.html">Home</a>
                             </li>
-                         <li class="nav-item dropdown">
-                              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                Tutorials
-                              </a>
-                              <ul class="dropdown-menu" aria-labelledby="navbarDropdown1">
-                                     <li><a href="gremlin.html" class="dropdown-item">Introduction to Gremlin</a></li>
-                                     <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/tutorials/getting-started/" >Getting Started</a></li>
-                                     <li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/tutorials/the-gremlin-console/">The Gremlin Console</a></li>
-                                     <li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/recipes/">Gremlin Recipes</a></li>
-                                     <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/tutorials/gremlins-anatomy/">Gremlin's Anatomy</a></li>
-                                     <li><hr class="dropdown-divider"></li>
-                                     <li><a class="dropdown-item" href="http://kelvinlawrence.net/book/Gremlin-Graph-Guide.html">Book: Practical Gremlin by Kelvin Lawrence</a></li>
-                                     <li><a class="dropdown-item" href="http://sql2gremlin.com/">SQL2Gremlin</a></li>
-                                  </ul>
-                             
+                            <li class="nav-item">
+                                <a class="nav-link" href="download.html">Download</a>
                             </li>
-                         <li class="nav-item dropdown">
-                              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                Community
-                              </a>
-                              <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                                 <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users">User Mailing List</a></li>
-                                 <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org">Developer Mailing List</a></li>
-                                 <li><a class="dropdown-item" href="https://discord.gg/ndMpKZcBEE" target="_blank"><img src="img/discord_logo.png" class="nav-icon">Join us on Discord</a></li>
-                                 <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/">Issue Tracker</a></li>
-                                 <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
-                                 <li><a class="dropdown-item" href="providers.html">Data System Support</a></li>
-                                 <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
-                                 <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
-                                <li><hr class="dropdown-divider"></li>
-                                 <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon">GitHub</a></li>
-                                 <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon">Twitter</a></li>
-                              </ul>
-                            
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                    Tools
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                                    <li><a class="dropdown-item" href="providers.html">Graph Systems</a></li>
+                                    <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a class="dropdown-item" href="https://gremlify.com/">Gremlify: Try Gremlin</a></li>
+                                    <li><a class="dropdown-item" href="https://tinkerpop.apache.org/gremlint">Gremlint: Lint Gremlin</a></li>
+                                    <li><a class="dropdown-item" href="https://www.gremlator.com/">Gremlator: Translate Gremlin</a></li>
+                                </ul>
                             </li>
-                        
-                         <li class="nav-item">
-                          <a class="nav-link" href="https://tinkerpop.apache.org/gremlint/">Gremlint</a>
-                        </li>
-                        <li class="nav-item dropdown">
-                          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            Apache Software
-                          </a>
-                          <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
-                                 <li><a  class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-                              </ul>
-                          
-                        </li>
-                         
-                      </ul>
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                                   data-bs-toggle="dropdown" aria-expanded="false">
+                                    Documentation
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+                                    <li class="dropdown-header">Latest Documentation</li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current" class="dropdown-item">Documentation Index</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/reference" class="dropdown-item">Reference</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/dev/provider" class="dropdown-item">Provider</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/dev/developer" class="dropdown-item">Developer</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/upgrade" class="dropdown-item">Upgrade Information</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/javadocs/current/core/" class="dropdown-item">Core Javadoc API</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/javadocs/current/full/" class="dropdown-item">Full Javadoc API</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/" class="dropdown-item">Documentation Archives</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/javadocs/" class="dropdown-item">Javadoc Archives</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/index.html#publications" class="dropdown-item">Publications</a></li>
+                                </ul>
+
+                            </li>
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button"
+                                   data-bs-toggle="dropdown" aria-expanded="false">
+                                    Tutorials
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown1">
+                                    <li><a href="gremlin.html" class="dropdown-item">Introduction to Gremlin</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://tinkerpop.apache.org/docs/current/tutorials/getting-started/">Getting
+                                        Started</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://tinkerpop.apache.org/docs/current/tutorials/the-gremlin-console/">The
+                                        Gremlin Console</a></li>
+                                    <li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/recipes/">Gremlin
+                                        Recipes</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://tinkerpop.apache.org/docs/current/tutorials/gremlins-anatomy/">Gremlin's
+                                        Anatomy</a></li>
+                                    <li>
+                                        <hr class="dropdown-divider">
+                                    </li>
+                                    <li><a class="dropdown-item"
+                                           href="http://kelvinlawrence.net/book/Gremlin-Graph-Guide.html">Book: Practical
+                                        Gremlin by Kelvin Lawrence</a></li>
+                                    <li><a class="dropdown-item" href="http://sql2gremlin.com/">SQL2Gremlin</a></li>
+                                </ul>
+
+                            </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                    Community
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
+                                    <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon"/>Discord</a></li>
+                                    <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon"/>Answer Overflow</a></li>
+                                    <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon"/>Stack Overflow</a></li>
+                                    <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon"/>User Mailing List</a></li>
+                                    <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon"/>Developer Mailing List</a></li>
+                                    <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon"/>Issue Tracker</a></li>
+                                    <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon"/>GitHub</a></li>
+                                    <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon"/>Twitch</a></li>
+                                    <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon"/>Twitter</a></li>
+                                    <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon"/>YouTube</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
+                                    <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
+                                </ul>
+                            </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown5" role="button"
+                                   data-bs-toggle="dropdown" aria-expanded="false">
+                                    Apache Software
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown5">
+                                    <li><a class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
+                                    <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://www.apache.org/events/current-event">Events</a></li>
+                                    <li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+                                    </li>
+                                    <li><a class="dropdown-item"
+                                           href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                                    <li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
+                                </ul>
+
+                            </li>
+
+                        </ul>
                     </div>
-                  </div>
-                </nav>
-            </div>
+                </div>
+            </nav>
         </div>
+    </div>
         
         <!-- hero -->
         <div class="container hero-inner">
@@ -154,37 +202,58 @@
                 </div>
                 <div class="row d-flex align-items-center">
                     <div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
-                        <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.6.0</span> (latest, stable) <p class="d-inline-block ms-4 mb-0">10-January-2022</p>
+                        <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.7.0</span> (latest, stable) <p class="d-inline-block ms-4 mb-0">31-July-2023</p>
+                    </div>
+                    <div class="col-lg-4 col-md-6 mb-2 mb-lg-0">
+                        <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.7.0/CHANGELOG.asciidoc#release-3-7-0">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.7.0/upgrade/#_tinkerpop_3_7-0">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.7.0/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_7_0">contributors</a></p>
+                    </div>
+                    <div class="col-lg-5 col-md-12 mb-2 mb-lg-2">
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-console-3.7.0-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-server-3.7.0-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-3.7.0-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
+                    </div>
+                </div>
+                <div class="row d-flex align-items-center">
+                    <div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
+                        <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.6.5</span> (maintenance) <p class="d-inline-block ms-4 mb-0">31-July-2023</p>
                     </div>
                      <div class="col-lg-4 col-md-6 mb-2 mb-lg-0">
-                        <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.6.0/CHANGELOG.asciidoc#release-3-6-0">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.6.0/upgrade/#_tinkerpop_3_6_0">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.6.0/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_6_0">contributors</a></p>
+                        <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.6.5/CHANGELOG.asciidoc#release-3-6-5">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.6.5/upgrade/#_tinkerpop_3_6_5">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.6.5/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_6_5">contributors</a></p>
                      </div>
                       <div class="col-lg-5 col-md-12 mb-2 mb-lg-2">
-                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.0/apache-tinkerpop-gremlin-console-3.6.0-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
-                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.0/apache-tinkerpop-gremlin-server-3.6.0-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
-                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.0/apache-tinkerpop-3.6.0-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.5/apache-tinkerpop-gremlin-console-3.6.5-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.5/apache-tinkerpop-gremlin-server-3.6.5-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.5/apache-tinkerpop-3.6.5-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
                       </div>
                 </div>
                 <div class="row d-flex align-items-center">
                     <div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
-                        <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.5.3</span> (maintenance) <p class="d-inline-block ms-4 mb-0">10-January-2022</p>
+                        <img src="img/download/icon.png" class="img-fluid me-2" alt="img"> <span class="bold">3.5.7</span> (maintenance) <p class="d-inline-block ms-4 mb-0">31-July-2023</p>
                     </div>
                      <div class="col-lg-4 col-md-6 mb-2 mb-lg-0">
-                        <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.5.3/CHANGELOG.asciidoc#release-3-5-3">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.5.3/upgrade/#_tinkerpop_3_5_3">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.5.3/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_5_3">contributors</a></p>
+                        <p class="text-blue mb-0"><a href="https://github.com/apache/tinkerpop/blob/3.5.7/CHANGELOG.asciidoc#release-3-5-7">release notes</a> | <a href="https://tinkerpop.apache.org/docs/3.5.7/upgrade/#_tinkerpop_3_5_7">upgrade</a> | <a href="https://tinkerpop.apache.org/docs/3.5.7/">documentation</a> | <a href="#" data-bs-toggle="modal" data-bs-target="#contributors-3_5_7">contributors</a></p>
                      </div>
                       <div class="col-lg-5 col-md-12 mb-2 mb-lg-0">
-                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.3/apache-tinkerpop-gremlin-console-3.5.3-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
-                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.3/apache-tinkerpop-gremlin-server-3.5.3-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
-                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.3/apache-tinkerpop-3.5.3-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.7/apache-tinkerpop-gremlin-console-3.5.7-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Console</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.7/apache-tinkerpop-gremlin-server-3.5.7-bin.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Gremlin Server</a>
+                        <a class="btn btn-theme me-2" href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.5.7/apache-tinkerpop-3.5.7-src.zip"><img src="img/download/bx-download.svg" class="img-fluid me-2" alt="img">Source</a>
                       </div>
                 </div>
-
                 <div class="row d-flex align-items-center mt-4 mt-md-5">
                      <h2 class="ft-25 black bold mb-4">Archived Releases</h2>
                     <div class="col-lg-3 col-md-6 mb-2 mb-lg-0">
                         <img src="img/download/icon.png" class="img-fluid me-2" alt="img">
                         <select  id="dropdownArchives" class="form-select d-inliine-block">
-                             <option selected="selected">3.5.2 (10-January-2022)</option>
+                                <option selected="selected">3.6.4 (12-May-2023)</option>
+                                <option>3.6.3 (1-May-2023)</option>
+                                <option>3.6.2 (16-January-2023)</option>
+                                <option>3.6.1 (18-July-2022)</option>
+                                <option>3.6.0 (4-April-2022)</option>
+                                <option>3.5.6 (1-May-2023)</option>
+                                <option>3.5.5 (16-January-2023)</option>
+                                <option>3.5.4 (18-July-2022)</option>
+                                <option>3.5.3 (4-April-2022)</option>
+                                <option>3.5.2 (10-January-2022)</option>
                                 <option>3.5.1 (19-July-2021)</option>
                                 <option>3.5.0 (3-May-2021)</option>
                                 <option>3.4.13 (10-January-2022)</option>
@@ -307,10 +376,10 @@
 
                             <tr>
                                 <td data-label="Repository" class="bold">Go Module</td>
-                                <td data-label="Artifacts">COMING SOON</td>
+                                <td data-label="Artifacts"><a href="https://pkg.go.dev/github.com/apache/tinkerpop/gremlin-go/v3" class="text-blue">gremlin-go</a></td>
                                 <td data-label="">
                                     <div class="code-box1">
-                                        COMING SOON
+                                        go get github.com/apache/tinkerpop/gremlin-go/v3&#64;v3.7.0
                                     </div>
                                 </td>
                             </tr>
@@ -324,7 +393,7 @@
                                         &lt;dependency> <br>
                                            &nbsp;&nbsp; &lt;groupId>org.apache.tinkerpop&lt;/groupId> <br>
                                            &nbsp;&nbsp; &lt;artifactId>gremlin-driver&lt;/artifactId> <br>
-                                          &nbsp;&nbsp;  &lt;version>3.5.1&lt;/version> <br>
+                                          &nbsp;&nbsp;  &lt;version>3.7.0&lt;/version> <br>
                                         &lt;/dependency>
                                   </div>
                               </td>
@@ -355,7 +424,7 @@
                               <td data-label="Artifacts"><a href="https://www.nuget.org/packages/Gremlin.Net/" class="text-blue">Gremlin.Net </a> <br> <a href="https://www.nuget.org/packages/Gremlin.Net.Template/" class="text-blue">Gremlin.Net.Template </a></td>
                               <td data-label="">
                                   <div class="code-box1">
-                                   dotnet add package Gremlin.Net --version 3.5.1 <br>dotnet add package Gremlin.Net.template --version 3.5.1
+                                   dotnet add package Gremlin.Net --version 3.7.0 <br>dotnet add package Gremlin.Net.template --version 3.7.0
                                   </div>
                               </td>
                             </tr>
@@ -412,6 +481,226 @@
 
    
     <!-- Contributor Modals -->
+    <!-- 3.7.0 -->
+    <div class="modal fade" id="contributors-3_7_0" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                </div>
+                <div class="modal-body">
+                    <h4 class="modal-title bold black mb-2 ">3.7.0</h4>
+                    <p>Release Manager: Cole Greer</p>
+
+                    <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.5..3.7.0
+   232  Stephen Mallette
+    86  Yang Xia
+    57  Florian Hockmann
+    37  Valentyn Kahamlyk
+    33  Lyndon Bauto
+    30  Ken Hu
+    27  Cole Greer
+    17  dependabot[bot]
+    15  Cole-Greer
+     9  Dave Bechberger
+     5  kenhuuu
+     3  Boxuan Li
+     3  spmallette
+     2  Jorge Bay-Gondra
+     2  Mike Personick
+     2  xiazcy
+     1  Daniel Crha
+     1  Dave
+     1  Gunther
+     1  Lionel Fleury
+     1  Simon Z
+     1  lyndon</code></pre></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 3.6.5 -->
+    <div class="modal fade" id="contributors-3_6_5" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                </div>
+                <div class="modal-body">
+                    <h4 class="modal-title bold black mb-2 ">3.6.5</h4>
+                    <p>Release Manager: Cole Greer</p>
+
+                    <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.4..3.6.5
+    26  Stephen Mallette
+    23  Cole Greer
+    19  dependabot[bot]
+    15  Cole-Greer
+    11  Valentyn Kahamlyk
+     6  Florian Hockmann
+     6  Ken Hu
+     3  kenhuuu
+     2  Alex
+     2  Alex Hamilton
+     2  Boxuan Li
+     2  Hongjiang Zhang
+     2  Phanindhra
+     2  Yang Xia
+     1  Lyndon Bauto
+     1  Oleksandr Porunov
+     1  lyndon
+     1  xiazcy</code></pre></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 3.6.4 -->
+    <div class="modal fade" id="contributors-3_6_4" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                </div>
+                <div class="modal-body">
+                    <h4 class="modal-title bold black mb-2 ">3.6.4</h4>
+                    <p>Release Manager: Yang Xia</p>
+
+                    <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.3..3.6.4
+     9  Yang Xia
+     5  xiazcy
+     2  Florian Hockmann
+     1  Cole Greer
+     1  Valentyn Kahamlyk</code></pre></div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <!-- 3.6.3 -->
+    <div class="modal fade" id="contributors-3_6_3" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                </div>
+                <div class="modal-body">
+                    <h4 class="modal-title bold black mb-2 ">3.6.3</h4>
+                    <p>Release Manager: Yang Xia</p>
+
+                    <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.2..3.6.3
+    51  Stephen Mallette
+    48  Yang Xia
+    25  Ken Hu
+    13  Valentyn Kahamlyk
+    13  Cole Greer
+    13  dependabot[bot]
+    11  kenhuuu
+    10  valentynk
+     7  Florian Hockmann
+     4  Oleksandr Porunov
+     3  xiazcy
+     2  Hongjiang Zhang
+     2  Kemal
+     2  iAmmarTahir
+     1  Phanindhra
+     1  Daniel Weber
+     1  Derposoft
+     1  Mike Personick
+     1  Aaron Coady
+     1  Tormod Haugene
+     1  lvca</code></pre></div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+      <!-- 3.6.2 -->
+      <div class="modal fade" id="contributors-3_6_2" tabindex="-1" role="dialog">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                  </div>
+                  <div class="modal-body">
+                      <h4 class="modal-title bold black mb-2 ">3.6.2</h4>
+                      <p>Release Manager: Yang Xia</p>
+
+                      <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.1..3.6.2
+   153  Stephen Mallette
+    59  Florian Hockmann
+    46  Yang Xia
+    38  dependabot[bot]
+    35  Valentyn Kahamlyk
+    12  Cole Greer
+    10  Ken Hu
+     4  Aaron Coady
+     3  Hongjiang Zhang
+     3  Rithin Kumar
+     3  tkolanko
+     2  Mike Personick
+     2  good41898
+     1  宁培培
+     1  Boxuan Li
+     1  Norio Akagi (norakagi)
+     1  OGoodness
+     1  Priyanka Awatramani
+     1  Willem Broekema</code></pre></div>
+                  </div>
+
+              </div>
+          </div>
+      </div>
+
+      <!-- 3.6.1 -->
+      <div class="modal fade" id="contributors-3_6_1" tabindex="-1" role="dialog">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                  </div>
+                  <div class="modal-body">
+                      <h4 class="modal-title bold black mb-2 ">3.6.1</h4>
+                      <p>Release Manager: Kelvin Lawrence</p>
+
+                      <div class="code-box1"><pre><code>$ git shortlog -sn 3.6.0..3.6.1
+   122  Stephen Mallette
+    81  Igor Ostapenko
+    56  Lyndon Bauto
+    49  Valentyn Kahamlyk
+    23  Rithin Kumar
+    19  Florian Hockmann
+    18  Simon Zhao
+    18  Yang Xia
+    15  Roi Martin
+    14  Dave Bechberger
+    12  dependabot[bot]
+     4  Daniel Weber
+     4  Jorge Bay-Gondra
+     4  Mike Personick
+     2  Dan DeRobertis
+     2  Ken Hu
+     2  Norio Akagi (norakagi)
+     1  Boxuan Li
+     1  Saikiran Boga
+     1  Vivek Gupta
+     1  c
+     1  felix
+     1  steigma</code></pre></div>
+                  </div>
+
+              </div>
+          </div>
+      </div>
+
       <!-- 3.6.0 -->
       <div class="modal fade" id="contributors-3_6_0" tabindex="-1" role="dialog">
           <div class="modal-dialog" role="document">
@@ -459,6 +748,150 @@
           </div>
       </div>
 
+    <!-- 3.5.6 -->
+    <div class="modal fade" id="contributors-3_5_7" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                </div>
+                <div class="modal-body">
+                    <h4 class="modal-title bold black mb-2 ">3.5.7</h4>
+                    <p>Release Manager: Cole Greer</p>
+
+                    <div class="code-box1"><pre><code>$ git shortlog -sn 3.5.6..3.5.7
+    19  dependabot[bot]
+    10  Cole Greer
+     6  Cole-Greer
+     6  Stephen Mallette
+     6  Valentyn Kahamlyk
+     3  Yang Xia
+     3  kenhuuu
+     2  Florian Hockmann
+     2  Hongjiang Zhang
+     2  Ken Hu
+     2  xiazcy
+     1  Alex
+     1  Boxuan Li
+     1  Lyndon Bauto</code></pre></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- 3.5.6 -->
+    <div class="modal fade" id="contributors-3_5_6" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                </div>
+                <div class="modal-body">
+                    <h4 class="modal-title bold black mb-2 ">3.5.6</h4>
+                    <p>Release Manager: Yang Xia</p>
+
+                    <div class="code-box1"><pre><code>$ git shortlog -sn 3.5.5..3.5.6
+    21  Stephen Mallette
+    14  Yang Xia
+    13  dependabot[bot]
+    10  Valentyn Kahamlyk
+     9  kenhuuu
+     9  Cole Greer
+     7  Ken Hu
+     4  Florian Hockmann
+     3  valentynk
+     2  xiazcy
+     2  Hongjiang Zhang
+     2  Kemal
+     2  iAmmarTahir
+     1  Aaron Coady
+     1  Derposoft
+     1  Daniel Weber
+     1  Tormod Haugene</code></pre></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+      <!-- 3.5.5 -->
+      <div class="modal fade" id="contributors-3_5_5" tabindex="-1" role="dialog">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                  </div>
+                  <div class="modal-body">
+                      <h4 class="modal-title bold black mb-2 ">3.5.5</h4>
+                      <p>Release Manager: Yang Xia</p>
+
+                      <div class="code-box1"><pre><code>$  git shortlog -sn 3.5.4..3.5.5
+    67  Stephen Mallette
+    37  dependabot[bot]
+    32  Florian Hockmann
+    23  Yang Xia
+    21  Valentyn Kahamlyk
+    10  Cole Greer
+     7  Ken Hu
+     4  Aaron Coady
+     3  Hongjiang Zhang
+     3  Rithin Kumar
+     2  good41898
+     1  Priyanka Awatramani
+     1  Willem Broekema
+     1  OGoodness
+     1  Norio Akagi (norakagi)
+     1  Boxuan Li</code></pre></div>
+                  </div>
+
+              </div>
+          </div>
+      </div>
+
+      <!-- 3.5.4 -->
+      <div class="modal fade" id="contributors-3_5_4" tabindex="-1" role="dialog">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                  </div>
+                  <div class="modal-body">
+                      <h4 class="modal-title bold black mb-2 ">3.5.4</h4>
+                      <p>Release Manager: Kelvin Lawrence</p>
+
+                      <div class="code-box1"><pre><code>$  git shortlog -sn 3.5.3..3.5.4
+    81  Igor Ostapenko
+    52  Stephen Mallette
+    43  Valentyn Kahamlyk
+    23  Lyndon Bauto
+    21  Rithin Kumar
+    18  Yang Xia
+    16  Simon Zhao
+    14  Roi Martin
+    13  Florian Hockmann
+    12  dependabot[bot]
+     6  Dave Bechberger
+     2  Daniel Weber
+     2  Jorge Bay-Gondra
+     2  Ken Hu
+     2  Mike Personick
+     1  Boxuan Li
+     1  Dan DeRobertis
+     1  Norio Akagi (norakagi)
+     1  Saikiran Boga
+     1  Vivek Gupta
+     1  c
+     1  felix
+     1  steigma</code></pre></div>
+                  </div>
+
+              </div>
+          </div>
+      </div>
+
       <!-- 3.5.3 -->
       <div class="modal fade" id="contributors-3_5_3" tabindex="-1" role="dialog">
           <div class="modal-dialog" role="document">
@@ -2092,9 +2525,9 @@
                 <div class="row d-flex justify-content-center">
                     <div class="col-md-8 col-lg-6">
                         <div class="ju-box">
-                            <h2 class="ft-40 text-blue bold">Join Us on</h2>
-                            <p class="bold">Join us on our Discord Chat</p>
-                            <a href="https://discord.gg/ndMpKZcBEE"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+                            <h2 class="ft-40 text-blue bold">Join Us</h2>
+                            <p class="bold">Join us on our Discord Server</p>
+                            <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
                         </div>
                     </div>
                 </div>
@@ -2111,9 +2544,11 @@
                             <div class="bold ft-25">Apache TinkerPop™</div>
                             <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
                             <ul class="list-unstyled list-inline hover-op-low">
-                                <li class="list-inline-item"><a href="https://discord.gg/ndMpKZcBEE"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
-                                <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
                                 <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
                             </ul>
                         </div>
                         <div class="col-md-4 ft-links">
@@ -2124,6 +2559,7 @@
                                         <li><a href="index.html">Home</a></li>
                                         <li><a href="download.html">Downloads</a></li>
                                         <li><a href="https://tinkerpop.apache.org/docs/current">Documentation</a></li>
+                                        <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html" target="_blank">Privacy Policy</a></li>
                                     </ul>
                                 </div>
                                 <div class="col-lg-6">
@@ -2145,7 +2581,7 @@
                 <div class="container">
                     <div class="row">
                         <div class="col-12">
-                            Copyright © 2015-2022 The Apache Software Foundation
+                            Copyright © 2015-2023 The Apache Software Foundation
                         </div>
                     </div>
                 </div>
@@ -2153,9 +2589,7 @@
         </footer>
         <script src="js/jquery-1.11.1.js"></script>
         <script src="js/bootstrap.bundle.min.js"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js"
-              integrity="sha512-Eak/29OTpb36LLo2r47IpVzPBLXnAMPAVypbSZiZ4Qkf8p/7S/XRG5xp7OKWPPYfJT6metI+IORkR5G8F900+g=="
-              crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+      <script src="js/wow.min.js"></script>
         <script src="js/my.js"></script>
     </body>
 </html>
diff --git a/docs/site/home/fonts/raleway.woff2 b/docs/site/home/fonts/raleway.woff2
new file mode 100644
index 0000000..33cb165
--- /dev/null
+++ b/docs/site/home/fonts/raleway.woff2
Binary files differ
diff --git a/docs/site/home/gremlin.html b/docs/site/home/gremlin.html
index 901610f..9690f69 100644
--- a/docs/site/home/gremlin.html
+++ b/docs/site/home/gremlin.html
@@ -19,119 +19,167 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <link href="img/favicon.png" rel="shortcut icon" />
-        <title>Apache TinkerPop</title>
+        <title>Apache TinkerPop: Gremlin</title>
         <meta name="description" content="">
         <meta name="keywords" content="">
-        <link href="css/bootstrap.min.css" rel="stylesheet"><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link href="css/bootstrap.min.css" rel="stylesheet">
+        <link href="css/font-awesome.css" rel="stylesheet"/>
         <link href="css/custome.css" rel="stylesheet">
         <link href="css/responsive.css" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.css" integrity="sha512-K2J6Yt6ElUYEMPcTr0wm555AAyiqkgYiUgPIW18FT88/aYSNDk0EvGjsln/TEu3ee/jaHf0xoXzFppSbBtUXbQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link href="css/animate.css" rel="stylesheet"/>
         <link href="css/prism.css" rel="stylesheet">
-        <link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Raleway:wght@400;500;600;700&display=swap" rel="stylesheet">
+        <link href="css/fonts.css" rel="stylesheet">
+        <!-- Matomo -->
+        <script>
+            var _paq = window._paq = window._paq || [];
+            /* We explicitly disable cookie tracking to avoid privacy issues */
+            _paq.push(['disableCookies']);
+            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['trackPageView']);
+            _paq.push(['enableLinkTracking']);
+            (function() {
+                var u="https://analytics.apache.org/";
+                _paq.push(['setTrackerUrl', u+'matomo.php']);
+                _paq.push(['setSiteId', '27']);
+                var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+                g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            })();
+        </script>
+        <!-- End Matomo Code -->
     </head>
     <body>
-      <!-- header -->
-         <div class="header">
-            <div class="container">
-              <nav class="navbar navbar-expand-lg  ">
-                  <div class="container-fluid">
+    <!-- header -->
+    <div class="header">
+        <div class="container">
+            <nav class="navbar navbar-expand-lg  ">
+                <div class="container-fluid">
                     <a class="navbar-brand" href="index.html">
                         <img src="img/logo.png" class="img-fluid" alt="img">
                     </a>
-                    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-                      <span class="fa fa-bars"></span>
+                    <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
+                            data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
+                            aria-expanded="false" aria-label="Toggle navigation">
+                        <span class="fa fa-bars"></span>
                     </button>
                     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                      <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
-                        <li class="nav-item">
-                          <a class="nav-link active" aria-current="page" href="index.html">Home</a>
-                        </li>
-                        <li class="nav-item">
-                          <a class="nav-link" href="download.html">Download</a>
-                        </li>
-                          <li class="nav-item dropdown">
-                              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                Documentation
-                              </a>
-                              <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
-                                  <li class="dropdown-header">Latest Documentation</li>
-                                  <li><a href="https://tinkerpop.apache.org/docs/current" class="dropdown-item">Documentation Index</a></li>
-                                  <li><a href="https://tinkerpop.apache.org/docs/current/reference" class="dropdown-item">Reference</a></li>
-                                  <li><a href="https://tinkerpop.apache.org/docs/current/dev/provider" class="dropdown-item">Provider</a></li>
-                                  <li><a href="https://tinkerpop.apache.org/docs/current/dev/developer" class="dropdown-item">Developer</a></li>
-                                  <li><a href="https://tinkerpop.apache.org/docs/current/upgrade" class="dropdown-item">Upgrade Information</a></li>
-                                  <li><a href="https://tinkerpop.apache.org/javadocs/current/core/" class="dropdown-item">Core Javadoc API</a></li>
-                                  <li><a href="https://tinkerpop.apache.org/javadocs/current/full/" class="dropdown-item">Full Javadoc API</a></li>
-                                  <li><hr class="dropdown-divider"></li>
-                                  <li><a href="https://tinkerpop.apache.org/docs/" class="dropdown-item">Documentation Archives</a></li>
-                                  <li><a href="https://tinkerpop.apache.org/javadocs/" class="dropdown-item">Javadoc Archives</a></li>
-                                  <li><hr class="dropdown-divider"></li>
-                                  <li><a href="https://tinkerpop.apache.org/docs/current/index.html#publications" class="dropdown-item">Publications</a></li>
-                              </ul>
-                              
+                        <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
+                            <li class="nav-item">
+                                <a class="nav-link active" aria-current="page" href="index.html">Home</a>
                             </li>
-                         <li class="nav-item dropdown">
-                              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                Tutorials
-                              </a>
-                              <ul class="dropdown-menu" aria-labelledby="navbarDropdown1">
-                                     <li><a href="gremlin.html" class="dropdown-item">Introduction to Gremlin</a></li>
-                                     <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/tutorials/getting-started/" >Getting Started</a></li>
-                                     <li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/tutorials/the-gremlin-console/">The Gremlin Console</a></li>
-                                     <li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/recipes/">Gremlin Recipes</a></li>
-                                     <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/tutorials/gremlins-anatomy/">Gremlin's Anatomy</a></li>
-                                     <li><hr class="dropdown-divider"></li>
-                                     <li><a class="dropdown-item" href="http://kelvinlawrence.net/book/Gremlin-Graph-Guide.html">Book: Practical Gremlin by Kelvin Lawrence</a></li>
-                                     <li><a class="dropdown-item" href="http://sql2gremlin.com/">SQL2Gremlin</a></li>
-                                  </ul>
-                             
+                            <li class="nav-item">
+                                <a class="nav-link" href="download.html">Download</a>
                             </li>
-                         <li class="nav-item dropdown">
-                              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                Community
-                              </a>
-                              <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                                 <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users">User Mailing List</a></li>
-                                 <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org">Developer Mailing List</a></li>
-                                 <li><a class="dropdown-item" href="https://discord.gg/ndMpKZcBEE" target="_blank"><img src="img/discord_logo.png" class="nav-icon">Join us on Discord</a></li>
-                                 <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/">Issue Tracker</a></li>
-                                 <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
-                                 <li><a class="dropdown-item" href="providers.html">Data System Support</a></li>
-                                 <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
-                                 <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
-                                <li><hr class="dropdown-divider"></li>
-                                 <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon">GitHub</a></li>
-                                 <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon">Twitter</a></li>
-                              </ul>
-                            
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                    Tools
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                                    <li><a class="dropdown-item" href="providers.html">Graph Systems</a></li>
+                                    <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a class="dropdown-item" href="https://gremlify.com/">Gremlify: Try Gremlin</a></li>
+                                    <li><a class="dropdown-item" href="https://tinkerpop.apache.org/gremlint">Gremlint: Lint Gremlin</a></li>
+                                    <li><a class="dropdown-item" href="https://www.gremlator.com/">Gremlator: Translate Gremlin</a></li>
+                                </ul>
                             </li>
-                        
-                         <li class="nav-item">
-                          <a class="nav-link" href="https://tinkerpop.apache.org/gremlint/">Gremlint</a>
-                        </li>
-                        <li class="nav-item dropdown">
-                          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            Apache Software
-                          </a>
-                          <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
-                                 <li><a  class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/events/current-event">Events</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-                                 <li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
-                              </ul>
-                          
-                        </li>
-                         
-                      </ul>
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                                   data-bs-toggle="dropdown" aria-expanded="false">
+                                    Documentation
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+                                    <li class="dropdown-header">Latest Documentation</li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current" class="dropdown-item">Documentation Index</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/reference" class="dropdown-item">Reference</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/dev/provider" class="dropdown-item">Provider</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/dev/developer" class="dropdown-item">Developer</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/upgrade" class="dropdown-item">Upgrade Information</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/javadocs/current/core/" class="dropdown-item">Core Javadoc API</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/javadocs/current/full/" class="dropdown-item">Full Javadoc API</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/" class="dropdown-item">Documentation Archives</a></li>
+                                    <li><a href="https://tinkerpop.apache.org/javadocs/" class="dropdown-item">Javadoc Archives</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a href="https://tinkerpop.apache.org/docs/current/index.html#publications" class="dropdown-item">Publications</a></li>
+                                </ul>
+
+                            </li>
+
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button"
+                                   data-bs-toggle="dropdown" aria-expanded="false">
+                                    Tutorials
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown1">
+                                    <li><a href="gremlin.html" class="dropdown-item">Introduction to Gremlin</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://tinkerpop.apache.org/docs/current/tutorials/getting-started/">Getting
+                                        Started</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://tinkerpop.apache.org/docs/current/tutorials/the-gremlin-console/">The
+                                        Gremlin Console</a></li>
+                                    <li><a class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/recipes/">Gremlin
+                                        Recipes</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://tinkerpop.apache.org/docs/current/tutorials/gremlins-anatomy/">Gremlin's
+                                        Anatomy</a></li>
+                                    <li>
+                                        <hr class="dropdown-divider">
+                                    </li>
+                                    <li><a class="dropdown-item"
+                                           href="http://kelvinlawrence.net/book/Gremlin-Graph-Guide.html">Book: Practical
+                                        Gremlin by Kelvin Lawrence</a></li>
+                                    <li><a class="dropdown-item" href="http://sql2gremlin.com/">SQL2Gremlin</a></li>
+                                </ul>
+
+                            </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                    Community
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
+                                    <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon"/>Discord</a></li>
+                                    <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon"/>Answer Overflow</a></li>
+                                    <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon"/>Stack Overflow</a></li>
+                                    <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon"/>User Mailing List</a></li>
+                                    <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon"/>Developer Mailing List</a></li>
+                                    <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon"/>Issue Tracker</a></li>
+                                    <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon"/>GitHub</a></li>
+                                    <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon"/>Twitch</a></li>
+                                    <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon"/>Twitter</a></li>
+                                    <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon"/>YouTube</a></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
+                                    <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
+                                </ul>
+                            </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown5" role="button"
+                                   data-bs-toggle="dropdown" aria-expanded="false">
+                                    Apache Software
+                                </a>
+                                <ul class="dropdown-menu" aria-labelledby="navbarDropdown5">
+                                    <li><a class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
+                                    <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
+                                    <li><a class="dropdown-item"
+                                           href="https://www.apache.org/events/current-event">Events</a></li>
+                                    <li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+                                    </li>
+                                    <li><a class="dropdown-item"
+                                           href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                                    <li><a class="dropdown-item" href="https://www.apache.org/security/">Security</a></li>
+                                </ul>
+
+                            </li>
+
+                        </ul>
                     </div>
-                  </div>
-                </nav>
-            </div>
+                </div>
+            </nav>
         </div>
+    </div>
         
         <!-- hero -->
         <div class="container hero-inner">
@@ -325,28 +373,28 @@
                     <div class="col-md-12 col-lg-6 mb-4 mb-lg-0">
                         <div class="code-box h-100">
                                                     <code>
-                                                        <span class="text-purpal">g</span><span class="text-blue">.V</span><span class="text-success">().</span><span class="text-blue">has</span><span class="text-success">("name","gremlin").</span> <span class="text-blue">as</span><span class="text-success">("a").</span>
+                                                        <span class="text-purpal">g</span><span class="text-blue">.V</span><span class="text-success">().</span><span class="text-blue">has</span><span class="text-success">("name","gremlin").</span><span class="text-blue">as</span><span class="text-success">("a").</span>
 
                                                             <br>&nbsp;&nbsp;<span class="text-blue">out</span><span class="text-success">("created").</span><span class="text-blue">in</span><span class="text-success">("created").</span>
 
                                                              <br>&nbsp;&nbsp;<span class="text-blue">where</span><span class="text-success">(</span><span class="text-blue">neq</span><span class="text-success">("a")).</span>
 
-                                                             <br>&nbsp;&nbsp;<span class="text-blue">in</span><span class="text-success"> ("manages").</span>
+                                                             <br>&nbsp;&nbsp;<span class="text-blue">in</span><span class="text-success">("manages").</span>
                                                              <br>&nbsp;&nbsp;<span class="text-blue">groupCount</span><span class="text-success">().</span><span class="text-blue">by</span><span class="text-success">("name")</span>
                                                     </code>
                                                 </div>
                     </div>
-                     <div class="col-md-12 col-lg-6">
+                    <div class="col-md-12 col-lg-6">
                         <h2 class="ft-30 bold black mb-3 md-md-5">Imperative & Declarative Traversals</h2>
-                        <p>A Gremlin traversal can be written in either an imperative (procedural) manner, a declarative (descriptive) manner, or in a hybrid manner containing both imperative and declarative aspects. An imperative Gremlin traversal tells the traversers how to proceed at each step in the traversal. For instance, the imperative traversal on the right first places a traverser at the vertex denoting Gremlin. That traverser then splits itself across all of Gremlin's collaborators that are not Gremlin himself. Next, the traversers walk to the managers of those collaborators to ultimately be grouped into a manager name count distribution. This traversal is imperative in that it tells the traversers to "go here and then go there" in an explicit, procedural manner.</p>
+                        <p>A Gremlin traversal can be written in either an imperative (procedural) manner, a declarative (descriptive) manner, or in a hybrid manner containing both imperative and declarative aspects. An imperative Gremlin traversal tells the traversers how to proceed at each step in the traversal. For instance, the imperative traversal in the first box first places a traverser at the vertex denoting Gremlin. That traverser then splits itself across all of Gremlin's collaborators that are not Gremlin himself. Next, the traversers walk to the managers of those collaborators to ultimately be grouped into a manager name count distribution. This traversal is imperative in that it tells the traversers to "go here and then go there" in an explicit, procedural manner.</p>
                     </div>
                     
                 </div>
 
                 <div class="row mb-3 mb-md-5">
                     
-                     <div class="col-md-12 col-lg-6 order-2 order-md-1">
-                        <p class="text-lg-end text-start">A declarative Gremlin traversal does not tell the traversers the order in which to execute their walk, but instead, allows each traverser to select a pattern to execute from a collection of (potentially nested) patterns. The declarative traversal on the left yields the same result as the imperative traversal above. However, the declarative traversal has the added benefit that it leverages not only a compile-time query planner (like imperative traversals), but also a runtime query planner that chooses which traversal pattern to execute next based on the historic statistics of each pattern -- favoring those patterns which tend to reduce/filter the most data.</p>
+                    <div class="col-md-12 col-lg-6 order-2 order-md-1">
+                        <p class="text-lg-end text-start">A declarative Gremlin traversal does not tell the traversers the order in which to execute their walk, but instead, allows each traverser to select a pattern to execute from a collection of (potentially nested) patterns. The declarative traversal in the second box yields the same result as the imperative traversal above. However, the declarative traversal has the added benefit that it leverages not only a compile-time query planner (like imperative traversals), but also a runtime query planner that chooses which traversal pattern to execute next based on the historic statistics of each pattern -- favoring those patterns which tend to reduce/filter the most data.</p>
                     </div>
                     <div class="col-md-12 col-lg-6 mb-4 mb-lg-0 order-1 order-md-2">
                         <div class="code-box h-100">
@@ -357,9 +405,9 @@
 
                                                             <br>&nbsp;&nbsp;<span class="text-blue">as</span><span class="text-success">("a").</span><span class="text-blue">out</span><span class="text-success">("created").as("b"),</span>
 
-                                                            <br>&nbsp;&nbsp;<span class="text-blue">as</span><span class="text-success">("a").</span><span class="text-blue">in</span><span class="text-success">("created").as("c"),</span>
+                                                            <br>&nbsp;&nbsp;<span class="text-blue">as</span><span class="text-success">("b").</span><span class="text-blue">in</span><span class="text-success">("created").as("c"),</span>
 
-                                                            <br>&nbsp;&nbsp;<span class="text-blue">as</span><span class="text-success">("a").</span><span class="text-blue">in</span><span class="text-success">("manages").as("d"),</span>
+                                                            <br>&nbsp;&nbsp;<span class="text-blue">as</span><span class="text-success">("c").</span><span class="text-blue">in</span><span class="text-success">("manages").as("d"),</span>
 
                                                             <br>&nbsp;&nbsp;&nbsp;<span class="text-blue">where</span><span class="text-success">("a",</span><span class="text-blue">neq</span><span class="text-success">("c"))).</span>
 
@@ -420,9 +468,9 @@
                                                             <br>&nbsp;&nbsp;&nbsp;<span class="text-blue">System.out.printIn</span><span class="text-success">("Average rating :" +</span><span class="text-blue">avg</span><span class="text-success">);</span>
 
 
-                                                              <br>&nbsp;&nbsp;<span class="text-success">}</span>
+                                                              <br>&nbsp;&nbsp;<span class="text-blue">}</span>
 
-                                                                <br>&nbsp;<span class="text-success">}</span>
+                                                                <br>&nbsp;<span class="text-blue">}</span>
                                                              
                                                     </code>
                                                 </div>
@@ -450,7 +498,7 @@
 
                                                             
 
-                                                            <br>&nbsp;&nbsp;&nbsp;<span class="text-blue">System.out.println(</span><span class="text-success">"Average rating"</span><span class="text-purpal">+</span><span class="text-blue">result.next().getDouble(</span><span class="text-success">"AVERAGE"</span><span class="text-blue">)</span>
+                                                            <br>&nbsp;&nbsp;&nbsp;<span class="text-blue">System.out.println(</span><span class="text-success">"Average rating"</span><span class="text-purpal">+</span><span class="text-blue">result.next().getDouble(</span><span class="text-success">"AVERAGE"</span><span class="text-blue">));</span>
 
 
                                                               <br>&nbsp;&nbsp;<span class="text-blue">}</span>
@@ -479,7 +527,7 @@
 
                                                             <br><span class="text-purpal">g</span><span class="text-blue"> =  traversal().withRemote(DriverRemoteConnection.using("<span class="text-success">Localhost</span><span class="text-blue">",</span><span class="text-purpal">8182</span><span class="text-blue">));</span> &nbsp;&nbsp;&nbsp;&nbsp; <span class="comment-text">//remote</span></span>
 
-                                                            <br><span class="text-purpal">g</span><span class="text-blue"> =  traversal().withEmbedded((graph).withComputer(SparkGraphComputer.<span class="text-purpal">class</span><span class="text-blue">);</span> &nbsp;&nbsp;&nbsp; <span class="comment-text">//distributed OLAP</span></span>
+                                                            <br><span class="text-purpal">g</span><span class="text-blue"> =  traversal().withEmbedded(graph).withComputer(SparkGraphComputer.<span class="text-purpal">class</span><span class="text-blue">);</span> &nbsp;&nbsp;&nbsp; <span class="comment-text">//distributed OLAP</span></span>
                                                             
                                                              
                                                     </code>
@@ -541,9 +589,9 @@
                 <div class="row d-flex justify-content-center">
                     <div class="col-md-8 col-lg-6">
                         <div class="ju-box">
-                            <h2 class="ft-40 text-blue bold">Join Us on</h2>
-                            <p class="bold">Join us on our Discord Chat</p>
-                            <a href="https://discord.gg/ndMpKZcBEE"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+                            <h2 class="ft-40 text-blue bold">Join Us</h2>
+                            <p class="bold">Join us on our Discord Server</p>
+                            <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
                         </div>
                     </div>
                 </div>
@@ -559,9 +607,11 @@
                             <div class="bold ft-25">Apache TinkerPop™</div>
                             <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
                             <ul class="list-unstyled list-inline hover-op-low">
-                                <li class="list-inline-item"><a href="https://discord.gg/ndMpKZcBEE"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
-                                <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
                                 <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                                <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
                             </ul>
                         </div>
                         <div class="col-md-4 ft-links">
@@ -572,6 +622,7 @@
                                         <li><a href="index.html">Home</a></li>
                                         <li><a href="download.html">Downloads</a></li>
                                         <li><a href="https://tinkerpop.apache.org/docs/current">Documentation</a></li>
+                                        <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html" target="_blank">Privacy Policy</a></li>
                                     </ul>
                                 </div>
                                 <div class="col-lg-6">
@@ -593,7 +644,7 @@
                 <div class="container">
                     <div class="row">
                         <div class="col-12">
-                            Copyright © 2015-2022 The Apache Software Foundation
+                            Copyright © 2015-2023 The Apache Software Foundation
                         </div>
                     </div>
                 </div>
@@ -601,9 +652,7 @@
         </footer>
         <script src="js/jquery-1.11.1.js"></script>
         <script src="js/bootstrap.bundle.min.js"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js"
-              integrity="sha512-Eak/29OTpb36LLo2r47IpVzPBLXnAMPAVypbSZiZ4Qkf8p/7S/XRG5xp7OKWPPYfJT6metI+IORkR5G8F900+g=="
-              crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+      <script src="js/wow.min.js"></script>
         <script src="js/my.js"></script>
         <script src="js/prism.js"></script>
     </body>
diff --git a/docs/site/home/img/answer-overflow-logo.png b/docs/site/home/img/answer-overflow-logo.png
new file mode 100644
index 0000000..1feb07c
--- /dev/null
+++ b/docs/site/home/img/answer-overflow-logo.png
Binary files differ
diff --git a/docs/site/home/img/community/db.png b/docs/site/home/img/community/db.png
new file mode 100644
index 0000000..7baa379
--- /dev/null
+++ b/docs/site/home/img/community/db.png
Binary files differ
diff --git a/docs/site/home/img/community/tools.png b/docs/site/home/img/community/tools.png
index 8a819eb..7fee280 100644
--- a/docs/site/home/img/community/tools.png
+++ b/docs/site/home/img/community/tools.png
Binary files differ
diff --git a/docs/site/home/img/discord_button.png b/docs/site/home/img/discord-button.png
similarity index 100%
rename from docs/site/home/img/discord_button.png
rename to docs/site/home/img/discord-button.png
Binary files differ
diff --git a/docs/site/home/img/discord_logo.png b/docs/site/home/img/discord-logo.png
similarity index 100%
rename from docs/site/home/img/discord_logo.png
rename to docs/site/home/img/discord-logo.png
Binary files differ
diff --git a/docs/site/home/img/jira-logo.png b/docs/site/home/img/jira-logo.png
new file mode 100644
index 0000000..b768d16
--- /dev/null
+++ b/docs/site/home/img/jira-logo.png
Binary files differ
diff --git a/docs/site/home/img/link-arrow.svg b/docs/site/home/img/link-arrow.svg
new file mode 100644
index 0000000..62f0935
--- /dev/null
+++ b/docs/site/home/img/link-arrow.svg
@@ -0,0 +1,11 @@
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50.000000 50.000000"
+     preserveAspectRatio="xMidYMid meet">
+    <g transform="translate(0.000000,50.000000) scale(0.100000,-0.100000)" fill="#147aa4" stroke="none">
+        <path d="M45 447 c-3 -7 -4 -100 -3 -207 l3 -195 205 0 205 0 0 205 0 205
+-203 3 c-159 2 -204 0 -207 -11z m395 -197 l0 -190 -190 0 -190 0 0 190 0 190
+190 0 190 0 0 -190z"/>
+        <path d="M240 400 c0 -6 29 -10 67 -10 l68 0 -110 -110 c-60 -60 -106 -113
+-102 -117 4 -4 57 42 117 102 l110 110 0 -68 c0 -38 4 -67 10 -67 6 0 10 35
+10 85 l0 85 -85 0 c-50 0 -85 -4 -85 -10z"/>
+    </g>
+</svg>
diff --git a/docs/site/home/img/mail.png b/docs/site/home/img/mail.png
new file mode 100644
index 0000000..86ce9a6
--- /dev/null
+++ b/docs/site/home/img/mail.png
Binary files differ
diff --git a/docs/site/home/img/providers/25.png b/docs/site/home/img/providers/25.png
new file mode 100644
index 0000000..e0073a1
--- /dev/null
+++ b/docs/site/home/img/providers/25.png
Binary files differ
diff --git a/docs/site/home/img/providers/26.png b/docs/site/home/img/providers/26.png
new file mode 100644
index 0000000..ca371cc
--- /dev/null
+++ b/docs/site/home/img/providers/26.png
Binary files differ
diff --git a/docs/site/home/img/providers/puppy-graph.png b/docs/site/home/img/providers/puppy-graph.png
new file mode 100644
index 0000000..f07e9ce
--- /dev/null
+++ b/docs/site/home/img/providers/puppy-graph.png
Binary files differ
diff --git a/docs/site/home/img/social/twitch.png b/docs/site/home/img/social/twitch.png
new file mode 100644
index 0000000..721f349
--- /dev/null
+++ b/docs/site/home/img/social/twitch.png
Binary files differ
diff --git a/docs/site/home/img/social/youtube.png b/docs/site/home/img/social/youtube.png
new file mode 100644
index 0000000..45d6d4a
--- /dev/null
+++ b/docs/site/home/img/social/youtube.png
Binary files differ
diff --git a/docs/site/home/img/stack-overflow-logo.png b/docs/site/home/img/stack-overflow-logo.png
new file mode 100644
index 0000000..d29cbc1
--- /dev/null
+++ b/docs/site/home/img/stack-overflow-logo.png
Binary files differ
diff --git a/docs/site/home/img/tools.png b/docs/site/home/img/tools.png
new file mode 100644
index 0000000..1942e5e
--- /dev/null
+++ b/docs/site/home/img/tools.png
Binary files differ
diff --git a/docs/site/home/img/twitch-logo.png b/docs/site/home/img/twitch-logo.png
new file mode 100644
index 0000000..bdc98e7
--- /dev/null
+++ b/docs/site/home/img/twitch-logo.png
Binary files differ
diff --git a/docs/site/home/img/youtube-logo.png b/docs/site/home/img/youtube-logo.png
new file mode 100644
index 0000000..bd762d7
--- /dev/null
+++ b/docs/site/home/img/youtube-logo.png
Binary files differ
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index 447f373..5d130ef 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -19,22 +19,33 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link href="img/favicon.png" rel="shortcut icon"/>
-    <title>Apache TinkerPop</title>
+    <title>Apache TinkerPop: Home</title>
     <meta name="description" content="">
     <meta name="keywords" content="">
     <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"
-          integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+    <link href="css/font-awesome.css" rel="stylesheet"/>
     <link href="css/custome.css" rel="stylesheet">
     <link href="css/responsive.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.css"
-          integrity="sha512-K2J6Yt6ElUYEMPcTr0wm555AAyiqkgYiUgPIW18FT88/aYSNDk0EvGjsln/TEu3ee/jaHf0xoXzFppSbBtUXbQ=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+    <link href="css/animate.css" rel="stylesheet"/>
     <link href="css/prism.css" rel="stylesheet">
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Raleway:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <link href="css/fonts.css" rel="stylesheet">
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* We explicitly disable cookie tracking to avoid privacy issues */
+        _paq.push(['disableCookies']);
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function() {
+            var u="https://analytics.apache.org/";
+            _paq.push(['setTrackerUrl', u+'matomo.php']);
+            _paq.push(['setSiteId', '27']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
 </head>
 <body>
 <!-- header -->
@@ -58,6 +69,21 @@
                         <li class="nav-item">
                             <a class="nav-link" href="download.html">Download</a>
                         </li>
+
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Tools
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                                <li><a class="dropdown-item" href="providers.html">Graph Systems</a></li>
+                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a class="dropdown-item" href="https://gremlify.com/">Gremlify: Try Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://tinkerpop.apache.org/gremlint">Gremlint: Lint Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://www.gremlator.com/">Gremlator: Translate Gremlin</a></li>
+                            </ul>
+                        </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -80,6 +106,7 @@
                             </ul>
 
                         </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -109,48 +136,31 @@
 
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button"
-                               data-bs-toggle="dropdown" aria-expanded="false">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                                 Community
                             </a>
                             <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users">User
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org">Developer
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item" href="https://discord.gg/ndMpKZcBEE" target="_blank"><img
-                                        src="img/discord_logo.png" class="nav-icon">Join us on Discord</a></li>
-                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/">Issue
-                                    Tracker</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a>
-                                </li>
-                                <li><a class="dropdown-item" href="providers.html">Data System Support</a></li>
-                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a>
-                                </li>
-                                <li>
-                                    <hr class="dropdown-divider">
-                                </li>
-                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img
-                                        src="img/github-logo.png" class="nav-icon">GitHub</a></li>
-                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img
-                                        src="img/twitter-logo.png" class="nav-icon">Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon"/>Discord</a></li>
+                                <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon"/>Answer Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon"/>Stack Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon"/>User Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon"/>Developer Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon"/>Issue Tracker</a></li>
+                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon"/>GitHub</a></li>
+                                <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon"/>Twitch</a></li>
+                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon"/>Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon"/>YouTube</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
                             </ul>
-
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="https://tinkerpop.apache.org/gremlint/">Gremlint</a>
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button"
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown5" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
                                 Apache Software
                             </a>
-                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown5">
                                 <li><a class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
                                 <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
                                 <li><a class="dropdown-item"
@@ -179,7 +189,7 @@
                 <h1 class="ft-40 bold black mb-3">Apache TinkerPop™</h1>
                 <p>Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic
                     systems (OLAP).</p>
-                <a href="https://discord.gg/ndMpKZcBEE" target="_blank"><img src="img/discord_button.png" alt="img"
+                <a href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-button.png" alt="img"
                                                                              class="img-fluid"></a>
             </div>
         </div>
@@ -200,30 +210,30 @@
                 <div class="dd-box">
                     <div class="text-center">
                         <h2 class="ft-30 bold black mb-2">Downloads & Documentation</h2>
-                        <p class="mb-3 mb-md-5 medium ">Released: 4-April-2022</p>
+                        <p class="mb-3 mb-md-5 medium ">Released: 31-July-2023</p>
                     </div>
                     <div class="row">
                         <div class="col-lg-6 border-right text-center">
-                            <h3 class="ft-25 bold black mb-4">TinkerPop 3.6.0 Downloads</h3>
+                            <h3 class="ft-25 bold black mb-6">TinkerPop 3.7.0 Downloads</h3>
                             <div class="row">
                                 <div class="col-md-4 mb-3">
                                     <img src="img/group-24.svg" class="img-fluid mb-2" alt="img"><br>
                                     <a class="text-blue"
-                                       href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.0/apache-tinkerpop-gremlin-console-3.6.0-bin.zip"><img
+                                       href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-console-3.7.0-bin.zip"><img
                                             src="img/download-cloud-line.svg" class="me-2 img-fluid" alt="img">Gremlin
                                         Console</a>
                                 </div>
                                 <div class="col-md-4 mb-3">
                                     <img src="img/group-25.svg" class="img-fluid mb-2" alt="img"><br>
                                     <a class="text-blue"
-                                       href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.0/apache-tinkerpop-gremlin-server-3.6.0-bin.zip"><img
+                                       href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-gremlin-server-3.7.0-bin.zip"><img
                                             src="img/download-cloud-line.svg" class="me-2 img-fluid" alt="img">Gremlin
                                         Server</a>
                                 </div>
                                 <div class="col-md-4 mb-3">
                                     <img src="img/group-26.svg" class="img-fluid mb-2" alt="img"><br>
                                     <a class="text-blue"
-                                       href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.6.0/apache-tinkerpop-3.6.0-src.zip"><img
+                                       href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.7.0/apache-tinkerpop-3.7.0-src.zip"><img
                                             src="img/download-cloud-line.svg" class="me-2 img-fluid"
                                             alt="img">Source</a>
                                 </div>
@@ -233,7 +243,6 @@
                             <h3 class="ft-25 bold black mb-4">Documentation</h3>
                             <div class="row">
                                 <div class="col-md-6 mb-3">
-
                                     <div class="dropdown text-start">
                                         <button class="btn btn-theme btn-cust w-100 dropdown-toggle text-start"
                                                 type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown"
@@ -275,7 +284,59 @@
                         </div>
                     </div>
 
+                    <div class="row">
+                        <div class="col-2 mb-1">
+                            &nbsp;
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="community.html#lang-go"><img src="img/community/go.png" class="img-fluid me-3" title="Go" alt="Go"></a>
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="community.html#lang-groovy"><img src="img/community/groovy.png" class="img-fluid me-3" title="Groovy" alt="Groovy"></a>
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="community.html#lang-java"><img src="img/community/java.png" class="img-fluid me-3" title="Java" alt="Java"></a>
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="community.html#lang-javascript"><img src="img/community/javascript.png" class="img-fluid me-3" title="Javascript" alt="Javascript" width="44"></a>
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="community.html#lang-csharp"><img src="img/community/c-sharp-logo-png.png" class="img-fluid me-3" title="C#" alt="C#"></a>
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="community.html#lang-python"><img src="img/community/python.png" class="img-fluid me-3" title="Python" alt="Python"></a>
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="community.html"><img src="img/tools.png" class="img-fluid me-3" title="More Languages and Tools" alt="More Languages and Tools" width="40"></a>
+                        </div>
+                        <div class="col-1 mb-1">
+                            <a href="providers.html"><img src="img/community/db.png" class="img-fluid me-3" title="Graph Systems" alt="Graph Systems"></a>
+                        </div>
+                        <div class="col-2 mb-1">
+                            &nbsp;
+                        </div>
+                    </div>
 
+                    <div class="row">
+                        <div class="col-3">
+                            &nbsp;
+                        </div>
+                        <div class="col-md-2 mt-3">
+                            <a class="text-blue" href="https://gremlify.com">
+                                <img src="img/link-arrow.svg" class="me-2 img-fluid" alt="img" style="max-height: 16px"/>Try Gremlin</a>
+                        </div>
+                        <div class="col-md-2 mt-3">
+                            <a class="text-blue" href="https://gremlint.com">
+                                <img src="img/link-arrow.svg" class="me-2 img-fluid" alt="img" style="max-height: 16px"/>Lint Gremlin</a>
+                        </div>
+                        <div class="col-md-2 mt-3">
+                            <a class="text-blue" href="https://www.gremlator.com">
+                                <img src="img/link-arrow.svg" class="me-2 img-fluid" alt="img" style="max-height: 16px"/>Translate Gremlin</a>
+                        </div>
+                        <div class="col-3 mt-3">
+                            &nbsp;
+                        </div>
+                    </div>
 
                 </div>
             </div>
@@ -401,8 +462,6 @@
                 <a class="btn btn-theme btn-cust" href="gremlin.html"><img src="img/link.svg" class="img-fluid me-2"
                                                                            alt="img">Learn More</a>
             </div>
-
-
         </div>
     </div>
 </div>
@@ -507,8 +566,8 @@
                 <div class="col">
                     <div class="com-box">
                         <div>
-                            <a class="text-blue " href="https://discord.gg/ndMpKZcBEE"><img src="img/discord.png" class="img-fluid mb-4 " alt="img"></a><br>
-                            <a class="text-blue " href="https://discord.gg/ndMpKZcBEE">Discord</a>
+                            <a class="text-blue " href="https://discord.gg/tinkerpop"><img src="img/discord.png" class="img-fluid mb-4 " alt="img"></a><br>
+                            <a class="text-blue " href="https://discord.gg/tinkerpop">Discord</a>
                         </div>
                     </div>
                 </div>
@@ -616,7 +675,7 @@
                                     <div class="mb-3">
                                         <p class="mb-0"><a class="medium text-blue"
                                                            href="https://ketrinadrawsalot.tumblr.com/" target="_blank">
-                                            Ketrina Yim</a><span class="medium">(Committer)</span></p>
+                                            Ketrina Thompson</a><span class="medium">(Committer)</span></p>
                                         <p class="mb-0"><span class="medium">Year : 2009</span></p>
                                         <p class="mb-0">Illustrator, creator of Gremlin and his merry band of
                                             robots.</p>
@@ -649,7 +708,7 @@
                                     <div class="mb-3">
                                         <p class="mb-0"><a class="medium text-blue"
                                                            href="https://github.com/FlorianHockmann/" target="_blank">Florian
-                                            Hockmann </a><span class="medium">(PMC Chair)</span></p>
+                                            Hockmann </a><span class="medium">(PMC)</span></p>
                                         <p class="mb-0"><span class="medium">Year : 2017</span></p>
                                         <p class="mb-0">.NET libraries, mailing list support.</p>
                                     </div>
@@ -659,7 +718,7 @@
                                     <div class="mb-3">
                                         <p class="mb-0"><a class="medium text-blue"
                                                            href="https://www.kelvinlawrence.net/" target="_blank">Kelvin
-                                            Lawrence </a><span class="medium">(PMC)</span></p>
+                                            Lawrence </a><span class="medium">(PMC Chair)</span></p>
                                         <p class="mb-0"><span class="medium">Year : 2017</span></p>
                                         <p class="mb-0">Gremlin language, Python GLV, documentation and mailing list support.</p>
                                     </div>
@@ -669,7 +728,7 @@
                                     <div class="mb-3">
                                         <p class="mb-0"><a class="medium text-blue"
                                                            href="https://www.linkedin.com/in/divijvaidya/"
-                                                           target="_blank">Divij Vaidya </a><span class="medium">(Committer)</span>
+                                                           target="_blank">Divij Vaidya </a><span class="medium">(PMC)</span>
                                         </p>
                                         <p class="mb-0"><span class="medium">Year : 2019</span></p>
                                         <p class="mb-0">Gremlin server-client interaction.</p>
@@ -706,6 +765,74 @@
                                         <p class="mb-0">Gremlin language and general core development</p>
                                     </div>
                                 </div>
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <p class="mb-0"><a class="medium text-blue"
+                                                           href="https://www.linkedin.com/in/davebechberger/"
+                                                           target="_blank">Dave Bechberger </a><span class="medium">(Committer)</span>
+                                        </p>
+                                        <p class="mb-0"><span class="medium">Year : 2022</span></p>
+                                        <p class="mb-0">Gremlin language, documentation, mailing list and Discord support</p>
+                                    </div>
+                                </div>
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <p class="mb-0"><a class="medium text-blue" href="https://www.linkedin.com/in/simon-zhao-69a792ab/"
+                                                           target="_blank">Simon Zhao </a><span class="medium">(Committer)</span>
+                                        </p>
+                                        <p class="mb-0"><span class="medium">Year : 2022</span></p>
+                                        <p class="mb-0">Golang GLV</p>
+                                    </div>
+                                </div>
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <p class="mb-0"><a class="medium text-blue" href="https://www.linkedin.com/in/xiazcy/"
+                                                           target="_blank">Yang Xia </a><span class="medium">(PMC)</span>
+                                        </p>
+                                        <p class="mb-0"><span class="medium">Year : 2022</span></p>
+                                        <p class="mb-0">Go GLV development, Docker and Windows build improvements</p>
+                                    </div>
+                                </div>
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <p class="mb-0">
+                                            <a class="medium text-blue"
+                                               href="https://www.linkedin.com/in/valentyn-kahamlyk-2bb4874b/"
+                                               target="_blank">Valentyn Kahamlyk </a><span class="medium">(Committer)</span>
+                                        </p>
+                                        <p class="mb-0"><span class="medium">Year : 2022</span></p>
+                                        <p class="mb-0">Go and Python GLV development, </p>
+                                    </div>
+                                </div>
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <p class="mb-0">
+                                            <a class="medium text-blue"
+                                               href="https://github.com/L0Lmaker"
+                                               target="_blank">Rithin Kumar  </a><span class="medium">(Committer)</span>
+                                        </p>
+                                        <p class="mb-0"><span class="medium">Year : 2022</span></p>
+                                        <p class="mb-0">Golang GLV</p>
+                                    </div>
+                                </div>
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <p class="mb-0"><a class="medium text-blue" href="https://github.com/kenhuuu"
+                                                           target="_blank">Ken Hu </a><span class="medium">(Committer)</span>
+                                        </p>
+                                        <p class="mb-0"><span class="medium">Year : 2023</span></p>
+                                        <p class="mb-0">General project maintenance</p>
+                                    </div>
+                                </div>
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <p class="mb-0"><a class="medium text-blue" href="https://github.com/Cole-Greer"
+                                                           target="_blank">Cole Greer </a><span class="medium">(Committer)</span>
+                                        </p>
+                                        <p class="mb-0"><span class="medium">Year : 2023</span></p>
+                                        <p class="mb-0">ARM Support, General Maintenance of Server/Core/GLVs</p>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <div class="tab-pane fade" id="pills-inactive" role="tabpanel"
@@ -872,9 +999,9 @@
         <div class="row d-flex justify-content-center">
             <div class="col-md-8 col-lg-6">
                 <div class="ju-box">
-                    <h2 class="ft-40 text-blue bold">Join Us on</h2>
-                    <p class="bold">Join us on our Discord Chat</p>
-                    <a href="https://discord.gg/ndMpKZcBEE"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+                    <h2 class="ft-40 text-blue bold">Join Us</h2>
+                    <p class="bold">Join us on our Discord Server</p>
+                    <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
                 </div>
             </div>
         </div>
@@ -888,15 +1015,13 @@
             <div class="row">
                 <div class="col-md-4">
                     <div class="bold ft-25">Apache TinkerPop™</div>
-                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases
-                        (OLTP) and graph analytic systems (OLAP).</p>
+                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
                     <ul class="list-unstyled list-inline hover-op-low">
-                        <li class="list-inline-item"><a href="https://discord.gg/ndMpKZcBEE"><img
-                                src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img
-                                src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img
-                                src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
                     </ul>
                 </div>
                 <div class="col-md-4 ft-links">
@@ -907,6 +1032,7 @@
                                 <li><a href="index.html">Home</a></li>
                                 <li><a href="download.html">Downloads</a></li>
                                 <li><a href="https://tinkerpop.apache.org/docs/current">Documentation</a></li>
+                                <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html" target="_blank">Privacy Policy</a></li>
                             </ul>
                         </div>
                         <div class="col-lg-6">
@@ -931,7 +1057,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-12">
-                    Copyright © 2015-2022 The Apache Software Foundation
+                    Copyright © 2015-2023 The Apache Software Foundation
                 </div>
             </div>
         </div>
@@ -939,11 +1065,9 @@
 </footer>
 <script src="js/jquery-1.11.1.js"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js"
-        integrity="sha512-Eak/29OTpb36LLo2r47IpVzPBLXnAMPAVypbSZiZ4Qkf8p/7S/XRG5xp7OKWPPYfJT6metI+IORkR5G8F900+g=="
-        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="js/wow.min.js"></script>
 <script src="js/my.js"></script>
 <script src="js/prism.js"></script>
 </body>
 </html>
-    
+
diff --git a/docs/site/home/js/wow.min.js b/docs/site/home/js/wow.min.js
new file mode 100644
index 0000000..a692251
--- /dev/null
+++ b/docs/site/home/js/wow.min.js
@@ -0,0 +1,2 @@
+/*! WOW - v1.1.2 - 2015-04-07
+* Copyright (c) 2015 Matthieu Aussaguel; Licensed MIT */(function(){var a,b,c,d,e,f=function(a,b){return function(){return a.apply(b,arguments)}},g=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};b=function(){function a(){}return a.prototype.extend=function(a,b){var c,d;for(c in b)d=b[c],null==a[c]&&(a[c]=d);return a},a.prototype.isMobile=function(a){return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(a)},a.prototype.createEvent=function(a,b,c,d){var e;return null==b&&(b=!1),null==c&&(c=!1),null==d&&(d=null),null!=document.createEvent?(e=document.createEvent("CustomEvent"),e.initCustomEvent(a,b,c,d)):null!=document.createEventObject?(e=document.createEventObject(),e.eventType=a):e.eventName=a,e},a.prototype.emitEvent=function(a,b){return null!=a.dispatchEvent?a.dispatchEvent(b):b in(null!=a)?a[b]():"on"+b in(null!=a)?a["on"+b]():void 0},a.prototype.addEvent=function(a,b,c){return null!=a.addEventListener?a.addEventListener(b,c,!1):null!=a.attachEvent?a.attachEvent("on"+b,c):a[b]=c},a.prototype.removeEvent=function(a,b,c){return null!=a.removeEventListener?a.removeEventListener(b,c,!1):null!=a.detachEvent?a.detachEvent("on"+b,c):delete a[b]},a.prototype.innerHeight=function(){return"innerHeight"in window?window.innerHeight:document.documentElement.clientHeight},a}(),c=this.WeakMap||this.MozWeakMap||(c=function(){function a(){this.keys=[],this.values=[]}return a.prototype.get=function(a){var b,c,d,e,f;for(f=this.keys,b=d=0,e=f.length;e>d;b=++d)if(c=f[b],c===a)return this.values[b]},a.prototype.set=function(a,b){var c,d,e,f,g;for(g=this.keys,c=e=0,f=g.length;f>e;c=++e)if(d=g[c],d===a)return void(this.values[c]=b);return this.keys.push(a),this.values.push(b)},a}()),a=this.MutationObserver||this.WebkitMutationObserver||this.MozMutationObserver||(a=function(){function a(){"undefined"!=typeof console&&null!==console&&console.warn("MutationObserver is not supported by your browser."),"undefined"!=typeof console&&null!==console&&console.warn("WOW.js cannot detect dom mutations, please call .sync() after loading new content.")}return a.notSupported=!0,a.prototype.observe=function(){},a}()),d=this.getComputedStyle||function(a){return this.getPropertyValue=function(b){var c;return"float"===b&&(b="styleFloat"),e.test(b)&&b.replace(e,function(a,b){return b.toUpperCase()}),(null!=(c=a.currentStyle)?c[b]:void 0)||null},this},e=/(\-([a-z]){1})/g,this.WOW=function(){function e(a){null==a&&(a={}),this.scrollCallback=f(this.scrollCallback,this),this.scrollHandler=f(this.scrollHandler,this),this.resetAnimation=f(this.resetAnimation,this),this.start=f(this.start,this),this.scrolled=!0,this.config=this.util().extend(a,this.defaults),this.animationNameCache=new c,this.wowEvent=this.util().createEvent(this.config.boxClass)}return e.prototype.defaults={boxClass:"wow",animateClass:"animated",offset:0,mobile:!0,live:!0,callback:null},e.prototype.init=function(){var a;return this.element=window.document.documentElement,"interactive"===(a=document.readyState)||"complete"===a?this.start():this.util().addEvent(document,"DOMContentLoaded",this.start),this.finished=[]},e.prototype.start=function(){var b,c,d,e;if(this.stopped=!1,this.boxes=function(){var a,c,d,e;for(d=this.element.querySelectorAll("."+this.config.boxClass),e=[],a=0,c=d.length;c>a;a++)b=d[a],e.push(b);return e}.call(this),this.all=function(){var a,c,d,e;for(d=this.boxes,e=[],a=0,c=d.length;c>a;a++)b=d[a],e.push(b);return e}.call(this),this.boxes.length)if(this.disabled())this.resetStyle();else for(e=this.boxes,c=0,d=e.length;d>c;c++)b=e[c],this.applyStyle(b,!0);return this.disabled()||(this.util().addEvent(window,"scroll",this.scrollHandler),this.util().addEvent(window,"resize",this.scrollHandler),this.interval=setInterval(this.scrollCallback,50)),this.config.live?new a(function(a){return function(b){var c,d,e,f,g;for(g=[],c=0,d=b.length;d>c;c++)f=b[c],g.push(function(){var a,b,c,d;for(c=f.addedNodes||[],d=[],a=0,b=c.length;b>a;a++)e=c[a],d.push(this.doSync(e));return d}.call(a));return g}}(this)).observe(document.body,{childList:!0,subtree:!0}):void 0},e.prototype.stop=function(){return this.stopped=!0,this.util().removeEvent(window,"scroll",this.scrollHandler),this.util().removeEvent(window,"resize",this.scrollHandler),null!=this.interval?clearInterval(this.interval):void 0},e.prototype.sync=function(){return a.notSupported?this.doSync(this.element):void 0},e.prototype.doSync=function(a){var b,c,d,e,f;if(null==a&&(a=this.element),1===a.nodeType){for(a=a.parentNode||a,e=a.querySelectorAll("."+this.config.boxClass),f=[],c=0,d=e.length;d>c;c++)b=e[c],g.call(this.all,b)<0?(this.boxes.push(b),this.all.push(b),this.stopped||this.disabled()?this.resetStyle():this.applyStyle(b,!0),f.push(this.scrolled=!0)):f.push(void 0);return f}},e.prototype.show=function(a){return this.applyStyle(a),a.className=a.className+" "+this.config.animateClass,null!=this.config.callback&&this.config.callback(a),this.util().emitEvent(a,this.wowEvent),this.util().addEvent(a,"animationend",this.resetAnimation),this.util().addEvent(a,"oanimationend",this.resetAnimation),this.util().addEvent(a,"webkitAnimationEnd",this.resetAnimation),this.util().addEvent(a,"MSAnimationEnd",this.resetAnimation),a},e.prototype.applyStyle=function(a,b){var c,d,e;return d=a.getAttribute("data-wow-duration"),c=a.getAttribute("data-wow-delay"),e=a.getAttribute("data-wow-iteration"),this.animate(function(f){return function(){return f.customStyle(a,b,d,c,e)}}(this))},e.prototype.animate=function(){return"requestAnimationFrame"in window?function(a){return window.requestAnimationFrame(a)}:function(a){return a()}}(),e.prototype.resetStyle=function(){var a,b,c,d,e;for(d=this.boxes,e=[],b=0,c=d.length;c>b;b++)a=d[b],e.push(a.style.visibility="visible");return e},e.prototype.resetAnimation=function(a){var b;return a.type.toLowerCase().indexOf("animationend")>=0?(b=a.target||a.srcElement,b.className=b.className.replace(this.config.animateClass,"").trim()):void 0},e.prototype.customStyle=function(a,b,c,d,e){return b&&this.cacheAnimationName(a),a.style.visibility=b?"hidden":"visible",c&&this.vendorSet(a.style,{animationDuration:c}),d&&this.vendorSet(a.style,{animationDelay:d}),e&&this.vendorSet(a.style,{animationIterationCount:e}),this.vendorSet(a.style,{animationName:b?"none":this.cachedAnimationName(a)}),a},e.prototype.vendors=["moz","webkit"],e.prototype.vendorSet=function(a,b){var c,d,e,f;d=[];for(c in b)e=b[c],a[""+c]=e,d.push(function(){var b,d,g,h;for(g=this.vendors,h=[],b=0,d=g.length;d>b;b++)f=g[b],h.push(a[""+f+c.charAt(0).toUpperCase()+c.substr(1)]=e);return h}.call(this));return d},e.prototype.vendorCSS=function(a,b){var c,e,f,g,h,i;for(h=d(a),g=h.getPropertyCSSValue(b),f=this.vendors,c=0,e=f.length;e>c;c++)i=f[c],g=g||h.getPropertyCSSValue("-"+i+"-"+b);return g},e.prototype.animationName=function(a){var b;try{b=this.vendorCSS(a,"animation-name").cssText}catch(c){b=d(a).getPropertyValue("animation-name")}return"none"===b?"":b},e.prototype.cacheAnimationName=function(a){return this.animationNameCache.set(a,this.animationName(a))},e.prototype.cachedAnimationName=function(a){return this.animationNameCache.get(a)},e.prototype.scrollHandler=function(){return this.scrolled=!0},e.prototype.scrollCallback=function(){var a;return!this.scrolled||(this.scrolled=!1,this.boxes=function(){var b,c,d,e;for(d=this.boxes,e=[],b=0,c=d.length;c>b;b++)a=d[b],a&&(this.isVisible(a)?this.show(a):e.push(a));return e}.call(this),this.boxes.length||this.config.live)?void 0:this.stop()},e.prototype.offsetTop=function(a){for(var b;void 0===a.offsetTop;)a=a.parentNode;for(b=a.offsetTop;a=a.offsetParent;)b+=a.offsetTop;return b},e.prototype.isVisible=function(a){var b,c,d,e,f;return c=a.getAttribute("data-wow-offset")||this.config.offset,f=window.pageYOffset,e=f+Math.min(this.element.clientHeight,this.util().innerHeight())-c,d=this.offsetTop(a),b=d+a.clientHeight,e>=d&&b>=f},e.prototype.util=function(){return null!=this._util?this._util:this._util=new b},e.prototype.disabled=function(){return!this.config.mobile&&this.util().isMobile(navigator.userAgent)},e}()}).call(this);
\ No newline at end of file
diff --git a/docs/site/home/providers.html b/docs/site/home/providers.html
index 77a7a21..04558c0 100644
--- a/docs/site/home/providers.html
+++ b/docs/site/home/providers.html
@@ -19,21 +19,31 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link href="img/favicon.png" rel="shortcut icon"/>
-    <title>Apache TinkerPop</title>
+    <title>Apache TinkerPop: Providers</title>
     <meta name="description" content="">
     <meta name="keywords" content="">
     <link href="css/bootstrap.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"
-          integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+    <link href="css/font-awesome.css" rel="stylesheet"/>
     <link href="css/custome.css" rel="stylesheet">
     <link href="css/responsive.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.css"
-          integrity="sha512-K2J6Yt6ElUYEMPcTr0wm555AAyiqkgYiUgPIW18FT88/aYSNDk0EvGjsln/TEu3ee/jaHf0xoXzFppSbBtUXbQ=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Raleway:wght@400;500;600;700&display=swap" rel="stylesheet">
+    <link href="css/animate.css" rel="stylesheet"/>
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* We explicitly disable cookie tracking to avoid privacy issues */
+        _paq.push(['disableCookies']);
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function() {
+            var u="https://analytics.apache.org/";
+            _paq.push(['setTrackerUrl', u+'matomo.php']);
+            _paq.push(['setSiteId', '27']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
 </head>
 <body>
 <!-- header -->
@@ -57,6 +67,21 @@
                         <li class="nav-item">
                             <a class="nav-link" href="download.html">Download</a>
                         </li>
+
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Tools
+                            </a>
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                                <li><a class="dropdown-item" href="providers.html">Graph Systems</a></li>
+                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a class="dropdown-item" href="https://gremlify.com/">Gremlify: Try Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://tinkerpop.apache.org/gremlint">Gremlint: Lint Gremlin</a></li>
+                                <li><a class="dropdown-item" href="https://www.gremlator.com/">Gremlator: Translate Gremlin</a></li>
+                            </ul>
+                        </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -79,6 +104,7 @@
                             </ul>
 
                         </li>
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
@@ -108,48 +134,31 @@
 
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button"
-                               data-bs-toggle="dropdown" aria-expanded="false">
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown3" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                                 Community
                             </a>
                             <ul class="dropdown-menu" aria-labelledby="navbarDropdown3">
-                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users">User
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org">Developer
-                                    Mailing List</a></li>
-                                <li><a class="dropdown-item" href="https://discord.gg/ndMpKZcBEE" target="_blank"><img
-                                        src="img/discord_logo.png" class="nav-icon">Join us on Discord</a></li>
-                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/">Issue
-                                    Tracker</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a>
-                                </li>
-                                <li><a class="dropdown-item" href="providers.html">Data System Support</a></li>
-                                <li><a class="dropdown-item" href="community.html">Languages and Tools</a></li>
-                                <li><a class="dropdown-item"
-                                       href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a>
-                                </li>
-                                <li>
-                                    <hr class="dropdown-divider">
-                                </li>
-                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img
-                                        src="img/github-logo.png" class="nav-icon">GitHub</a></li>
-                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img
-                                        src="img/twitter-logo.png" class="nav-icon">Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://discord.gg/tinkerpop" target="_blank"><img src="img/discord-logo.png" class="nav-icon"/>Discord</a></li>
+                                <li><a class="dropdown-item" href="https://www.answeroverflow.com/c/838910279550238720"><img src="img/answer-overflow-logo.png" class="nav-icon"/>Answer Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://stackoverflow.com/questions/tagged/gremlin"><img src="img/stack-overflow-logo.png" class="nav-icon"/>Stack Overflow</a></li>
+                                <li><a class="dropdown-item" href="https://groups.google.com/group/gremlin-users"><img src="img/mail.png" class="nav-icon"/>User Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://lists.apache.org/list.html?dev@tinkerpop.apache.org"><img src="img/mail.png" class="nav-icon"/>Developer Mailing List</a></li>
+                                <li><a class="dropdown-item" href="https://issues.apache.org/jira/browse/TINKERPOP/"><img src="img/jira-logo.png" class="nav-icon"/>Issue Tracker</a></li>
+                                <li><a class="dropdown-item" href="https://github.com/apache/tinkerpop/"><img src="img/github-logo.png" class="nav-icon"/>GitHub</a></li>
+                                <li><a class="dropdown-item" href="https://www.twitch.tv/apachetinkerpop"><img src="img/twitch-logo.png" class="nav-icon"/>Twitch</a></li>
+                                <li><a class="dropdown-item" href="https://twitter.com/apachetinkerpop"><img src="img/twitter-logo.png" class="nav-icon"/>Twitter</a></li>
+                                <li><a class="dropdown-item" href="https://www.youtube.com/@apachetinkerpop"><img src="img/youtube-logo.png" class="nav-icon"/>YouTube</a></li>
+                                <li><hr class="dropdown-divider"></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/developer/#_contributing">Contributing</a></li>
+                                <li><a  class="dropdown-item" href="https://tinkerpop.apache.org/docs/current/dev/provider/#policies">Policies</a></li>
                             </ul>
-
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="https://tinkerpop.apache.org/gremlint/">Gremlint</a>
                         </li>
                         <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown4" role="button"
+                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown5" role="button"
                                data-bs-toggle="dropdown" aria-expanded="false">
                                 Apache Software
                             </a>
-                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown4">
+                            <ul class="dropdown-menu" aria-labelledby="navbarDropdown5">
                                 <li><a class="dropdown-item" href="https://www.apache.org/">Apache Homepage</a></li>
                                 <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License</a></li>
                                 <li><a class="dropdown-item"
@@ -217,6 +226,19 @@
                     identify TinkerPop-enabled graph systems and does not constitute an endorsement by Apache TinkerPop
                     nor the Apache Software Foundation.</p>
             </div>
+
+            <div class="col-md-6 col-lg-4">
+                <div class="uc-box">
+                    <div class="d-flex align-items-start">
+                        <img src="img/providers/25.png " class="img-fluid mb-3" alt="img">
+                        <div class="text-start ms-3">
+                            <a class="ft-18 bold text-blue" href="https://aerospike.com/products/graph-database/">Aerospike Graph</a>
+                            <p class="mb-0 mt-2">A massively scalable, high-performance graph database for the property graph model</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="col-md-6 col-lg-4">
                 <div class="uc-box">
                     <div class="d-flex align-items-start">
@@ -441,6 +463,18 @@
             <div class="col-md-6 col-lg-4">
                 <div class="uc-box">
                     <div class="d-flex align-items-start">
+                        <img src="img/providers/26.png " class="img-fluid mb-3" alt="img">
+                        <div class="text-start ms-3">
+                            <a class="ft-18 bold text-blue" href="https://puppygraph.com/">PuppyGraph</a>
+                            <p class="mb-0 mt-2">Query tablular data (Iceberg, Hive, MySQL, etc) as a graph.</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-6 col-lg-4">
+                <div class="uc-box">
+                    <div class="d-flex align-items-start">
                         <img src="img/providers/19.png " class="img-fluid mb-3" alt="img">
                         <div class="text-start ms-3">
                             <a class="ft-18 bold text-blue" href="https://github.com/apache/incubator-s2graph">Apache S2Graph</a>
@@ -522,9 +556,9 @@
         <div class="row d-flex justify-content-center">
             <div class="col-md-8 col-lg-6">
                 <div class="ju-box">
-                    <h2 class="ft-40 text-blue bold">Join Us on</h2>
-                    <p class="bold">Join us on our Discord Chat</p>
-                    <a href="https://discord.gg/ndMpKZcBEE"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
+                    <h2 class="ft-40 text-blue bold">Join Us</h2>
+                    <p class="bold">Join us on our Discord Server</p>
+                    <a href="https://discord.gg/tinkerpop"><img src="img/tpvewx.png" class="img-fluid mt-3" alt="img"></a>
                 </div>
             </div>
         </div>
@@ -538,15 +572,13 @@
             <div class="row">
                 <div class="col-md-4">
                     <div class="bold ft-25">Apache TinkerPop™</div>
-                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases
-                        (OLTP) and graph analytic systems (OLAP).</p>
+                    <p class="mt-2 mb-4">Apache TinkerPop™ is a graph computing framework for both graph databases (OLTP) and graph analytic systems (OLAP).</p>
                     <ul class="list-unstyled list-inline hover-op-low">
-                        <li class="list-inline-item"><a href="https://discord.gg/ndMpKZcBEE"><img
-                                src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img
-                                src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
-                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img
-                                src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://discord.gg/tinkerpop"><img src="img/social/discord.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://github.com/apache/tinkerpop"><img src="img/social/github-box.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.twitch.tv/apachetinkerpop"><img src="img/social/twitch.png" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://twitter.com/apachetinkerpop"><img src="img/social/twitter-square.svg" class="img-fluid" alt="img"></a></li>
+                        <li class="list-inline-item"><a href="https://www.youtube.com/@apachetinkerpop"><img src="img/social/youtube.png" class="img-fluid" alt="img"></a></li>
                     </ul>
                 </div>
                 <div class="col-md-4 ft-links">
@@ -557,6 +589,7 @@
                                 <li><a href="index.html">Home</a></li>
                                 <li><a href="download.html">Downloads</a></li>
                                 <li><a href="https://tinkerpop.apache.org/docs/current">Documentation</a></li>
+                                <li><a href="https://privacy.apache.org/policies/privacy-policy-public.html" target="_blank">Privacy Policy</a></li>
                             </ul>
                         </div>
                         <div class="col-lg-6">
@@ -581,7 +614,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-12">
-                    Copyright © 2015-2022 The Apache Software Foundation
+                    Copyright © 2015-2023 The Apache Software Foundation
                 </div>
             </div>
         </div>
@@ -589,9 +622,7 @@
 </footer>
 <script src="js/jquery-1.11.1.js"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js"
-        integrity="sha512-Eak/29OTpb36LLo2r47IpVzPBLXnAMPAVypbSZiZ4Qkf8p/7S/XRG5xp7OKWPPYfJT6metI+IORkR5G8F900+g=="
-        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="js/wow.min.js"></script>
 <script src="js/my.js"></script>
 </body>
 </html>
diff --git a/docs/src/dev/developer/administration.asciidoc b/docs/src/dev/developer/administration.asciidoc
index 53be99a..d8b79f6 100644
--- a/docs/src/dev/developer/administration.asciidoc
+++ b/docs/src/dev/developer/administration.asciidoc
@@ -121,9 +121,10 @@
 [include the link to the vote result thread from private]
 ----
 
-If the candidate does not (yet) have an Apache account, then please note that fact in the notification email. Provide
-the board 72 hours to respond with objection before extending the invite to the new PMC member. Once that time has
-elapsed, the invite may be sent to the new PMC member. The following template may be used for the invitation (be sure
+If the candidate does not (yet) have an Apache account, then please note that fact in the notification email.
+It is important to verify that this NOTICE was actually included in the
+link:https://mail-search.apache.org/members/private-arch/board[board archive] to ensure that is has been delivered to the board.
+After verifying this, the invite may be sent to the new PMC member. The following template may be used for the invitation (be sure
 to copy private@ when sending the email):
 
 [source,text]
@@ -146,41 +147,12 @@
 == Board Reports
 
 The PMC Chair is responsible for submitting a link:http://www.apache.org/foundation/board/reporting[report to the board]
-on a quarterly basis. TinkerPop reports on the following months: January, April, July, October. The report has the
-following format:
-
-[source,text]
-----
-## Description:
- Apache TinkerPop is a graph computing framework for both graph databases
- (OLTP) and graph analytic systems (OLAP).
-
-## Activity:
- <discuss general project health, project direction, community growth/activity, etc.>
-
-## Issues:
- There are no issues requiring board attention at this time.
-
-## Releases:
- - x.y.z (<month> <day>, <year>)
- - x.y.z (<month> <day>, <year>)
-
-## PMC/Committer:
-
- - Last PMC addition was <name> - <month> <year>
- - Last committer addition was <name> - <month> <year>
-
-## Links
-
-[1] <hyperlink to external reference, if a reference was made in the report>
-----
+on a quarterly basis. TinkerPop reports on the following months: January, April, July, October.
 
 A draft of the report should be sent to the TinkerPop developer mailing list for review at least three days prior to
-submitting to the board. The final report should be sent in plain-text format to `board@apache.org` and should be
-committed to the appropriate meeting agenda in SVN at:
-
-[source,text]
-https://svn.apache.org/repos/private/foundation/board
+submitting to the board. The final report can be submitted via link:https://whimsy.apache.org/board/agenda/[Whimsy] or
+via the link:https://reporter.apache.org[Apache Reporter Service] which already provides a template for the report and
+explains the different sections.
 
 [[contributor-listing]]
 == Contributor Listing
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index d5e97ee..3026abe 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -28,7 +28,9 @@
 
 At a minimum, development of TinkerPop requires link:https://openjdk.java.net/projects/jdk8/[Java 8] but it is
 preferable to use link:https://openjdk.java.net/projects/jdk/11/[Java 11] cross-compiled to Java 8 (the
-cross-compilation happens automatically as part of the build). Maven (requiring a minimum of
+cross-compilation happens automatically as part of the build). Starting with 3.7.0, you can also build with
+link:https://openjdk.org/projects/jdk/17/[Java 17]. Note, however, that there are some issues with deep reflection
+so there are `--add-opens` JVM options included in the pom files to enable this to work. Maven (requiring a minimum of
 link:https://maven.apache.org/download.cgi[Maven 3.5.3+]) is used as the common build system, which even
 controls the builds of non-JVM link:https://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-drivers-variants[GLVs]
 such as `gremlin-python`. Java and Maven are described as a "minimum" for a development environment, because they
@@ -215,6 +217,15 @@
 in the `.m2` (`~/.m2/`) and in the `grapes` (`~/.groovy/grapes/`) cache. E.g., if the error is about
 `asm#asm;3.2!asm.jar`, then remove the `asm/asm` sub directory in both directories.
 
+NOTE: Unexpected failures with OLAP often point to a jar conflict that arises in scenarios where Hadoop or Spark
+dependencies (or other dependencies for that matter) are modified and conflict. It is not picked up by the enforcer
+plugin because the inconsistency arises through plugin installation in Gremlin Console at document generation time.
+Making adjustments to the various paths by way of the `<manifestEntries>` on the jar given the functionality provided
+by the `DependencyGrabber` class which allows you to manipulate (typically deleting conflicting files from `/lib` and
+`/plugin`) plugin loading will usually resolve it, though it could also be a more general environmental problem with
+Spark or Hadoop. The easiest way to see the error is to simply run the examples in the Gremlin Console which more
+plainly displays the error than the failure of the documentation generation process.
+
 To generate the web site locally, there is no need for any of the above infrastructure. Site generation is a simple
 shell script:
 
@@ -458,7 +469,6 @@
 ** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes`
 ** Turn off "heavy" logging in the "process" tests: `mvn clean install -DargLine="-DmuteTestLogs=true"`
 ** The test suite for `neo4j-gremlin` is disabled by default - to turn it on: `mvn clean install -DincludeNeo4j`
-* Generate <<building-testing,test resources>> for `gremlin-io-test`: `mvn clean install -pl :gremlin-io-test -Dio`
 * Regenerate toy graph data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
 ** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `IoDataGenerationTest.shouldWriteGratefulDead`)
 * Start Gremlin Server with Docker using the standard test configuration: `docker/gremlin-server.sh`
@@ -476,7 +486,8 @@
 * Check the effective `pom.xml`: `mvn -pl gremlin-python -Pglv-python help:effective-pom -Doutput=withProfilePom.xml`
 * Deploy JavaDocs/AsciiDocs: `bin/publish-docs.sh svn-username`
 * Integration Tests: `mvn verify -DskipIntegrationTests=false`
-** Execute with the `-DincludeNeo4j` option to include transactional tests.
+** Execute with the `-DincludeNeo4j` option to include neo4j-gremlin tests. As of 3.7.0, transactional tests on Gremlin Server, Gremlin Driver,
+and GLVs will run automatically with integration tests against the TinkerTransactionGraph.
 ** Execute with the `-DuseEpoll` option to try to use Netty native transport (works on Linux, but will fallback to Java NIO on other OS).
 * Benchmarks: `mvn verify -DskipBenchmarks=false`
 ** Reports are generated to the console and to `gremlin-tools/gremlin-benchmark/target/reports/benchmark`.
diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc
index 12d2e3e..706a280 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -399,6 +399,7 @@
 The syntax of the type notation involves a prefix character to help denote the type, a value between two square
 brackets, optionally suffixed with some additional notation depending on the primary type.
 
+* Date - *dt[_xxx_]* - The "xxx" should be ISO 8601 string.
 * Edge - *e[_xxx_]* - The "xxx" should be replaced with a representation of an edge in the form of the
 `vertex_name-edgelabel->vertex_name`. This syntax may also include the `.id` suffix which would indicate getting the
 edge identifier or the `.sid` suffix which gets a string representation of the edge identifier.
@@ -425,7 +426,10 @@
 * Set - *s[_xxx_,_yyy_,_zzz_,...]* - A comma separated collection of values that make up the set should be added to
 between the square brackets. These values respect the type system thus allowing for creation of sets of vertices,
 edges, maps, and any other available type.
-* String - Any value not using the system notation will be interpreted as a string.
+* String - Any value not using the system notation will be interpreted as
+a string by default.
+** *str[_xxx_]* (Optional) - xxx should be replaced with a string. Optional notation used for specific string results,
+such as null and spaces.
 * T - *t[_xxx_]* - The "xxx" should be replaced with a value of the `T` enum, such as `id` or `label`.
 * Vertex - *v[_xxx_]* - The "xxx" should be replaced with the "name" property of a vertex in the graph. This syntax may
 include the `.id` suffix which would indicate getting the vertex identifier or the `.sid` suffix which gets a string
@@ -572,8 +576,9 @@
 `GraphComputer`.
 * `@GraphComputerVerificationStarGraphExceeded` - The scenario itself is not written to support `GraphComputer` because
 the traversal does not mind the star graph limitation.
-* `@MultiMetaProperties` - The scenario uses "The Crew" graph as a dataset or otherwise utilizes multi-properties
-or meta-properties for creating or querying data.
+* `@InsertionOrderingRequired` - The scenario is reliant on the graph system predictably returning results (vertices, edges, properties) in the same order in which they were inserted into the graph.
+* `@MetaProperties` - The scenario makes use of meta-properties.
+* `@MultiProperties` - The scenario makes use of multi-properties.
 * `@RemoteOnly` - The scenario uses some Gremlin syntax that cannot be supported outside of remote test executions. The
 best example of this sort of test would be one that uses the remote `Lambda` syntax.
 * `@UserSuppliedVertexIds` - The scenario relies on the vertex IDs specified in the dataset used by the scenario.
@@ -589,6 +594,28 @@
 Tag filters can be applied to Intellij at execution time by adding a system properties of
 `-Dcucumber.filter.tags=<step-filter>`.
 
+[[gremlin-socket-server-tests]]
+=== Gremlin Socket Server Tests
+`gremlin-socket-server` is an included test server for driver tests which require predefined server
+behavior. Typically, this is to test scenarios such as the server closing the connection or returning
+an error code but other response behavior can be added as needed for tests.
+
+Gremlin socket server uses the request id of incoming messages to determine how to respond.
+Request ids are defined in `gremlin-tools/gremlin-socket-server/conf/*.yaml`. The server side
+behavior for each request id is implemented in `TestWSGremlinInitializer`.
+
+To add new server side behavior, define a new request id in the config yaml, then add a corresponding
+field in `SocketServerSettings`. In `TestWSGremlinInitializer`, add a new block to the if else chain in the
+decode method which matches the request id. Define all server behavior and responses in this block.
+
+To write the driver test, send a request message to the gremlin socket server port as if it were a normal
+gremlin server. Override the request id on the request with one defined in the config yaml and gremlin
+socket server will respond according to the defined behavior.
+
+Ensure that the socket server is running during driver tests. By default, a docker image for
+`gremlin-socket-server` is built during `mvn install`. The simplest way to use the socket server during
+driver tests is to run a gremlin socket server container during the integration phase of driver tests.
+
 == Developing Benchmarks
 
 Benchmarks are a useful tool to track performance between TinkerPop versions and also as tools to aid development
@@ -921,79 +948,3 @@
 are then configured to point at that area of the file system for those configuration files. The XML files
 can be edited to fine tune control of the log output, but generally speaking the current configuration is likely
 best for everyone's general purposes, so if changes are made please revert them prior to commit.
-
-[[io]]
-== IO Documentation and Testing
-
-The link:https://tinkerpop.apache.org/docs/x.y.z/dev/io[IO Documentation] provides more details into GraphML and GraphSON
-with a special focus on the needs of developers who are working directly with these formats. GraphSON gets
-the greatest focus here as it is used as the primary IO format for link:https://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-drivers-variants[GLVs].
-This documentation is largely generated from the `gremlin-io-test` module found under `gremlin-tools`. The
-`gremlin-io-test` module also includes a testing framework which validates that formats don't break between TinkerPop
-versions. Unfortunately, this module requires some maintenance to ensure that the documentation and tests both stay
-updated.
-
-The `gremlin-io-test` module contains a set of files in the test resources that are statically bound to the version in
-which they were generated. Older versions should never be modified. The only time changes to these resources should be
-accepted should be for the current `SNAPSHOT` version. The test resources are generated from the `Model` class which
-contains the objects that will undergo serialization for purpose of testing. Note that these same objects in the
-`Model` are also used to generate documentation.
-
-To generate these test resources and documentation snippets based on the `Model`, use this Maven command:
-
-[source,text]
-----
-mvn clean install -pl :gremlin-io-test -Dio
-----
-
-This command will generate two directories in the `/target` output directory of `gremlin-io-test`: `test-case-data`
-and `dev-docs`. The contents of `test-case-data` represents the serialized `Model` objects that can be copied to the
-test resources and the contents of the `dev-docs` contains asciidoc snippets that can be copied to the IO documentation.
-
-Generating data files in the fashion mentioned above with Maven is only good for versions of TinkerPop on the 3.3.x
-line because the `gremlin-io-test` module did not exist in 3.2.x. Of course, compatibility is still tested back to
-those older versions. To generate test data from 3.2.x, there are Groovy scripts in the comments of the
-`graphson.asciidoc` files that can copy/pasted to the Gremlin Console. They will generate the batch of test files
-needed for `gremlin-io-test`.
-
-When does this command need to be executed?
-
-1. If a new object is added to the `Model` - in this case, the newly created data files should be copied to the
-appropriate test resource directory for the current `SNAPSHOT` version and the appropriate asciidoc snippet added to
-the IO asciidocs.
-2. After the release of a new TinkerPop version - in this case, a new test resource directory should be created for
-the `SNAPSHOT` version and the generated `test-case-data` copied in appropriately.
-
-The second case, does require some additional discussion. When a new version is added the following classes will need
-to be updated in the following ways:
-
-*GraphBinaryCompatibility* - Include new GraphBinary 1.0 enums for the current `SNAPSHOT`.
-
-[source,java]
-----
-V1_3_4_3("3.4.3", "1.0", "v1"),
-V1_3_4_4("3.4.4", "1.0", "v1");
-----
-
-*GraphSONCompatibility* - Include new GraphSON enums for each of the various GraphSON configurations and versions.
-
-[source,java]
-----
-V1D0_3_3_x("3.3.x", "1.0", "v1d0"),
-V2D0_PARTIAL_3_3_x("3.3.x", "2.0", "v2d0-partial"),
-V2D0_NO_TYPE_3_3_x("3.3.x", "2.0", "v2d0-no-types"),
-V3D0_PARTIAL_3_3_x("3.3.x", "3.0", "v3d0");
-----
-
-*GraphBinaryCompatibilityTest* - Add the newly included `GraphBinaryCompatibility` enums to the test parameters being
-careful to match the appropriate "mapper" to the right version.
-
-*GraphSONUntypedCompatibilityTest* - Add the newly included GraphSON 1.0 and 2.0 "untyped" enums to the test parameters
-being careful to match the appropriate "mapper" to the right version.
-
-*GraphSONTypedCompatibilityTest* - Add the newly included GraphSON 3.0 and 2.0 "typed" enums to the test parameters
-being careful to match the appropriate "mapper" to the right version.
-
-At this point, all of the IO tests are rigged up properly and assuming the test resources are available a standard
-`mvn clean install` should execute the compatibility tests and validate that everything is working as expected and
-that there are no breaks in serialization processes.
diff --git a/docs/src/dev/developer/index.asciidoc b/docs/src/dev/developer/index.asciidoc
index 6031142..3af4d0b 100644
--- a/docs/src/dev/developer/index.asciidoc
+++ b/docs/src/dev/developer/index.asciidoc
@@ -14,12 +14,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
+
+:docinfo: shared
+:docinfodir: ../../
+:toc-position: left
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
 
-:toc-position: left
-
 = Developer Documentation
 
 This document contains information for TinkerPop developers, contributors, and community members. It focuses on
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index aaf1b8e..6a5e525 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -132,9 +132,6 @@
 ... All tickets not marked "Fixed", "Done", or "Implemented" for their Resolution should not have a Fix Version
 assigned (use common sense when reviewing these tickets before removing the Fix Version as it is possible the incorrect
 Resolution may have been assigned).
-.. Be sure that `gremlin-io-test` has been updated (from 3.3.0 on - this module was not available prior to the 3.3.x line)
-... This is typically a post-release task, but it's worth checking to be sure in case the step was somehow overlooked.
-... Instructions for updating the module are described in the <<io,IO Documentation and Testing Section>>.
 . When all documentation changes are in place, use `bin/publish-docs.sh` to deploy a final `SNAPSHOT` representation
 of the docs and thus validate that there are no issues with the documentation generation process. Request review
 of the published documentation on the dev mailing list.
@@ -287,6 +284,7 @@
 .. Update `community.html`, specifically the version numbers for our official releases.
 .. Update link:https://tinkerpop.apache.org/download.html[Downloads] page, when moving "Current Releases" to "Archived
 Releases" recall that the hyperlink must change to point to version in the link:https://archive.apache.org/dist/tinkerpop/[Apache Archives].
+.. Update `docs/gremlint/package.json` with the latest version of gremlint.
 .. Preview changes locally with `bin/generate-home.sh` then commit changes to git.
 . Wait for zip distributions to sync to the Apache mirrors (i.e ensure the download links work from a mirror).
 . `bin/publish-home.sh <username>` to publish the updated web site with new releases.
@@ -327,6 +325,7 @@
 .. Commit and push the `SNAPSHOT` changes to git
 . Examine the `future.asciidoc` and update the "Roadmap" as needed.
 . Send email to advise that code freeze is lifted.
+. Consider the changes made to Gremlin and determine if the community needs to organize a PR to [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/gremlin) to keep TypeScript up to date.
 . Ensure that the GLV examples compile and run with the latest image and dependencies: `bin/run-examples.sh`.
 .. Make changes as necessary to update the examples.
 . Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review, then once consensus is reached removed those branches.
diff --git a/docs/src/dev/future/index.asciidoc b/docs/src/dev/future/index.asciidoc
index 76a4c5d..f849877 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -1,5 +1,3 @@
-= TinkerPop Future
-
 ////
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,9 +14,16 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
+
+:docinfo: shared
+:docinfodir: ../../
+:toc-position: left
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
-:toc-position: left
+*x.y.z*
+
+= TinkerPop Future
 
 This document offers a rough view at what features can be expected from future releases and catalogs proposals for
 changes that might be better written and understood in a document form as opposed to a dev list post.
@@ -42,14 +47,14 @@
 are removed with new items taking their place as they are planned. The release line is removed from the roadmap
 completely when it is no longer maintained.
 
-== 3.7.x - Target 22Q4
+== 3.7.x - Target 2023H1
 
-Development has not yet started on the 3.7.x release line with a targeted release date for the initial release of the
-line of 22H2.
+The development of the 3.7.x release line is currently under way with a target release date for the initial release of
+the line of 23H1.
 
 * Add support for traversals as parameters for `V()`, `is()`, and `has()` (includes `Traversal` arguments to `P`)
 * Geospatial support for TinkerPop (link:++https://lists.apache.org/list?dev@tinkerpop.apache.org:2021-7:DISCUSS%20geo-spatial++[DISCUSS Thread])
-* Add mid-traversal `E()` support
+* Add mid-traversal `E()` support (link:https://issues.apache.org/jira/browse/TINKERPOP-2798[TINKERPOP-2798])
 * Allow properties on elements (as opposed to just references) for remote traversals
 * Add subgraph/tree structure in all GLVs
 * List functions (`concat()`/etc.)
@@ -91,6 +96,8 @@
 |=========================================================
 |Proposal |Description |Targets |Resolved
 |link:https://github.com/apache/tinkerpop/blob/master/docs/src/dev/future/proposal-equality-1.asciidoc[Proposal 1] |Equality, Equivalence, Comparability and Orderability Semantics - Documents existing Gremlin semantics along with clarifications for ambiguous behaviors and recommendations for consistency. |3.6.0 |N
+|link:https://github.com/apache/tinkerpop/blob/master/docs/src/dev/future/proposal-arrow-flight-2[Proposal 2] |Gremlin Arrow Flight. |4.0.0 |N
+|link:https://github.com/apache/tinkerpop/blob/master/docs/src/dev/future/proposal-3-remove-closures[Proposal 3] |Removing the Need for Closures/Lambda in Gremlin |3.7.0 |N
 |=========================================================
 
 = Appendix
diff --git a/docs/src/dev/future/proposal-3-remove-closures.asciidoc b/docs/src/dev/future/proposal-3-remove-closures.asciidoc
new file mode 100644
index 0000000..87cace0
--- /dev/null
+++ b/docs/src/dev/future/proposal-3-remove-closures.asciidoc
@@ -0,0 +1,1531 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+== Proposal 3 - Removing the Need for Closures/Lambda in Gremlin
+
+=== Status
+
+This proposal has been accepted through a post to the TinkerPop Dev List and is ready to begin implementaion.
+
+=== Motivation
+
+There are a number of useful operations that Gremlin users often wish to
+perform that are not provided today in the form of traversal steps or
+predicates (P/TextP). For historical reasons these functions were
+omitted and users were able to accomplish these tasks by specifying
+anonymous code blocks or “closures” to perform these tasks. For example,
+below is an example of how you can achieve a case-insensitive search for
+any cities that contain “Miami”.
+
+....
+g.V().hasLabel('city').
+    has('name',filter{it.get().toLowerCase().contains('Miami'.toLowerCase())})
+....
+
+While this is just one example of how closures are used, they are a
+powerful fallback mechanism in Gremlin to handle use cases where there
+is no functionality within the Gremlin language to meet the
+requirements. However, for a variety of reasons such as security and
+performance, many/most remote providers of TinkerPop do not allow users
+to execute closures as part of a query. This leaves users with a
+problem, as the mechanism provided to solve these sorts of use cases is
+not allowed. Examples of some commonly requested functionality that
+cannot be accomplished without the use of closures would be:
+
+[cols=",,",options="header",]
+|===
+|String Functions |List Functions |Date Functions
+|asString |reverse |dateAdd
+|concat |remove |dateDiff
+|length |indexOf |asDate
+|split |product |
+|substring |all |
+|rTrim |any |
+|lTrim |none |
+|trim |concat |
+|replace |length |
+|reverse |intersect |
+|toUpper |difference |
+|toLower |union |
+|===
+
+=== Considerations
+
+* Adding full support for traversals as parameters to predicates would
+simplify the syntax of these examples. However, this is a known issue
+with Gremlin and none of the proposed options below are blocked by it,
+nor do they exacerbated this issue any further. As such, the
+ramifications of that change are not covered by this proposal.
+
+=== Proposed Options and Recommendation
+
+==== Option 1 (Recommended)
+
+Create a new Gremlin step for each of the desired functions a user is
+looking to perform. Each step encapsulates a set of functionality that
+customers are looking to achieve. While certain steps may be reused
+across input types (e.g. `reverse()` for both list and string inputs)
+the behaviors of each step is well-defined for a given input type.
+
+*Example*: Find me all `city` nodes with a `name` starting with `miami`,
+ignoring case?
+`g.V().hasLabel('city').where(values('name').toLower(), eq('miami'))`
+
+===== Pros:
+
+* Most similar to current Gremlin patterns for adding steps
+* Feel the most like Gremlin when writing the
+
+===== Cons:
+
+* Would result in a potentially large number of steps being added to the
+language, hindering discoverability
+* Adds complexity to creating and maintaining all the current GLVs due
+to the number of new steps.
+
+==== Option 2
+
+Create a single Gremlin step that take the operation as a parameter and
+uses that parameter to mutate the behavior to achieve the desired
+functionality.
+
+*Example*: : Find me all `city` nodes with a `name` starting with
+`miami`, ignoring case?
+`g.V().hasLabel('city').where(F.apply(Func.toLower, values('name')), eq('miami'))`
+
+===== Pros:
+
+* Single step simplifies adding new operations across GLVs
+
+===== Cons:
+
+* Introduces a novel concept, a function, to the Gremlin language
+* No set signature for `F.apply` as it will differ per operation
+
+==== Option 3
+
+Create a new type of predicate in Gremlin that specifies the operation
+and returns the correct output. This would be a new paradigm within
+Gremlin, as it extends predicates to return non-boolean results.
+
+*Example*:: Find me all `city` nodes with a `name` starting with
+`miami`, ignoring case?
+`g.V().hasLabel('city').where(SP.toLower(values('name')).is('miami'))`
+
+===== Pros:
+
+* Single predicate simplifies adding new operations as they are now a
+token and not a new step that needs to be propagated across all the GLVs
+
+===== Cons:
+
+* New paradigm in Gremlin that further blurs the line between predicates
+and steps
+* Signature differs for each predicate operation
+* Signatures of common steps needs to change to include options like
+`where(Predicate)`
+
+=== Proposed Syntax
+
+<<string-function-syntax>>
+
+<<list-function-syntax>>
+
+<<date-function-syntax>>
+
+=== Examples
+
+==== String Examples
+
+===== String Example 1 (SE1)
+
+I want to find the offices, by name, where the name does not have a "-"
+as the third character of the string
+(https://stackoverflow.com/questions/56115935/gremlin-is-there-a-way-to-find-the-character-based-on-the-index-of-a-string[here])
+
+`g.V().hasLabel('office').where(__.values('name').substr(2, 1)).is(neq('-'))) `
+
+===== String Example 2 (SE2)
+
+I would like to trim out the "Mbit/s" from the string
+(https://stackoverflow.com/questions/45365726/im-unable-to-substring-values-that-i-get-by-running-a-gremlin-query-ive-been[here])
+
+`g.V('Service').has('serviceId','ETHA12819844').out('AssociatedToService').`
+`value("bandwidth").replace("Mbit/s", "")`
+
+===== String Example 3 (SE3)
+
+I am trying to add a new vertex which should be labeled like an existing
+vertex but with some prefix attached
+(https://stackoverflow.com/questions/61106927/concatenate-gremlin-graphtraversal-result-with-string[here])
+
+....
+`g.V(3).as('a').addV(constant("").concat("prefix_", select('a').label())`
+....
+
+===== String Example 4 (SE4)
+
+Find all products that start with the same case-insensitive prefix. +
+e.g. Given the following products:
+
+[cols=",",options="header",]
+|===
+|id |product_name
+|1 |PROD-123
+|2 |PROD-234
+|3 |TEST-1234
+|4 |GAMMA-1234
+|5 |PR-123
+|===
+
+We should return:
+
+[cols=",",options="header",]
+|===
+|id |product_name
+|1 |PROD-123
+|2 |PROD-234
+|===
+
+....
+g.V().hasLabel('Product').has('product_name').as('product1').
+  V().hasLabel('Product').has('product_name'`).`
+  where(__.is(select('product1').toLower())`.values('product_name').substring(0, 5)).
+  select('product1')
+....
+
+===== String Example 5 (SE5)
+
+Perform case-insensitive search
+
+....
+g.V().hasLabel('Product').where(values('product_name').toLower(), eq('foo'))
+....
+
+===== String Example 6 (SE6)
+
+Applying functions to returning values, in this case return the `age`
+and a lower cased version of `name`
+
+`g.V().hasLabel('person').valueMap('age', 'name').by().by(toLower())`
+
+===== String Example 7 (SE7)
+
+Concatenating values on the return, in this case return a concatenated
+name
+
+`g.V().hasLabel('person').project('age', 'name').` `by('age').`
+`by(values('first_name').concat(" ").concat(values('last_name'))`
+
+==== List Examples
+
+===== List Example 1 (LE1)
+
+Given a list of people, return the list of `age`s if everyone’s `age` >
+18
+
+`g.V().hasLabel('person').values('age').fold().where(all(gt(18)))`
+
+===== List Example 2 (LE2)
+
+Given a set of vertices, return the list of vertices if anyone’s `age` >
+18
+
+`g.V([1,2,3,4]).fold().where(any(values('age').is(gt(18))))`
+
+===== List Example 3 (LE3)
+
+Given a list, find the index of the first occurrence of `Dave`
+
+`g.V().hasLabel('person').fold().indexOf(has('name', 'Dave'))` `==> 12`
+
+`g.inject(['Dave', 'Kelvin', 'Stephen']).indexOf(constant('Dave'))`
+`==> 0`
+
+===== List Example 4 (LE4)
+
+Given a list of people, remove any person with a name of `Dave`
+
+`g.V().hasLabel('person').fold().remove(has('name', 'Dave'))`
+`==> [‘Kelvin’, ‘Stephen’]`
+
+`g.inject(['Dave', 'Kelvin', 'Stephen']).remove(constant('Dave'))`
+`==> [‘Kelvin’, ‘Stephen’]`
+
+`g.inject(['Dave', 'Kelvin', 'Stephen']).remove(constant(['Dave', 'Stephen'))`
+`==> ['Kelvin']`
+
+==== Date Examples
+
+===== Date Example 1 (DE1)
+
+Given a transaction, find me all other transactions within 7 days prior
+
+`g.V('transaction1').values('date').dateAdd(DT.Days, -7).as('purchase_date').V().hasLabel('transaction').where(gt('purchase_date')).by('date').by()`
+
+===== Date Example 2 (DE2)
+
+Given two transactions, find me the difference in the dates
+
+`g.V('transaction1').values('date').dateDiff(DT.Days, V('transaction2').values('date').asDate())`
+
+===== Date Example 3 (DE3)
+
+Given a static value, return me the value as a date
+
+`g.inject('1900-01-01').asDate()`
+
+===== Date Example 4 (DE4)
+
+Find the difference between a transaction and the first of the year
+
+`g.V('transaction1').values('date').dateDiff(DT.Days, inject(datetime('2023-01-01'))`
+
+
+
+== String Manipulation functions in TinkerPop [[string-function-syntax]]
+
+One of the common gaps that user's find when using Gremlin is that there
+is a lack of string manipulation capabilities within the language
+itself. This requires that users use closures to handle many common
+string manipulation options that users want to do on data in the graph.
+This is a problem for many users as many of the providers prevent the
+use of arbitrary closures due to the security risks so for these users
+there is no way to manipulate strings directly.
+
+=== Proposal
+
+The proposal here is to add a set of steps to handle common string
+manipulation requests from users, the details for each are discussed
+below:
+
+* <<asString, asString()>>
+* <<concat, concat()>>
+* <<length, length()>>
+* <<split, split()>>
+* <<substring, substring()>>
+* <<rTrim, rTrim()>>
+* <<lTrim, lTrim()>>
+* <<trim, trim()>>
+* <<replace, replace()>>
+* <<reverse, reverse()>>
+* <<toUpper, toUpper()>>
+* <<toLower, toLower()>>
+
+=== Gremlin Language Variant Function Names
+
+[cols=",,,,,",options="header",]
+|===
+|Groovy |Java |Python |JavaScript |.NET |Go
+|asString() |asString() |as_string() |asString() |AsString() |AsString()
+
+|concat() |concat() |concat() |concat() |Concat() |Concat()
+
+|length() |length() |length() |length() |Length() |Length()
+
+|split() |split() |split() |split() |Split() |Split()
+
+|substring() |substring() |substring() |substring() |Substring()
+|Substring()
+
+|rTrim() |rTrim() |rtrim() |rTrim() |RTrim() |RTrim()
+
+|lTrim() |lTrim() |ltrim() |lTrim() |LTrim() |LTrim()
+
+|trim() |trim() |trim() |trim() |Trim() |Trim()
+
+|replace() |replace() |replace() |replace() |Replace() |Replace()
+
+|reverse() |reverse() |reverse() |reverse() |Reverse() |Reverse()
+
+|toUpper() |toUpper() |to_upper() |toUpper() |ToUpper() |ToUpper()
+
+|toLower() |toLower() |to_lower() |toLower() |ToLower() |ToLower()
+|===
+
+'''''
+
+== Function Definitions
+
+=== `asString()` [[asString]]
+
+Returns the value of the incoming traverser as a string
+
+==== Signature(s)
+
+`asString()`
+
+`asString(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+Any data type allowed by TinkerPop
+
+==== Expected Output
+
+A String value representing the string value of the traverser being
+passed in as shown below:
+
+[cols=",,",options="header",]
+|===
+|Incoming Datatype |Example Query |Example Output
+|Integer |`g.inject(29).asString()` |29
+
+|Float |`g.inject(29.0).asString()` |29.0
+
+|String |`g.inject('foo').asString()` |foo
+
+|UUID |`g.inject(UUID.randomUUID()).asString()`
+|47557eed-04e7-4aa4-89eb-9689d26fe94a
+
+|Map
+|`g.inject([["id": 1], ["id": 2, "something":"anything"]]).asString()`
+|[[id:1], [id:2, something:anything]]
+
+|Date |`g.inject(datetime()).asString()` |Sun Nov 04 00:00:00 UTC 2018
+
+|List |`g.inject([1,2,3]).asString()` |[1, 2, 3]
+
+|List (Local Scope) |`g.inject([1,2,3]).asString(local)` |["1", "2",
+"3"]
+
+|Vertex |`g.V(1).asString()` |v[1]
+
+|Edge |`g.E(7).asString()` |e[7][1-knows->2]
+
+|Property |`g.V(1).properties('age').asString()` |vp[age->29]
+
+|null |`g.V().group().by('foo').select(keys).asString()` |null
+|===
+
+'''''
+
+=== `concat()` [[concat]]
+
+Concatenates one or more strings together
+
+==== Signature(s)
+
+`concat(String...)`
+
+`concat(Traversal)`
+
+==== Parameters
+
+* `String...` - One or more String values to concatenate to the input
+string
+* `Traversal` - A traversal value to concatenate
+
+==== Allowed incoming traverser types
+
+String data types. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A String value representing the concatenation of all the incoming traverser and input values
+
+....
+g.inject('this').concat('is', 'a', 'test')
+==>thisisatest
+g.V(1).values('first_name').concat(' ').concat(V(1).values('last_name')
+==>John Doe
+g.inject('this', 'is', 'a', 'test').concat(' inserted')
+==>this inserted
+==>is inserted
+==>a inserted
+==>test inserted
+g.inject('John').concat(' ').concat(V(1).values('last_name'))
+==>John Doe
+....
+
+*Note* `concat()` may also be extended to handle concatenating list
+values together but that is out of scope for this change.
+
+'''''
+
+=== `length()` [[length]]
+
+Returns the length of the input string
+
+==== Signature(s)
+
+`length()`
+
+`length(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A Long value representing the number of items in an array or the number
+of characters in a string
+
+....
+g.inject('this').length()
+==>4
+g.inject('this').length(local)
+==>4
+....
+
+*Note*:While this is similar to `count(local)` they are not the same.
+`count(local)` treats the input by calculating the count of the items
+stored within the traversal. `length()` treats the input as an array and
+provides the length of that array.
+
+[cols=",,,",options="header",]
+|===
+|Input Datatype |Example traversal |count(local) |length()
+|Integer |`g.inject(29)` |1 |IllegalArgumentException
+
+|Float |`g.inject(29.0)` |1 |IllegalArgumentException
+
+|String |`g.inject('foo')` |1 |3
+
+|UUID |`g.inject(UUID.randomUUID())` |1 |IllegalArgumentException
+
+|Map |`g.inject(["id": 2, "something":"anything"]])` |1
+|IllegalArgumentException
+
+|Date |`g.inject(datetime())` |1 |IllegalArgumentException
+
+|List |`g.inject([1,2,3])` |3 |3
+
+|Vertex |`g.V(1)` |1 |IllegalArgumentException
+
+|Edge |`g.E(7)` |1 |IllegalArgumentException
+
+|Property |`g.V(1).properties('age')` |1 |IllegalArgumentException
+
+|null |`g.V().group().by('foo').select(keys)` |0
+|IllegalArgumentException
+|===
+
+'''''
+
+=== `split()` [[split]]
+
+Returns a list of strings created by splitting the input string around
+the matches of the given delimiter.
+
+==== Signature(s)
+
+`split(String)`
+
+`split(Scope, String)`
+
+==== Parameters
+
+* String - The delimiter character(s) to split the input string* *
+
+==== Allowed inputs
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array of strings split around the delimiter character(s)
+
+....
+g.inject('this').split('h')
+==>[t, is]
+g.inject('one,two').split(',')
+==>[one, two]
+g.inject('axxb').split('x')
+==>[a, b]
+g.inject('axybxc').split('xy')
+==>[a, bxc]
+g.inject(['this', 'that']).split('h')
+==>[[t, is], [t, at]]
+....
+
+'''''
+
+=== `substring()` [[substring]]
+
+returns a substring of the original string with the length specified,
+uses a 0-based start
+
+==== Signature(s)
+
+`substring(Long, Long)`
+
+`substring(Long)`
+
+`substring(Scope, Long, Long)`
+
+`substring(Scope, Long)`
+
+==== Parameters
+
+* Long - The start index, 0 based. If the value is negative then the
+start location will be the end of the string and it will go the
+specified number of characters from the end of the string.
+* Long - The number of characters to return. Optional - if not provided
+then all remaining characters will be returned
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A String value containing the number of characters specified beginning
+at the start location. If the start location plus the length specified
+is greater than or equal to the input length, the result will contain
+the entire string.
+
+....
+g.inject('this').substring(0, 1)
+==>t
+g.inject('this').substring(2)
+==>is
+g.inject('this').substring(2, 5)
+==>is
+g.inject('this').substring(-1)
+==>s
+g.inject(['this', 'is', 'a', 'test']).substring(local, 2)
+==>[is, '' ,'' , 'st']
+....
+
+'''''
+
+=== `rTrim()` [[rTrim]]
+
+Returns a string with trailing whitespace removed
+
+*Note*: Whitespace characters are defined as space/tab/line feed/line
+tabulation/form feed/carriage return.
+
+==== Signature(s)
+
+`rTrim()`
+
+`rTrim(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A string value with trailing whitespace removed
+
+....
+g.inject('this ').rTrim()
+==>this
+g.inject(['this ', 'that ']).rTrim(local)
+==>[this, that]
+....
+
+'''''
+
+=== `lTrim()` [[lTrim]]
+
+Returns a string with leading whitespace removed
+
+*Note*: Whitespace characters are defined as space/tab/line feed/line
+tabulation/form feed/carriage return.
+
+==== Signature(s)
+
+`lTrim()`
+
+`lTrim(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A string value with leading whitespace removed
+
+....
+g.inject(' this').lTrim()
+==>this
+g.inject([' this', ' that']).lTrim(local)
+==>[this, that]
+....
+
+'''''
+
+=== `trim()` [[trim]]
+
+Returns a string with leading and trailing whitespace removed
+
+*Note*: Whitespace characters are defined as space/tab/line feed/line
+tabulation/form feed/carriage return.
+
+==== Signature(s)
+
+`trim()`
+
+`trim(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A string value with leading and trailing whitespace removed
+
+....
+g.inject(' this ').trim()
+==>this
+g.inject([' this ', ' that ']).trim()
+==>[this, that]
+....
+
+'''''
+
+=== `replace()` [[replace]]
+
+Returns a string with the specified characters in the original string
+replaced with the new characters
+
+==== Signature(s)
+
+`replace(String, String)`
+
+`replace(Scope, String, String)`
+
+==== Parameters
+
+* String - The character(s) to be replaced
+* String - The character(s) to replace with
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A string
+
+....
+g.inject('this').replace('t', 'x)
+==>xhis
+g.inject('this').replace('x', 't')
+==>this
+g.inject('this').replace('is', 'was')
+==>thwas
+g.inject(['this', 'that']).replace('th', 'was')
+==>[wasis, wasat]
+....
+
+'''''
+
+=== `reverse()` [[reverse]]
+
+Reverses the current string
+
+==== Signature(s)
+
+`reverse()`
+
+`reverse(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A String value representing the reversed version of the incoming string
+
+....
+g.inject('this').reverse()
+==>siht
+g.inject(['this', 'that']).reverse(local)
+==>[siht, taht]
+....
+
+*Note* `reverse()` may also be extended to handle concatenating list
+values together but that is out of scope for this change.
+
+'''''
+
+=== `toUpper()` [[toUpper]]
+
+Returns an upper case string representation.
+
+*Note*: All case conversions will be done via the mappings specified for
+Unicode (https://www.unicode.org/reports/tr44/#Casemapping[found here])
+
+==== Signature(s)
+
+`toUpper()`
+
+`toUpper(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A string
+
+....
+g.inject('this').toUpper()
+==>THIS
+g.inject(['this', 'that']).toUpper()
+==>[THIS, THAT]
+....
+
+'''''
+
+=== `toLower()` [[toLower]]
+
+Returns an lower case string representation
+
+*Note*: All case conversions will be done via the mappings specified for
+Unicode (https://www.unicode.org/reports/tr44/#Casemapping[found here])
+
+==== Signature(s)
+
+`toLower()`
+
+`toLower(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+String data types or array, if local scope is used. If a non-string
+traverser, or the list containing non-string values, is passed in then
+an `IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A string
+
+....
+g.inject('THIS').toLower()
+==>this
+g.inject(['THIS', 'THAT']).toLower()
+==>[this, that]
+....
+
+
+== List Manipulation functions in TinkerPop [[list-function-syntax]]
+
+One of the common gaps that user's find when using Gremlin is that there
+is a lack of list manipulation capabilities within the language itself.
+This requires that users use closures to handle many common manipulation
+options that users want to do on data in the graph. This is a problem
+for many users as many of the providers prevent the use of arbitrary
+closures due to the security risks so for these users there is no way to
+manipulate strings directly.
+
+=== Proposal
+
+The proposal here is to add a set of steps to handle common list
+manipulation requests from users, the details for each are discussed
+below:
+
+* <<length_list, length()>>
+* <<reverse_list, reverse()>>
+* <<remove_list, remove()>>
+* <<indexOf_list, indexOf()>>
+* <<product_list, product()>>
+* <<all_list, all()>>
+* <<any_list, any()>>
+* <<none_list, none()>>
+* <<concat_list, concat()>>
+* <<intersect_list, intersect()>>
+* <<union_list, union()>>
+* <<difference_list, difference()>>
+* <<disjunct_list, disjunct()>>
+* <<conjoin_list, conjoin()>>
+
+=== Gremlin Language Variant Function Names
+
+[cols=",,,,,",options="header",]
+|===
+|Groovy |Java |Python |JavaScript |.NET |Go
+|length() |length() |length() |length() |Length() |Length()
+
+|reverse() |reverse() |reverse() |reverse() |Reverse() |Reverse()
+
+|remove() |remove() |remove() |remove() |Remove() |Remove()
+
+|indexOf() |indexOf() |index_of() |indexOf() |IndexOf() |IndexOf()
+
+|product() |product() |product() |product() |Product() |Product()
+
+|all() |all() |all() |all() |All() |All()
+
+|any() |any() |any() |any() |Any() |Any()
+
+|none() |none() |none() |none() |None() |None()
+
+|concat() |concat() |concat() |concat() |Concat() |Concat()
+
+|intersect() |intersect() |intersect() |intersect() |Intersect()
+|Intersect()
+
+|union() |union() |union() |union() |Union() |Union()
+
+|difference() |difference() |difference() |difference() |Difference()
+|Difference()
+
+|disjunct() |disjunct() |disjunct() |disjunct() |Disjunct()
+|Disjunct()
+
+|conjoin() |conjoin() |conjoin() |conjoin() |Conjoin() |Conjoin()
+|===
+
+'''''
+
+== Function Definitions
+
+=== `length()` [[length_list]]
+
+Returns the length of a list in the incoming traverser
+
+==== Signature(s)
+
+`length()`
+
+==== Parameters
+
+None
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A Long value representing the number of items in an array or the number
+of characters in a string
+
+....
+g.inject([1, 2]).length()
+==>2
+....
+
+=== `reverse()` [[reverse_list]]
+
+Returns the value of the incoming list in reverse order
+
+==== Signature(s)
+
+`reverse()`
+
+==== Parameters
+
+None
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array in reverse order.
+
+....
+g.inject([1,2]).reverse()
+==>[2, 1]
+....
+
+=== `remove()` [[remove_list]]
+
+Removes the first element from the incoming list where the value equals
+the specified value
+
+==== Signature(s)
+
+`remove(value)`
+
+`remove(Traversal)`
+
+==== Parameters
+
+* value - The value to remove
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array value representing the new list
+
+....
+g.inject([1,2]).remove(1)
+==>[2]
+....
+
+=== `indexOf()` [[indexOf_list]]
+ 
+Returns the first occurrence of the `value` in the incoming array
+
+==== Signature(s)
+
+`indexOf(value)`
+
+`indexOf(Traversal)`
+
+==== Parameters
+
+* value - The value to locate
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A long representing the index of the first occurrence of the value
+(zero-based). If the values does not exist then `null` is returned
+
+....
+g.inject([1,2]).indexOf(1)
+==>0
+....
+
+=== `product()` [[product_list]]
+
+Returns the cartesian product of two lists
+
+==== Signature(s)
+
+`product(value)`
+
+`product(Traversal)`
+
+==== Parameters
+
+* value - An array
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A set of values where each value contains the cartesian product of two
+lists
+
+....
+g.inject([1,2]).product([3,4])
+==>[[1,3], [1,4], [2,3], [2,4]]
+....
+
+=== `any()` [[any_list]]
+
+Allows the traverser to continue if any items in the array pass the
+supplied predicate.
+
+==== Signature(s)
+
+`any(Predicate)`
+
+==== Parameters
+
+* Predicate - The predicate to use to test the values in the array
+
+==== Allowed incoming traverser types
+
+Array data types. All other types will be filtered out.
+
+==== Expected Output
+
+The arrays which have any item pass the predicate.
+
+....
+g.inject([1,2]).any(P.eq(1))
+==>[1,2]
+....
+
+=== `all()` [[all_list]]
+
+Allows the traverser to continue if all items in the array pass the
+supplied predicate.
+
+==== Signature(s)
+
+`all(Predicate)`
+
+==== Parameters
+
+* Predicate - The predicate to use to test the values in the array
+
+==== Allowed incoming traverser types
+
+Array data types. All other types will be filtered out.
+
+==== Expected Output
+
+The arrays which have all items pass the predicate.
+
+....
+g.inject([1,2]).all(P.gt(0))
+==>[1,2]
+....
+
+=== `none()` [[none_list]]
+
+Returns true if no items in the array `value` exist in the input
+
+==== Signature(s)
+
+`none(value)`
+
+`none(Traversal)`
+
+==== Parameters
+
+* value - An array of the items to check in the incoming list
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+True if no values from one list are in the other, False otherwise
+
+....
+g.inject([1,2]).none([1])
+==>false
+g.inject([1,2]).none([1, 3])
+==>false
+g.inject([1,2]).none([3])
+==>true
+....
+
+=== `concat()` [[concat_list]]
+
+Returns the concatenation of the incoming array and the traversal or
+array value passed as a parameter. This will return all values,
+including duplicates.
+
+==== Signature(s)
+
+`concat(value)`
+
+`concat(Traversal)`
+
+==== Parameters
+
+* value - An array of the items to check in the incoming list
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array containing the values of the concatenation of the two lists
+
+....
+g.inject([1,2]).concat([3])
+==>[1, 2, 3]
+g.inject([1,2]).concat([1, 4])
+==>[1, 2, 1, 4]
+g.V().has('age', 29).values('age').dedup().fold().concat(V().has('age', 30).values('age').dedup().fold())
+==>[29, 30]
+....
+
+=== `union()` [[union_list]]
+
+Returns the union of the incoming array and the traversal or array value
+passed as a parameter. This will return an array of unique values
+
+==== Signature(s)
+
+`union(value)`
+
+`union(Traversal)`
+
+==== Parameters
+
+* value - An array of the items to check in the incoming list
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array containing the unique values of the union of the two lists
+
+....
+g.inject([1,2]).union([1])
+==>[1, 2]
+g.inject([1,2]).union([1, 4])
+==>[1, 2, 4]
+g.V().has('age', 29).values('age').dedup().fold().union(V().has('age', 30).values('age').dedup().fold())
+==>[29, 30]
+....
+
+=== `intersect()` [[intersect_list]]
+
+Returns the intersection of the incoming array and the traversal or
+array value passed as a parameter. This will return an array of unique
+values
+
+==== Signature(s)
+
+`intersect(value)`
+
+`intersect(Traversal)`
+
+==== Parameters
+
+* value - An array of the items to check in the incoming list
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array containing the unique values of the intersection of the two
+lists
+
+....
+g.inject([1,2]).intersect([1])
+==>[1]
+g.inject([1,2]).intersect([1, 2, 3])
+==>[1, 2]
+g.V().has('age', 29).values('age').dedup().fold().intersect(V().has('age', 30).values('age').dedup().fold())
+==>[]
+....
+
+=== `difference()` [[difference_list]]
+
+Returns the difference of the incoming array and the traversal or array
+value passed as a parameter. This will return an array of unique values
+
+==== Signature(s)
+
+`difference(value)`
+
+`difference(Traversal)`
+
+==== Parameters
+
+* value - An array of the items to check in the incoming list
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array containing the different values of the intersection of the two
+lists
+
+....
+g.inject([1,2]).difference([1])
+==>[2]
+g.inject([1,2]).difference([1, 2, 3])
+==>[3]
+g.V().has('age', 29).values('age').dedup().fold().difference(V().has('age', 30).values('age').dedup().fold())
+==>[29, 30]
+....
+
+=== `disjunct()` [[disjunct_list]]
+
+Returns the disjunct set of the incoming array and the traversal or array
+value passed as a parameter. This will return an array of unique values
+
+==== Signature(s)
+
+`disjunct(value)`
+
+`disjunct(Traversal)`
+
+==== Parameters
+
+* value - An array of the items to check in the incoming list
+
+==== Allowed incoming traverser types
+
+Array data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+An array containing the different values of the intersection of the two
+lists
+
+....
+g.inject([1,2]).disjunct([1])
+==>[2]
+g.inject([1,2,4]).disjunct([1, 2, 3])
+==>[3, 4]
+....
+
+=== `conjoin()` [[conjoin_list]]
+
+Returns the join of the incoming array and delimiter passed as a
+parameter. This will return a String of the values joined together with
+the delimiter.
+
+==== Signature(s)
+
+`conjoin(delimiter)`
+
+==== Parameters
+
+* delimiter - A string delimiter used to join the values
+
+==== Allowed incoming traverser types
+
+String data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A string of the values joined together with the delimiter
+
+....
+g.inject([1,2]).conjoin("5")
+==>152
+g.inject([1,2,3]).conjoin(";")
+==>1;2;3
+....
+
+== Date Manipulation functions in TinkerPop [[date-function-syntax]]
+
+One of the common gaps that user's find when using Gremlin is that there
+is a lack of date manipulation capabilities within the language itself.
+This requires that users use closures to handle many common manipulation
+options that users want to do on data in the graph. This is a problem
+for many users as many of the providers prevent the use of arbitrary
+closures due to the security risks so for these users there is no way to
+manipulate strings directly.
+
+=== Proposal
+
+The proposal here is to add a set of steps to handle common datetime
+manipulation requests from users, the details for each are discussed
+below:
+
+* <<asDate, asDate()>>
+* <<dateAdd, dateAdd()>>
+* <<dateDiff, dateDiff()>>
+
+=== Gremlin Language Variant Function Names
+
+[cols=",,,,,",options="header",]
+|===
+|Groovy |Java |Python |JavaScript |.NET |Go
+|asDate() |asDate() |as_date() |asDate() |AsDate() |AsDate()
+|dateAdd() |dateAdd() |date_add() |dateAdd() |DateAdd() |DateAdd()
+|dateDiff() |dateDiff() |date_diff() |dateDiff() |DateDiff() |DateDiff()
+|===
+
+== Function Definitions
+
+=== `asDate()` [[asDate]]
+
+Returns the value of the incoming traverser as an ISO-8601 date
+
+==== Signature(s)
+
+`asDate()`
+
+`asDate(Scope)`
+
+==== Parameters
+
+* Scope - Scope Enum
+
+==== Allowed incoming traverser types
+
+Any data type that can be parsed into an ISO-8601 date. If an
+unsupported types is passed in then an `IllegalArgumentException` will
+be thrown
+
+==== Expected Output
+
+A Date value representing the ISO-8601 value of the traverser being
+passed in as shown below:
+
+[cols=",,",options="header",]
+|===
+|Incoming Datatype |Example Query |Example Output
+|Integer |`g.inject(0).asDate()` |1900-01-01T00:00:00Z
+
+|Float |`g.inject(29.0).asDate()` |1900-01-01T00:00:00Z
+
+|String |`g.inject('1/1/1900').asDate()` |1900-01-01T00:00:00Z
+
+|UUID |`g.inject(UUID.randomUUID()).asDate()`
+|`IllegalArgumentException`
+
+|Map
+|`g.inject([["id": 1], ["id": 2, "something":"anything"]]).asDate()`
+|`IllegalArgumentException`]
+
+|Datetime |`g.inject(datetime()).asDate()` |Sun Nov 04 00:00:00 UTC 2018
+
+|List |`g.inject([1,2,3]).asDate()` |`IllegalArgumentException`
+
+|List (Local Scope) |`g.inject([1,2,3]).asDate(local)`
+|`IllegalArgumentException`
+
+|Vertex |`g.V(1).asDate()` |`IllegalArgumentException`
+
+|Edge |`g.E(7).asDate()` |`IllegalArgumentException`
+
+|Property |`g.V(1).properties('age').asDate()`
+|`IllegalArgumentException`
+
+|null |`g.V().group().by('foo').select(keys).asDate()`
+|`IllegalArgumentException`
+|===
+
+=== `dateAdd()` [[dateAdd]]
+
+Returns the value with the addition of the `value` number of units as
+specified by the `DateToken`
+
+==== Signature(s)
+
+`dateAdd(DateToken, value)`
+
+`dateAdd(Scope, DateToken, value))`
+
+==== Parameters
+
+* DateToken - DateToken Enum
+* value - The number of units, specified by the Datetime Token, to add to
+the incoming values
+
+==== Allowed incoming traverser types
+
+Datetime data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+A Datetime with the value added.
+
+....
+g.inject(datetime()).dateAdd(DT.days, 7)
+==> 2018-03-22
+g.inject(datetime()).dateAdd(DT.days, -7)
+==> 2018-03-8
+g.inject([datetime(), datetime()]).dateAdd(local, DT.days, 7)
+==> [2018-03-22, 2018-03-22]
+....
+
+=== `dateDiff()` [[dateDiff]]
+
+Returns the difference between two Datetimes in epoch time
+
+==== Signature(s)
+
+`dateDiff(value)`
+
+`dateDiff(Traversal)`
+
+`dateDiff(Scope, value))`
+
+==== Parameters
+
+* value - The Datetime to find the difference from
+
+==== Allowed incoming traverser types
+
+Datetime data types. If non-array data types are passed in then an
+`IllegalArgumentException` will be thrown
+
+==== Expected Output
+
+The epoch time difference between the two values
+
+....
+g.inject(datetime()).dateDiff(datetime().dateAdd(DT.days, 7))
+==> 604800
+g.inject(datetime()).dateDiff(datetime().dateAdd(DT.days, 7))
+==> -604800
+g.inject([datetime(), datetime()]).dateDiff(local, DT.days, 7)
+==> [604800, 604800]
+....
diff --git a/docs/src/dev/future/proposal-arrow-flight-2.asciidoc b/docs/src/dev/future/proposal-arrow-flight-2.asciidoc
new file mode 100644
index 0000000..0849c08
--- /dev/null
+++ b/docs/src/dev/future/proposal-arrow-flight-2.asciidoc
@@ -0,0 +1,77 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
+
+*x.y.z - Proposal 2*
+
+= Gremlin Arrow Flight
+
+== Introduction
+Gremlin Server and Clients are based on WebSockets with a https://tinkerpop.apache.org/docs/current/dev/provider/#_graph_driver_provider_requirements/[custom sub-protocol] and serialization to GraphSON and GraphBinary. Developers for each driver must implement those protocols from scratch and there is a limited amount of code which is being reused (only 3rd party WebSocket libraries are currently reused in the client variants). The protocol implementation is a complicated and error-prone process, so most drivers only support some subset of Gremlin Server features. The maintenance cost is also constantly increasing with the number of new client variants being added to TinkerPop.
+
+== Motivation
+We would like to propose a solution to reduce maintenance and simplify the development of the client drivers by using a standard protocol based on the Apache Arrow Flight. As Arrow Flight is implemented in the most common languages like C++, C#, Java and Python we anticipate a larger amount of existing codebase can be reused which would help to reduce maintenance costs in the future. Also, we can reuse some other Arrow Flight features like authentication and error handling.
+
+== Assumptions
+
+* Need to reuse existing code as much as possible
+* It is desirable, but not necessary, to maintain compatibility with existing drivers
+* To simplify development at the initial stage, we will reuse existing serialization mechanism
+
+== Requirements
+
+* Gremlin Server and drivers should replace the network layer with Arrow Flight
+* No significant drop in performance
+* Gremlin Arrow must pass the Gherkin test suite
+
+== Specifications
+=== Design Overview
+
+The main idea is to replace the transport layer with FlightServer and FlightClient. They support asynchronous data transfer, splitting data into chunks, and authorization. While Arrow Flight typically requires schema, in a short term we can proceed with implementation using existing serializers and GraphBinary format. By using GraphBinary we will not have all capabilities that Arrow Flight provides out of the box, like efficient compression. However, in future, we see the value of adding capabilities to generate a schema from the server-side, and that can enable additional use cases.
+
+==== First stage: replace transport layer, but keep serializers
+
+Arrow Flight Server and Client implementations can be used to replace network code for Gremlin Server and GLV's.
+
+Pros:
+* Reduction of the code base to be developed and maintained
+* A relatively low number of modifications
+
+Cons:
+* We may observe reduced performance due to schema transfer and other overhead
+* Still need to support GraphBinary serialization
+
+==== Second stage: replace transport layer, make dynamic schema generation and use native Arrow structures for data transmission
+
+In addition, need to rework the serialization and add schema generation.
+We can use a user-provided schema to simplify development and reduce the size of the data transferred.
+
+Pros:
+* Greater reduction of the codebase to be developed and maintained
+* Performance and memory usage will be improved for large data sets due to Arrow Flight optimizations and the ability to transfer data in parallel
+* No need to support GraphBinary and GraphSON serialization protocols 
+* We can use Arrow libraries to import and export data, supported several popular formats like CSV, JSON, Apache Parquet, Apache ORC
+
+Cons:
+* Reduced performance for small result sets
+* Can be complicated and expensive to generate a schema for each request. Can be solved with intoducing schema to Tinkerpop.
+
+Open question: how to efficiently serialize heterogeneous data, for example `g.inject(1,"str",new HashMap<>())`.
+
+== Similar solutions
+
+link:https://github.com/neo4j-field/neo4j-arrow/[neo4j-arrow]
diff --git a/docs/src/dev/future/proposal-transaction-4.asciidoc b/docs/src/dev/future/proposal-transaction-4.asciidoc
new file mode 100644
index 0000000..5a63e10
--- /dev/null
+++ b/docs/src/dev/future/proposal-transaction-4.asciidoc
@@ -0,0 +1,137 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
+
+*x.y.z - Proposal 4*
+
+== TinkerGraph Transaction Support
+
+=== Introduction
+Now, if you need to use transactions in TinkerPop, the only solution is to use the Neo4j plugin. Unfortunately, this plugin has not been updated for a long time and is only compatible with Neo4j version 3.4, which reached end of life in March 2020. Gremlin cannot be used as a replacement for other graphs that support transactions.
+
+=== Motivation
+* Users will be able to use transactions without the outdated Neo4j plugin.
+* Test framework simplification.
+* A more robust Gremlin Server setup out-of-the-box.
+* A better learning experience for new users.
+* A less complicated transaction story for new users.
+* A better test graph that is more readily swappable with other graphs.
+
+=== Assumptions
+
+* Need to reuse existing code as much as possible.
+* Users should be able to work both with and without transactions.
+* Transaction implementation should not have additional external dependencies.
+* Existing drivers should work without changes.
+
+=== Specifications
+==== Design Overview
+The main changes relate to TinkerGraph, need to make a similar solution but with transaction support. Also TinkerGraph by default will have 2 configurations on Gremlin Server and users themselves will choose what they need, TinkerGraph or TinkerTransactionGraph.
+Locks will be write-only to reduce the impact of transactions on performance. In this case the isolation level will be `read committed`, the same as now with the Neo4j plugin. 
+Only ThreadLocalTransaction is planned, therefore embedded graph transactions may not be fully supported.
+
+==== Overview of changes to code base
+===== ElementContainer
+Storage for current Element value and ThreadLocal updated value with `isDeleted` flag. Similar for `Vertices` and `Edges`.
+[code]
+----
+class ElementContainer {
+    Vertex current;
+    ThreadLocal<Vertex> transactionUpdatedValue;
+    ThreadLocal<Boolean> isDeleted;
+}
+----
+
+===== TinkerTransactionGraph
+Vertices and Edges will store with version number and dirty transaction values
+`Map<Object, ElementContainer> vertices` where `Object` is Vertex Id.
+Shared code with TinkerGraph will be moved to AbstractTinkerGraph.
+
+===== TinkerTransactionElement
+Add `currentVersion` to all TinkerElements. This is the number of the transaction that last updated it.
+
+===== TinkerThreadLocalTransaction
+Extension of AbstractThreadLocalTransaction. Add a unique transaction number. Can use `AtomicLong.incrementAndGet`
+
+===== Graph Feature files
+Add TinkerTransactionGraphFeatures, TinkerTransactionGraphVertexFeatures, TinkerTransactionGraphEdgeFeatures, TinkerTransactionGraphGraphFeatures, TinkerTransactionGraphVertexPropertyFeatures.
+
+==== CRUD operations without transaction
+1. Wrap into transaction
+2. Commit
+
+==== CRUD operations with transaction
+===== Create
+Add new ElementContainer to `vertices` and `edges` in TinkerTransactionGraph.
+
+==== Read
+Read values from `vertices` ElementContainer, `transactionUpdatedValue` if present, otherwise `current`.
+if `isDeleted` flag is set, then the element is deleted in transaction and should be skipped.
+
+===== Update
+Update corresponding ElementContainer  in `vertices`.
+
+===== Delete
+Set `isDeleted` flag in ElementContainer  in `vertices`.
+
+==== Transaction flows
+===== Commit flow
+To reduce lock time double-checked locking used.
+1. Make list of all affected elements sorted by transaction#. The reason is to reduce the lock time.
+2. If any has a newer version, then fail.
+3. Try to lock all Vertices/Edges changed in transaction. For vertex/edge delete operation also need to lock adjacent edges/vertices. Lock is for write operations only. If some Vertex/Edge is already locked then fail.
+4. Check versions again, fail if some element is updated. Code: `Vertices.get(id).current()).currentVersion() !=Vertices.get(id).transactionUpdatedValue().currentVersion()`
+5. For all Elements replace current version with value updated in transaction (or remove Element on Delete operation). Cleanup `transactionUpdatedValue`.
+6. Change version of all updated Elements.
+7. Unlock.
+8. Update indexes if needed.
+
+===== Rollback
+Cleanup `transactionUpdatedValue` in `vertices`
+
+===== Error
+On any error, including transaction conflict:
+1. Rollback
+2. Throw exception
+
+===== Timeout
+Add transactionWatchdog which will rollback locked/expired transactions. Similar to `Session.touch`.
+1. If the transaction was open longer than some preconfigured (default 10-20 minutes?) time.
+2. If the transaction start commit, but not finish (default 1-2 seconds?).
+
+===== Examples of conflict resolution
+* tx1 adds a property to v1, tx2 deletes v1 (same for edges)
+transaction that executed first will set the lock on v1, second transaction will fail on one of steps 2-4.
+* tx1 adds an edge from v1 to v2, tx2 deletes v1 or v2
+If tx1 try to commit first: tx1 add edge, tx2 delete v1 AND all edges including newly added.
+If tx2 try to commit first: tx2 deletes v1 or v2, tx1 will fail on step 1.
+* tx1 changes a Cardinality.single property to x, tx2 changes the same Cardinality.single property to y
+Last transaction will fail on step 2 or 4.
+* tx1 adds a new vertex v1, tx2 adds the same vertex (same for edges)
+Last transaction will fail on step 2 or 4 or 5.
+* tx1 removes vertex v1, tx2 removes the same vertex (same for edges)
+Both transactions will be successful. 
+* tx1 adds vertex v1, tx2 removes vertex v1 (same for edges)
+If v1 exists before and tx1 commit first: tx1 fail on step 5
+If v1 exists before and tx2 commit first: tx1 fail on step 2 or 4
+If v1 not exists before and tx1 commit first: tx1 ok; tx2 depends on commit time, ok when tx1 finished and fail on step 2 or 4 otherwise.
+If v1 not exists before and tx2 commit first: tx2 ok, tx1 ok
+
+
+==== Additional changes
+Split TinkerFactory into AbstractTinkerFactory and TinkerFactory, add TinkerTransactionGraphFactory.
+Transfer responsibility of graph update operations from static TinkerHelper to TinkerGraph/TinkerTransactionGraph.
diff --git a/docs/src/dev/io/graphbinary.asciidoc b/docs/src/dev/io/graphbinary.asciidoc
index 210c953..410cc6f 100644
--- a/docs/src/dev/io/graphbinary.asciidoc
+++ b/docs/src/dev/io/graphbinary.asciidoc
@@ -108,6 +108,7 @@
 - `0x2c`: Metrics
 - `0x2d`: TraversalMetrics
 - `0x2e`: Merge
+- `0x2f`: DT
 - `0xfe`: Unspecified null object
 - `0x00`: Custom
 
@@ -572,6 +573,10 @@
 
 Format: a single `String` representing the enum value.
 
+==== DT
+
+Format: a single `String` representing the enum value.
+
 ==== Custom
 
 A custom type, represented as a blob value.
diff --git a/docs/src/dev/io/graphson.asciidoc b/docs/src/dev/io/graphson.asciidoc
index 1351e8c..4b2f89a 100644
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@ -13,356 +13,6 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-*******************************************************************************
-* The following groovy script generates the data samples for GraphSON and is
-* used when older versions of TinkerPop need data generation for the tests,
-* specifically, the 3.2.x line before gremlin-io-test was a module.
-*******************************************************************************
-import java.time.*
-mapper = GraphSONMapper.build().
-                        addRegistry(TinkerIoRegistry.instance()).
-                        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
-                        version(GraphSONVersion.V1_0).create().createMapper()
-graph = TinkerFactory.createTheCrew()
-g = graph.traversal()
-
-new File("io-output/test-case-data/graphson/").mkdirs()
-
-toJson = { o, type, comment = "", suffix = "v1d0" ->
-  println "Writing ${type}"
-
-  def jsonSample = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(o)
-
-  def fileToWriteTo = new File("io-output/test-case-data/graphson/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".json")
-  if (fileToWriteTo.exists())
-    fileToWriteTo.delete()
-
-  fileToWriteTo.withWriter{ it.write(jsonSample) }
-
-  "==== ${type}\n\n" +
-  (comment.isEmpty() ? "" : comment + "\n\n") +
-  "[source,json]\n" +
-  "----\n" +
-  jsonSample + "\n" +
-  "----\n" +
-  "\n"
-}
-
-
-file = new File("io-output/out-graphson-1d0.txt")
-file.withWriter { writer ->
-
-  writer.write("=== Graph Structure\n\n")
-  writer.write(toJson(graph.edges().next(), "Edge"))
-  writer.write(toJson(g.V().out().out().path().next(), "Path"))
-  writer.write(toJson(graph.edges().next().properties().next(), "Property"))
-  writer.write(toJson(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph"))
-  writer.write(toJson(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`."))
-  writer.write(toJson(g.V().out().out().tree().next(), "Tree"))
-  writer.write(toJson(graph.vertices().next(), "Vertex"))
-  writer.write(toJson(graph.vertices().next().properties().next(), "VertexProperty"))
-
-  writer.write("\n")
-  writer.write("=== RequestMessage\n\n")
-  def msg = null
-  msg = RequestMessage.build("authentication").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
-  writer.write(toJson(msg, "Authentication Response", "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge."))
-  msg = RequestMessage.build("eval").processor("session").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Eval", "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters."))
-  msg = RequestMessage.build("eval").processor("session").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Eval Aliased", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-  msg = RequestMessage.build("close").processor("session").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Close", "The following `RequestMessage` is an example of a request to close a session."))
-  msg = RequestMessage.build("eval").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
-  writer.write(toJson(msg, "Sessionless Eval", "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters."))
-  msg = RequestMessage.build("eval").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
-  writer.write(toJson(msg, "Sessionless Eval Aliased", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-
-  writer.write("\n")
-  writer.write("=== ResponseMessage\n\n")
-  msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                        code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-  writer.write(toJson(msg, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges may be requested in some cases, but not in the default provided by Gremlin Server)."))
-  msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                        code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-                        result(Arrays.asList(graph.vertices().next())).create()
-  writer.write(toJson(msg, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script."))
-
-}
-
-mapper = GraphSONMapper.build().
-                        addRegistry(TinkerIoRegistryV2d0.instance()).
-                        typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-                        version(GraphSONVersion.V2_0).create().createMapper()
-
-file = new File("io-output/out-graphson-2d0-partial.txt")
-file.withWriter { writer ->
-
-  writer.write("=== Core\n\n")
-  writer.write(toJson(File, "Class", "", "v2d0-partial"))
-  writer.write(toJson(new Date(1481750076295L), "Date", "", "v2d0-partial"))
-  writer.write(toJson(100.00d, "Double", "", "v2d0-partial"))
-  writer.write(toJson(100.00f, "Float", "", "v2d0-partial"))
-  writer.write(toJson(100, "Integer", "", "v2d0-partial"))
-  writer.write(toJson(100L, "Long", "", "v2d0-partial"))
-  writer.write(toJson(new java.sql.Timestamp(1481750076295L), "Timestamp", "", "v2d0-partial"))
-  writer.write(toJson(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", "", "v2d0-partial"))
-
-  writer.write("\n")
-  writer.write("=== Graph Structure\n\n")
-  writer.write(toJson(graph.edges().next(), "Edge", "", "v2d0-partial"))
-  writer.write(toJson(g.V().out().out().path().next(), "Path", "", "v2d0-partial"))
-  writer.write(toJson(graph.edges().next().properties().next(), "Property", "", "v2d0-partial"))
-  writer.write(toJson(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", "", "v2d0-partial"))
-  writer.write(toJson(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.", "v2d0-partial"))
-  writer.write(toJson(g.V().out().out().tree().next(), "Tree", "", "v2d0-partial"))
-  writer.write(toJson(graph.vertices().next(), "Vertex", "", "v2d0-partial"))
-  writer.write(toJson(graph.vertices().next().properties().next(), "VertexProperty", "", "v2d0-partial"))
-
-  writer.write("\n")
-  writer.write("=== Graph Process\n\n")
-  writer.write(toJson(SackFunctions.Barrier.normSack, "Barrier", "", "v2d0-partial"))
-  writer.write(toJson(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.", "v2d0-partial"))
-  writer.write(toJson(g.V().hasLabel('person').out().in().tree(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` would be quite different for the endless variations of commands that could be used together in the Gremlin language.", "v2d0-partial"))
-  writer.write(toJson(VertexProperty.Cardinality.list, "Cardinality", "", "v2d0-partial"))
-  writer.write(toJson(Column.keys, "Column", "", "v2d0-partial"))
-  writer.write(toJson(Direction.OUT, "Direction", "", "v2d0-partial"))
-  writer.write(toJson(Operator.sum, "Operator", "", "v2d0-partial"))
-  writer.write(toJson(Order.shuffle, "Order", "", "v2d0-partial"))
-  writer.write(toJson(org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick.any, "Pick", "", "v2d0-partial"))
-  writer.write(toJson(Pop.all, "Pop", "", "v2d0-partial"))
-  writer.write(toJson(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "", "v2d0-partial"))
-  tm = g.V().hasLabel('person').out().out().tree().profile().next()
-  metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0));
-  metrics.addNested(new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(1)));
-  writer.write(toJson(metrics, "Metrics", "", "v2d0-partial"))
-  writer.write(toJson(P.gt(0), "P", "`P` expects a single value of a `List` of values. There is special handling for `List` values when it comes to `within`, `without`, `inside`, `outside` and `between`. For `inside`, `outside` and `between`, the expectation is that the collection contain two objects (the rest will be ignored) and those two objects become the arguments to those methods. For `within` and `without`, these methods will accept an arbitrary number of objects in the collection.", "v2d0-partial"))
-  writer.write(toJson(P.within(1), "P within", "Please see <<p,P>> for additional information on `within`.", "v2d0-partial"))
-  writer.write(toJson(P.without(1,2), "P without", "Please see <<p,P>> for additional information on `within`.", "v2d0-partial"))
-  writer.write(toJson(P.gt(0).and(P.lt(10)), "P and", "", "v2d0-partial"))
-  writer.write(toJson(P.gt(0).or(P.within(-1, -10, -100)), "P or", "", "v2d0-partial"))
-  writer.write(toJson(Scope.local, "Scope", "", "v2d0-partial"))
-  writer.write(toJson(T.label, "T", "", "v2d0-partial"))
-  writer.write(toJson(g.V().hasLabel('person').out().out().tree().profile().next(), "TraversalMetrics", "", "v2d0-partial"))
-  writer.write(toJson(g.V().hasLabel('person').nextTraverser(), "Traverser", "", "v2d0-partial"))
-
-  writer.write("\n")
-  writer.write("=== RequestMessage\n\n")
-  msg = RequestMessage.build("authentication").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
-  writer.write(toJson(msg, "Authentication Response", "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.", "v2d0-partial"))
-  msg = RequestMessage.build("eval").processor("session").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Eval", "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.", "v2d0-partial"))
-  msg = RequestMessage.build("eval").processor("session").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Eval Aliased", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".", "v2d0-partial"))
-  msg = RequestMessage.build("close").processor("session").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Close", "The following `RequestMessage` is an example of a request to close a session.", "v2d0-partial"))
-  msg = RequestMessage.build("eval").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
-  writer.write(toJson(msg, "Sessionless Eval", "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.", "v2d0-partial"))
-  msg = RequestMessage.build("eval").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
-  writer.write(toJson(msg, "Sessionless Eval Aliased", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".", "v2d0-partial"))
-
-  writer.write("\n")
-  writer.write("=== ResponseMessage\n\n")
-  msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                        code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-  writer.write(toJson(msg, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges may be requested in some cases, but no in the default provided by Gremlin Server).", "v2d0-partial"))
-  msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                        code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-                        result(Arrays.asList(graph.vertices().next())).create()
-  writer.write(toJson(msg, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.", "v2d0-partial"))
-
-  writer.write("\n")
-  writer.write("=== Extended\n\n")
-  writer.write("""Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:\n
-[source,java]
-----
-mapper = GraphSONMapper.build().
-                        typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                        version(GraphSONVersion.V2_0).create().createMapper()
-----\n
-""")
-  writer.write(toJson(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", "", "v2d0-partial"))
-  writer.write(toJson(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", "", "v2d0-partial"))
-  writer.write(toJson(new Byte("1"), "Byte", "", "v2d0-partial"))
-  writer.write(toJson(java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", "", "v2d0-partial"))
-  writer.write(toJson("x".charAt(0), "Char", "", "v2d0-partial"))
-  writer.write(toJson(Duration.ofDays(5), "Duration", "The following example is a `Duration` of five days.", "v2d0-partial"))
-  writer.write(toJson(java.net.InetAddress.getByName("localhost"), "InetAddress", "", "v2d0-partial"))
-  writer.write(toJson(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", "", "v2d0-partial"))
-  writer.write(toJson(LocalDate.of(2016, 1, 1), "LocalDate", "", "v2d0-partial"))
-  writer.write(toJson(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", "", "v2d0-partial"))
-  writer.write(toJson(LocalTime.of(12, 30, 45), "LocalTime", "", "v2d0-partial"))
-  writer.write(toJson(MonthDay.of(1, 1), "MonthDay", "", "v2d0-partial"))
-  writer.write(toJson(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", "", "v2d0-partial"))
-  writer.write(toJson(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", "", "v2d0-partial"))
-  writer.write(toJson(Period.of(1, 6, 15), "Period", "The following example is a `Period` of one year, six months and fifteen days.", "v2d0-partial"))
-  writer.write(toJson(new Short("100"), "Short", "", "v2d0-partial"))
-  writer.write(toJson(Year.of(2016), "Year", "The following example is of the `Year` \"2016\".", "v2d0-partial"))
-  writer.write(toJson(YearMonth.of(2016, 6), "YearMonth", "The following example is a `YearMonth` of \"June 2016\"", "v2d0-partial"))
-  writer.write(toJson(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", "", "v2d0-partial"))
-  writer.write(toJson(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.", "v2d0-partial"))
-
-}
-
-mapper = GraphSONMapper.build().
-                        addRegistry(TinkerIoRegistryV2d0.instance()).
-                        typeInfo(TypeInfo.NO_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-                        version(GraphSONVersion.V2_0).create().createMapper()
-
-file = new File("io-output/out-graphson-2d0-no-types.txt")
-file.withWriter { writer ->
-
-  writer.write("=== Core\n\n")
-  writer.write(toJson(File, "Class", "", "v2d0-no-types"))
-  writer.write(toJson(new Date(1481750076295L), "Date", "", "v2d0-no-types"))
-  writer.write(toJson(100.00d, "Double", "", "v2d0-no-types"))
-  writer.write(toJson(100.00f, "Float", "", "v2d0-no-types"))
-  writer.write(toJson(100, "Integer", "", "v2d0-no-types"))
-  writer.write(toJson(100L, "Long", "", "v2d0-no-types"))
-  writer.write(toJson(new java.sql.Timestamp(1481750076295L), "Timestamp", "", "v2d0-no-types"))
-  writer.write(toJson(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", "", "v2d0-no-types"))
-
-  writer.write("\n")
-  writer.write("=== Graph Structure\n\n")
-  writer.write(toJson(graph.edges().next(), "Edge", "", "v2d0-no-types"))
-  writer.write(toJson(g.V().out().out().path().next(), "Path", "", "v2d0-no-types"))
-  writer.write(toJson(graph.edges().next().properties().next(), "Property", "", "v2d0-no-types"))
-  writer.write(toJson(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", "", "v2d0-no-types"))
-  writer.write(toJson(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.", "v2d0-no-types"))
-  writer.write(toJson(g.V().out().out().tree().next(), "Tree", "", "v2d0-no-types"))
-  writer.write(toJson(graph.vertices().next(), "Vertex", "", "v2d0-no-types"))
-  writer.write(toJson(graph.vertices().next().properties().next(), "VertexProperty", "", "v2d0-no-types"))
-
-  writer.write("\n")
-  writer.write("=== Graph Process\n\n")
-  writer.write(toJson(SackFunctions.Barrier.normSack, "Barrier", "", "v2d0-no-types"))
-  writer.write(toJson(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.", "v2d0-no-types"))
-  writer.write(toJson(g.V().hasLabel('person').out().in().tree(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` would be quite different for the endless variations of commands that could be used together in the Gremlin language.", "v2d0-no-types"))
-  writer.write(toJson(VertexProperty.Cardinality.list, "Cardinality", "", "v2d0-no-types"))
-  writer.write(toJson(Column.keys, "Column", "", "v2d0-no-types"))
-  writer.write(toJson(Direction.OUT, "Direction", "", "v2d0-no-types"))
-  writer.write(toJson(Operator.sum, "Operator", "", "v2d0-no-types"))
-  writer.write(toJson(Order.shuffle, "Order", "", "v2d0-no-types"))
-  writer.write(toJson(Pop.all, "Pop", "", "v2d0-no-types"))
-  writer.write(toJson(org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick.any, "Pick", "", "v2d0-no-types"))
-  writer.write(toJson(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "", "v2d0-no-types"))
-  tm = g.V().hasLabel('person').out().out().tree().profile().next()
-  metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0));
-  metrics.addNested(new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(1)));
-  writer.write(toJson(metrics, "Metrics", "", "v2d0-no-types"))
-  writer.write(toJson(P.gt(0), "P", "", "v2d0-no-types"))
-  writer.write(toJson(P.within(1), "P within", "v2d0-no-types"))
-  writer.write(toJson(P.without(1,2), "P without", "v2d0-no-types"))
-  writer.write(toJson(P.gt(0).and(P.lt(10)), "P and", "", "v2d0-no-types"))
-  writer.write(toJson(P.gt(0).or(P.within(-1, -10, -100)), "P or", "", "v2d0-no-types"))
-  writer.write(toJson(Scope.local, "Scope", "", "v2d0-no-types"))
-  writer.write(toJson(T.label, "T", "", "v2d0-no-types"))
-  writer.write(toJson(g.V().hasLabel('person').out().out().tree().profile().next(), "TraversalMetrics", "", "v2d0-no-types"))
-  writer.write(toJson(g.V().hasLabel('person').nextTraverser(), "Traverser", "", "v2d0-no-types"))
-
-  writer.write("\n")
-  writer.write("=== RequestMessage\n\n")
-  msg = RequestMessage.build("authentication").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
-  writer.write(toJson(msg, "Authentication Response", "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.", "v2d0-no-types"))
-  msg = RequestMessage.build("eval").processor("session").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Eval", "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.", "v2d0-no-types"))
-  msg = RequestMessage.build("eval").processor("session").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Eval Aliased", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".", "v2d0-no-types"))
-  msg = RequestMessage.build("close").processor("session").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("session", "unique-session-identifier").create()
-  writer.write(toJson(msg, "Session Close", "The following `RequestMessage` is an example of a request to close a session.", "v2d0-no-types"))
-  msg = RequestMessage.build("eval").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
-  writer.write(toJson(msg, "Sessionless Eval", "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.", "v2d0-no-types"))
-  msg = RequestMessage.build("eval").
-                       overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                       add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
-  writer.write(toJson(msg, "Sessionless Eval Aliased", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".", "v2d0-no-types"))
-
-  writer.write("\n")
-  writer.write("=== ResponseMessage\n\n")
-  msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                        code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-  writer.write(toJson(msg, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server).", "v2d0-no-types"))
-  msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                        code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-                        result(Arrays.asList(graph.vertices().next())).create()
-  writer.write(toJson(msg, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.", "v2d0-no-types"))
-
-  writer.write("\n")
-  writer.write("=== Extended\n\n")
-  writer.write("""Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:\n
-[source,java]
-----
-mapper = GraphSONMapper.build().
-                        typeInfo(TypeInfo.NO_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                        version(GraphSONVersion.V2_0).create().createMapper()
-----\n
-""")
-  writer.write(toJson(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", "", "v2d0-partial"))
-  writer.write(toJson(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", "", "v2d0-partial"))
-  writer.write(toJson(new Byte("1"), "Byte", "", "v2d0-partial"))
-  writer.write(toJson(java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", "", "v2d0-partial"))
-  writer.write(toJson("x".charAt(0), "Char", "", "v2d0-partial"))
-  writer.write(toJson(Duration.ofDays(5), "Duration", "The following example is a `Duration` of five days.", "v2d0-partial"))
-  writer.write(toJson(java.net.InetAddress.getByName("localhost"), "InetAddress", "", "v2d0-partial"))
-  writer.write(toJson(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", "", "v2d0-partial"))
-  writer.write(toJson(LocalDate.of(2016, 1, 1), "LocalDate", "", "v2d0-partial"))
-  writer.write(toJson(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", "", "v2d0-partial"))
-  writer.write(toJson(LocalTime.of(12, 30, 45), "LocalTime", "", "v2d0-partial"))
-  writer.write(toJson(MonthDay.of(1, 1), "MonthDay", "", "v2d0-partial"))
-  writer.write(toJson(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", "", "v2d0-partial"))
-  writer.write(toJson(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", "", "v2d0-partial"))
-  writer.write(toJson(Period.of(1, 6, 15), "Period", "The following example is a `Period` of one year, six months and fifteen days.", "v2d0-partial"))
-  writer.write(toJson(new Short("100"), "Short", "", "v2d0-partial"))
-  writer.write(toJson(Year.of(2016), "Year", "The following example is of the `Year` \"2016\".", "v2d0-partial"))
-  writer.write(toJson(YearMonth.of(2016, 6), "YearMonth", "The following example is a `YearMonth` of \"June 2016\"", "v2d0-partial"))
-  writer.write(toJson(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", "", "v2d0-partial"))
-  writer.write(toJson(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.", "v2d0-partial"))
-
-}
-*******************************************************************************
-
-
 ////
 [[graphson]]
 = GraphSON
@@ -2780,6 +2430,16 @@
 }
 ----
 
+==== DT
+
+[source,json]
+----
+{
+  "@type" : "g:DT",
+  "@value" : "minute"
+}
+----
+
 ==== Lambda
 
 [source,json]
@@ -3629,13 +3289,13 @@
 
 === Extended
 
-Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:
+Note that the "extended" types require the addition of the separate `GraphSONXModuleV2` module as follows:
 
 [source,java]
 ----
 mapper = GraphSONMapper.build().
                         typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+                        addCustomModule(GraphSONXModuleV2.build()).
                         version(GraphSONVersion.V2_0).create().createMapper()
 ----
 
@@ -3852,17 +3512,17 @@
 [[graphson-3d0]]
 == Version 3.0
 
-Version 3.0 of GraphSON was first introduced on TinkerPop 3.3.0 and is represented by the `application/vnd.graphbinary-v3.0`
-mime type. It is quite similar to GraphSON 2.0 and in most cases will appear compatible to the eye, however there are
-some critical differences:
+Version 3.0 of GraphSON was first introduced on TinkerPop 3.3.0 and is represented by the `application/vnd.gremlin-v3.0+json`
+mime type. It was introduced as only having embedded types. It is quite similar to GraphSON 2.0 with embedded types
+and in most cases will appear compatible to the eye, however there are some critical differences. GraphSON 2.0 relied
+on JSON data types for collections like `Map` and `List`. In GraphSON 3.0, there is explicit typed support for `Map`,
+`List` and `Set` as Gremlin relies on those types in quite specific ways that are not directly compatible with the
+JSON definitions of those collections. In the case of `List` and `Set`, it was important to distinguish between the
+two and for `Map` it was necessary to have the ability to return `Map` instances that did not have `String` keys
+(e.g. `g.V().out().groupCount()`).
 
-* GraphSON 3.0 does not have an option to be typeless. Types are always embedded except for strings and boolean values
-which are inferred from JSON types.
-* GraphSON 2.0 relied on JSON data types for collections like `Map` and `List`. In GraphSON 3.0, there is explicit
-typed support for `Map`, `List` and `Set` as Gremlin relies on those types in quite specific ways that are not
-directly compatible with the JSON definitions of those collections. In the case of `List` and `Set`, it was important
-to distinguish between the two and for `Map` it was necessary to have the ability to return `Map` instances that did
-not have `String` keys (e.g. `g.V().out().groupCount()`).
+As of TinkerPop 3.7.0, GraphSON 3.0 also has a typeless representation referenced by the
+`application/vnd.gremlin-v3.0+json;types=false`. This format matches the format developed for 1.0.
 
 === Core
 
@@ -5174,6 +4834,16 @@
 }
 ----
 
+==== DT
+
+[source,json]
+----
+{
+  "@type" : "g:DT",
+  "@value" : "minute"
+}
+----
+
 ==== Lambda
 
 [source,json]
@@ -5994,7 +5664,7 @@
 ----
 mapper = GraphSONMapper.build().
                         typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV3d0.build().create(false)).
+                        addCustomModule(GraphSONXModuleV3.build()).
                         version(GraphSONVersion.V3_0).create().createMapper()
 ----
 
diff --git a/docs/src/dev/io/gryo.asciidoc b/docs/src/dev/io/gryo.asciidoc
index 5d07ed0..5822e9b 100644
--- a/docs/src/dev/io/gryo.asciidoc
+++ b/docs/src/dev/io/gryo.asciidoc
@@ -13,105 +13,6 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-
-*******************************************************************************
-* The following groovy script generates the data samples for Gryo and is used
-* when older versions of TinkerPop need data generation for the tests,
-* specifically, the 3.2.x line before gremlin-io-test was a module.
-*******************************************************************************
-import org.apache.tinkerpop.shaded.kryo.io.Output
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
-import org.apache.tinkerpop.gremlin.structure.*
-import org.apache.tinkerpop.gremlin.structure.io.gryo.*
-import org.apache.tinkerpop.gremlin.structure.io.*
-import org.apache.commons.configuration2.BaseConfiguration
-import java.time.*
-
-new File("io-output/dev-docs/").mkdirs()
-new File("io-output/test-case-data/gryo").mkdirs()
-
-conf = new BaseConfiguration()
-conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
-graph = TinkerGraph.open(conf)
-TinkerFactory.generateTheCrew(graph)
-g = graph.traversal()
-               
-toGryo = { o, type, mapper, suffix = "" ->
-    def fileToWriteTo = new File("io-output/test-case-data/gryo/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".kryo")
-    if (fileToWriteTo.exists()) fileToWriteTo.delete()
-    out = new Output(new FileOutputStream(fileToWriteTo))
-    mapper.writeObject(out, o)
-    out.close()
-}
-
-mapper = GryoMapper.build().
-        version(GryoVersion.V1_0).
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        create().createMapper()
-
-toGryo(File, "Class", mapper, "v1d0")
-toGryo(new Date(1481750076295L), "Date", mapper, "v1d0")
-toGryo(100.00d, "Double", mapper, "v1d0")
-toGryo(100.00f, "Float", mapper, "v1d0")
-toGryo(100, "Integer", mapper, "v1d0")
-toGryo(100L, "Long", mapper, "v1d0")
-toGryo(new java.sql.Timestamp(1481750076295L), "Timestamp", mapper, "v1d0")
-toGryo(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", mapper, "v1d0")
-
-toGryo(graph.edges().next(), "Edge", mapper, "v1d0")
-toGryo(g.V().out().out().path().next(), "Path", mapper, "v1d0")
-toGryo(graph.edges().next().properties().next(), "Property", mapper, "v1d0")
-toGryo(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH).getStarGraphToSerialize(), "StarGraph", mapper, "v1d0")
-toGryo(graph, "TinkerGraph", mapper, "v1d0")
-toGryo(g.V(1).out().out().tree().next(), "Tree", mapper, "v1d0")
-toGryo(graph.vertices().next(), "Vertex", mapper, "v1d0")
-toGryo(graph.vertices().next().properties().next(), "VertexProperty", mapper, "v1d0")
-
-toGryo(SackFunctions.Barrier.normSack, "Barrier", mapper, "v1d0")
-toGryo(new Bytecode.Binding("x", 1), "Binding", mapper, "v1d0")
-toGryo(g.V().hasLabel('person').out().in().tree().asAdmin().getBytecode(), "Bytecode", mapper, "v1d0")
-toGryo(VertexProperty.Cardinality.list, "Cardinality", mapper, "v1d0")
-toGryo(Column.keys, "Column", mapper, "v1d0")
-toGryo(Direction.OUT, "Direction", mapper, "v1d0")
-toGryo(Operator.sum, "Operator", mapper, "v1d0")
-toGryo(Order.shuffle, "Order", mapper, "v1d0")
-toGryo(Pop.all, "Pop", mapper, "v1d0")
-toGryo(org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick.any, "Pick", mapper, "v1d0")
-toGryo(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper, "v1d0")
-tm = g.V().hasLabel('person').out().out().tree().profile().next()
-metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0));
-metrics.addNested(new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(1)));
-toGryo(metrics, "Metrics", mapper, "v1d0")
-toGryo(P.gt(0), "P", mapper, "v1d0")
-toGryo(P.gt(0).and(P.lt(10)), "P and", mapper, "v1d0")
-toGryo(P.gt(0).or(P.within(-1, -10, -100)), "P or", mapper, "v1d0")
-toGryo(Scope.local, "Scope", mapper, "v1d0")
-toGryo(T.label, "T", mapper, "v1d0")
-toGryo(g.V().hasLabel('person').out().out().tree().profile().next(), "TraversalMetrics", mapper, "v1d0")
-toGryo(g.V().hasLabel('person').nextTraverser(), "Traverser", mapper, "v1d0")
-
-toGryo(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", mapper, "v1d0")
-toGryo(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", mapper, "v1d0")
-toGryo(new Byte("1"), "Byte", mapper, "v1d0")
-toGryo(java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", mapper, "v1d0")
-toGryo("x".charAt(0), "Char", mapper, "v1d0")
-toGryo(Duration.ofDays(5), "Duration", mapper, "v1d0")
-toGryo(java.net.InetAddress.getByName("localhost"), "InetAddress", mapper, "v1d0")
-toGryo(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", mapper, "v1d0")
-toGryo(LocalDate.of(2016, 1, 1), "LocalDate", mapper, "v1d0")
-toGryo(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper, "v1d0")
-toGryo(LocalTime.of(12, 30, 45), "LocalTime", mapper, "v1d0")
-toGryo(MonthDay.of(1, 1), "MonthDay", mapper, "v1d0")
-toGryo(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", mapper, "v1d0")
-toGryo(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", mapper, "v1d0")
-toGryo(Period.of(1, 6, 15), "Period", mapper, "v1d0")
-toGryo(new Short("100"), "Short", mapper, "v1d0")
-toGryo(Year.of(2016), "Year", mapper, "v1d0")
-toGryo(YearMonth.of(2016, 6), "YearMonth", mapper, "v1d0")
-toGryo(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", mapper, "v1d0")
-toGryo(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "v1d0")
-*******************************************************************************
 ////
 [[gryo]]
 = Gryo
diff --git a/docs/src/dev/io/index.asciidoc b/docs/src/dev/io/index.asciidoc
index 25c1ad7..b49816b 100644
--- a/docs/src/dev/io/index.asciidoc
+++ b/docs/src/dev/io/index.asciidoc
@@ -14,12 +14,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
+
+:docinfo: shared
+:docinfodir: ../../
+:toc-position: left
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
 
-:toc-position: left
-
 = IO Reference
 
 image:gremlin-io2.png[width=300]
diff --git a/docs/src/dev/provider/gremlin-semantics.asciidoc b/docs/src/dev/provider/gremlin-semantics.asciidoc
index b8b6dde..1ef5dfe 100644
--- a/docs/src/dev/provider/gremlin-semantics.asciidoc
+++ b/docs/src/dev/provider/gremlin-semantics.asciidoc
@@ -524,12 +524,133 @@
 step is meant to behave. This section discusses the semantics for individual steps to help users and providers
 understand implementation expectations.
 
+[[all-step]]
+=== all()
+
+*Description:* Filters array data from the Traversal Stream if all of the array's items match the supplied predicate.
+
+*Syntax:* `all(P predicate)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`List`/`array`/`Iterable`/`Iterator` |`List`/`array`/`Iterable`/`Iterator`
+|=========================================================
+
+*Arguments:*
+
+* `predicate` - The predicate to use to test each value in the array data.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+Each value will be tested using the supplied predicate. Empty lists always pass through and null/non-list traversers
+will be filtered out of the Traversal Stream.
+
+*Exceptions*
+
+* A GremlinTypeErrorException will be thrown if one occurs and no other value evaluates to false.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AllStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#all-step[reference]
+
+[[any-step]]
+=== any()
+
+*Description:* Filters array data from the Traversal Stream if any of the array's items match the supplied predicate.
+
+*Syntax:* `any(P predicate)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`List`/`array`/`Iterable`/`Iterator` |`List`/`array`/`Iterable`/`Iterator`
+|=========================================================
+
+*Arguments:*
+
+* `predicate` - The predicate to use to test each value in the array data.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+Each value will be tested using the supplied predicate. Empty lists, null traversers, and non-list traversers will be
+filtered out of the Traversal Stream.
+
+*Exceptions*
+
+* A GremlinTypeErrorException will be thrown if one occurs and no other value evaluates to true.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AnyStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#any-step[reference]
+
+[[asDate-step]]
+=== asDate()
+
+*Description:* Parse the value of incoming traverser as date. Supported ISO-8601 strings and Unix time numbers.
+
+*Syntax:* `asDate()`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`any` |`any`
+|=========================================================
+
+*Arguments:*
+
+None
+
+Incoming date remains unchanged.
+
+*Exceptions*
+* If the incoming traverser is a non-String/Number/Date value then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsDateStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#asDate-step[reference]
+
+[[asString-step]]
+=== asString()
+
+*Description:* Returns the value of incoming traverser as strings, or if `Scope.local` is specified, returns each element inside
+incoming list traverser as string.
+
+*Syntax:* `asString()` | `asString(Scope scope)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`any` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual traverser, casting all (except `null`) to string. The `local` scope will behave like
+`global` for everything except lists, where it will cast individual non-`null` elements inside the list into string and return a
+list of string instead.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+None
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#asString-step[reference]
+
 [[call-step]]
 === call()
 
 *Description:* Provides support for provider-specific service calls.
 
-*Syntax:* `call()` | `call(String, Map)` | `call(String, Traversal)` | `call(String, Map, Traversal)`
+*Syntax:* `call()` | `call(String service, Map params)` | `call(String service, Traversal childTraversal)` | `call(String service, Map params, Traversal childTraversal)`
 
 [width="100%",options="header"]
 |=========================================================
@@ -539,10 +660,10 @@
 
 *Arguments:*
 
-* `String` - The name of the service call.
-* `Map` - A collection of static parameters relevant to the particular service call. Keys and values can be any
+* `service` - The name of the service call.
+* `params` - A collection of static parameters relevant to the particular service call. Keys and values can be any
 type currently supported by the Gremlin type system.
-* `Traversal` - A traversal used to dynamically build at query time a collection of parameters relevant to the service
+* `childTraversal` - A traversal used to dynamically build at query time a collection of parameters relevant to the service
 call.
 
 *Modulation:*
@@ -609,12 +730,133 @@
 link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/service/ServiceRegistry.java[ServiceRegistry],
 link:https://tinkerpop.apache.org/docs/x.y.z/reference/#call-step[reference]
 
+[[combine-step]]
+=== combine()
+
+*Description:* Appends one list to the other and returns the result to the Traversal Stream.
+
+*Syntax:* `combine(Object values)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`array`/`Iterable` |`List`
+|=========================================================
+
+*Arguments:*
+
+* `values` - A list of items (as an Iterable or an array) or a traversal that will produce a list of items.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+A list is returned after the combine operation is applied so duplicates are allowed. `Merge` can be used instead if
+duplicates aren't wanted. This step only applies to list types which means that non-iterable types (including null)
+will cause exceptions to be thrown.
+
+*Exceptions*
+
+* If the incoming traverser isn't a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+* If the argument doesn't resolve to a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#combine-step[reference],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#merge-step[merge() reference]
+
+[[concat-step]]
+=== concat()
+
+*Description:* Concatenates the incoming String traverser with the input String arguments, and return the joined String.
+
+*Syntax:* `concat()` | `concat(String... concatStrings)` | `concat(Traversal concatTraveral, Traversal... otherConcatTraverals)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String` |`String`
+|=========================================================
+
+*Arguments:*
+
+* `concatStrings` - Varargs of `String`. If one or more String values are provided, they will be concatenated together
+with the incoming traverser. If no argument is provided, the String value from the incoming traverser is returned.
+* `concatTraveral` - A `Traversal` whose must value resolve to a `String`. The first result returned from the traversal will
+be concatenated with the incoming traverser.
+* `otherConcatTraverals` - Varargs of `Traversal`. Each `Traversal` value must resolve to a `String`. The first result
+returned from each traversal will be concatenated with the incoming traverser and the previous traversal arguments.
+
+Any `null` String values will be skipped when concatenated with non-`null` String values. If two `null` value are
+concatenated, the `null` value will be propagated and returned.
+
+*Exceptions*
+
+* If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#concat-step[reference]
+
+[[dateAdd-step]]
+=== dateAdd()
+
+*Description:* Increase value of input Date.
+
+*Syntax:* `dateAdd(DT dateToken, Integer value)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`Date` |`Date`
+|=========================================================
+
+*Arguments:*
+
+* `dateToken` - Date token enum. Supported values `second`, `minute`, `hour`, `day`.
+* `value` - The number of units, specified by the DT Token, to add to the incoming values. May be negative for subtraction.
+
+*Exceptions*
+
+* If the incoming traverser is a non-Date value then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateAddStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#dateAdd-step[reference]
+
+[[dateDiff-step]]
+=== dateDiff()
+
+*Description:* Returns the difference between two Dates in epoch time.
+
+*Syntax:* `dateDiff(Date value)` | `dateDiff(Traversal dateTraversal)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`Date` |`Date`
+|=========================================================
+
+*Arguments:*
+
+* `value` - Date for subtraction.
+* `dateTraversal` - The `Traversal` value must resolve to a `Date`. The first result returned from the traversal will be
+subtracted with the incoming traverser.
+
+If argument resolves as `null` then incoming date will not be changed.
+
+*Exceptions*
+
+* If the incoming traverser is a non-Date value then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateDiffStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#dateDiff-step[reference]
+
 [[dedup-step]]
 === dedup()
 
 *Description:* Removes repeatedly seen results from the Traversal Stream.
 
-*Syntax:* `dedup()` | `dedup(labels)`
+*Syntax:* `dedup()` | `dedup(String... labels)` | `dedup(Scope scope, String... labels)`
 
 [width="100%",options="header"]
 |=========================================================
@@ -624,6 +866,10 @@
 
 *Arguments:*
 
+* `scope` - Determines the scope in which `dedup` is applied.
+The `global` scope will drop duplicate values across the global stream of traversers. The `local` scope operates at the
+individual traverser level, and will remove duplicate values from within a collection.
+
 * `labels` - If `dedup()` is provided a list of labels, then it will ensure that the de-duplication
 is not with respect to the current traverser object, but to the path history of the traverser.
 
@@ -670,8 +916,78 @@
 `["Alex", "Bob"]`, `["Bob", "Alex"]`, `["Bob", "Chloe"]`, or `["Chloe", "Bob"]`
 
 See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DedupLocalStep.java[source (local)],
 link:https://tinkerpop.apache.org/docs/x.y.z/reference/#dedup-step[reference]
 
+[[difference-step]]
+=== difference()
+
+*Description:* Adds the difference of two lists to the Traversal Stream. 
+
+*Syntax:* `difference(Object values)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`array`/`Iterable` |`Set`
+|=========================================================
+
+*Arguments:*
+
+* `values` - A list of items (as an Iterable or an array) or a `Traversal` that will produce a list of items.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+Set difference (`A-B`) is an ordered operation. The incoming traverser is treated as `A` and the provided argument is
+treated as `B`. A set is returned after the difference operation is applied so there won't be duplicates. This step only
+applies to list types which means that non-iterable types (including null) will cause exceptions to be thrown.
+
+*Exceptions*
+
+* If the incoming traverser isn't a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+* If the argument doesn't resolve to a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#difference-step[reference]
+
+[[disjunct-step]]
+=== disjunct()
+
+*Description:* Adds the disjunct set to the Traversal Stream.
+
+*Syntax:* `disjunct(Object values)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`array`/`Iterable` |`Set`
+|=========================================================
+
+*Arguments:*
+
+* `values` - A list of items (as an Iterable or an array) or a `Traversal` that will produce a list of items.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+A set is returned after the disjunct operation is applied so there won't be duplicates. This step only applies to list
+types which means that non-iterable types (including null) will cause exceptions to be thrown.
+
+*Exceptions*
+
+* If the incoming traverser isn't a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+* If the argument doesn't resolve to a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#disjunct-step[reference]
+
 [[element-step]]
 === element()
 
@@ -693,12 +1009,207 @@
 
 None
 
+[[format-step]]
+=== format()
+
+*Description:* a mid-traversal step which will handle result formatting to string values.
+
+*Syntax:* `format(String formatString)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |`by()` |`any` |`String`
+|=========================================================
+
+*Arguments:*
+
+* `formatString` - Variables can be represented with `%{variable_name}` notation.
+Positional arguments can be used as `%{_}` token. Can be used multiple times.
+The variable values are used in the order that the first one will be found: Element properties, then Scope values.
+If value for some variable was not found, then the result is filtered out.
+
+*Exceptions*
+
+None
+
+*Modulation:*
+
+* `by()` - Used to inject positional argument. For example:
+`g.V().format("%{name} has %{_} connections").by(bothE().count())`.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FormatStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#format-step[reference]
+
+[[length-step]]
+=== length()
+
+*Description:* Returns the length of the incoming string or list, if `Scope.local` is specified, returns
+the length of each string elements inside incoming list traverser.
+
+*Syntax:* `length()` | `length(Scope scope)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`Integer`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#length-step[reference]
+
+[[intersect-step]]
+=== intersect()
+
+*Description:* Adds the intersection to the Traversal Stream.
+
+*Syntax:* `intersect(Object values)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`array`/`Iterable` |`Set`
+|=========================================================
+
+*Arguments:*
+
+* `values` - A list of items (as an Iterable or an array) or a `Traversal` that will produce a list of items.
+
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+A set is returned after the intersect operation is applied so there won't be duplicates. This step only applies to list
+types which means that non-iterable types (including null) will cause exceptions to be thrown.
+
+*Exceptions*
+
+* If the incoming traverser isn't a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+* If the argument doesn't resolve to a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#intersect-step[reference]
+
+[[conjoin-step]]
+=== conjoin()
+
+*Description:* Joins every element in a list together into a String. 
+
+*Syntax:* `conjoin(String delimiter)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`array`/`Iterable` |`String`
+|=========================================================
+
+*Arguments:*
+
+* `delimiter` - A delimiter to use to join the elements together. Can't be null.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+Every element in the list (except `null`) is converted to a String. Null values are ignored. The delimiter is inserted
+between neighboring elements to form the final result. This step only applies to list types which means that
+non-iterable types (including `null`) will cause exceptions to be thrown.
+
+*Exceptions*
+
+* If the incoming traverser isn't a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+* If the argument doesn't resolve to a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#conjoin-step[reference]
+
+[[lTrim-step]]
+=== lTrim()
+
+*Description:* Returns a string with leading whitespace removed.
+
+*Syntax:* `lTrim()` | `lTrim(Scope scope)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#lTrim-step[reference]
+
+[[merge-step]]
+=== merge()
+
+*Description:* Adds the union of two sets (or two maps) to the Traversal Stream.
+
+*Syntax:* `merge(Object values)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`array`/`Iterable`/`Map` |`Set`/`Map`
+|=========================================================
+
+*Arguments:*
+
+* `values` - A list of items (as an `Iterable` or an array), a `Map`, or a `Traversal` that will produce a list of items.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+For iterable types, a set is returned after the merge operation is applied so there won't be duplicates. For maps, if
+both maps contain the same key then the value yielded from the argument will be the value put into the merged map. This
+step only applies to list types or maps which means that other non-iterable types (including null) will cause exceptions
+to be thrown.
+
+*Exceptions*
+
+* If the incoming traverser isn't a list (array or Iterable) or map then an `IllegalArgumentException` will be thrown.
+* If the argument doesn't resolve to a list (array or Iterable) or map then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#merge-step[reference]
+
 [[merge-e-step]]
 === mergeE()
 
 *Description:* Provides upsert-like functionality for edges.
 
-*Syntax:* `mergeE()` | `mergeE(Map)` | `mergeE(Traversal)`
+*Syntax:* `mergeE()` | `mergeE(Map searchCreate)` | `mergeE(Traversal searchCreate)`
 
 [width="100%",options="header"]
 |=========================================================
@@ -776,7 +1287,7 @@
 
 *Description:* Provides upsert-like functionality for vertices.
 
-*Syntax:* `mergeV()` | `mergeV(Map)` | `mergeV(Traversal)`
+*Syntax:* `mergeV()` | `mergeV(Map searchCreate)` | `mergeV(Traversal searchCreate)`
 
 [width="100%",options="header"]
 |=========================================================
@@ -833,4 +1344,274 @@
 * As is common to Gremlin, it is expected that `Traversal` arguments may utilize `sideEffect()` steps.
 
 See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java[source],
-link:https://tinkerpop.apache.org/docs/x.y.z/reference/#mergev-step[reference]
\ No newline at end of file
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#mergev-step[reference]
+
+[[product-step]]
+=== product()
+
+*Description:* Adds the cartesian product to the Traversal Stream.
+
+*Syntax:* `product(Object values)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`array`/`Iterable` |`List(List)`
+|=========================================================
+
+*Arguments:*
+
+* `values` - A list of items (as an `Iterable` or an array) or a `Traversal` that will produce a list of items.
+
+*Modulation:*
+
+None
+
+*Considerations:*
+
+A list of lists is returned after the product operation is applied with the inner list being a result pair. This step only
+applies to list types which means that non-iterable types (including null) will cause exceptions to be thrown.
+
+*Exceptions*
+
+* If the incoming traverser isn't a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+* If the argument doesn't resolve to a list (array or Iterable) then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#product-step[reference]
+
+[[replace-step]]
+=== replace()
+
+*Description:* Returns a string with the specified characters in the original string replaced with the new characters.
+
+*Syntax:* `replace(String oldChar, String newChar)` | `replace(Scope scope, String oldChar, String newChar)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `oldChar` - The string character(s) in the original string to be replaced. Nullable, a null input will be a no-op and
+the original string will be returned
+* `newChar` - The string character(s) to replace with. Nullable, a null input will be a no-op and the original string
+will be returned
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#replace-step[reference]
+
+[[reverse-step]]
+=== reverse()
+
+*Description:* Returns the reverse of the incoming traverser
+
+*Syntax:* `reverse()`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`Object` |`Object`
+|=========================================================
+
+*Arguments:*
+
+None
+
+The behavior of reverse depends on the type of the incoming traverser. If the traverser is a string, then the string is
+reversed. If the traverser is iterable (Iterable, Iterator, or an array) then a list containing the items in reverse
+order are returned. All other types (including null) are not processed and are returned unmodified.
+
+*Exceptions*
+
+* If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseStep.java[source],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#reverse-step[reference]
+
+[[rTrim-step]]
+=== rTrim()
+
+*Description:* Returns a string with trailing whitespace removed.
+
+*Syntax:* `rTrim()` | `rTrim(Scope scope)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#rTrim-step[reference]
+
+[[split-step]]
+=== split()
+
+*Description:* Returns a list of strings created by splitting the incoming string traverser around the matches of the given separator.
+
+*Syntax:* `split(String separator)` | `split(Scope scope, String separator)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`List`
+|=========================================================
+
+*Arguments:*
+
+* `separator` - The string character(s) used as delimiter to split the input string. Nullable, a null separator will split on
+whitespaces.
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#split-step[reference]
+
+[[substring-step]]
+=== substring()
+
+*Description:* Returns a substring of the incoming string traverser with a 0-based start index (inclusive) and end index (exclusive).
+
+*Syntax:* `substring(int startIndex, int endIndex)` | `substring(Scope scope, int startIndex, int endIndex)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `startIndex` - The start index, 0 based. If the start index is negative then it will begin at the specified index counted
+from the end of the string, or 0 if it exceeds the string length.
+* `endIndex` - The end index, 0 based. Optional, if it is not specific then all remaining characters will be returned. End
+index &leq; start index will return the empty string.
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#substring-step[reference]
+
+[[toLower-step]]
+=== toLower()
+
+*Description:* Returns the lowercase representation of incoming string traverser, or if `Scope.local` is specified, returns
+the lowercase representation of each string elements inside incoming list traverser.
+
+*Syntax:* `toLower()` | `toLower(Scope scope)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#toLower-step[reference]
+
+[[toUpper-step]]
+=== toUpper()
+
+*Description:* Returns the uppercase representation of incoming string traverser, or if `Scope.local` is specified, returns
+the uppercase representation of each string elements inside incoming list traverser.
+
+*Syntax:* `toUpper()` | `toUpper(Scope scope)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#toUpper-step[reference]
+
+[[trim-step]]
+=== trim()
+
+*Description:* Returns a string with leading and trailing whitespace removed.
+
+*Syntax:* `trim()` | `trim(Scope scope)`
+
+[width="100%",options="header"]
+|=========================================================
+|Start Step |Mid Step |Modulated |Domain |Range
+|N |Y |N |`String`/`array`/`Iterable` |`String`/`List`
+|=========================================================
+
+*Arguments:*
+
+* `scope` - Determines the type of traverser it operates on. Both scopes will operate on the level of individual traversers.
+The `global` scope will operate on individual string traverser. The `local` scope will operate on list traverser with string elements inside.
+
+Null values from the incoming traverser are not processed and remain as null when returned.
+
+*Exceptions*
+* For `Scope.global` or parameterless function calls, if the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+* For `Scope.local`, if the incoming traverser is not a string or a list of strings then an `IllegalArgumentException` will be thrown.
+
+See: link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimGlobalStep.java[source],
+link:https://github.com/apache/tinkerpop/tree/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimLocalStep.java[source (local)],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#trim-step[reference]
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index b276621..9cb37ae 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -14,12 +14,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
+
+:docinfo: shared
+:docinfodir: ../../
+:toc-position: left
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
 
-:toc-position: left
-
 = Introduction
 
 image:tinkerpop-cityscape.png[]
@@ -191,7 +194,8 @@
 * `VertexProperty`
 ** This interface is both a `Property` and an `Element` as `VertexProperty` is a first-class graph element in that it
 can have its own properties (i.e. meta-properties). Even if the implementation does not intend to support
-meta-properties, the `VertexProperty` needs to be implemented as an `Element`.
+meta-properties, the `VertexProperty` needs to be implemented as an `Element`. `VertexProperty` should return empty
+iterable for properties if meta-properties is not supported.
 
 [[olap-implementations]]
 ==== OLAP Implementations
@@ -1096,6 +1100,9 @@
 NOTE: Please refer to the link:https://tinkerpop.apache.org/docs/x.y.z/dev/io[IO Reference Documentation] for more
 examples of `RequestMessage` and `ResponseMessage` instances.
 
+NOTE: Tinkerpop provides a test server which may be useful for testing drivers. Details can be found
+link:https://tinkerpop.apache.org/docs/current/dev/developer/#gremlin-socket-server-tests[here]
+
 === OpProcessors Arguments
 
 The following sections define a non-exhaustive list of available operations and arguments for embedded `OpProcessors`
diff --git a/docs/src/docinfo.html b/docs/src/docinfo.html
new file mode 100644
index 0000000..8524b44
--- /dev/null
+++ b/docs/src/docinfo.html
@@ -0,0 +1,31 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!-- Matomo -->
+<script>
+    var _paq = window._paq = window._paq || [];
+    /* We explicitly disable cookie tracking to avoid privacy issues */
+    _paq.push(['disableCookies']);
+    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+        var u="https://analytics.apache.org/";
+        _paq.push(['setTrackerUrl', u+'matomo.php']);
+        _paq.push(['setSiteId', '27']);
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    })();
+</script>
+<!-- End Matomo Code -->
\ No newline at end of file
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 3fd5b01..69e3582 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -15,6 +15,8 @@
 limitations under the License.
 ////
 
+:docinfo: shared
+
 image::apache-tinkerpop-logo.png[width=500]
 
 *x.y.z*
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index 5e6556a..fb2765a 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -14,12 +14,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
+
+:docinfo: shared
+:docinfodir: ../
+:toc-position: left
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
 
-:toc-position: left
-
 = Recipes
 
 image:gremlin-chef.png[width=120,float=left] All programming languages tend to have
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index ddab2c3..a241264 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -498,10 +498,10 @@
 [INFO] Logger$info - Loading 'modern' graph data.
 [INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
 [INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
-[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
-[INFO] AbstractChannelizer - Configured application/vnd.graphbinary-v1.0 with org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1
-[INFO] AbstractChannelizer - Configured application/vnd.graphbinary-v1.0-stringd with org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3
+[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3
+[INFO] AbstractChannelizer - Configured application/vnd.graphbinary-v1.0 with org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1
+[INFO] AbstractChannelizer - Configured application/vnd.graphbinary-v1.0-stringd with org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1
 [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
 [INFO] GremlinServer$1 - Channel started at port 8182.
 ----
@@ -1144,7 +1144,7 @@
 
 ===== GraphSON
 
-The GraphSON serializer produces human readable output in JSON format and is a good configuration choice for those
+The GraphSON serializer produces human-readable output in JSON format and is a good configuration choice for those
 trying to use TinkerPop from non-JVM languages.  JSON obviously has wide support across virtually all major
 programming languages and can be consumed by a wide variety of tools. The format itself is described in the
 link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphson[IO Documentation]. The following table shows the
@@ -1153,20 +1153,28 @@
 [width="100%",cols="2,2,4,4",options="header"]
 |=========================================================
 |Version |Embedded Types |Mime Type |Class
-|1.0 |yes |`application/vnd.gremlin-v1.0+json` |`GraphSONMessageSerializerGremlinV1d0`
-|1.0 |no |`application/vnd.gremlin-v1.0+json;types=false` |`GraphSONUntypedMessageSerializerV1d0`
-|2.0 |yes |`application/vnd.gremlin-v2.0+json` |`GraphSONMessageSerializerV2d0`
-|2.0 |no |`application/vnd.gremlin-v2.0+json;types=false` |`GraphSONUntypedMessageSerializerV2d0`
-|3.0 |yes |`application/vnd.gremlin-v3.0+json` |`GraphSONMessageSerializerV3d0`
+|1.0 |yes |`application/vnd.gremlin-v1.0+json` |`GraphSONMessageSerializerGremlinV1`
+|1.0 |no |`application/vnd.gremlin-v1.0+json;types=false` |`GraphSONUntypedMessageSerializerV1`
+|2.0 |yes |`application/vnd.gremlin-v2.0+json` |`GraphSONMessageSerializerV2`
+|2.0 |no |`application/vnd.gremlin-v2.0+json;types=false` |`GraphSONUntypedMessageSerializerV2`
+|3.0 |yes |`application/vnd.gremlin-v3.0+json` |`GraphSONMessageSerializerV3`
+|3.0 |no |`application/vnd.gremlin-v3.0+json;types=false` |`GraphSONMessageSerializerV3`
 |=========================================================
 
-The above serializer classes can be found in the `org.apache.tinkerpop.gremlin.driver.ser` package of `gremlin-driver`.
+The above serializer classes can be found in the `org.apache.tinkerpop.gremlin.util.ser` package of `gremlin-util`.
+
+NOTE: Gremlin can produce results that cannot be serialized with untyped GraphSON as the result simply cannot fit
+the structure JSON inherently allows. A simple example would be `g.V().groupCount()` which returns a `Map`. A `Map`
+is no problem for JSON, but the key to this `Map` is a `Vertex`, which is a complex object, and cannot be a key in
+JSON which only allows `String` keys. Untyped GraphSON will simply convert the `Vertex` to a `String` for purpose of
+serialization and as a result that data and type is lost. If this information is needed, switch to a typed format or
+adjust the Gremlin query in some way to return it in a different form that fits JSON structure.
 
 Configuring GraphSON in the Gremlin Server configuration looks like this:
 
 [source,yaml]
 ----
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3 }
 ----
 
 Gremlin Server is configured by default with GraphSON 3.0 as shown above. It has the following configuration option:
@@ -1186,8 +1194,8 @@
 
 [source,yaml]
 ----
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3 }
 ----
 
 In the above situation, both `GraphSONMessageSerializerV1d0` and `GraphSONMessageSerializerV3d0` each bind to the
@@ -1197,9 +1205,9 @@
 
 [source,text]
 ----
-[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
-[INFO] AbstractChannelizer - application/json already has org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 configured - it will not be replaced by org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, change order of serialization configuration if this is not desired.
+[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+json with org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3
+[INFO] AbstractChannelizer - application/json already has org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1 configured - it will not be replaced by org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, change order of serialization configuration if this is not desired.
 ----
 
 Given the above, using GraphSON 3.0 under this configuration will require that the user specific the type:
@@ -1212,11 +1220,6 @@
 {"requestId":"9fdf0892-d86c-41f2-94b5-092785c473eb","status":{"message":"","code":200,"attributes":{"@type":"g:Map","@value":[]}},"result":{"data":{"@type":"g:List","@value":[{"@type":"g:Int32","@value":99}]},"meta":{"@type":"g:Map","@value":[]}}
 ----
 
-IMPORTANT: `GraphSONMessageSerializerGremlinV1d0` configures `application/vnd.gremlin-v1.0+json`, but this mime type does
-not support text serialization (i.e. `MessageTextSerializer`) which means that it cannot be used for the serializing
-results to the HTTP endpoint in Gremlin Server. GraphSON 1.0 must be configured with `application/json` using the
-`GraphSONMessageSerializerV1d0` as demonstrated above or use mimeType `application/vnd.gremlin-v1.0+json;types=false`.
-
 [[server-graphbinary]]
 ===== GraphBinary
 
@@ -1225,7 +1228,7 @@
 format itself is described in the link:https://tinkerpop.apache.org/docs/x.y.z/dev/io/#graphbinary[IO Documentation].
 
 [source,yaml]
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
 
 It has the MIME type of `application/vnd.graphbinary-v1.0` and the following configuration options:
 
@@ -1714,7 +1717,7 @@
 ----
 package org.yourpackage;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -1835,7 +1838,7 @@
      * {@link AuthorizationException} if this is not the case.
      *
      * @param user {@link AuthenticatedUser} that needs authorization.
-     * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.driver.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
+     * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.util.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
      */
     public void authorize(final AuthenticatedUser user, final RequestMessage msg) throws AuthorizationException {
         if (!usernamesSandbox.contains(user.getName())) {
@@ -2290,10 +2293,23 @@
 With the type of request and detachment model in mind, it is now possible to discuss how best to consider element
 properties in relation to them all in concert.
 
-By default, Gremlin Server sample configurations utilize `ReferenceElementStrategy` when creating the out-of-the-box
-`GraphTraversalSource`. As the name suggests, this means that elements will be detached by reference and will
-therefore not have properties included. The relevant configuration from the Gremlin Server initialization script looks
-like this:
+By default, Gremlin Server configuration returns all properties.
+
+To manage properties for each request you can use the <<configuration-steps-with,with()>> configuration option 
+`materializeProperties`
+
+[source,groovy]
+----
+g.with('materializeProperties', 'tokens').V()
+----
+
+The `tokens` value for the `materializeProperties` means that only `id` and `label` should be returned.
+Another option, `all`, can be used to indicate that all properties should be returned and is the default value.
+
+In some cases it can be inconvenient to load Elements with properties due to large data size or for compatibility reasons.
+That can be solved by utilizing `ReferenceElementStrategy` when creating the out-of-the-box `GraphTraversalSource`.
+As the name suggests, this means that elements will be detached by reference and will therefore not have properties 
+included. The relevant configuration from the Gremlin Server initialization script looks like this:
 
 [source,groovy]
 ----
@@ -2301,39 +2317,12 @@
 ----
 
 This configuration is global to Gremlin Server and therefore all methods of connection will always return elements
-without properties. If this strategy is not included, then there are other considerations to take into account such as
-the connection type (i.e. script or bytecode) and the serializer.
-
-For script-based requests, users should take care when returning graph elements. By default, elements will be returned
-as "detached elements" and depending on the serializer being used those detached elements may or may not have their
-properties carried with them. Gryo and GraphSON serializers will write all properties in the return payload in this
-case but GraphBinary will not. Therefore, script-based requests that use Gryo or GraphSON should definitely follow the
-best practice of only returning the data required by the application.
-
-For bytecode-based requests, graph elements have reference detachment and thus only return the `id` and `label` of
-the elements. While this approach alleviates a potential performance problem that the script approach exposes, it is
-still important to follow the practice of being specific about the data that is required by the requesting application
-as it won't arrive on the client side without that declaration.
+without properties. If this strategy is not included, then elements will be returned with properties.
 
 Ultimately, the detachment model should have little impact to Gremlin usage if the best practice of specifying only
-the data required by the application is adhered to. In other words, while there may be a difference in the contents
-of return values for these traversals:
+the data required by the application is adhered to. 
 
-[source,java]
-----
-// properties returned from g.V().hasLabel('person') because this is using the
-// Script API with full detachment
-Cluster cluster = Cluster.open();
-Client client = cluster.connect();
-ResultSet results = client.submit("g.V().hasLabel('person')");
-
-// no properties returned from g.V().hasLabel("person") because this is using
-// Bytecode API with reference detachment
-GraphTraversalSource g = traversal().withRemote('conf/remote-graph.properties');
-List<Vertex> results = g.V().hasLabel("person").toList();
-----
-
-There is no difference if re-written using the best practice of requesting only the data the application needs:
+The best practice of requesting only the data the application needs:
 
 [source,java]
 ----
@@ -2347,10 +2336,8 @@
 
 Both of the above requests return a list of `Map` instances that contain the `id`, `label` and the "name" property.
 
-TIP: The example graph configurations pre-packaged with Gremlin Server utilize `ReferenceElementStrategy`
-which convert all graph elements to references by initializing "g" using
-`withStrategies(ReferenceElementStrategy.instance()`. Consider utilizing `ReferenceElementStrategy` whenever creating
-a `GraphTraversalSource` in Java to ensure the most portable Gremlin.
+TIP: Consider utilizing `ReferenceElementStrategy` whenever creating a `GraphTraversalSource` in Java to ensure 
+the most portable Gremlin.
 
 NOTE: For those interested, please see link:https://lists.apache.org/thread.html/e959e85d4f8b3d46d281f2742a6e574c7d27c54bfc52f802f7c04af3%40%3Cdev.tinkerpop.apache.org%3E[this post]
 to the TinkerPop dev list which outlines the full history of this issue and related concerns.
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index 2edc4f1..50dca67 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -308,13 +308,15 @@
 ----
 options := new(RequestOptionsBuilder).
 			SetEvaluationTimeout(5000).
+			SetBatchSize(32).
+			SetMaterializeProperties("tokens").
 			AddBinding("x", 100).
 			Create()
 resultSet, err := client.SubmitWithOptions("g.V(x).count()", options)
 ----
 
-The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent` and
-`evaluationTimeout`. `RequestOptions` may also contain a map of variable `bindings` to be applied to the supplied
+The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent`, `evaluationTimeout` and `materializeProperties`.
+`RequestOptions` may also contain a map of variable `bindings` to be applied to the supplied
 traversal string.
 
 IMPORTANT: The preferred method for setting a per-request timeout for scripts is demonstrated above, but those familiar
@@ -510,6 +512,10 @@
 	var order = gremlingo.Order
 ----
 
+Finally, the enum construct for `Cardinality` cannot have functions attached to it the way it can be done in Java,
+therefore cardinality functions that take a value like `list()`, `set()`, and `single()` are referenced from a
+`CardinalityValue` class rather than `Cardinality` itself.
+
 [[gremlin-go-limitations]]
 === Limitations
 
@@ -575,6 +581,10 @@
 statically from the anonymous traversal `+__+` and therefore, must always be prefixed with `+__.+` For instance:
 `+g.V().as('a').in().as('b').where(__.not(__.as('a').out().as('b')))+`
 
+Care needs to be taken when using the `any(P)` step as you may accidentally invoke Groovy's `any(Closure)` method. This
+typically happens when calling `any()` without arguments. You can tell if Groovy's `any` has been called if the return
+value is a boolean.
+
 Since Groovy has access to the full JVM as Java does, it is possible to construct `Date`-like objects directly, but
 the Gremlin language does offer a `datetime()` function that is exposed in the Gremlin Console and as a function for
 Gremlin scripts sent to Gremlin Server. The function accepts the following forms of dates and times using a default
@@ -853,7 +863,7 @@
 The `IoRegistry` tells the serializer what classes from the graph provider to auto-register during serialization.
 Gremlin Server roughly uses this same approach when it configures its serializers, so using this same model will
 ensure compatibility when making requests. Obviously, it is possible to switch to GraphSON or GraphBinary by using
-the appropriate `MessageSerializer` (e.g. `GraphSONMessageSerializerV3d0` or `GraphBinaryMessageSerializerV1d0` respectively)
+the appropriate `MessageSerializer` (e.g. `GraphSONMessageSerializerV3` or `GraphBinaryMessageSerializerV1` respectively)
 in the same way and building that into the `Cluster` object.
 
 [[gremlin-java-lambda]]
@@ -1349,6 +1359,8 @@
 const order = gremlin.process.order
 const scope = gremlin.process.scope
 const t = gremlin.process.t
+const cardinality = gremlin.process.cardinality
+const CardinalityValue = gremlin.process.CardinalityValue
 ----
 
 By defining these imports it becomes possible to write Gremlin in the more shorthand, canonical style that is
@@ -1484,7 +1496,7 @@
 const result = await client.submit("g.V().repeat(both()).times(100)", null, { evaluationTimeout: 5000 })
 ----
 
-The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent` and
+The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent`, `materializeProperties` and
 `evaluationTimeout` (formerly `scriptEvaluationTimeout` which is also supported but now deprecated).
 
 IMPORTANT: The preferred method for setting a per-request timeout for scripts is demonstrated above, but those familiar
@@ -1611,6 +1623,10 @@
 *Steps* - <<from-step,from_()>>, <<in-step,in_()>>, <<with-step,with_()>>
 *Tokens* - `Direction.from_`
 
+In addition, the enum construct for `Cardinality` cannot have functions attached to it the way it can be done in Java,
+therefore cardinality functions that take a value like `list()`, `set()`, and `single()` are referenced from a
+`CardinalityValue` class rather than `Cardinality` itself.
+
 Gremlin allows for `Map` instances to include `null` keys, but `null` keys in Javascript have some interesting behavior
 as in:
 
@@ -1646,6 +1662,7 @@
 
 Either of the above two options accomplishes the desired goal as both prevent `groupCount()` from having to process
 the possibility of `null`.
+
 [[gremlin-javascript-limitations]]
 === Limitations
 
@@ -1911,7 +1928,7 @@
 include::../../../gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/GremlinVariantsTests.cs[tags=submittingScriptsWithTimeout]
 ----
 
-The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent` and
+The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent`, `materializeProperties` and
 `evaluationTimeout` (formerly `scriptEvaluationTimeout` which is also supported but now deprecated). These options are
 available as constants on the `Gremlin.Net.Driver.Tokens` class.
 
@@ -2002,17 +2019,21 @@
 Gremlin allows for `Map` instances to include `null` keys, but `null` keys in C# `Dictionary` instances are not allowed.
 It is therefore necessary to rewrite a traversal such as:
 
-[source,javascript]
+[source,csharp]
 ----
-g.V().groupCount().by('age')
+g.V().GroupCount<object>().By("age")
 ----
 
 where "age" is not a valid key for all vertices in a way that will remove the need for a `null` to be returned.
 
-[source,javascript]
+Finally, the enum construct for `Cardinality` cannot have functions attached to it the way it can be done in Java,
+therefore cardinality functions that take a value like `list()`, `set()`, and `single()` are referenced from a
+`CardinalityValue` class rather than `Cardinality` itself.
+
+[source,csharp]
 ----
-g.V().has('age').groupCount().by('age')
-g.V().hasLabel('person').groupCount().by('age')
+g.V().Has("age").GroupCount<object>().By("age")
+g.V().HasLabel("person").GroupCount<object>().By("age")
 ----
 
 Either of the above two options accomplishes the desired goal as both prevent `groupCount()` from having to process
@@ -2183,6 +2204,7 @@
 from gremlin_python.process.traversal import T
 from gremlin_python.process.traversal import Order
 from gremlin_python.process.traversal import Cardinality
+from gremlin_python.process.traversal import CardinalityValue
 from gremlin_python.process.traversal import Column
 from gremlin_python.process.traversal import Direction
 from gremlin_python.process.traversal import Operator
@@ -2453,7 +2475,7 @@
 result_set = client.submit('g.V().repeat(both()).times(100)', request_options={'evaluationTimeout': 5000})
 ----
 
-The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent` and
+The following options are allowed on a per-request basis in this fashion: `batchSize`, `requestId`, `userAgent`, `materializeProperties` and
 `evaluationTimeout` (formerly `scriptEvaluationTimeout` which is also supported but now deprecated).
 
 IMPORTANT: The preferred method for setting a per-request timeout for scripts is demonstrated above, but those familiar
@@ -2567,13 +2589,17 @@
 In situations where Python reserved words and global functions overlap with standard Gremlin steps and tokens, those
 bits of conflicting Gremlin get an underscore appended as a suffix:
 
-*Steps* - <<and-step,and_()>>, <<as-step,as_()>>, <<filter-step,filter_()>>, <<from-step,from_()>>,
+*Steps* - <<all-step,all_()>>, <<and-step,and_()>>, <<any-step,any_()>>, <<as-step,as_()>>, <<filter-step,filter_()>>, <<from-step,from_()>>,
 <<has-step,has_key_>>, <<id-step,id_()>>, <<is-step,is_()>>, <<in-step,in_()>>, <<max-step,max_()>>,
 <<min-step,min_()>>, <<not-step,not_()>>, <<or-step,or_()>>, <<range-step,range_()>>, <<sum-step,sum_()>>,
 <<with-step,with_()>>
 
 *Tokens* - <<a-note-on-scopes,Scope.global_>>, `Direction.from_`, `Operator.sum_`
 
+In addition, the enum construct for `Cardinality` cannot have functions attached to it the way it can be done in Java,
+therefore cardinality functions that take a value like `list()`, `set()`, and `single()` are referenced from a
+`CardinalityValue` class rather than `Cardinality` itself.
+
 [[gremlin-python-limitations]]
 === Limitations
 
diff --git a/docs/src/reference/implementations-tinkergraph.asciidoc b/docs/src/reference/implementations-tinkergraph.asciidoc
index a376338..f0ba65f 100644
--- a/docs/src/reference/implementations-tinkergraph.asciidoc
+++ b/docs/src/reference/implementations-tinkergraph.asciidoc
@@ -160,6 +160,9 @@
 loaded/persisted to disk.
 |=========================================================
 
+NOTE: To use <<tinkergraph-gremlin-tx, transactions>>, configure `gremlin.graph` as
+`org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerTransactionGraph`.
+
 The `IdManager` settings above refer to how TinkerGraph will control identifiers for vertices, edges and vertex
 properties.  There are several options for each of these settings: `ANY`, `LONG`, `INTEGER`, `UUID`, or the fully
 qualified class name of an `IdManager` implementation on the classpath.  When not specified, the default values
@@ -198,3 +201,157 @@
 g.io("data/tinkerpop-crew.kryo").read().iterate()
 g.V().properties()
 ----
+
+[[tinkergraph-gremlin-tx]]
+=== Transactions
+
+`TinkerGraph` includes optional transaction support and thread-safety through the `TinkerTransactionGraph` class.
+The default configuration of TinkerGraph remains non-transactional.
+
+NOTE: This feature was first made available in TinkerPop 3.7.0.
+
+==== Transaction Semantics
+
+`TinkerTransactionGraph` only has support for `ThreadLocal` transactions, so embedded graph transactions may not be fully
+supported. You can think of the transaction as belonging to a thread, any traversals executed within the same thread
+will share the same transaction even if you attempt to start a new transaction.
+
+`TinkerTransactionGraph` provides the `read committed` transaction isolation level. This means that it will always try to
+guard against dirty reads. While you may notice stricter isolation semantics in some cases, you should not depend on
+this behavior as it may change in the future.
+
+`TinkerTransactionGraph` employs optimistic locking as its locking strategy. This reduces complexity in the design as
+there are fewer timeouts that the user needs to manage. However, a consequence of this approach is that a transaction
+will throw a `TransactionException` if two different transactions attempt to lock the same element (see "Best Practices"
+below).
+
+[[testing-remote-providers]]
+==== Testing Remote Providers
+
+These transaction semantics described above may not fit use cases for some production scenarios that require strict
+ACID-like transactions. Therefore, it is recommended that `TinkerTransactionGraph` be used as a `Graph` for test
+environments where you still require access to a `Graph` that supports transactions. `TinkerTransactionGraph` does fully
+support TinkerPop's `Transaction` interface which still makes it a useful `Graph` for exploring the
+<<transactions,Transaction API>>.
+
+A common scenario where this sort of testing is helpful is with <<connecting-rgp, Remote Graph Providers>>, where
+developing unit tests might be hard against a graph service. Instead, configure `TinkerTransactionGraph`, either in an
+embedded style if using Java or with Gremlin Server for other cases.
+
+[source,java]
+----
+// consider this class that returns the results of some Gremlin. by constructing the
+// GraphService in a way that takes a GraphTraversalSource it becomes possible to
+// execute getPersons() under any graph system.
+public class GraphService {
+    private final GraphTraversalSource g;
+
+    public GraphService(GraphTraversalSource g) {
+        this.g = g;
+    }
+
+    public List<Vertex> getPersons() {
+        return g.V().hasLabel("person").toList();
+    }
+}
+
+// when writing tests for the GraphService it becomes possible to configure the test
+// to run in a variety of scenarios. here we decide that TinkerTransactionGraph is a
+// suitable test graph replacement for our actual production graph.
+public class GraphServiceTest {
+    private static final TinkerTransactionGraph graph = TinkerTransactionGraph().open();
+    private static final GraphTraversalSource g = traversal.withEmbedded(graph);
+    private static final GraphService service = new GraphService(g);
+
+    @Test
+    public void shouldGetPersons() {
+        final List<Vertex> persons = service.getPersons();
+        assertEquals(6, persons.size());
+    }
+}
+
+// or perhaps, since we're using a remote graph provider, we feel it would be better to
+// start Gremlin Server with a TinkerTransactionGraph configured using a docker container,
+// embedding it directly in our tests or running it as a separate process like:
+//
+// bin/gremlin-server.sh conf/gremlin-server-transaction.yaml
+//
+// and then connect to it with a driver in more of an integration test style. obviously,
+// with this approach you could also configure your production graph directly or use custom
+// build options to trigger different test configurations for a more dynamic approach
+public class GraphServiceTest {
+    private static final GraphTraversalSource g = traversal.withRemote(
+            new DriverRemoteConnection('ws://localhost:8182/gremlin'));
+    private static final GraphService service = new GraphService(g);
+
+    @Test
+    public void shouldGetPersons() {
+        final List<Vertex> persons = service.getPersons();
+        assertEquals(6, persons.size());
+    }
+}
+----
+
+WARNING: There can be subtle behavioral differences between TinkerGraph and the graph ultimately intended for use.
+Be aware of the differences when writing tests to ensure that you are testing behaviors of your applications
+appropriately.
+
+==== Best Practices
+
+Errors can occur before a transaction gets committed. Specifically for `TinkerTransactionGraph`, you may encounter many
+`TransactionException` errors in a highly concurrent environment due its optimistic approach to locking. Users should
+follow the try-catch-rollback pattern described in the
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#transactions[transactions] section in combination with
+exponential backoff based retries to mitigate this issue.
+
+==== Performance Considerations
+
+While transactions impose minimal impact for mutating workloads, users should expect performance degradation for
+read-only work relative to the non-transactional configuration. However, its approach to locking
+(write-only, optimistic) and its in-memory nature, TinkerTransactionGraph is likely faster than other `Graph`
+implementations that support transactions.
+
+==== Examples
+
+Constructing a simple graph using `TinkerTransactionGraph` in Java is presented below:
+
+[source,java]
+----
+Graph graph = TinkerTransactionGraph.open();
+g = traversal().withEmbedded(graph)
+GraphTraversalSource gtx = g.tx().begin();
+
+try {
+  Vertex marko = gtx.addV("person").property("name","marko").property("age",29).next();
+  Vertex lop = gtx.addV("software").property("name","lop").property("lang","java").next();
+  gtx.addE("created").from(marko).to(lop).property("weight",0.6d).iterate();
+
+  gtx.tx().commit();
+} catch (Exception ex) {
+  gtx.tx().rollback();
+}
+----
+
+The above Gremlin creates two vertices named "marko" and "lop" and connects them via a created-edge with a weight=0.6
+property. In case of any errors `rollback()` will be called and no changes will be performed.
+
+To use the embedded TinkerTransactionGraph in Gremlin Console:
+
+[gremlin-groovy]
+----
+graph = TinkerTransactionGraph.open() <1>
+g = traversal().withEmbedded(graph) <2>
+g.addV('test').property('name','one')
+g.tx().commit() <3>
+g.V().valueMap()
+g.addV('test').property('name','two') <4>
+g.V().valueMap()
+g.tx().rollback() <5>
+g.V().valueMap()
+----
+
+<1> Open transactional graph.
+<2> Spawn a GraphTraversalSource with transactional graph.
+<3> Commit the add vertex operation
+<4> Add a second vertex without committing
+<5> Rollback the change
diff --git a/docs/src/reference/index.asciidoc b/docs/src/reference/index.asciidoc
index 2253991..f655621 100644
--- a/docs/src/reference/index.asciidoc
+++ b/docs/src/reference/index.asciidoc
@@ -14,12 +14,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
+
+:docinfo: shared
+:docinfodir: ../
+:toc-position: left
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
 
-:toc-position: left
-
 include::preface.asciidoc[]
 
 include::intro.asciidoc[]
diff --git a/docs/src/reference/intro.asciidoc b/docs/src/reference/intro.asciidoc
index 3fad7e1..8f69a1b 100644
--- a/docs/src/reference/intro.asciidoc
+++ b/docs/src/reference/intro.asciidoc
@@ -477,7 +477,7 @@
 
 Despite leveraging TinkerPop protocols and drivers as being typical, RGPs are not required to do so to be considered
 TinkerPop-enabled. RGPs may well have their own drivers and protocols that may plug into
-<<gremlin-drivers-variants,Gremlin Language Variants> and may allow for more advanced options like better security,
+<<gremlin-drivers-variants,Gremlin Language Variants>> and may allow for more advanced options like better security,
 cluster awareness, batched requests or other features. The details of these different systems are outside the scope
 of this documentation, so be sure to consult their documentation for more information.
 
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index ca89014..bfc1cf4 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -657,6 +657,30 @@
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#aggregate(java.lang.String)++[`aggregate(String)`],
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#aggregate(org.apache.tinkerpop.gremlin.process.traversal.Scope,java.lang.String)++[`aggregate(Scope,String)`]
 
+[[all-step]]
+=== All Step
+
+It is possible to filter list traversers using `all()`-step (*filter*). Every item in the list will be tested against
+the supplied predicate and if all of the items pass then the traverser is passed along the stream, otherwise it is
+filtered. Empty lists are passed along but null or non-iterable traversers are filtered out.
+
+[NOTE, caption=Python]
+====
+The term `all` is a reserved word in Python, and therefore must be referred to in Gremlin with `all_()`.
+====
+
+[gremlin-groovy,modern]
+----
+g.V().values('age').fold().all(gt(25)) <1>
+----
+
+<1> Return the list of ages only if everyone's age is greater than 25.
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#all(org.apache.tinkerpop.gremlin.process.traversal.P)++[`all(P)`],
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/P.html++[`P`]
+
 [[and-step]]
 === And Step
 
@@ -689,6 +713,30 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#and(org.apache.tinkerpop.gremlin.process.traversal.Traversal...)++[`and(Traversal...)`]
 
+[[any-step]]
+=== Any Step
+
+It is possible to filter list traversers using `any()`-step (*filter*). All items in the list will be tested against
+the supplied predicate and if any of the items pass then the traverser is passed along the stream, otherwise it is
+filtered. Empty lists, null traversers, and non-iterable traversers are filtered out as well.
+
+[NOTE, caption=Python]
+====
+The term `any` is a reserved word in Python, and therefore must be referred to in Gremlin with `any_()`.
+====
+
+[gremlin-groovy,modern]
+----
+g.V().values('age').fold().any(gt(25)) <1>
+----
+
+<1> Return the list of ages if anyone's age is greater than 25.
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#any(org.apache.tinkerpop.gremlin.process.traversal.P)++[`any(P)`],
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/P.html++[`P`]
+
 [[as-step]]
 === As Step
 
@@ -731,6 +779,52 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#as(java.lang.String,java.lang.String...)++[`as(String,String...)`]
 
+[[asString-step]]
+=== AsString Step
+
+The `asString()`-step (*map*) returns the value of incoming traverser as strings. Null values are returned unchanged.
+
+[gremlin-groovy,modern]
+----
+g.V().hasLabel('person').values('age').asString() <1>
+g.V().hasLabel('person').values('age').asString().concat(' years old') <2>
+g.V().hasLabel('person').values('age').fold().asString(local) <3>
+----
+
+<1> Return ages as string.
+<2> Return ages as string and use concat to generate phrases.
+<3> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#asString()++[`asString()`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#asString(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`asString(Scope)`]
+
+[[asDate-step]]
+=== AsDate Step
+
+The `asDate()`-step (*map*) converts string or numeric input to Date.
+
+For string input only ISO-8601 format is supported. For numbers, the value is considered as the number of the
+milliseconds since "the epoch" (January 1, 1970, 00:00:00 GMT). Date input is passed without changes.
+
+If the incoming traverser is not a string, number or Date then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject(1690934400000).asDate() <1>
+g.inject("2023-08-02T00:00:00Z").asDate() <2>
+g.inject(datetime("2023-08-24T00:00:00Z")).asDate() <3>
+----
+
+<1> Convert number to Date
+<2> Convert ISO-8601 string to Date
+<3> Pass Date without modification
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#asDate()++[`asDate()`]
+
 [[barrier-step]]
 === Barrier Step
 
@@ -1049,6 +1143,90 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#coin(double)++[`coin(double)`]
 
+[[combine-step]]
+=== Combine Step
+
+The `combine()`-step (*map*) combines the elements of the incoming list traverser and the provided list argument into
+one list. This is also known as appending or concatenating. This step only expects list data (array or Iterable) and
+will throw an `IllegalArgumentException` if any other type is encountered (including `null`). This differs from the
+`merge()`-step in that it allows duplicates to exist.
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").fold().combine(["james","jen","marko","vadas"])
+g.V().values("name").fold().combine(__.constant("stephen").fold())
+----
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#combine(java.lang.Object)++[`combine(Object)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#combine-step++[`Semantics`]
+
+[[concat-step]]
+=== Concat Step
+
+The `concat()`-step (*map*) concatenates one or more String values together to the incoming String traverser. This step
+can take either String varargs or Traversal varargs.
+Any `null` String values will be skipped when concatenated with non-`null` String values. If two `null` value are
+concatenated, the `null` value will be propagated and returned.
+If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.addV(constant('prefix_').concat(__.V(1).label())).property(id, 10) <1>
+g.V(10).label()
+g.V().hasLabel('person').values('name').as('a').
+    constant('Mr.').concat(__.select('a')) <2>
+g.V().hasLabel('software').as('a').values('name').
+    concat(' uses ').
+    concat(select('a').values('lang')) <3>
+g.V(1).outE().as('a').V(1).values('name').
+    concat(' ').
+    concat(select('a').label()).
+    concat(' ').
+    concat(select("a").inV().values('name')) <4>
+g.V(1).outE().as('a').V(1).values('name').
+    concat(constant(' '),
+        select("a").label(),
+        constant(' '),
+        select('a').inV().values('name')) <5>
+g.inject('hello', 'hi').concat(__.V().values('name')) <6>
+g.inject('This').concat(' ').concat('is a ', 'gremlin.') <7>
+----
+
+<1> Add a new vertex with id 10 which should be labeled like an existing vertex but with some prefix attached
+<2> Attach the prefix "Mr." to all the names using the `constant()`-step
+<3> Generate a string of software names and the language they use
+<4> Generate a string description for each of marko's outgoing edges
+<5> Alternative way to generate the string description by using traversal varargs. Use the `constant()` step to add
+desired strings between arguments.
+<6> The `concat()` step will append the first result from the child traversal to the incoming traverser
+<7> A generic use of `concat()` to join strings together
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#concat(java.lang.String)++[`concat(String...)`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#concat(org.apache.tinkerpop.gremlin.process.traversal.Traversal,org.apache.tinkerpop.gremlin.process.traversal.Traversal...)++[`concat(Taversal, Traversal...)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#concat-step++[`Semantics`]
+
+[[conjoin-step]]
+=== Conjoin Step
+
+The `conjoin()`-step (*map*) joins together the elements in the incoming list traverser together with the provided argument
+as a delimiter. The resulting `String` is added to the Traversal Stream. This step only expects list data (array or
+Iterable) in the incoming traverser and will throw an `IllegalArgumentException` if any other type is encountered
+(including `null`). Null values are skipped and not included in the result.
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").fold().conjoin("+")
+----
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#conjoin(java.lang.String)++[`conjoin(String)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#conjoin-step++[`Semantics`]
+
 [[connectedcomponent-step]]
 === ConnectedComponent Step
 
@@ -1166,6 +1344,43 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#cyclicPath()++[`cyclicPath()`]
 
+[[dateAdd-step]]
+=== DateAdd Step
+
+The `dateAdd()`-step (*map*) returns the value with the addition of the value number of units as specified by the DateToken. 
+If the incoming traverser is not a Date, then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("2023-08-02T00:00:00Z").asDate().dateAdd(DT.day, 7) <1>
+g.inject(["2023-08-02T00:00:00Z", "2023-08-03T00:00:00Z"]).unfold().asDate().dateAdd(DT.minute, 1) <2>
+----
+
+<1> Add 7 days to Date
+<2> Add 1 minute to incoming dates
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#dateAdd(org.apache.tinkerpop.gremlin.process.traversal.DT,int)++[`dateAdd(DT,int)`]
+
+[[dateDiff-step]]
+=== DateDiff Step
+
+The `dateDiff()`-step (*map*) returns the difference between two Dates in epoch time. 
+If the incoming traverser is not a Date, then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("2023-08-02T00:00:00Z").asDate().dateDiff(constant("2023-08-03T00:00:00Z").asDate()) <1>
+----
+
+<1> Find difference between two dates
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#dateDiff(java.util.Date)++[`dateDiff(Date)`],
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#dateDiff(org.apache.tinkerpop.gremlin.process.traversal.Traversal)++[`dateDiff(Traversal)`]
+
 [[dedup-step]]
 === Dedup Step
 
@@ -1215,6 +1430,45 @@
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Scope.html++[`Scope`],
 link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#dedup-step++[`Semantics`]
 
+[[difference-step]]
+=== Difference Step
+
+The `difference()`-step (*map*) calculates the difference between the incoming list traverser and the provided list
+argument. More specifically, this provides the set operation A-B where A is the traverser and B is the argument. This
+step only expects list data (array or Iterable) and will throw an `IllegalArgumentException` if any other type is
+encountered (including `null`).
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").fold().difference(["lop","ripple"])
+g.V().values("name").fold().difference(__.V().limit(2).values("name").fold())
+----
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#difference(java.lang.Object)++[`difference(Object)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#difference-step++[`Semantics`]
+
+[[disjunct-step]]
+=== Disjunct Step
+
+The `disjunct()`-step (*map*) calculates the disjunct set between the incoming list traverser and the provided list
+argument. This step only expects list data (array or Iterable) and will throw an `IllegalArgumentException` if any other
+type is encountered (including `null`).
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").fold().disjunct(["lop","peter","sam"]) <1>
+g.V().values("name").fold().disjunct(__.V().limit(3).values("name").fold())
+----
+
+<1> Find the unique names between two group of names
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#disjunct(java.lang.Object)++[`disjunct(Object)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#disjunct-step++[`Semantics`]
+
 [[drop-step]]
 === Drop Step
 
@@ -1238,16 +1492,18 @@
 [[e-step]]
 === E Step
 
-The `E()`-step is meant to read edges from the graph and is usually used to start a `GraphTraversal`. Unlike the related
-<<v-step,V()>> it cannot be used mid-traversal.
+The `E()`-step is meant to read edges from the graph and is usually used to start a `GraphTraversal`, but can also
+be used mid-traversal.
 
 [gremlin-groovy,modern]
 ----
 g.E(11) <1>
 g.E().hasLabel('knows').has('weight', gt(0.75))
+g.inject(1).coalesce(E().hasLabel("knows"), addE("knows").from(V().has("name","josh")).to(V().has("name","vadas"))) <2>
 ----
 
 <1> Find the edge by its unique identifier (i.e. `T.id`) - not all graphs will use a numeric value for their identifier.
+<2> Get edges with label `knows`, if there is none then add new one between `josh` and `vadas`.
 
 *Additional References*
 
@@ -1390,6 +1646,29 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#flatMap(org.apache.tinkerpop.gremlin.process.traversal.Traversal)++[`map(Traversal)`]
 
+[[format-step]]
+=== Format Step
+
+This step is designed to simplify some string operations. In general, it is similar to the string formatting function
+available in many programming languages. Variable values can be picked up from Element properties, maps and scope variables.
+
+[gremlin-groovy,modern]
+----
+g.V().format("%{name} is %{age} years old") <1>
+g.V().hasLabel("person").as("a").values("name").as("p1").select("a").in("knows").format("%{p1} knows %{name}") <2>
+g.V().format("%{name} has %{_} connections").by(bothE().count()) <3>
+g.V().project("name","count").by(values("name")).by(bothE().count()).format("%{name} has %{count} connections") <4>
+----
+
+<1> A `format()` will use property values from incoming Element to produce String result.
+<2> A `format()` will use scope variable `p1` and property `name` to resolve variable values.
+<3> A `format()` will use property `name` and traversal product for positional argument to resolve variable values.
+<4> A `format()` will use map produced by `project` step to resolve variable values.
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#format(java.lang.String)++[`format(String)`],
+
 [[fold-step]]
 === Fold Step
 
@@ -1712,6 +1991,24 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#inject(E...)++[`inject(Object)`]
 
+[[intersect-step]]
+=== Intersect Step
+
+The `intersect()`-step (*map*) calculates the intersection between the incoming list traverser and the provided list
+argument. This step only expects list data (array or Iterable) and will throw an `IllegalArgumentException` if any other
+type is encountered (including `null`).
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").fold().intersect(["marko","josh","james","jen"])
+g.V().values("name").fold().intersect(__.V().limit(2).values("name").fold())
+----
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#intersect(java.lang.Object)++[`intersect(Object)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#intersect-step++[`Semantics`]
+
 anchor:_gremlin_i_o[]
 [[io-step]]
 === IO Step
@@ -1761,6 +2058,10 @@
 writing perspective is not that different in there are no parallel operations in play, however streaming the output
 to disk requires a single pass of the data without high memory requirements for larger datasets.
 
+IMPORTANT: Default graph formats don't contain information about property cardinality, so it is up to the graph
+provider to choose the appropriate one. You will see a warning message if the chosen cardinality is SINGLE
+while your graph input contains multiple values for that property.
+
 In general, TinkerPop recommends that users examine the native bulk import/export tools of the graph implementation
 that they choose. Those tools will often outperform the `io()`-step and perhaps be easier to use with a greater
 feature set. That said, graph providers do have the option to optimize `io()` to back it with their own
@@ -1957,6 +2258,26 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#label()++[`label()`]
 
+[[length-step]]
+=== Length Step
+
+The `length()`-step (*map*) returns the length incoming string or list of string traverser. Null values are not processed and remain as null when returned.
+If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.V().values('name').length() <1>
+g.V().values('name').fold().length(local) <2>
+----
+
+<1> Return the string length of all vertex names.
+<2> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#length()++[`length()`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#length(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`length(Scope)`]
+
 [[limit-step]]
 === Limit Step
 
@@ -2060,6 +2381,23 @@
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#loops()++[`loops()`],
 link:++https://tinkerpop.apache.org/docs/x.y.z/recipes/#looping++[`Looping Recipes`]
 
+[[lTrim-step]]
+=== LTrim Step
+
+The `lTrim()`-step (*map*) returns a string with leading whitespace removed. Null values are not processed and remain
+as null when returned. If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("   hello   ", " world ", null).lTrim()
+g.inject(["   hello   ", " world ", null]).lTrim(local) <1>
+----
+
+<1> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#lTrim()++[`lTrim()`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#lTrim(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`lTrim(Scope)`]
+
 [[map-step]]
 === Map Step
 
@@ -2421,6 +2759,25 @@
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#mean(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`mean(Scope)`],
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Scope.html++[`Scope`]
 
+[[merge-step]]
+=== Merge Step
+
+The `merge()`-step (*map*) merges the elements of the incoming list traverser and the provided list argument into one
+list. This is also known as the union operation. This step only expects list data (array or Iterable) and will throw
+an `IllegalArgumentException` if any other type is encountered (including `null`). This differs from the `combine()`-step
+in that it doesn't allow duplicates.
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").fold().merge(["james","jen","marko","vadas"])
+g.V().values("name").fold().merge(__.constant("james").fold())
+----
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#merge(java.lang.Object)++[`merge(Object)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#merge-step++[`Semantics`]
+
 [[mergeedge-step]]
 === MergeEdge Step
 
@@ -2536,7 +2893,7 @@
 g.E().elementMap()
 ----
 
-The `Merge.outV` and `Merge.inV` tokens can be used as placeholders for values for `Direction.OUT` and Direction.IN`
+The `Merge.outV` and `Merge.inV` tokens can be used as placeholders for values for `Direction.OUT` and `Direction.IN`
 respectively in the `mergeE` arguments. These options can produce `Vertices`, as in the example above, or they can
 specify `Maps`, which will be used to search for `Vertices` in the graph. This is useful when the exact `T.id` of
 the from/to vertices is not known in advance:
@@ -2677,22 +3034,35 @@
 ======================================================================================================================================================================
 ----
 
-In some cases, such as when adding multi-properties or meta-properties to a vertex, one or
-more `property` steps can follow the `mergeV()` step. Note that meta-properties and
-multi-properties cannot be added directly using just `mergeV()` as a key/value pair such as
-`'my-numbers:[1,2,3,4]` will be treated as a `List` object and not a set of multi-property
-values.
+When working with multi-properties, there are two ways to specify them for `mergeV()`. First, you can specify them
+individually using a `CardinalityValue` as the value in the `Map`. The `CardinalityValue` allows you to specify the
+value as well as the `Cardinality` for that value. Note that it is only possible to specify one value with this syntax
+even if you are using `set` or `list`.
 
 [gremlin-groovy]
 ----
 g.mergeV([(T.label):'Dog', name:'Max']). <1>
-  property(list,'alias','Maximus').
-  property(list,'alias','Maxamillion') <2>
+    option(onCreate, [alias: set('Maximus')]). <2>
+  property(set,'alias','Maxamillion') <3>
 g.V().has('name','Max').valueMap().with(WithOptions.tokens)
 ----
 
 <1> Find or create a vertex for Max.
-<2> Whether Max was found or created, add some aliases with list cardinality.
+<2> If Max is not found then add an alias of `set` cardinality.
+<3> Whether Max was found or created, add another alias with `set` cardinality.
+
+The second option is to specify `Cardinality` for the entire range of values as follows:
+
+[gremlin-groovy]
+----
+g.mergeV([(T.label):'Dog', name:'Max']).
+    option(onCreate, [alias: 'Maximus', city: 'Boston'], set) <1>
+g.mergeV([(T.label):'Dog', name:'Max']).
+    option(onCreate, [alias: 'Maximus', city: single('Boston')], set) <2>
+----
+
+<1> If Max is created then set the alias and city with cardinality of `set`.
+<2> If Max is created then set the alias with cardinality of `set` and city with cardinality `single`.
 
 More than one vertex can be created by a single `mergeV()` operation. This is done by
 injecting a `List` of `Map` objects into the traversal and letting them stream into the `mergeV()`
@@ -2793,13 +3163,15 @@
 [[none-step]]
 === None Step
 
-The `none()`-step (*filter*) filters all objects from a traversal stream. It is especially useful for to traversals
+The `none()`-step (*filter*) filters all objects from a traversal stream. It is especially useful for traversals
 that are executed remotely where returning results is not useful and the traversal is only meant to generate
 side-effects. Choosing not to return results saves in serialization and network costs as the objects are filtered on
 the remote end and not returned to the client side. Typically, this step does not need to be used directly and is
 quietly used by the `iterate()` terminal step which appends `none()` to the traversal before actually cycling through
 results.
 
+NOTE: As of release 4.0.0, `none()` will be renamed to `discard()`.
+
 *Additional References*
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Traversal.html#none()++[`none()`]
@@ -3155,6 +3527,24 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#peerPressure()++[`peerPressure()`]
 
+[[product-step]]
+=== Product Step
+
+The `product()`-step (*map*) calculates the cartesian product between the incoming list traverser and the provided list
+argument. This step only expects list data (array or Iterable) and will throw an `IllegalArgumentException` if any
+other type is encountered (including `null`).
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").fold().product(["james","jen"])
+g.V().values("name").fold().product(__.V().has("age").limit(1).values("age").fold())
+----
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#product(java.lang.Object)++[`product(Object)`]
+link:++https://tinkerpop.apache.org/docs/x.y.z/dev/provider/#product-step++[`Semantics`]
+
 [[profile-step]]
 === Profile Step
 
@@ -3352,20 +3742,23 @@
 g.V(1).property(list,'age',35)  <2>
 g.V(1).property(list, ['city': 'santa fe', 'state': 'new mexico'])  <3>
 g.V(1).valueMap()
-g.V(1).property('friendWeight',outE('knows').values('weight').sum(),'acl','private') <4>
-g.V(1).properties('friendWeight').valueMap() <5>
-g.addV().property(T.label,'person').valueMap().with(WithOptions.tokens) <6>
-g.addV().property(null) <7>
+g.V(1).property(list, ['age': single(36), 'city': 'wilmington', 'state': 'delaware'])  <4>
+g.V(1).valueMap()
+g.V(1).property('friendWeight',outE('knows').values('weight').sum(),'acl','private') <5>
+g.V(1).properties('friendWeight').valueMap() <6>
+g.addV().property(T.label,'person').valueMap().with(WithOptions.tokens) <7>
+g.addV().property(null) <8>
 g.addV().property(set, null)
 ----
 
-<1> Properties can also take a Map as an argument.
+<1> Properties can also take a `Map` as an argument.
 <2> For vertices, a cardinality can be provided for <<vertex-properties,vertex properties>>.
-<3> If a cardinality is specified for a Map then that cardinality will be used for all properties in the map.  If you need different cardinalities per property then you should individually add the property values.
-<4> It is possible to select the property value (as well as key) via a traversal.
-<5> For vertices, the `property()`-step can add meta-properties.
-<6> The label value can be specified as a property only at the time a vertex is added and if one is not specified in the addV()
-<7> If you pass a `null` value for the Map this will be treated as a no-op and the input will be returned
+<3> If a cardinality is specified for a `Map` then that cardinality will be used for all properties in the map.
+<4> Assign the `Cardinality` individually to override the specified `list` or the default cardinality if not specified.
+<5> It is possible to select the property value (as well as key) via a traversal.
+<6> For vertices, the `property()`-step can add meta-properties.
+<7> The label value can be specified as a property only at the time a vertex is added and if one is not specified in the addV()
+<8> If you pass a `null` value for the Map this will be treated as a no-op and the input will be returned
 
 *Additional References*
 
@@ -3541,6 +3934,63 @@
 
 link:++https://tinkerpop.apache.org/docs/x.y.z/recipes/#looping++[`Looping Recipes`]
 
+[[replace-step]]
+=== Replace Step
+The `replace()`-step (*map*) returns a string with the specified characters in the original string replaced with the new
+characters. Any null arguments will be a no-op and the original string is returned. Null values from the incoming
+traversers are not processed and remain as null when returned. If the incoming traverser is a non-String  value then
+an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject('that', 'this', 'test', null).replace('h', 'j') <1>
+g.inject('hello world').replace(null, 'j') <2>
+g.V().hasLabel("software").values("name").replace("p", "g") <3>
+g.V().hasLabel("software").values("name").fold().replace(local, "p", "g") <4>
+----
+<1> Replace "h" in the strings with "j".
+<2> Null inputs are ignored and the original string is returned.
+<3> Return software names with "p" replaced by "g".
+<4> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+*Additional References*
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#replace(java.lang.String,java.lang.String)++[`replace(String,String)`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#replace(org.apache.tinkerpop.gremlin.process.traversal.Scope,java.lang.String,java.lang.String)++[`replace(Scope,String,String)`]
+
+[[reverse-step]]
+=== Reverse Step
+
+The `reverse()`-step (*map*) returns the reverse of the incoming list traverser. Single values (including `null`) are not
+processed and are added back to the Traversal Stream unchanged. If the incoming traverser is a String value then the
+reversed String will be returned.
+
+[gremlin-groovy,modern]
+----
+g.V().values("name").reverse() <1>
+g.V().values("name").order().fold().reverse() <2>
+----
+<1> Reverse the order of the characters in each name.
+<2> Fold all the names into a list in ascending order and then reverse the list's ordering (into descending).
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#reverse()++[`reverse()`]
+
+[[rTrim-step]]
+=== RTrim Step
+
+The `rTrim()`-step (*map*) returns a string with trailing whitespace removed. Null values are not processed and remain
+as null when returned. If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("   hello   ", " world ", null).rTrim()
+g.inject(["   hello   ", " world ", null]).rTrim(local) <1>
+----
+
+<1> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#rTrim()++[`rTrim()`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#rTrim(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`rTrim(Scope)`]
+
 [[sack-step]]
 === Sack Step
 
@@ -3992,6 +4442,29 @@
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#skip(org.apache.tinkerpop.gremlin.process.traversal.Scope,long)++[`skip(Scope,long)`],
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Scope.html++[`Scope`]
 
+[[split-step]]
+=== Split Step
+The `split()`-step (*map*) returns a list of strings created by splitting the incoming string traverser around the
+matches of the given separator. A null separator will split the string by whitespaces. Null values from the incoming
+traversers are not processed and remain as null when returned. If the incoming traverser is a non-String value then an
+IllegalArgumentException will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("that", "this", "test", null).split("h") <1>
+g.V().hasLabel("person").values("name").split("a") <2>
+g.inject("helloworld", "hello world", "hello   world").split(null) <3>
+g.V().hasLabel("person").values("name").fold().split(local, "a") <4>
+----
+<1> Split the strings by "h".
+<2> Split person names by "a".
+<3> Splitting by null will split by whitespaces.
+<4> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list of results.
+
+*Additional References*
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#split(java.lang.String)++[`split(String)`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#split(org.apache.tinkerpop.gremlin.process.traversal.Scope,java.lang.String)++[`split(Scope, String)`]
+
 [[subgraph-step]]
 === Subgraph Step
 
@@ -4077,6 +4550,34 @@
 
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#subgraph(java.lang.String)++[`subgraph(String)`]
 
+[[substring-step]]
+=== Substring Step
+The `substring()`-step (*map*) returns a substring with a 0-based start index (inclusive) and optionally an end index (exclusive) specified.
+If the start index is negative then it will begin at the specified index counted from the end of the string, or 0 if exceeding the string length.
+Likewise, if the end index is negative then it will end at the specified index counted from the end of the string, or 0 if exceeding the string length.
+
+End index is optional, if it is not specified or if it exceeds the length of the string then all remaining characters will
+be returned. End index &leq; start index will return the empty string. Null values are not processed and remain as null when returned.
+If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("test", "hello world", null).substring(1, 8)
+g.inject("hello world").substring(-4) <1>
+g.inject("hello world").substring(2, 0) <2>
+g.V().hasLabel("software").values("name").substring(2)
+g.V().hasLabel("software").values("name").fold().substring(local, 2) <3>
+----
+<1> Negative start index, the first character is read by counting from the end of the string
+<2> Length of 0 specified will return the empty string
+<3> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+*Additional References*
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#substring(int)++[`substring(int)`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#substring(org.apache.tinkerpop.gremlin.process.traversal.Scope,int)++[`substring(Scope,int)`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#substring(int,int)++[`substring(int,int)`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#substring(org.apache.tinkerpop.gremlin.process.traversal.Scope,int,int)++[`substring(Scope,int,int)`]
+
 [[sum-step]]
 === Sum Step
 
@@ -4207,6 +4708,46 @@
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#toV(org.apache.tinkerpop.gremlin.structure.Direction)++[`toV(Direction)`],
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/structure/Direction.html++[`Direction`]
 
+[[toLower-step]]
+=== ToLower Step
+
+The `toLower()`-step (*map*) returns the lowercase representation of incoming string or list of string traverser. Null values are not processed and remain as null when returned.
+If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("HELLO", "wORlD", null).toLower()
+g.inject(["HELLO", "wORlD", null]).toLower(Scope.local) <1>
+----
+
+<1> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#toLower()++[`toLower()`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#toLower(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`toLower(Scope)`]
+
+[[toUpper-step]]
+=== ToUpper Step
+
+The `toUpper()`-step (*map*) returns the uppercase representation of incoming string or list of string traverser. Null values are not processed and remain as null when returned.
+If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("hello", "wORlD", null).toUpper()
+g.V().values("name").toUpper() <1>
+g.V().values("name").fold().toUpper(local) <2>
+----
+
+<1> Returns the upper case representation of all vertex names.
+<2> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+*Additional References*
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#toUpper()++[`toUpper()`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#toUpper(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`toUpper(Scope)`]
+
 [[tree-step]]
 === Tree Step
 
@@ -4253,6 +4794,23 @@
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#tree()++[`tree()`],
 link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#tree(java.lang.String)++[`tree(String)`]
 
+[[trim-step]]
+=== Trim Step
+
+The `trim()`-step (*map*) returns a string with leading and leading whitespace removed. Null values are not processed and remain
+as null when returned. If the incoming traverser is a non-String value then an `IllegalArgumentException` will be thrown.
+
+[gremlin-groovy,modern]
+----
+g.inject("   hello   ", " world ", null).trim()
+g.inject(["   hello   ", " world ", null]).trim(Scope.local) <1>
+----
+
+<1> Use `Scope.local` to operate on individual string elements inside incoming list, which will return a list.
+
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#trim()++[`trim()`]
+link:++https://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#trim(org.apache.tinkerpop.gremlin.process.traversal.Scope)++[`trim(Scope)`]
+
 [[unfold-step]]
 === Unfold Step
 
@@ -4295,6 +4853,8 @@
 g.V(4).union(
          __.in().values('age'),
          out().values('lang')).path()
+g.union(V().has('person','name','vadas'),
+        V().has('software','name','lop').in('created'))
 ----
 
 *Additional References*
diff --git a/docs/src/tutorials/getting-started/index.asciidoc b/docs/src/tutorials/getting-started/index.asciidoc
index 169e7e1..07a2053 100644
--- a/docs/src/tutorials/getting-started/index.asciidoc
+++ b/docs/src/tutorials/getting-started/index.asciidoc
@@ -15,6 +15,9 @@
 limitations under the License.
 ////
 
+:docinfo: shared
+:docinfodir: ../../
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
diff --git a/docs/src/tutorials/gremlin-language-variants/index.asciidoc b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
index d26544c..db1797d 100644
--- a/docs/src/tutorials/gremlin-language-variants/index.asciidoc
+++ b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
@@ -14,6 +14,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
+
+:docinfo: shared
+:docinfodir: ../../
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
index abc037a..27146f9 100644
--- a/docs/src/tutorials/gremlins-anatomy/index.asciidoc
+++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
@@ -15,6 +15,9 @@
 limitations under the License.
 ////
 
+:docinfo: shared
+:docinfodir: ../../
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
diff --git a/docs/src/tutorials/the-gremlin-console/index.asciidoc b/docs/src/tutorials/the-gremlin-console/index.asciidoc
index ad04607..e566e62 100644
--- a/docs/src/tutorials/the-gremlin-console/index.asciidoc
+++ b/docs/src/tutorials/the-gremlin-console/index.asciidoc
@@ -15,6 +15,9 @@
 limitations under the License.
 ////
 
+:docinfo: shared
+:docinfodir: ../../
+
 image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
 *x.y.z*
diff --git a/docs/src/upgrade/index.asciidoc b/docs/src/upgrade/index.asciidoc
index 512ec7a..419ee28 100644
--- a/docs/src/upgrade/index.asciidoc
+++ b/docs/src/upgrade/index.asciidoc
@@ -14,10 +14,13 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 ////
-image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
 
+:docinfo: shared
+:docinfodir: ../
 :toc-position: left
 
+image::apache-tinkerpop-logo.png[width=500,link="https://tinkerpop.apache.org"]
+
 = TinkerPop Upgrade Information
 
 This document helps users of Apache TinkerPop™ to understand the changes that come with each software release.  It
@@ -25,6 +28,8 @@
 equally useful to TinkerPop providers, who build libraries and other systems on the core APIs and protocols that
 TinkerPop exposes.
 
+include::release-3.7.x.asciidoc[]
+
 include::release-3.6.x.asciidoc[]
 
 include::release-3.5.x.asciidoc[]
diff --git a/docs/src/upgrade/release-3.6.x.asciidoc b/docs/src/upgrade/release-3.6.x.asciidoc
index 8411003..f630731 100644
--- a/docs/src/upgrade/release-3.6.x.asciidoc
+++ b/docs/src/upgrade/release-3.6.x.asciidoc
@@ -76,7 +76,7 @@
 
 *Release Date: July 31, 2023*
 
-Please see the link:https://github.com/apache/tinkerpop/blob/3.6.5/CHANGELOG.asciidoc#release-3-6-5[changelog] for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.6.5/CHANGELOG.asciidoc#release-3.6.5[changelog] for a complete list of all the modifications that are part of this release.
 
 === Upgrading for Users
 
diff --git a/docs/src/upgrade/release-3.7.x.asciidoc b/docs/src/upgrade/release-3.7.x.asciidoc
new file mode 100644
index 0000000..9ddac7c
--- /dev/null
+++ b/docs/src/upgrade/release-3.7.x.asciidoc
@@ -0,0 +1,900 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+
+= TinkerPop 3.7.0
+
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-zamfir.png[width=185]
+
+*Gremfir Master of the Pan Flute*
+
+=== TinkerPop 3.7.3
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.7.3/CHANGELOG.asciidoc#release-3-7-3[changelog] for a
+complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+
+== TinkerPop 3.7.2
+
+*Release Date: April 8, 2024*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.7.2/CHANGELOG.asciidoc#release-3-7-2[changelog] for a
+complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+==== Notice: Renaming `none()` step to `discard()` in 4.0.0
+`none()`, which is primarily used by `iterate()` to discard traversal results in remote contexts, will be renamed to
+`discard()` in release 4.0.0.
+
+=== Upgrading for Providers
+
+==== Notice: Renaming NoneStep to DiscardStep in 4.0.0
+NoneStep, which is primarily used by `iterate()` to discard traversal results in remote contexts, will be renamed to
+DiscardStep in release 4.0.0 to make room for a list filtering NoneStep.
+
+== TinkerPop 3.7.1
+*Release Date: November 20, 2023*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.7.1/CHANGELOG.asciidoc#release-3-7-1[changelog] for a
+complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+==== String Manipulation Steps
+This version introduces the following new string manipulation steps `asString()`, `length()`, `toLower()`, `toUpper()`, `trim()`,
+`lTrim()`, `rTrim()`, `reverse()`, `replace()`, `split()`, `substring()`, and `format()`, as well as modifications to the `concat()` step introduced in 3.7.0.
+
+===== Updates to String Step concat():
+Concat has been modified to take traversal varargs instead of a single traversal. Users no longer have to chain
+concat() steps together to concatenate multiple traversals:
+[source,text]
+----
+gremlin> g.V(1).outE().as("a").V(1).values("name").concat(select("a").label(), select("a").inV().values("name"))
+==>markocreatedlop
+==>markoknowsvadas
+==>markoknowsjosh
+----
+
+A notable breaking change from 3.7.0 is that we have output order of `inject()` as a child of `concat()` to be consistent with other parent steps. Any 3.7.0 uses of `concat(inject(X))` should change to `concat(constant(X))` to retain the old semantics.
+[source,text]
+----
+// 3.7.0
+gremlin> g.inject("a").concat(inject("b"))
+==>ab
+
+// 3.7.1
+gremlin> g.inject("a").concat(inject())
+==>aa
+gremlin> g.inject("a").concat(inject("b"))
+==>aa
+gremlin> g.inject("a").concat(constant("b"))
+==>ab
+----
+
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#concat-step[concat()-step]
+
+===== New String Steps asString(), length(), toLower(), toUpper():
+
+The following example demonstrates the use of a closure to perform the above functions:
+[source,text]
+----
+gremlin> g.V().hasLabel("person").values("age").map{it.get().toString()}
+==>29
+==>27
+==>32
+==>35
+gremlin> g.V().values("name").map{it.get().length()}
+==>5
+==>5
+==>3
+==>4
+==>6
+==>5
+gremlin> g.inject("TO", "LoWeR", "cAsE").map{it.get().toLowerCase()}
+==>to
+==>lower
+==>case
+gremlin> g.V().values("name").map{it.get().toUpperCase()}
+==>MARKO
+==>VADAS
+==>LOP
+==>JOSH
+==>RIPPLE
+==>PETER
+----
+
+With these additional steps this operation can be performed with standard Gremlin syntax:
+[source,text]
+----
+gremlin> g.V().hasLabel("person").values("age").asString()
+==>29
+==>27
+==>32
+==>35
+gremlin> g.V().values("name").length()
+==>5
+==>5
+==>3
+==>4
+==>6
+==>5
+gremlin> g.inject("TO", "LoWeR", "cAsE").toLower()
+==>to
+==>lower
+==>case
+gremlin> g.V().values("name").toUpper()
+==>MARKO
+==>VADAS
+==>LOP
+==>JOSH
+==>RIPPLE
+==>PETER
+----
+
+Scopes are also enabled on these string functions. The global scope functions synonymous to parameterless function call, and will only accept string traversers.
+The local scope will also operate inside of lists of strings.
+[source,text]
+----
+gremlin> g.V().values("name").fold().toUpper(local)
+==>[MARKO,VADAS,LOP,JOSH,RIPPLE,PETER]
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2672[TINKERPOP-2672],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#asString-step[asString()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#length-step[length()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#toLower-step[toLower()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#toUpper-step[toUpper()-step]
+
+===== New String Steps trim(), lTrim(), rTrim(), reverse():
+
+The following example demonstrates the use of a closure to reverse and trim strings (concatenated with a string for demonstration):
+
+[source,text]
+----
+gremlin> g.V().values("name").map{it.get().reverse()}
+==>okram
+==>sadav
+==>pol
+==>hsoj
+==>elppir
+==>retep
+gremlin>  g.inject("  hi  ").map{it.get().trim() + "trim"}
+==>hitrim
+gremlin>  g.inject("  hi  ").map{it.get().replaceAll(/^\s+/, '') + "left_trim"}
+==>hi  left_trim
+gremlin>  g.inject("  hi  ").map{it.get().replaceAll(/\s+$/, '') + "right_trim"}
+==>  hiright_trim
+----
+
+With these additional steps this operation can be performed with standard Gremlin syntax:
+[source,text]
+----
+gremlin> g.V().values("name").reverse()
+==>okram
+==>sadav
+==>pol
+==>hsoj
+==>elppir
+==>retep
+gremlin>  g.inject("  hi  ").trim().concat("trim")
+==>hitrim
+gremlin>  g.inject("  hi  ").lTrim().concat("left_trim")
+==>hi  left_trim
+gremlin>  g.inject("  hi  ").rTrim().concat("right_trim")
+==>  hiright_trim
+----
+
+Scopes are enabled on trim(), lTrim(), and rTrim(). The global scope functions synonymous to parameterless function call, and will only accept string traversers.
+The local scope will also operate inside of lists of strings.
+Due to reverse() overloading as a list function, scope is not applied, as reversing lists inside of lists is not a practical use case.
+[source,text]
+----
+gremlin> g.inject(["  hello  ", " world "]).trim(Scope.local)
+==>[hello,world]
+----
+
+See: link:https://tinkerpop.apache.org/docs/x.y.z/reference/#trim-step[trim()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#lTrim-step[lTrim()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#rTrim-step[rTrim()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#reverse-step[reverse()-step],
+link:https://issues.apache.org/jira/browse/TINKERPOP-2672[TINKERPOP-2672]
+
+===== New String Steps replace(), split(), substring()
+
+The following example demonstrates the use of a closure to perform `replace()` and `split()` functions:
+[source,text]
+----
+gremlin> g.V().hasLabel("software").values("name").map{it.get().replace("p", "g")}
+==>log
+==>riggle
+gremlin> g.V().hasLabel("person").values("name").map{it.get().split("a")}
+==>[m, rko]
+==>[v, d, s]
+==>[josh]
+==>[peter]
+----
+With these additional steps this operation can be performed with standard Gremlin syntax:
+[source,text]
+----
+gremlin> g.V().hasLabel("software").values("name").replace("p", "g")
+==>log
+==>riggle
+gremlin> g.V().hasLabel("person").values("name").split("a")
+==>[m,rko]
+==>[v,d,s]
+==>[josh]
+==>[peter]
+----
+
+For `substring()`, the new Gremlin step follows the Python standard, taking parameters start index and optionally an
+end index. This will enable certain operations that would be complex to achieve with closure:
+[source,text]
+----
+gremlin> g.V().hasLabel("person").values("name").map{it.get().substring(1,4)}
+==>ark
+==>ada
+==>osh
+==>ete
+gremlin> g.V().hasLabel("person").values("name").map{it.get().substring(1)}
+==>arko
+==>adas
+==>osh
+==>eter
+gremlin> g.V().hasLabel("person").values("name").map{it.get().substring(-2)}
+String index out of range: -2
+Type ':help' or ':h' for help.
+----
+
+The `substring()`-step will return a substring with indices specified by the start and end indices, or from
+the start index to the remainder of the string if an end index is not specified. Negative indices are allowed and will
+count from the end of the string:
+[source,text]
+----
+gremlin> g.V().hasLabel("person").values("name").substring(1,4)
+==>ark
+==>ada
+==>osh
+==>ete
+gremlin> g.V().hasLabel("person").values("name").substring(1)
+==>arko
+==>adas
+==>osh
+==>eter
+gremlin> g.V().hasLabel("person").values("name").substring(-2)
+==>ko
+==>as
+==>sh
+==>er
+----
+
+See: link:https://tinkerpop.apache.org/docs/x.y.z/reference/#replace-step[replace()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#split-step[split()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#substring-step[substring()-step],
+link:https://issues.apache.org/jira/browse/TINKERPOP-2672[TINKERPOP-2672]
+
+===== New String Step format()
+This step is designed to simplify some string operations. In general, it is similar to the string formatting function
+available in many programming languages. Variable values can be picked up from Element properties, maps and scope variables.
+
+[source,text]
+----
+gremlin> g.V().format("%{name} is %{age} years old")
+==>marko is 29 years old
+==>vadas is 27 years old
+==>josh is 32 years old
+==>peter is 35 years old
+gremlin> g.V().hasLabel("person").as("a").values("name").as("p1").select("a").in("knows").format("%{p1} knows %{name}")
+==>vadas knows marko
+==>josh knows marko
+gremlin> g.V(1).format("%{name} has %{_} connections").by(bothE().count())
+==>marko has 3 connections
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2334[TINKERPOP-2334],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#format-step[format()-step]
+
+==== List Manipulation Steps
+Additional List manipulation/filter steps have been added to replace the use of closures: `any()`, `all()`, `product()`,
+`merge()`, `intersect()`, `combine()`, `conjoin()`, `difference()`,`disjunct()` and `reverse()`.
+
+The following example demonstrates usage of the newly introduced steps:
+
+[source,text]
+----
+gremlin> g.V().values("age").fold().all(P.gt(10))
+==>[29,27,32,35]
+gremlin> g.V().values("age").fold().any(P.eq(32))
+==>[29,27,32,35]
+gremlin> g.V().values("age").fold().product(__.V().values("age").limit(2).fold())
+==>[[29,29],[29,27],[27,29],[27,27],[32,29],[32,27],[35,29],[35,27]]
+gremlin> g.V().values("age").fold().merge([32,30,50])
+==>[32,50,35,27,29,30]
+gremlin> g.V().values("age").fold().combine([32,30,50])
+==>[29,27,32,35,32,30,50]
+gremlin> g.V().values("age").fold().intersect([32,30,50])
+==>[32]
+gremlin> g.V().values("age").fold().disjunct([32,30,50])
+==>[50,35,27,29,30]
+gremlin> g.V().values("age").fold().difference([32,30,50])
+==>[35,27,29]
+gremlin> g.V().values("age").order().by(desc).fold().reverse()
+==>[27,29,32,35]
+gremlin> g.V().values("age").fold().conjoin("-")
+==>29-27-32-35
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2978[TINKERPOP-2978],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#all-step[all()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#any-step[any()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#product-step[product()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#merge-step[merge()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#intersect-step[intersect()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#combine-step[combine()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#conjoin-step[conjoin()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#difference-step[difference()-step],
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#disjunct-step[disjunct()-step]
+
+==== Date Manipulation Steps
+
+Date manipulations in Gremlin queries were only possible using closures, which may or may not be supported by
+different providers. In 3.7.1, we introduce the `asDate()`, `dateAdd` and `dateDiff` steps aimed to replace the usage of closure.
+
+The following example demonstrates usage of newly introduced steps:
+
+[source,text]
+----
+gremlin> g.inject("2023-08-02T00:00:00Z").asDate().dateAdd(DT.day, 7).dateDiff(datetime("2023-08-02T00:00:00Z"))
+==>604800
+----
+
+See: link:https://tinkerpop.apache.org/docs/x.y.z/reference/#asDate-step[asDate()-step]
+See: link:https://tinkerpop.apache.org/docs/x.y.z/reference/#dateAdd-step[dateAdd()-step]
+See: link:https://tinkerpop.apache.org/docs/x.y.z/reference/#dateDiff-step[dateDiff()-step]
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2979[TINKERPOP-2979]
+
+===== `datetime()` for Current Server Time
+
+Function `datetime()` extended to return current server time when used without argument.
+
+[source,text]
+----
+gremlin> datetime().toGMTString()
+==>13 Oct 2023 20:44:20 GMT
+----
+
+=== Upgrading for Providers
+
+==== Graph System Providers
+
+===== MultiProperty and MetaProperty Test Tags
+
+The `@MultiMetaProperties` tag signified Gherkin feature tests that were using multi-properties and/or meta-properties.
+The features were originally combined as a single tag because tests that had the tag used the crew graph for testing.
+As time has gone on, some tests have used the empty graph and inserted their own test data that uses one or the other
+feature. In an effort to better allow graphs to support one feature or the other and to test them the single tag has
+been split into two tags: `@MultiProperties` and `@MetaProperties`. The original `@MultiMetaProperties` tag has been
+removed.
+
+===== InsertionOrderingRequired Test Tag
+
+Added a new `@InsertionOrderingRequired` tag which signifies Gherkin feature tests which are reliant on the graph system predictably returning results (vertices, edges, properties) in the same order in which they were inserted into the graph. These tests should be skipped by any graph which does not guarantee such ordering.
+
+==== Graph Driver Providers
+
+
+
+
+== TinkerPop 3.7.0
+
+*Release Date: July 31, 2023*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.7.0/CHANGELOG.asciidoc#release-3-7-0[changelog] for a complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+==== String concat() Step
+
+String manipulations in Gremlin queries were only possible using closures, which may or may not be supported by
+different providers. In 3.7.0, we introduce the `concat()`-step as the beginning of a series of string manipulation steps
+aimed to replace the usage of closure.
+
+The following example demonstrates the use of a closure to add a new vertex with a label like an existing vertex but
+with some prefix attached:
+
+[source,text]
+----
+gremlin> g.V(1).map{"prefix_" + it.get().label}.as('a').addV(select('a'))
+==>v[13]
+gremlin> g.V(13).label()
+==>prefix_person
+----
+
+With `concat()` step this operation can be performed with standard Gremlin syntax:
+
+[source,text]
+----
+gremlin> g.addV(constant("prefix_").concat(__.V(1).label()))
+==>v[14]
+gremlin> g.V(14).label()
+==>prefix_person
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2672[TINKERPOP-2672]
+
+==== union() Start Step
+
+The `union()`-step could only be used mid-traversal after a start step. The typical workaround for this issue was to
+use `inject()` with a dummy value to start the traversal and then utilize `union()`:
+
+[source,text]
+----
+gremlin> g.inject(0).union(V().has('name','vadas'),
+......1>                   V().has('software','name','lop').in('created')).
+......2>   values('name')
+==>vadas
+==>marko
+==>josh
+==>peter
+----
+
+As of this version, `union()` can be used more directly to avoid the workaround:
+
+[source,text]
+----
+gremlin> g.union(V().has('name','vadas'),
+......1>         V().has('software','name','lop').in('created')).
+......2>   values('name')
+==>vadas
+==>marko
+==>josh
+==>peter
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2873[TINKERPOP-2873]
+
+==== Map and Cardinality
+
+Relatively recent changes to the Gremlin language have allowed properties to be set by way of a `Map`. As it pertains
+to vertices, a `Map` can be given to `mergeV()` and `property()` steps. The limitation was that setting `Cardinality`
+with this syntax was not possible without reverting back to `property()` steps that took a `Cardinality` as an argument
+in some way. The following paragraphs show how changes for in 3.6.5 make this syntax much better for multi-properties.
+
+The `mergeV()` step makes it much easier to write upsert-like traversals. Of course, if you had a graph that required
+the use of multi-properties, some of the ease of `mergeV()` was lost. It typically meant falling back to traversals
+using `sideEffect()` or similar direct uses of `property()` to allow it to work properly:
+
+[source,groovy]
+----
+g.mergeV([(T.id): '1234']).
+  option(onMatch, sideEffect(property(single,'age', 20).
+                             property(set,'city','miami')).constant([:]))
+----
+
+For this version, `mergeV()` gets two new bits of syntax. First, it is possible to individually define the cardinality
+for each property value in the `Map` for `onCreate` or `onMerge` events. Therefore, the above example could be written
+as:
+
+[source,text]
+----
+gremlin> g.addV().property(id,1234).property('age',19).property(set, 'city', 'detroit')
+==>v[1234]
+gremlin> g.mergeV([(T.id): 1234]).
+......1>   option(onMatch, ['age': single(20), 'city': set('miami')])
+==>v[1234]
+gremlin> g.V(1234).valueMap()
+==>[city:[detroit,miami],age:[20]]
+----
+
+The other option available is to provide a default `Cardinality` to the `option()` as follows, continuing from the
+previous example:
+
+[source,text]
+----
+gremlin> g.mergeV([(T.id): 1234]).
+......1>     option(onMatch, ['age': 21, 'city': set('orlando')], single)
+==>v[1234]
+gremlin> g.mergeV([(T.id): 1234]).
+......1>     option(onMatch, ['age': 22, 'city': set('boston')], single)
+==>v[1234]
+gremlin> g.V(1234).valueMap()
+==>[city:[detroit,miami,orlando,boston],age:[22]]
+----
+
+In the above example, any property value that does not have its cardinality explicitly defined, will be assumed to be
+the cardinality of the argument specified.
+
+For `property(Map)` the `Cardinality` could be set universally for the `Map` with `property(Cardinality, Map)` but
+there was no mechanism to set that value individually. Using the same pattern above and constructing a
+`CardinalityValue` now allows this possibility.
+
+[source,text]
+----
+gremlin> g.addV().property(id,1234).property('age',19).property(set, 'city', 'detroit')
+==>v[1234]
+gremlin> g.V(1234).property(['age': 20, 'city': set('miami')])
+==>v[1234]
+gremlin> g.V(1234).property(['age': single(21), 'city': set('orlando')])
+==>v[1234]
+gremlin> g.V(1234).property(single, ['age': 21, 'city': set('boston')])
+==>v[1234]
+gremlin> g.V(1234).valueMap()
+==>[city:[detroit,miami,orlando,boston],age:[21]]
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2957[TINKERPOP-2957]
+
+==== TinkerGraph Transactions
+
+Previously, there was no reference implementation provided for the `Transaction` API as this feature wasn't supported by
+TinkerGraph. Users were instead directed towards the Neo4jGraph provided in `neo4j-gremlin` if they wanted to get access
+to a `Graph` implementation that supported transactions. Unfortunately, the maintenance around this plugin has largely
+been abandoned and is only compatible with Neo4j version 3.4, which reached end of life in March 2020.
+
+As of this version, we are introducing the transactional TinkerGraph, `TinkerTransactionGraph`, which is TinkerGraph with
+transaction capabilities. The `TinkerTransactionGraph` has `read committed` isolation level, which is the same as the
+Neo4jGraph provided in `neo4j-gremlin`. Only `ThreadLocal` transactions are implemented, therefore embedded graph
+transactions may not be fully supported. These transaction semantics may not fit the use case for some production
+scenarios that require strict ACID-like transactions. Therefore, it is recommended that TinkerTransactionGraph be used
+as a Graph for test environments where you still require support for transactions.
+
+===== Usage examples
+
+To use `TinkerTransactionGraph` remotely, start a Gremlin Server with the included `gremlin-server-transaction.yaml`
+config file.
+
+[source,bash]
+----
+bin/gremlin-server.sh conf/gremlin-server-transaction.yaml
+----
+
+Then to connect with Java:
+
+[source,java]
+----
+GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using("localhost",8182,"g")); <1>
+
+GraphTraversalSource gtx = g.tx().begin(); <2>
+try {
+    gtx.addV('test1').iterate(); <3>
+    gtx.addV('test2').iterate(); <3>
+
+    gtx.tx().commit(); <4>
+} catch (Exception ex) {
+    gtx.tx().rollback(); <5>
+}
+----
+
+<1> Create connection to Gremlin Server with transaction enabled graph.
+<2> Spawn a GraphTraversalSource with opened transaction.
+<3> Make some updates to graph.
+<4> Commit all changes.
+<5> Rollback all changes on error.
+
+One can also use the remote TinkerTransactionGraph in Gremlin Console:
+
+[source,text]
+----
+gremlin> :remote connect tinkerpop.server conf/remote.yaml session <1>
+==>Configured localhost/127.0.0.1:8182-[2e70bf11-12f7-4dfe-8a5e-a3d57f0df304]
+gremlin> g = traversal().withRemote(DriverRemoteConnection.using("localhost",8182,"g"))
+==>graphtraversalsource[emptygraph[empty], standard]
+gremlin> gtx = g.tx().begin() <2>
+==>graphtraversalsource[emptygraph[empty], standard]
+gremlin> gtx.addV('test').property('name', 'one')
+==>v[0]
+gremlin> gtx.V().valueMap()
+==>[name:[one]]
+gremlin> g.V().valueMap()
+gremlin> gtx.tx().commit()
+==>null
+gremlin> g.V().valueMap() <3>
+==>[name:[one]]
+gremlin> g.V()
+==>v[0]
+gremlin> gtx = g.tx().begin() <4>
+==>graphtraversalsource[emptygraph[empty], standard]
+gremlin> gtx.addV('test').property('name', 'two')
+==>v[2]
+gremlin> gtx.V().valueMap()
+==>[name:[one]]
+==>[name:[two]]
+gremlin> g.V().valueMap()
+==>[name:[one]]
+gremlin> gtx.tx().rollback()
+==>null
+gremlin> g.V().valueMap() <5>
+==>[name:[one]]
+----
+
+<1> Open remote Console session and spawn remote graph traversal source for the empty TinkerTransactionGraph.
+<2> Spawn a GraphTraversalSource by opening a transaction.
+<3> The vertex is added in the remote graph until we commit the transaction (which automatically closes the transaction).
+<4> Spawn another GraphTraversalSource by opening a new transaction.
+<5> The second vertex will not bed added to the remote graph since we rolled back the change
+
+To use the embedded TinkerTransactionGraph in Gremlin Console:
+
+[source,text]
+----
+gremlin> graph = TinkerTransactionGraph.open() <1>
+==>tinkertransactiongraph[vertices:0 edges:0]
+gremlin> g = traversal().withEmbedded(graph) <2>
+==>graphtraversalsource[tinkertransactiongraph[vertices:0 edges:0], standard]
+gremlin> g.addV('test').property('name','one')
+==>v[0]
+gremlin> g.tx().commit() <3>
+==>null
+gremlin> g.V().valueMap()
+==>[name:[one]]
+gremlin> g.addV('test').property('name','two') <4>
+==>v[2]
+gremlin> g.V().valueMap()
+==>[name:[one]]
+==>[name:[two]]
+gremlin> g.tx().rollback() <5>
+==>null
+gremlin> g.V().valueMap()
+==>[name:[one]]
+----
+
+<1> Open transactional graph.
+<2> Spawn a GraphTraversalSource with transactional graph.
+<3> Commit the add vertex operation
+<4> Add a second vertex without committing
+<5> Rollback the change
+
+Note that all embedded `TinkerTransactionGraph` remains `ThreadLocal` transactions, meaning that all traversal sources
+spawned from the graph will operate within the same transaction scope.
+
+IMPORTANT: `TinkerTransactionGraph` comes with performance and semantic limitations, where the former is expect to
+be resolved in future versions. Since its primary recommended use case is for testing these limitations should not be
+an impediment. Production use cases for TinkerGraph should generally prefer the non-transactional implementation.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2975[TINKERPOP-2975],
+link:https://tinkerpop.apache.org/docs/3.7.0/reference/#tinkergraph-gremlin-tx[Reference Documentation - TinkerGraph Transactions]
+
+==== Properties on Elements
+
+One of the peculiar aspects of using Gremlin remotely is that if you do something like `v = g.V().next()` you will
+find that the `v`, the `Vertex` object, does not have any properties associated with it, even if the database
+associates some with it. It will be a "reference" only, in that it will only have an `id` and `label`. The reason and
+history for this approach can be found on the link:https://lists.apache.org/thread/xltcon4zxnwq4fyw2r2126syyrqm8spy[dev list].
+While this has been a long-standing way TinkerPop operates, it is a confusing point for new users and often forces
+some inconvenience on folks by requiring them to alter queries to transform graph elements to other forms that can
+carry the property data (e.g. `elementMap()`).
+
+With this new release, properties are finally available on graph elements for all programming languages and are now
+returned by default for OLTP requests. Gremlin Server 3.5 and 3.6 can return properties only in some special cases.
+
+Queries still won't return properties on Elements for OLAP. It deals with references only as it always have
+irrespective of remote or local execution.
+
+Consider the following example of this functionality with Javascript:
+
+[source,javascript]
+----
+const client = new Client('ws://localhost:8182/gremlin',{traversalSource: 'gmodern'});
+await client.open();
+const result = await client.submit('g.V(1)');
+console.log(JSON.stringify(result.first()));
+await client.close();
+----
+
+The result will be different depending on the version of Gremlin Server. For 3.5/3.6:
+
+[source,json]
+----
+{"id":1,"label":"person"}
+----
+
+For 3.7:
+[source,json]
+----
+{"id":1,"label":"person","properties":{"name":[{"id":0,"label":"name","value":"marko","key":"name"}],"age":[{"id":1,"label":"age","value":29,"key":"age"}]}}
+---- 
+
+===== Enabling the previous behavior
+
+Note that drivers from earlier versions like 3.5 and 3.6 will not be able to retrieve properties on elements. Older
+drivers connecting to 3.7.x servers should disable this functionality server-side in one of two ways:
+
+*Configure Gremlin Server to not return properties* - update Gremlin Server initialization script with
+`ReferenceElementStrategy`. This configuration is essentially the one used in older versions of the server by default.
+
+[source,groovy]
+----
+globals << [g : traversal().withEmbedded(graph).withStrategies(ReferenceElementStrategy)]
+----
+
+*Disable property inclusion per request* - the `materializeProperties` has a `tokens` option for this purpose.
+
+[source,csharp]
+----
+g.With("materializeProperties", "tokens").V(1).Next()
+----
+
+===== Possible issues
+
+`ReferenceElement`-type objects are no longer returned by the server by default. When upgrading existing code to 3.7.0,
+it is possible that this change could have some impact if you directly declared use of those classes. For example:
+
+[source,java]
+----
+ReferenceVertex v = g.V().next();
+----
+
+would need to be changed to:
+
+[source,java]
+----
+Vertex v = g.V().next();
+----
+
+In other words, it would be best to code to the various structural interfaces like `Vertex` and `Edge` rather than
+specific implementations.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2824[TINKERPOP-2824]
+
+==== Gremlin.NET: Nullable Annotations
+
+Gremlin.NET now uses link:https://learn.microsoft.com/en-us/dotnet/csharp/nullable-references#nullable-variable-annotations[nullable annotations]
+to state wether an argument or a return value can be null or not. This should make it much less likely to get a
+`NullReferenceException` from Gremlin.NET.
+
+This change required to make some breaking changes but most users should not be affected by this as the breaking
+changes are limited to APIs that are mostly intended for graph driver providers.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2348[TINKERPOP-2348]
+
+==== Removed connectOnStartup javascript
+
+Removed the `connectOnStartup` option for Gremlin Javascript API to resolve potential `unhandledRejection` and race
+conditions. New `DriverRemoteConnection` objects no longer initiate connection by default at startup. Call `open()`
+explicitly if one wishes to manually connect on startup.
+
+For example:
+
+[source,javascript]
+----
+const drc = new DriverRemoteConnection(url);
+drc.open().catch(err => {
+   // Handle error upon open.
+})
+----
+
+==== Creation of New `gremlin-util` Module
+
+`gremlin-driver` has been refactored and several classes have been extracted to a new `gremlin-util` module. Any classes
+which are utilized by both `gremlin-driver` and `gremlin-server` have been extracted to `gremlin-util`. This includes
+the entire `tinkerpop.gremlin.driver.ser` and `tinkerpop.gremlin.driver.message` packages as well as
+`tinkerpop.gremlin.driver.MessageSerializer` and `tinkerpop.gremlin.driver.Tokens`. For a full list of the migrated
+classes, see: link:https://issues.apache.org/jira/browse/TINKERPOP-2819[TINKERPOP-2819].
+All migrated classes have had their packages updated to reflect this change. For these classes, packages have changed
+from `tinkerpop.gremlin.driver.*` to `tinkerpop.gremlin.util.*`. For example
+`org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1` has been updated to
+`org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1`. All imports of these classes should be updated
+to reflect this change. All server config files which declare a list of serializers should also be updated to
+reflect the new location of serializer classes.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2819[TINKERPOP-2819]
+
+==== Removal of `gremlin-driver` from `gremlin-server`
+
+`gremlin-driver` is no longer a dependency of `gremlin-server` and thus will no longer be packaged in server
+distributions. Any app which makes use of both `gremlin-driver` and `gremlin-server` will now need to directly
+include both modules.
+
+==== Serializer Renaming
+
+Serializers tended to have a standard suffix that denotes the version. It usually appears as something like "V1d0".
+The "d0" portion of this has always been a bit superfluous and was actually not used when GraphBinary was introduced,
+preferring a simple "V1". To bring greater consistency to the naming the "d0" has been dropped from all places where
+it was referenced that way.
+
+There was a bit of a misnaming in the early days of TinkerPop 3.x where typed versus untyped json was mixed up among
+the GraphSON `MessageSerializer` implementations. For GraphSON 1.0, untyped GraphSON was referred to as
+`GraphSONMessageSerializerV1d0` and typed as `GraphSONMessageSerializerGremlinV1d0`, but for version 2.0 of GraphSON,
+the idea of untyped GraphSON was left behind and so typed GraphSON became `GraphSONMessageSerializerV2d0` which
+followed to version 3.0. With the return of typed and untyped GraphSON for 3.6.5, it seemed important to unify all
+of this naming and given the previously mentioned removal of the "d0" we now have:
+
+* `GraphSONMessageSerializerV1` is now typed GraphSON 1.0
+* `GraphSONMessageSerializerGremlinV1d0` is removed.
+* `GraphSONUntypedMessageSerializerV1` is now untyped GraphSON 1.0
+* `GraphSONMessageSerializerV2` is now typed GraphSON 2.0
+* `GraphSONMessageSerializerGremlinV2d0` is removed - it was deprecated in 3.4.0 actually and served little purpose
+* `GraphSONUntypedMessageSerializerV2` is now untyped GraphSON 2.0
+* `GraphSONMessageSerializerV3` is typed GraphSON 3.0 as it always has been
+* `GraphSONUntypedMessageSerializerV3` is untyped GraphSON 3.0 which is newly added
+
+==== Building and Running with JDK 17
+
+You can now run TinkerPop with Java 17. Be advised that there are some issues with reflection and so you may need to
+either --add-opens or --add-exports certain modules to enable it to work with Java 17. This mostly affects the Kryo
+serialization library which is used with OLAP. If you use OLTP, then you may not need to add any of these options to
+the JVM. The following are only examples used by TinkerPop's automated tests and are placed here for convenience.
+
+[source,text]
+----
+    --add-opens=java.base/java.io=ALL-UNNAMED
+    --add-opens=java.base/java.nio=ALL-UNNAMED
+    --add-opens=java.base/sun.nio.cs=ALL-UNNAMED
+    --add-opens=java.base/java.lang=ALL-UNNAMED
+    --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+    --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+    --add-opens=java.base/java.util=ALL-UNNAMED
+    --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+    --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
+    --add-opens=java.base/java.net=ALL-UNNAMED
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2703[TINKERPOP-2703]
+
+=== Upgrading for Providers
+
+==== Graph Driver Providers
+
+===== Gremlin.NET: Nullable Reference Types
+
+Enabling nullable reference types comes with some breaking changes in Gremlin.NET which can affect driver providers.
+
+GraphBinary APIs changed to make better use of nullable reference types. Instead of one method `WriteValueAsync` and
+one method `ReadValueAsync`, there are now methods `WriteNullableValueAsync` and `ReadNullableValueAsync` that allow
+`null` values and methods `WriteNonNullableValueAsync` and `ReadNonNullableValueAsync` that do not allow `null` values.
+
+Some `set` property accessors were removed from some pure data classes in the `Structure` and the `Driver.Messages`
+namespaces to initialize these properties directly from the constructor which ensures that they are really not `null`.
+We also used this opportunity to convert some of these pure data classes into a `record`.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2348[TINKERPOP-2348]
+
+==== Graph System Providers
+
+===== Reworked Gremlin Socket Server
+
+The `SimpleSocketServer` from `gremlin-driver` has been brought into a new module `gremlin-tools/gremlin-socket-server`
+and it has been adapted to be usable by all drivers for testing. See more about creating gremlin socket server tests
+link:https://tinkerpop.apache.org/docs/x.y.z/dev/developer/#gremlin-socket-server-tests[here].
+
+===== Mid-traversal E()
+
+Traversals now support mid-traversal E()-steps.
+
+Prior to this change you were limited to using E()-step only at the start of traversal, but now you can this step in
+the middle. This improvement makes it easier for users to build certain types of queries. For example, get edges with
+label knows, if there is none then add new one between josh and vadas.
+
+`g.inject(1).coalesce(E().hasLabel("knows"), addE("knows").from(V().has("name","josh")).to(V().has("name","vadas")))`
+
+Another reason is to make E() and V() steps equivalent in terms of use in the middle of traversal.
+
+See link:https://issues.apache.org/jira/browse/TINKERPOP-2798[TINKERPOP-2798]
+
+===== PBiPredicate interface
+
+Custom predicates used in `P` now should implement `PBiPredicate` interface.
+
+It allows to set the name of the predicate that will be used for serialization by overriding `getPredicateName`.
+In previous version `toString` used for this.
+
+In most cases it should be enough just to replace `BiPredicate` with `PBiPredicate` in predicate declaration.
+
+See link:https://issues.apache.org/jira/browse/TINKERPOP-2949[TINKERPOP-2949]
diff --git a/docs/static/images/furnace-boxes.png b/docs/static/images/furnace-boxes.png
new file mode 100644
index 0000000..53bea1b
--- /dev/null
+++ b/docs/static/images/furnace-boxes.png
Binary files differ
diff --git a/docs/static/images/future-biggremlin.png b/docs/static/images/future-biggremlin.png
new file mode 100644
index 0000000..9df549d
--- /dev/null
+++ b/docs/static/images/future-biggremlin.png
Binary files differ
diff --git a/docs/static/images/future-cyborggremlin.png b/docs/static/images/future-cyborggremlin.png
new file mode 100644
index 0000000..45c4bee
--- /dev/null
+++ b/docs/static/images/future-cyborggremlin.png
Binary files differ
diff --git a/docs/static/images/future-firegremlin.png b/docs/static/images/future-firegremlin.png
new file mode 100644
index 0000000..5edb888
--- /dev/null
+++ b/docs/static/images/future-firegremlin.png
Binary files differ
diff --git a/docs/static/images/future-gremzilla.png b/docs/static/images/future-gremzilla.png
new file mode 100644
index 0000000..7fbda73
--- /dev/null
+++ b/docs/static/images/future-gremzilla.png
Binary files differ
diff --git a/docs/static/images/future-lavagremlin.png b/docs/static/images/future-lavagremlin.png
new file mode 100644
index 0000000..c6089b8
--- /dev/null
+++ b/docs/static/images/future-lavagremlin.png
Binary files differ
diff --git a/docs/static/images/future-noodles.png b/docs/static/images/future-noodles.png
new file mode 100644
index 0000000..e37df75
--- /dev/null
+++ b/docs/static/images/future-noodles.png
Binary files differ
diff --git a/docs/static/images/future-raygremlin.png b/docs/static/images/future-raygremlin.png
new file mode 100644
index 0000000..51a62a5
--- /dev/null
+++ b/docs/static/images/future-raygremlin.png
Binary files differ
diff --git a/docs/static/images/future-robogremlin.png b/docs/static/images/future-robogremlin.png
new file mode 100644
index 0000000..1bfc4a8
--- /dev/null
+++ b/docs/static/images/future-robogremlin.png
Binary files differ
diff --git a/docs/static/images/future-spidergremlin.png b/docs/static/images/future-spidergremlin.png
new file mode 100644
index 0000000..4e75bd5
--- /dev/null
+++ b/docs/static/images/future-spidergremlin.png
Binary files differ
diff --git a/docs/static/images/future-squirrelgremlin.png b/docs/static/images/future-squirrelgremlin.png
new file mode 100644
index 0000000..92cf2dd
--- /dev/null
+++ b/docs/static/images/future-squirrelgremlin.png
Binary files differ
diff --git a/docs/static/images/future-whale.png b/docs/static/images/future-whale.png
new file mode 100644
index 0000000..7a2eb64
--- /dev/null
+++ b/docs/static/images/future-whale.png
Binary files differ
diff --git a/docs/static/images/gremlin-medal.png b/docs/static/images/gremlin-medal.png
new file mode 100644
index 0000000..76033dd
--- /dev/null
+++ b/docs/static/images/gremlin-medal.png
Binary files differ
diff --git a/docs/static/images/gremlin-neptune.png b/docs/static/images/gremlin-neptune.png
new file mode 100644
index 0000000..99b004f
--- /dev/null
+++ b/docs/static/images/gremlin-neptune.png
Binary files differ
diff --git a/docs/static/images/gremlin-octocat.png b/docs/static/images/gremlin-octocat.png
new file mode 100644
index 0000000..bcd8759
--- /dev/null
+++ b/docs/static/images/gremlin-octocat.png
Binary files differ
diff --git a/docs/static/images/gremlin-zamfir.png b/docs/static/images/gremlin-zamfir.png
new file mode 100644
index 0000000..e9e6822
--- /dev/null
+++ b/docs/static/images/gremlin-zamfir.png
Binary files differ
diff --git a/docs/static/images/rexster-diver.png b/docs/static/images/rexster-diver.png
new file mode 100644
index 0000000..809c9e1
--- /dev/null
+++ b/docs/static/images/rexster-diver.png
Binary files differ
diff --git a/docs/static/images/rexster-pulls.png b/docs/static/images/rexster-pulls.png
new file mode 100644
index 0000000..6f43cb4
--- /dev/null
+++ b/docs/static/images/rexster-pulls.png
Binary files differ
diff --git a/gremlin-annotations/pom.xml b/gremlin-annotations/pom.xml
index 4156bcf..caebc18 100644
--- a/gremlin-annotations/pom.xml
+++ b/gremlin-annotations/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-annotations</artifactId>
@@ -138,7 +138,7 @@
         <profile>
             <id>jdk11</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[11,18)</jdk>
             </activation>
             <build>
                 <plugins>
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 822b1cb..df59f85 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-archetype-dsl</artifactId>
diff --git a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
index 1dabb27..c37584d 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
@@ -73,7 +73,7 @@
         <profile>
             <id>jdk11</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[11,18)</jdk>
             </activation>
             <build>
                 <plugins>
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 10f6263..1433d65 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-archetype-server</artifactId>
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
index 2e57f1c..d18e8e3 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
@@ -83,7 +83,7 @@
         <profile>
             <id>jdk11</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[11,18)</jdk>
             </activation>
             <build>
                 <plugins>
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
index 3ba912d..9d5278b 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
@@ -28,7 +28,7 @@
                org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-modern.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
 metrics: {
   slf4jReporter: {enabled: true, interval: 180000}}
 strictTransactionManagement: false
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index 7470061..f417a9a 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-archetype-tinkergraph</artifactId>
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
index 27f3209..9bd2658 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
@@ -67,7 +67,7 @@
         <profile>
             <id>jdk11</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[11,18)</jdk>
             </activation>
             <build>
                 <plugins>
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 5415165..57409cf 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-archetype</artifactId>
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index c53ff42..e70ea0a 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.6.8-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.7.3-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
diff --git a/gremlin-console/conf/remote-objects.yaml b/gremlin-console/conf/remote-objects.yaml
index 70eb0fb..608f2a7 100644
--- a/gremlin-console/conf/remote-objects.yaml
+++ b/gremlin-console/conf/remote-objects.yaml
@@ -34,4 +34,4 @@
 
 hosts: [localhost]
 port: 8182
-serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
\ No newline at end of file
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
\ No newline at end of file
diff --git a/gremlin-console/conf/remote-secure.yaml b/gremlin-console/conf/remote-secure.yaml
index a29d99a..61ce00f 100644
--- a/gremlin-console/conf/remote-secure.yaml
+++ b/gremlin-console/conf/remote-secure.yaml
@@ -31,4 +31,4 @@
 connectionPool: {
   enableSsl: true,
   sslEnabledProtocols: [TLSv1.2] }
-serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
\ No newline at end of file
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
\ No newline at end of file
diff --git a/gremlin-console/conf/remote.yaml b/gremlin-console/conf/remote.yaml
index 1a43250..e0ac5c0 100644
--- a/gremlin-console/conf/remote.yaml
+++ b/gremlin-console/conf/remote.yaml
@@ -31,4 +31,4 @@
 
 hosts: [localhost]
 port: 8182
-serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 412b56c..024bea9 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-console</artifactId>
     <name>Apache TinkerPop :: Gremlin Console</name>
@@ -139,6 +139,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-cli-picocli</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <directory>${basedir}/target</directory>
@@ -291,6 +296,10 @@
                                     <file>src/main/static/licenses/slf4j</file>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                    <resource>META-INF/licenses/treelayout</resource>
+                                    <file>src/main/static/licenses/treelayout</file>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
                                     <resource>META-INF/licenses/logback</resource>
                                     <file>src/main/static/licenses/logback</file>
                                 </transformer>
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy
index 0fee402..f155024 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Colorizer.groovy
@@ -19,7 +19,7 @@
 
 package org.apache.tinkerpop.gremlin.console;
 
-import org.codehaus.groovy.tools.shell.AnsiDetector
+import org.apache.groovy.groovysh.AnsiDetector
 import org.fusesource.jansi.Ansi
 import org.fusesource.jansi.AnsiConsole
 
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index f5c681f..b54396b 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -23,12 +23,16 @@
 import jline.TerminalFactory
 import jline.console.history.FileHistory
 
+import org.apache.groovy.groovysh.ExitNotification
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.InteractiveShellRunner
+import org.apache.groovy.groovysh.commands.SetCommand
 import org.apache.tinkerpop.gremlin.console.commands.BytecodeCommand
+import org.apache.tinkerpop.gremlin.console.commands.ClsCommand
 import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
 import org.apache.tinkerpop.gremlin.console.commands.InstallCommand
 import org.apache.tinkerpop.gremlin.console.commands.PluginCommand
 import org.apache.tinkerpop.gremlin.console.commands.RemoteCommand
-import org.apache.tinkerpop.gremlin.console.commands.ClsCommand
 import org.apache.tinkerpop.gremlin.console.commands.SubmitCommand
 import org.apache.tinkerpop.gremlin.console.commands.UninstallCommand
 import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader
@@ -37,11 +41,7 @@
 import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException
 import org.apache.tinkerpop.gremlin.process.traversal.Failure
-import org.apache.tinkerpop.gremlin.process.traversal.Step
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_LP_NL_O_P_S_SE_SL_Traverser
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation
 import org.apache.tinkerpop.gremlin.structure.Edge
@@ -49,11 +49,7 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.util.Gremlin
 import org.apache.tinkerpop.gremlin.util.iterator.ArrayIterator
-import org.codehaus.groovy.tools.shell.ExitNotification
-import org.codehaus.groovy.tools.shell.Groovysh
 import org.codehaus.groovy.tools.shell.IO
-import org.codehaus.groovy.tools.shell.InteractiveShellRunner
-import org.codehaus.groovy.tools.shell.commands.SetCommand
 import org.fusesource.jansi.Ansi
 import sun.misc.Signal
 import sun.misc.SignalHandler
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy
index 9782237..f5a65e6 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovysh.groovy
@@ -19,15 +19,17 @@
 package org.apache.tinkerpop.gremlin.console
 
 import groovy.transform.ThreadInterrupt
+import org.apache.groovy.groovysh.Command
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.ParseCode
+import org.apache.groovy.groovysh.Parser
+import org.apache.groovy.groovysh.util.CommandArgumentParser
+import org.apache.groovy.groovysh.util.ScriptVariableAnalyzer
 import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
 import org.codehaus.groovy.control.CompilerConfiguration
+import org.codehaus.groovy.control.MultipleCompilationErrorsException
 import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
-import org.codehaus.groovy.tools.shell.Command
-import org.codehaus.groovy.tools.shell.Groovysh
 import org.codehaus.groovy.tools.shell.IO
-import org.codehaus.groovy.tools.shell.ParseCode
-import org.codehaus.groovy.tools.shell.Parser
-import org.codehaus.groovy.tools.shell.util.CommandArgumentParser
 
 /**
  * Overrides the posix style parsing of Groovysh allowing for commands to parse prior to Groovy 2.4.x.
@@ -102,11 +104,44 @@
                 List<String> current = new ArrayList<String>(buffers.current())
                 current << line
 
+                String importsSpec = this.getImportStatements()
+
                 // determine if this script is complete or not - if not it's a multiline script
-                def status = parser.parse(current)
+                def status = parser.parse([importsSpec] + current)
 
                 switch (status.code) {
                     case ParseCode.COMPLETE:
+                        if (!Boolean.valueOf(getPreference(INTERPRETER_MODE_PREFERENCE_KEY, 'false')) || isTypeOrMethodDeclaration(current)) {
+                            // Evaluate the current buffer w/imports and dummy statement
+                            List buff = [importsSpec] + [ 'true' ] + current
+                            try {
+                                interp.evaluate(buff)
+                            } catch(MultipleCompilationErrorsException t) {
+                                if (isIncompleteCaseOfAntlr4(t)) {
+                                    // treat like INCOMPLETE case
+                                    buffers.updateSelected(current)
+                                    break
+                                }
+                                throw t
+                            } catch (MissingPropertyException mpe) {
+                                // Ignore any local missing properties since it doesn't affect remote execution.
+                            }
+                        } else {
+                            // Evaluate Buffer wrapped with code storing bounded vars
+                            try {
+                                evaluateWithStoredBoundVars(importsSpec, current)
+                            } catch(MultipleCompilationErrorsException t) {
+                                if (isIncompleteCaseOfAntlr4(t)) {
+                                    // treat like INCOMPLETE case
+                                    buffers.updateSelected(current)
+                                    break
+                                }
+                                throw t
+                            } catch (MissingPropertyException mpe) {
+                                // Ignore any local missing properties since it doesn't affect remote execution.
+                            }
+                        }
+
                         // concat script here because commands don't support multi-line
                         def script = String.join(Parser.getNEWLINE(), current)
                         setLastResult(mediator.currentRemote().submit([script]))
@@ -140,4 +175,48 @@
 
         maybeRecordResult(result)
     }
+
+    private Object evaluateWithStoredBoundVars(String importsSpec, List<String> current) {
+        Object result
+        String variableBlocks = null
+        // To make groovysh behave more like an interpreter, we need to retrieve all bound
+        // vars at the end of script execution, and then update them into the groovysh Binding context.
+        Set<String> boundVars = ScriptVariableAnalyzer.getBoundVars(importsSpec + Parser.NEWLINE + current.join(Parser.NEWLINE), interp.classLoader)
+        if (boundVars) {
+            variableBlocks = "$COLLECTED_BOUND_VARS_MAP_VARNAME = new HashMap();"
+            boundVars.each({ String varname ->
+                // bound vars can be in global or some local scope.
+                // We discard locally scoped vars by ignoring MissingPropertyException
+                variableBlocks += """
+try {$COLLECTED_BOUND_VARS_MAP_VARNAME[\"$varname\"] = $varname;
+} catch (MissingPropertyException e){}"""
+            })
+        }
+        // Evaluate the current buffer w/imports and dummy statement
+        List<String> buff
+        if (variableBlocks) {
+            buff = [importsSpec] + ['try {', 'true'] + current + ['} finally {' + variableBlocks + '}']
+        } else {
+            buff = [importsSpec] + ['true'] + current
+        }
+        interp.evaluate(buff)
+
+        if (variableBlocks) {
+            def boundVarValues = (Map<String, Object>) interp.context.getVariable(COLLECTED_BOUND_VARS_MAP_VARNAME)
+            boundVarValues.each({ String name, Object value -> interp.context.setVariable(name, value) })
+        }
+
+        return result
+    }
+
+    private boolean isIncompleteCaseOfAntlr4(MultipleCompilationErrorsException t) {
+        // TODO antlr4 parser errors pop out here - can we rework to be like antlr2?
+        (
+            (t.message.contains('Unexpected input: ') || t.message.contains('Unexpected character: ')) && !(
+                t.message.contains("Unexpected input: '}'")
+                    || t.message.contains("Unexpected input: ')'")
+                    || t.message.contains("Unexpected input: ']'")
+            )
+        )
+    }
 }
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy
index 5fc7d9a..066596f 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/PluggedIn.groovy
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.console
 
-import org.apache.tinkerpop.gremlin.console.Preferences;
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.jsr223.BindingsCustomizer
 import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
 import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer
@@ -26,7 +26,6 @@
 import org.apache.tinkerpop.gremlin.jsr223.console.ConsoleCustomizer
 import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor
-import org.codehaus.groovy.tools.shell.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 
 /**
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy
index d8c1afe..63ccfd6 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy
@@ -22,7 +22,7 @@
 import java.util.prefs.PreferenceChangeEvent
 import java.util.prefs.PreferenceChangeListener
 
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.Groovysh
 import org.codehaus.groovy.tools.shell.IO
 
 public class Preferences {
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy
index ca966e5..0a302b5 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/BytecodeCommand.groovy
@@ -18,6 +18,8 @@
  */
 package org.apache.tinkerpop.gremlin.console.commands
 
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.console.Mediator
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal
@@ -25,11 +27,9 @@
 import org.apache.tinkerpop.gremlin.structure.io.IoRegistry
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3d0
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper
 import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
 
 /**
  * Commands that help work with Gremlin bytecode.
@@ -90,7 +90,7 @@
 
     private def static createDefaultBuilder() {
         def builder = GraphSONMapper.build().
-                addCustomModule(GraphSONXModuleV3d0.build().create(false)).
+                addCustomModule(GraphSONXModuleV3.build()).
                 version(GraphSONVersion.V3_0)
 
         def loadedTinkerGraph = false
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy
index b21e0c4..a7821c9 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/ClsCommand.groovy
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.console.commands
 
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.console.Mediator
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
 
 /**
  * Clear the console.
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy
index f86042d..7716727 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/GremlinSetCommand.groovy
@@ -20,11 +20,11 @@
 
 import jline.console.completer.Completer
 
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.commands.SetCommand
-import org.codehaus.groovy.tools.shell.util.PackageHelper
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.commands.SetCommand
+import org.apache.groovy.groovysh.util.PackageHelper
+import org.apache.groovy.groovysh.util.SimpleCompleter
 import org.codehaus.groovy.tools.shell.util.Preferences
-import org.codehaus.groovy.tools.shell.util.SimpleCompletor
 
 /**
  * A Gremlin-specific implementation of the {@code SetCommand} provided by Groovy.  Didn't see another way to
@@ -79,8 +79,8 @@
         }
 
         return [
-            new SimpleCompletor(loader),
-            null
+                new SimpleCompleter(loader),
+                null
         ]
     }
 }
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy
index 9736f44..2a3f944 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/InstallCommand.groovy
@@ -18,15 +18,15 @@
  */
 package org.apache.tinkerpop.gremlin.console.commands
 
+import groovy.grape.Grape
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.console.ConsoleFs
 import org.apache.tinkerpop.gremlin.console.Mediator
 import org.apache.tinkerpop.gremlin.console.PluggedIn
-import groovy.grape.Grape
 import org.apache.tinkerpop.gremlin.groovy.util.Artifact
 import org.apache.tinkerpop.gremlin.groovy.util.DependencyGrabber
 import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
 
 /**
  * Install a dependency into the console.
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy
index 98cd7cf..38ae294 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/PluginCommand.groovy
@@ -18,10 +18,10 @@
  */
 package org.apache.tinkerpop.gremlin.console.commands
 
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.console.ConsoleFs
 import org.apache.tinkerpop.gremlin.console.Mediator
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
 
 /**
  * Activate and manage a plugin.
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
index ba98410..c25c0c4 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
@@ -18,11 +18,11 @@
  */
 package org.apache.tinkerpop.gremlin.console.commands
 
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.console.Mediator
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
 
 /**
  * Configure a remote connection to a Gremlin Server.
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy
index 5021458..a246e0e 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/SubmitCommand.groovy
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.console.commands
 
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.console.Mediator
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
 
 /**
  * Submit a script to a Gremlin Server instance.
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy
index 285a231..617064d 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/UninstallCommand.groovy
@@ -18,10 +18,10 @@
  */
 package org.apache.tinkerpop.gremlin.console.commands
 
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
 import org.apache.tinkerpop.gremlin.console.ConsoleFs
 import org.apache.tinkerpop.gremlin.console.Mediator
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
 
 /**
  * Uninstall a maven dependency from the Console's path.
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
index 44654d5..476dc7d 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
@@ -22,28 +22,28 @@
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.Host;
 import org.apache.tinkerpop.gremlin.driver.LoadBalancingStrategy;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.Result;
 import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseResult;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatus;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatus;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
 import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversal;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONUntypedMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
 import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
 import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
@@ -74,10 +74,10 @@
                     ResponseResult.class,
                     ResponseStatus.class,
                     ResponseStatusCode.class,
-                    GraphSONMessageSerializerGremlinV1d0.class,
-                    GraphSONUntypedMessageSerializerV1d0.class,
-                    GraphSONMessageSerializerV2d0.class,
-                    GraphSONMessageSerializerV3d0.class,
+                    GraphSONMessageSerializerV1.class,
+                    GraphSONUntypedMessageSerializerV1.class,
+                    GraphSONMessageSerializerV2.class,
+                    GraphSONMessageSerializerV3.class,
                     GraphBinaryMessageSerializerV1.class,
                     MessageTextSerializer.class,
                     SerializationException.class,
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
index 22ffe3c..20f20bc 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
@@ -24,10 +24,10 @@
 import org.apache.tinkerpop.gremlin.driver.RequestOptions;
 import org.apache.tinkerpop.gremlin.driver.Result;
 import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor;
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
diff --git a/gremlin-console/src/main/static/LICENSE b/gremlin-console/src/main/static/LICENSE
index 07e20c0..dbc7957 100644
--- a/gremlin-console/src/main/static/LICENSE
+++ b/gremlin-console/src/main/static/LICENSE
@@ -215,6 +215,7 @@
      minlog (com.esotericsoftware:minlog:1.3.0 - https://github.com/EsotericSoftware/minlog)
        - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.minlog
        - for details, see licenses/minlog
+     treelayout (org.abego.treelayout:org.abego.treelayout.core:1.0.3 - http://treelayout.sourceforge.net/) - for details, see licenses/treelayout
 
 ========================================================================
 MIT Licenses
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 13c3bc7..3ad0024 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,15 +18,10 @@
 Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
 
 ------------------------------------------------------------------------
-Apache Groovy 2.5.22 (AL ASF)
+Apache Groovy 4.0.9 (AL ASF)
 ------------------------------------------------------------------------
-This product includes/uses ANTLR (http://www.antlr2.org/)
-developed by Terence Parr 1989-2006
-
-This product bundles icons from the famfamfam.com silk icons set
-http://www.famfamfam.com/lab/icons/silk/
-Licensed under the Creative Commons Attribution Licence v2.5
-http://creativecommons.org/licenses/by/2.5/
+This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
+Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
 
 ------------------------------------------------------------------------
 Apache Ivy 2.5.1 (AL ASF)
@@ -91,11 +86,11 @@
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 ------------------------------------------------------------------------
-Netty 4.1.96
+Netty 4.1.101
 ------------------------------------------------------------------------
 Copyright 2014 The Netty Project
 
 ------------------------------------------------------------------------
-Objenesis 2.4 (Included through gremlin-shaded)
+Objenesis 3.3 - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.objenesis
 ------------------------------------------------------------------------
-Copyright 2006-2016 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita
diff --git a/gremlin-console/src/main/static/licenses/treelayout b/gremlin-console/src/main/static/licenses/treelayout
new file mode 100644
index 0000000..e92280d
--- /dev/null
+++ b/gremlin-console/src/main/static/licenses/treelayout
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovyshTest.groovy b/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovyshTest.groovy
new file mode 100644
index 0000000..4ecb5f5
--- /dev/null
+++ b/gremlin-console/src/test/groovy/org/apache/tinkerpop/gremlin/console/GremlinGroovyshTest.groovy
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.console
+
+import org.apache.tinkerpop.gremlin.console.commands.RemoteCommand
+import org.apache.tinkerpop.gremlin.console.jsr223.AbstractGremlinServerIntegrationTest
+import org.apache.tinkerpop.gremlin.console.jsr223.DriverRemoteAcceptor
+import org.apache.tinkerpop.gremlin.console.jsr223.MockGroovyGremlinShellEnvironment
+import org.codehaus.groovy.tools.shell.IO
+import org.junit.Test
+
+import java.nio.file.Paths
+
+class GremlinGroovyshTest extends AbstractGremlinServerIntegrationTest {
+    private IO testio
+    private ByteArrayOutputStream out
+    private ByteArrayOutputStream err
+    private GremlinGroovysh shell
+
+    @Override
+    void setUp() {
+        super.setUp()
+        out = new ByteArrayOutputStream()
+        err = new ByteArrayOutputStream()
+        testio = new IO(new ByteArrayInputStream(), out, err)
+        shell = new GremlinGroovysh(new Mediator(null), testio)
+    }
+
+    @Override
+    void tearDown() {
+        super.tearDown()
+        shell.execute(":purge preferences") // for test cases where persistent preferences (interpreterMode) are set.
+    }
+
+    @Test
+    void shouldEnableRemoteConsole() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+
+        assert (false == shell.mediator.localEvaluation)
+        assert out.toString().startsWith("All scripts will now be sent to")
+    }
+
+    @Test
+    void shouldGetSimpleResultFromRemoteConsole() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+        out.reset()
+        shell.execute("1+1")
+
+        assert ("2" == out.toString())
+    }
+
+    @Test
+    void shouldGetGremlinResultFromRemoteConsole() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+        out.reset()
+        shell.execute("g.V().count()")
+
+        assert ("0" == out.toString())
+    }
+
+    @Test
+    void shouldGetMultilineResultFromRemoteConsole() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+        out.reset()
+        shell.execute("if (true) {")
+        shell.execute("g.V().count() }")
+
+        assert ("0" == out.toString())
+    }
+
+    @Test
+    void shouldNotSubmitIncompleteLinesFromRemoteConsole() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+        shell.execute("if (0 == g.V().count()) {")
+
+        assert (0 != shell.buffers.current().size())
+    }
+
+    @Test
+    void shouldGetGremlinResultFromRemoteConsoleInInterpreterMode() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+        shell.execute(":set interpreterMode")
+        out.reset()
+        shell.execute("g.V().count()")
+
+        assert ("0" == out.toString())
+    }
+
+    @Test
+    void shouldGetMultilineResultFromRemoteConsoleInInterpreterMode() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+        shell.execute(":set interpreterMode")
+        out.reset()
+        shell.execute("if (true) {")
+        shell.execute("g.V().count() }")
+
+        assert ("0" == out.toString())
+    }
+
+    @Test
+    void shouldOnlyExecuteOnceRemoteConsoleInInterpreterMode() {
+        setupRemote(shell)
+        shell.execute(":remote console")
+        shell.execute(":set interpreterMode")
+        out.reset()
+        shell.execute("a = 1")
+
+        assert "1" == out.toString()
+    }
+
+    private def setupRemote(GremlinGroovysh shell) {
+        shell.setResultHook(handleResult)
+        shell.register(new RemoteCommand(shell, shell.mediator))
+        shell.mediator.addRemote(new DriverRemoteAcceptor(new MockGroovyGremlinShellEnvironment(shell)))
+        shell.mediator.currentRemote().connect([Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("remote.yaml").toURI()).toString()])
+
+        server.getServerGremlinExecutor().getGremlinExecutor().getScriptEngineManager().put(
+                "g",
+                server.getServerGremlinExecutor().getGraphManager().getGraph("graph").traversal())
+    }
+
+    private def handleResult = { result ->
+        if (result instanceof Iterator) {
+            Iterator resultItr = (Iterator) result
+
+            while (resultItr.hasNext()) {
+                testio.out.print(resultItr.next())
+                testio.out.flush()
+            }
+        } else if (result instanceof Number) {
+            testio.out.print((Number) result)
+            testio.out.flush()
+        } else if (result instanceof String) {
+            testio.out.print((String) result)
+            testio.out.flush()
+        }
+    }
+}
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java
index 1bf9193..1cf4a78 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/AbstractGremlinServerIntegrationTest.java
@@ -24,6 +24,7 @@
 import org.junit.Before;
 
 import java.io.InputStream;
+import java.nio.file.Paths;
 
 /**
  * Starts and stops an instance for each executed test.
@@ -31,7 +32,7 @@
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public abstract class AbstractGremlinServerIntegrationTest {
-    private GremlinServer server;
+    protected GremlinServer server;
 
     public Settings overrideSettings(final Settings settings) {
         return settings;
@@ -47,6 +48,9 @@
         final Settings settings = Settings.read(stream);
 
         final Settings overridenSettings = overrideSettings(settings);
+        String prop = Paths.get(AbstractGremlinServerIntegrationTest.class.getResource("tinkergraph-empty.properties").toURI()).toString();
+        overridenSettings.graphs.put("graph", prop);
+
         this.server = new GremlinServer(overridenSettings);
 
         server.start().join();
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
index 33499d5..57b7979 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
@@ -18,16 +18,16 @@
  */
 package org.apache.tinkerpop.gremlin.console.jsr223;
 
+import org.apache.groovy.groovysh.Groovysh;
 import org.apache.tinkerpop.gremlin.TestHelper;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.Result;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
 import org.apache.tinkerpop.gremlin.server.Settings;
 import org.apache.tinkerpop.gremlin.structure.io.Storage;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.codehaus.groovy.tools.shell.Groovysh;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
index a15857a..84f4254 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
@@ -18,10 +18,10 @@
  */
 package org.apache.tinkerpop.gremlin.console.jsr223;
 
+import org.apache.groovy.groovysh.Groovysh;
 import org.apache.tinkerpop.gremlin.TestHelper;
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
 import org.apache.tinkerpop.gremlin.structure.io.Storage;
-import org.codehaus.groovy.tools.shell.Groovysh;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java
index 9e2a024..7781d87 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptorIntegrateTest.java
@@ -20,12 +20,12 @@
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import org.apache.commons.io.input.NullInputStream;
+import org.apache.groovy.groovysh.Groovysh;
 import org.apache.tinkerpop.gremlin.console.GremlinGroovysh;
 import org.apache.tinkerpop.gremlin.console.Mediator;
 import org.apache.tinkerpop.gremlin.jsr223.console.RemoteException;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.codehaus.groovy.tools.shell.Groovysh;
 import org.codehaus.groovy.tools.shell.IO;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java
index e24b77c..b7753af 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/MockGroovyGremlinShellEnvironment.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tinkerpop.gremlin.console.jsr223;
 
+import org.apache.groovy.groovysh.Groovysh;
 import org.apache.tinkerpop.gremlin.jsr223.console.GremlinShellEnvironment;
-import org.codehaus.groovy.tools.shell.Groovysh;
 import org.codehaus.groovy.tools.shell.IO;
 
 /**
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java
index 07fd951..9b26f76 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/UtilitiesGremlinPluginTest.java
@@ -19,9 +19,9 @@
 package org.apache.tinkerpop.gremlin.console.jsr223;
 
 import org.apache.commons.io.input.NullInputStream;
+import org.apache.groovy.groovysh.Groovysh;
 import org.apache.tinkerpop.gremlin.console.PluggedIn;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.codehaus.groovy.tools.shell.Groovysh;
 import org.codehaus.groovy.tools.shell.IO;
 import org.junit.Test;
 
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml
index 68894ff..16080e7 100644
--- a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml
@@ -25,10 +25,10 @@
                org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                       # application/vnd.gremlin-v3.0+gryo-stringd
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}  # application/vnd.gremlin-v1.0+json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}         # application/json,application/vnd.gremlin-v3.0+json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}         # application/vnd.gremlin-v2.0+json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                              # application/vnd.gremlin-v3.0+gryo-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}         # application/vnd.gremlin-v1.0+json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}         # application/json,application/vnd.gremlin-v3.0+json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}         # application/vnd.gremlin-v2.0+json
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml
index 68e482f..187e2c7 100644
--- a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml
+++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/remote.yaml
@@ -17,4 +17,4 @@
 
 hosts: [localhost]
 port: 45940
-serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
\ No newline at end of file
+serializer: { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
\ No newline at end of file
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index a9a311d..61b903c 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-core</artifactId>
     <name>Apache TinkerPop :: Gremlin Core</name>
@@ -36,6 +36,14 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-configuration2</artifactId>
         </dependency>
@@ -71,15 +79,6 @@
             <artifactId>exp4j</artifactId>
             <version>${exp4j.version}</version>
         </dependency>
-        <!-- LOGGING -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
         <!-- TESTING -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
index 9a3fe30..96f5592 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
@@ -53,7 +53,9 @@
 import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
 import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
+import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.Bindings;
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
 import org.apache.tinkerpop.gremlin.process.traversal.IO;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.Operator;
@@ -66,7 +68,6 @@
 import org.apache.tinkerpop.gremlin.process.traversal.TextP;
 import org.apache.tinkerpop.gremlin.process.traversal.Translator;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
@@ -130,8 +131,8 @@
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV1d0;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV3d0;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV1;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV3;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
@@ -196,6 +197,7 @@
         CLASS_IMPORTS.add(VertexProperty.Cardinality.class);
         CLASS_IMPORTS.add(Column.class);
         CLASS_IMPORTS.add(Direction.class);
+        CLASS_IMPORTS.add(DT.class);
         CLASS_IMPORTS.add(Merge.class);
         CLASS_IMPORTS.add(Operator.class);
         CLASS_IMPORTS.add(Order.class);
@@ -228,8 +230,8 @@
         CLASS_IMPORTS.add(GraphSONVersion.class);
         CLASS_IMPORTS.add(GraphSONWriter.class);
         CLASS_IMPORTS.add(LegacyGraphSONReader.class);
-        CLASS_IMPORTS.add(GryoClassResolverV1d0.class);
-        CLASS_IMPORTS.add(GryoClassResolverV3d0.class);
+        CLASS_IMPORTS.add(GryoClassResolverV1.class);
+        CLASS_IMPORTS.add(GryoClassResolverV3.class);
         CLASS_IMPORTS.add(GryoIo.class);
         CLASS_IMPORTS.add(GryoMapper.class);
         CLASS_IMPORTS.add(GryoReader.class);
@@ -335,6 +337,7 @@
         uniqueMethods(Lambda.class).forEach(METHOD_IMPORTS::add);
         try {
             METHOD_IMPORTS.add(DatetimeHelper.class.getMethod("datetime", String.class));
+            METHOD_IMPORTS.add(DatetimeHelper.class.getMethod("datetime"));
         } catch (Exception ex) {
             throw new IllegalStateException("Could not load datetime() function to imports");
         }
@@ -347,6 +350,7 @@
         Collections.addAll(ENUM_IMPORTS, VertexProperty.Cardinality.values());
         Collections.addAll(ENUM_IMPORTS, Column.values());
         Collections.addAll(ENUM_IMPORTS, Direction.values());
+        Collections.addAll(ENUM_IMPORTS, DT.values());
         Collections.addAll(ENUM_IMPORTS, Merge.values());
         Collections.addAll(ENUM_IMPORTS, Operator.values());
         Collections.addAll(ENUM_IMPORTS, Order.values());
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java
index 6c771bd..842d4da 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngine.java
@@ -20,6 +20,7 @@
 
 import org.apache.tinkerpop.gremlin.language.grammar.GremlinAntlrToJava;
 import org.apache.tinkerpop.gremlin.language.grammar.GremlinQueryParser;
+import org.apache.tinkerpop.gremlin.language.grammar.VariableResolver;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -32,6 +33,7 @@
 import javax.script.SimpleBindings;
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Map;
 
 /**
  * A {@link GremlinScriptEngine} implementation that evaluates Gremlin scripts using {@code gremlin-language}. As it
@@ -104,7 +106,9 @@
         if (!(o instanceof GraphTraversalSource))
             throw new IllegalArgumentException("g is of type " + o.getClass().getSimpleName() + " and is not an instance of TraversalSource");
 
-        final GremlinAntlrToJava antlr = new GremlinAntlrToJava((GraphTraversalSource) o);
+        final Map<String, Object> m = context.getBindings(ScriptContext.ENGINE_SCOPE);
+        final GremlinAntlrToJava antlr = new GremlinAntlrToJava((GraphTraversalSource) o,
+                new VariableResolver.DefaultVariableResolver(m));
 
         try {
             return GremlinQueryParser.parse(script, antlr);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptChecker.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptChecker.java
index 3cea1db..d744634 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptChecker.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptChecker.java
@@ -18,6 +18,8 @@
  */
 package org.apache.tinkerpop.gremlin.jsr223;
 
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Optional;
@@ -34,15 +36,16 @@
     /**
      * An empty result whose properties return as empty.
      */
-    public static final Result EMPTY_RESULT = new Result(null, null);
+    public static final Result EMPTY_RESULT = new Result(null, null, null);
 
     /**
      * At least one of these tokens should be present somewhere in the Gremlin string for {@link #parse(String)} to
      * take any action at all.
      */
     private static final Set<String> tokens = new HashSet<>(Arrays.asList("evaluationTimeout", "scriptEvaluationTimeout",
-                                                                          "ARGS_EVAL_TIMEOUT", "ARGS_SCRIPT_EVAL_TIMEOUT",
-                                                                          "requestId", "REQUEST_ID"));
+            "ARGS_EVAL_TIMEOUT", "ARGS_SCRIPT_EVAL_TIMEOUT", "requestId", "REQUEST_ID", "materializeProperties",
+            "ARGS_MATERIALIZE_PROPERTIES"));
+
     /**
      * Matches single line comments, multi-line comments and space characters.
      * <pre>
@@ -95,24 +98,35 @@
     private static final String requestIdTokens = "[\"']requestId[\"']|(?:Tokens\\.)?REQUEST_ID";
 
     /**
+     * Regex fragment for the materializeProperties to look for. There are basically four:
+     * <ul>
+     *     <li>{@code materializeProperties} which is a string value and thus single or double quoted</li>
+     *     <li>{@code ARGS_MATERIALIZE_PROPERTIES} which is a enum type of value which can be referenced with or without a {@code Tokens} qualifier</li>
+     * </ul>
+     */
+    private static final String materializePropertiesTokens = "[\"']materializeProperties[\"']|(?:Tokens\\.)?ARGS_MATERIALIZE_PROPERTIES";
+
+    /**
      * Matches {@code .with({timeout-token},{timeout})} with a matching group on the {@code timeout}.
-     *
+     * input: g.with('materializeProperties',100)
      * <pre>
      * From https://regex101.com/
      *
-     * \.with\((?:(?:["']evaluationTimeout["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT),(?<to>\d*)(:?L|l)?)|(?:(?:["']requestId["']|(?:Tokens\.)?REQUEST_ID),["'](?<rid>.*?))["']\)
-     *
+     * \.with\((((?:["']materializeProperties["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT),(?<to>\d*)(:?L|l)?)|((?:["']materializeProperties["']|(?:Tokens\.)?ARGS_MATERIALIZE_PROPERTIES),["'](?<mp>.*?)["']?)|((?:["']requestId["']|(?:Tokens\.)?REQUEST_ID),["'](?<rid>.*?)["']))\)
+     * 
      * gm
-     * 1st Alternative \.with\((?:(?:["']evaluationTimeout["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT),(?<to>\d*)(:?L|l)?)
      * \. matches the character . with index 4610 (2E16 or 568) literally (case sensitive)
      * with matches the characters with literally (case sensitive)
      * \( matches the character ( with index 4010 (2816 or 508) literally (case sensitive)
-     * Non-capturing group (?:(?:["']evaluationTimeout["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT),(?<to>\d*)(:?L|l)?)
-     * Non-capturing group (?:["']evaluationTimeout["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT)
-     * 1st Alternative ["']evaluationTimeout["']
+     * 1st Capturing Group (((?:["']materializeProperties["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT),(?<to>\d*)(:?L|l)?)|((?:["']materializeProperties["']|(?:Tokens\.)?ARGS_MATERIALIZE_PROPERTIES),["'](?<mp>.*?)["']?)|((?:["']requestId["']|(?:Tokens\.)?REQUEST_ID),["'](?<rid>.*?)["']))
+     * 1st Alternative ((?:["']materializeProperties["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT),(?<to>\d*)(:?L|l)?)
+     * 2nd Capturing Group ((?:["']materializeProperties["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT),(?<to>\d*)(:?L|l)?)
+     * Non-capturing group (?:["']materializeProperties["']|["']scriptEvaluationTimeout["']|(?:Tokens\.)?ARGS_EVAL_TIMEOUT|(?:Tokens\.)?ARGS_SCRIPT_EVAL_TIMEOUT)
+     * 1st Alternative ["']materializeProperties["']
      * Match a single character present in the list below ["']
      * "' matches a single character in the list "' (case sensitive)
-     * evaluationTimeout matches the characters evaluationTimeout literally (case sensitive)
+     * materializeProperties
+     *  matches the characters materializeProperties literally (case sensitive)
      * Match a single character present in the list below ["']
      * "' matches a single character in the list "' (case sensitive)
      * 2nd Alternative ["']scriptEvaluationTimeout["']
@@ -137,7 +151,7 @@
      * Named Capture Group to (?<to>\d*)
      * \d matches a digit (equivalent to [0-9])
      * * matches the previous token between zero and unlimited times, as many times as possible, giving back as needed (greedy)
-     * 2nd Capturing Group (:?L|l)?
+     * 4th Capturing Group (:?L|l)?
      * ? matches the previous token between zero and one times, as many times as possible, giving back as needed (greedy)
      * 1st Alternative :?L
      * : matches the character : with index 5810 (3A16 or 728) literally (case sensitive)
@@ -145,24 +159,29 @@
      * L matches the character L with index 7610 (4C16 or 1148) literally (case sensitive)
      * 2nd Alternative l
      * l matches the character l with index 10810 (6C16 or 1548) literally (case sensitive)
-     * 2nd Alternative (?:(?:["']requestId["']|(?:Tokens\.)?REQUEST_ID),["'](?<rid>.*?))["']\)
-     * Non-capturing group (?:(?:["']requestId["']|(?:Tokens\.)?REQUEST_ID),["'](?<rid>.*?))
-     * Non-capturing group (?:["']requestId["']|(?:Tokens\.)?REQUEST_ID)
-     * 1st Alternative ["']requestId["']
-     * 2nd Alternative (?:Tokens\.)?REQUEST_ID
+     * 2nd Alternative ((?:["']materializeProperties["']|(?:Tokens\.)?ARGS_MATERIALIZE_PROPERTIES),["'](?<mp>.*?)["']?)
+     * 5th Capturing Group ((?:["']materializeProperties["']|(?:Tokens\.)?ARGS_MATERIALIZE_PROPERTIES),["'](?<mp>.*?)["']?)
+     * Non-capturing group (?:["']materializeProperties["']|(?:Tokens\.)?ARGS_MATERIALIZE_PROPERTIES)
+     * 1st Alternative ["']materializeProperties["']
+     * 2nd Alternative (?:Tokens\.)?ARGS_MATERIALIZE_PROPERTIES
      * , matches the character , with index 4410 (2C16 or 548) literally (case sensitive)
      * Match a single character present in the list below ["']
      * "' matches a single character in the list "' (case sensitive)
-     * Named Capture Group rid (?<rid>.*?)
-     * . matches any character (except for line terminators)
-     * *? matches the previous token between zero and unlimited times, as few times as possible, expanding as needed (lazy)
+     * Named Capture Group mp (?<mp>.*?)
      * Match a single character present in the list below ["']
-     * "' matches a single character in the list "' (case sensitive)
+     * 3rd Alternative ((?:["']requestId["']|(?:Tokens\.)?REQUEST_ID),["'](?<rid>.*?)["'])
+     * 7th Capturing Group ((?:["']requestId["']|(?:Tokens\.)?REQUEST_ID),["'](?<rid>.*?)["'])
      * \) matches the character ) with index 4110 (2916 or 518) literally (case sensitive)
+     * Global pattern flags
+     * g modifier: global. All matches (don't return after first match)
+     * m modifier: multi line. Causes ^ and $ to match the begin/end of each line (not only begin/end of string)
      * </pre>
      */
     private static final Pattern patternWithOptions =
-            Pattern.compile("\\.with\\(((?:" + timeoutTokens + "),(?<to>\\d*)(:?L|l)?)|((?:" + requestIdTokens + "),[\"'](?<rid>.*?))[\"']\\)");
+            Pattern.compile("\\.with\\((((?:"
+                    + timeoutTokens + "),(?<to>\\d*)(:?L|l)?)|((?:"
+                    + materializePropertiesTokens + "),[\"'](?<mp>.*?)[\"']?)|((?:"
+                    + requestIdTokens + "),[\"'](?<rid>.*?)[\"']))\\)");
 
     /**
      * Parses a Gremlin script and extracts a {@code Result} containing properties that are relevant to the checker.
@@ -184,6 +203,7 @@
         // arguments given to Result class as null mean they weren't assigned (or the parser didn't find them somehow - eek!)
         Long timeout = null;
         String requestId = null;
+        String materializeProperties = null;
         do {
             // timeout is added up across all scripts
             final String to = m.group("to");
@@ -195,9 +215,13 @@
             // request id just uses the last one found
             final String rid = m.group("rid");
             if (rid != null) requestId = rid;
+
+            //materializeProperties just uses the last one found
+            final String mp = m.group("mp");
+            if (mp != null) materializeProperties = mp;
         } while (m.find());
 
-        return new Result(timeout, requestId);
+        return new Result(timeout, requestId, materializeProperties);
     }
 
     /**
@@ -206,33 +230,44 @@
     public static class Result {
         private final Long timeout;
         private final String requestId;
+        private final String materializeProperties;
 
-        private Result(final Long timeout, final String requestId) {
+        private Result(final Long timeout, final String requestId, final String materializeProperties) {
             this.timeout = timeout;
             this.requestId = requestId;
+            this.materializeProperties = materializeProperties;
         }
 
         /**
-         * Gets the value of the timeouts that were set using the {@code with()} source step. If there are multiple
-         * commands using this step, the timeouts are summed together.
+         * Gets the value of the timeouts that were set using the {@link GraphTraversal#with(String, Object)} source step.
+         * If there are multiple commands using this step, the timeouts are summed together.
          */
         public final Optional<Long> getTimeout() {
             return null == timeout ? Optional.empty() : Optional.of(timeout);
         }
 
         /**
-         * Gets the value of the request identifier supplied using the {@code with()} source step. If there are
-         * multiple commands using this step, the last usage should represent the id returned here.
+         * Gets the value of the request identifier supplied using the {@link GraphTraversal#with(String, Object)} source step.
+         * If there are multiple commands using this step, the last usage should represent the id returned here.
          */
         public Optional<String> getRequestId() {
             return null == requestId ? Optional.empty() : Optional.of(requestId);
         }
 
+        /**
+         * Gets the value of the materializeProperties supplied using the {@link GraphTraversal#with(String, Object)} source step.
+         * If there are multiple commands using this step, the last usage should represent the value returned here.
+         */
+        public Optional<String> getMaterializeProperties() {
+            return null == materializeProperties ? Optional.empty() : Optional.of(materializeProperties);
+        }
+
         @Override
         public String toString() {
             return "GremlinScriptChecker.Result{" +
                     "timeout=" + timeout +
                     ", requestId='" + requestId + '\'' +
+                    ", materializeProperties='" + materializeProperties + '\'' +
                     '}';
         }
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index b594937..1641d82 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@ -26,6 +26,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
@@ -111,14 +112,33 @@
         if (object instanceof Bytecode.Binding)
             return translateObject(((Bytecode.Binding) object).value());
         else if (object instanceof Bytecode) {
-            try {
-                final Traversal.Admin<?, ?> traversal = (Traversal.Admin) this.anonymousTraversalStart.invoke(null);
-                for (final Bytecode.Instruction instruction : ((Bytecode) object).getStepInstructions()) {
-                    invokeMethod(traversal, Traversal.class, instruction.getOperator(), instruction.getArguments());
+            // source based bytecode at this stage of translation could have special meaning, but generally this is
+            // going to spawn a new anonymous traversal.
+            final Bytecode bc = (Bytecode) object;
+            if (!bc.getSourceInstructions().isEmpty()) {
+                // currently, valid source instructions will be singly defined. would be odd to get this error. could
+                // be just bad construction from a language variant if it appears. maybe better as an assertion but
+                // third-party variants might benefit from this error
+                if (bc.getSourceInstructions().size() != 1) {
+                    throw new IllegalStateException("More than one source instruction defined in bytecode");
                 }
-                return traversal;
-            } catch (final Throwable e) {
-                throw new IllegalStateException(e.getMessage(), e);
+
+                final Bytecode.Instruction inst = bc.getSourceInstructions().get(0);
+                if (inst.getOperator().equals(CardinalityValueTraversal.class.getSimpleName())) {
+                    return CardinalityValueTraversal.from(inst);
+                } else {
+                    throw new IllegalStateException(String.format("Unknown source instruction for %s", inst.getOperator()));
+                }
+            } else {
+                try {
+                    final Traversal.Admin<?, ?> traversal = (Traversal.Admin) this.anonymousTraversalStart.invoke(null);
+                    for (final Bytecode.Instruction instruction : bc.getStepInstructions()) {
+                        invokeMethod(traversal, Traversal.class, instruction.getOperator(), instruction.getArguments());
+                    }
+                    return traversal;
+                } catch (final Throwable e) {
+                    throw new IllegalStateException(e.getMessage(), e);
+                }
             }
         } else if (object instanceof TraversalStrategyProxy) {
             final Map<String, Object> map = new HashMap<>();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java
new file mode 100644
index 0000000..2a3b214
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java
@@ -0,0 +1,453 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.language.grammar;
+
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
+import org.apache.tinkerpop.gremlin.process.traversal.Merge;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.lang.reflect.Array;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Map;
+import java.util.function.Function;
+
+public class ArgumentVisitor extends DefaultGremlinBaseVisitor<Object> {
+
+    private final VariableResolver resolver;
+
+    private final GremlinAntlrToJava antlr;
+
+    public ArgumentVisitor(final VariableResolver resolver, final GremlinAntlrToJava antlr) {
+        this.resolver = resolver;
+        this.antlr = antlr;
+    }
+
+    /**
+     * Wrapper to visit function for boolean.
+     */
+    public boolean parseBoolean(final GremlinParser.BooleanArgumentContext ctx) {
+        return (boolean) visitBooleanArgument(ctx);
+    }
+
+    /**
+     * Wrapper to visit function for integer types.
+     */
+    public Number parseNumber(final GremlinParser.IntegerArgumentContext ctx) {
+        return (Number) visitIntegerArgument(ctx);
+    }
+
+    /**
+     * Wrapper to visit function for float types.
+     */
+    public Number parseNumber(final GremlinParser.FloatArgumentContext ctx) {
+        return (Number) visitFloatArgument(ctx);
+    }
+
+    /**
+     * Wrapper to visit function for string types.
+     */
+    public String parseString(final GremlinParser.StringArgumentContext ctx) {
+        return (String) visitStringArgument(ctx);
+    }
+
+    /**
+     * Wrapper to visit function for Date type.
+     */
+    public Date parseDate(final GremlinParser.DateArgumentContext ctx) {
+        return (Date) visitDateArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for object types.
+     */
+    public Object parseObject(final GremlinParser.GenericLiteralArgumentContext ctx) {
+        return visitGenericLiteralArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link Direction} types.
+     */
+    public Direction parseDirection(final GremlinParser.TraversalDirectionArgumentContext ctx) {
+        return (Direction) visitTraversalDirectionArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link Vertex} types.
+     */
+    public Vertex parseVertex(final GremlinParser.StructureVertexArgumentContext ctx) {
+        return (Vertex) visitStructureVertexArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link Order} types.
+     */
+    public Order parseOrder(final GremlinParser.TraversalOrderArgumentContext ctx) {
+        return (Order) visitTraversalOrderArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link Scope} types.
+     */
+    public Scope parseScope(final GremlinParser.TraversalScopeArgumentContext ctx) {
+        return (Scope) visitTraversalScopeArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link T} types.
+     */
+    public T parseT(final GremlinParser.TraversalTokenArgumentContext ctx) {
+        return (T) visitTraversalTokenArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link VertexProperty.Cardinality} types.
+     */
+    public VertexProperty.Cardinality parseCardinality(final GremlinParser.TraversalCardinalityArgumentContext ctx) {
+        return (VertexProperty.Cardinality) visitTraversalCardinalityArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link Merge} types.
+     */
+    public Merge parseMerge(final GremlinParser.TraversalMergeArgumentContext ctx) {
+        return (Merge) visitTraversalMergeArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link Pop} types.
+     */
+    public Pop parsePop(final GremlinParser.TraversalPopArgumentContext ctx) {
+        return (Pop) visitTraversalPopArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link DT} types.
+     */
+    public DT parseDT(final GremlinParser.TraversalDTArgumentContext ctx) {
+        return (DT) visitTraversalDTArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@link Pop} types.
+     */
+    public Column parseColumn(final GremlinParser.TraversalColumnArgumentContext ctx) {
+        return (Column) visitTraversalColumnArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@code Function} types like {@link T} and {@link Column}.
+     */
+    public Function parseFunction(final GremlinParser.TraversalFunctionArgumentContext ctx) {
+        return (Function) visitTraversalFunctionArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@code Comparator} types like {@link Order}.
+     */
+    public Comparator parseComparator(final GremlinParser.TraversalComparatorArgumentContext ctx) {
+        return (Comparator) visitTraversalComparatorArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@code Map} types.
+     */
+    public Map parseMap(final GremlinParser.GenericLiteralMapArgumentContext ctx) {
+        return (Map) visitGenericLiteralMapArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for {@code Map} types.
+     */
+    public Map parseMap(final GremlinParser.GenericLiteralMapNullableArgumentContext ctx) {
+        return (Map) visitGenericLiteralMapNullableArgument(ctx);
+    }
+
+    /**
+     * Wrapper for visit function for list types.
+     */
+    public Object[] parseObjectVarargs(final GremlinParser.GenericLiteralListArgumentContext ctx) {
+        if (ctx.genericLiteralList() != null) {
+            return antlr.genericVisitor.parseObjectList(ctx.genericLiteralList());
+        } else {
+            final Object l = visitVariable(ctx.variable());
+            if (null == l) {
+                return null;
+            } else if (l.getClass().isArray()) {
+                final int length = Array.getLength(l);
+                final Object[] result = new Object[length];
+                for (int i = 0; i < length; i++) {
+                    result[i] = Array.get(l, i);
+                }
+                return result;
+            } else if (l instanceof Iterable) {
+                return IteratorUtils.list(((Iterable<?>) l).iterator()).toArray();
+            } else {
+                return new Object[] { l };
+            }
+        }
+    }
+
+    /**
+     * Wrapper to visit function for string types.
+     */
+    public String parseString(final GremlinParser.StringNullableArgumentContext ctx) {
+        return (String) visitStringNullableArgument(ctx);
+    }
+
+    @Override
+    public Object visitBooleanArgument(final GremlinParser.BooleanArgumentContext ctx) {
+        if (ctx.booleanLiteral() != null) {
+            return antlr.genericVisitor.parseBoolean(ctx.booleanLiteral());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitIntegerArgument(final GremlinParser.IntegerArgumentContext ctx) {
+        if (ctx.integerLiteral() != null) {
+            return antlr.genericVisitor.parseIntegral(ctx.integerLiteral());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitFloatArgument(final GremlinParser.FloatArgumentContext ctx) {
+        if (ctx.floatLiteral() != null) {
+            return antlr.genericVisitor.parseFloating(ctx.floatLiteral());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitStringArgument(final GremlinParser.StringArgumentContext ctx) {
+        if (ctx.stringLiteral() != null) {
+            return antlr.genericVisitor.parseString(ctx.stringLiteral());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitStringNullableArgument(final GremlinParser.StringNullableArgumentContext ctx) {
+        if (ctx.stringNullableLiteral() != null) {
+            return antlr.genericVisitor.parseString(ctx.stringNullableLiteral());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitDateArgument(final GremlinParser.DateArgumentContext ctx) {
+        if (ctx.dateLiteral() != null) {
+            return antlr.genericVisitor.parseDate(ctx.dateLiteral());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitGenericLiteralArgument(final GremlinParser.GenericLiteralArgumentContext ctx) {
+        if (ctx.genericLiteral() != null) {
+            return antlr.genericVisitor.visitGenericLiteral(ctx.genericLiteral());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitGenericLiteralListArgument(final GremlinParser.GenericLiteralListArgumentContext ctx) {
+        if (ctx.genericLiteralList() != null) {
+            return antlr.genericVisitor.visitChildren(ctx.genericLiteralList());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalDirectionArgument(final GremlinParser.TraversalDirectionArgumentContext ctx) {
+        if (ctx.traversalDirection() != null) {
+            return TraversalEnumParser.parseTraversalDirectionFromContext(ctx.traversalDirection());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitStructureVertexArgument(final GremlinParser.StructureVertexArgumentContext ctx) {
+        if (ctx.structureVertex() != null) {
+            return antlr.structureVisitor.visitStructureVertex(ctx.structureVertex());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalOrderArgument(final GremlinParser.TraversalOrderArgumentContext ctx) {
+        if (ctx.traversalOrder() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(Order.class, ctx.traversalOrder());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalScopeArgument(final GremlinParser.TraversalScopeArgumentContext ctx) {
+        if (ctx.traversalScope() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.traversalScope());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalTokenArgument(final GremlinParser.TraversalTokenArgumentContext ctx) {
+        if (ctx.traversalToken() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(T.class, ctx.traversalToken());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalCardinalityArgument(final GremlinParser.TraversalCardinalityArgumentContext ctx) {
+        if (ctx.traversalCardinality() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(VertexProperty.Cardinality.class, ctx.traversalCardinality());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalMergeArgument(final GremlinParser.TraversalMergeArgumentContext ctx) {
+        if (ctx.traversalMerge() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(Merge.class, ctx.traversalMerge());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalPopArgument(final GremlinParser.TraversalPopArgumentContext ctx) {
+        if (ctx.traversalPop() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(Pop.class, ctx.traversalPop());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalDTArgument(final GremlinParser.TraversalDTArgumentContext ctx) {
+        if (ctx.traversalDT() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(DT.class, ctx.traversalDT());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalColumnArgument(final GremlinParser.TraversalColumnArgumentContext ctx) {
+        if (ctx.traversalColumn() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(Column.class, ctx.traversalColumn());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalComparatorArgument(final GremlinParser.TraversalComparatorArgumentContext ctx) {
+        if (ctx.traversalComparator() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(Order.class, ctx.traversalComparator().traversalOrder());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalFunctionArgument(final GremlinParser.TraversalFunctionArgumentContext ctx) {
+        if (ctx.traversalFunction() != null) {
+            final GremlinParser.TraversalFunctionContext tfc = ctx.traversalFunction();
+            if (tfc.traversalToken() != null) {
+                return TraversalEnumParser.parseTraversalEnumFromContext(T.class, tfc.traversalToken());
+            } else if (tfc.traversalColumn() != null)
+                return TraversalEnumParser.parseTraversalEnumFromContext(Column.class, tfc.traversalColumn());
+            else {
+                throw new GremlinParserException("Unrecognized enum for traversal function");
+            }
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalBiFunctionArgument(final GremlinParser.TraversalBiFunctionArgumentContext ctx) {
+        if (ctx.traversalBiFunction() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(Operator.class, ctx.traversalBiFunction().traversalOperator());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitGenericLiteralMapArgument(final GremlinParser.GenericLiteralMapArgumentContext ctx) {
+        if (ctx.genericLiteralMap() != null) {
+            return antlr.genericVisitor.visitGenericLiteralMap(ctx.genericLiteralMap());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitGenericLiteralMapNullableArgument(final GremlinParser.GenericLiteralMapNullableArgumentContext ctx) {
+        if (ctx.nullLiteral() != null) {
+            return null;
+        } else if (ctx.genericLiteralMap() != null) {
+            return antlr.genericVisitor.visitGenericLiteralMap(ctx.genericLiteralMap());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitTraversalSackMethodArgument(final GremlinParser.TraversalSackMethodArgumentContext ctx) {
+        if (ctx.traversalSackMethod() != null) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(SackFunctions.Barrier.class, ctx.traversalSackMethod());
+        } else {
+            return visitVariable(ctx.variable());
+        }
+    }
+
+    @Override
+    public Object visitVariable(final GremlinParser.VariableContext ctx) {
+        return resolver.apply(ctx.getText(), ctx);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java
index 39dac7e..35660c1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java
@@ -34,7 +34,6 @@
 		final String className = (ctx != null)? ctx.getClass().getName() : "";
 		throw new UnsupportedOperationException("Method not implemented for context class " + className);
 	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -167,6 +166,10 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_E(final GremlinParser.TraversalMethod_EContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_addE_String(final GremlinParser.TraversalMethod_addE_StringContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -195,10 +198,18 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_all_P(final GremlinParser.TraversalMethod_all_PContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_and(final GremlinParser.TraversalMethod_andContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_any_P(final GremlinParser.TraversalMethod_any_PContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_as(final GremlinParser.TraversalMethod_asContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -307,6 +318,14 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_combine_Object(final GremlinParser.TraversalMethod_combine_ObjectContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_conjoin_String(final GremlinParser.TraversalMethod_conjoin_StringContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_connectedComponent(final GremlinParser.TraversalMethod_connectedComponentContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -335,6 +354,14 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_difference_Object(final GremlinParser.TraversalMethod_difference_ObjectContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_disjunct_Object(final GremlinParser.TraversalMethod_disjunct_ObjectContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_drop(final GremlinParser.TraversalMethod_dropContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -499,6 +526,10 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_intersect_Object(final GremlinParser.TraversalMethod_intersect_ObjectContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_inV(final GremlinParser.TraversalMethod_inVContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -575,6 +606,10 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_merge_Object(final GremlinParser.TraversalMethod_merge_ObjectContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_min_Empty(final GremlinParser.TraversalMethod_min_EmptyContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -643,6 +678,10 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_product_Object(final GremlinParser.TraversalMethod_product_ObjectContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalMethod_profile_Empty(final GremlinParser.TraversalMethod_profile_EmptyContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -911,6 +950,126 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalMethod_concat_Traversal_Traversal(final GremlinParser.TraversalMethod_concat_Traversal_TraversalContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_concat_String(final GremlinParser.TraversalMethod_concat_StringContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_format_String(GremlinParser.TraversalMethod_format_StringContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_asString_Empty(final GremlinParser.TraversalMethod_asString_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_asString_Scope(final GremlinParser.TraversalMethod_asString_ScopeContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_toUpper_Empty(final GremlinParser.TraversalMethod_toUpper_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_toUpper_Scope(final GremlinParser.TraversalMethod_toUpper_ScopeContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_toLower_Empty(final GremlinParser.TraversalMethod_toLower_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_toLower_Scope(final GremlinParser.TraversalMethod_toLower_ScopeContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_length_Empty(final GremlinParser.TraversalMethod_length_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_length_Scope(final GremlinParser.TraversalMethod_length_ScopeContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_trim_Empty(final GremlinParser.TraversalMethod_trim_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_trim_Scope(final GremlinParser.TraversalMethod_trim_ScopeContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_lTrim_Empty(final GremlinParser.TraversalMethod_lTrim_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_lTrim_Scope(final GremlinParser.TraversalMethod_lTrim_ScopeContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_rTrim_Empty(final GremlinParser.TraversalMethod_rTrim_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_rTrim_Scope(final GremlinParser.TraversalMethod_rTrim_ScopeContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_reverse_Empty(final GremlinParser.TraversalMethod_reverse_EmptyContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_replace_String_String(final GremlinParser.TraversalMethod_replace_String_StringContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_replace_Scope_String_String(final GremlinParser.TraversalMethod_replace_Scope_String_StringContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_split_String(final GremlinParser.TraversalMethod_split_StringContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_split_Scope_String(final GremlinParser.TraversalMethod_split_Scope_StringContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_substring_int(final GremlinParser.TraversalMethod_substring_intContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_substring_Scope_int(final GremlinParser.TraversalMethod_substring_Scope_intContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_substring_int_int(final GremlinParser.TraversalMethod_substring_int_intContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_substring_Scope_int_int(final GremlinParser.TraversalMethod_substring_Scope_int_intContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_asDate(final GremlinParser.TraversalMethod_asDateContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_dateAdd(final GremlinParser.TraversalMethod_dateAddContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_dateDiff_Traversal(final GremlinParser.TraversalMethod_dateDiff_TraversalContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMethod_dateDiff_Date(final GremlinParser.TraversalMethod_dateDiff_DateContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalScope(final GremlinParser.TraversalScopeContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -947,6 +1106,10 @@
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override public T visitTraversalDT(GremlinParser.TraversalDTContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override public T visitTraversalPredicate(final GremlinParser.TraversalPredicateContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -1187,10 +1350,6 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitStringBasedLiteral(final GremlinParser.StringBasedLiteralContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override public T visitDateLiteral(final GremlinParser.DateLiteralContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -1207,110 +1366,6 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitGremlinStringConstants(final GremlinParser.GremlinStringConstantsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitPageRankStringConstants(final GremlinParser.PageRankStringConstantsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitPeerPressureStringConstants(final GremlinParser.PeerPressureStringConstantsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitShortestPathStringConstants(final GremlinParser.ShortestPathStringConstantsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitWithOptionsStringConstants(final GremlinParser.WithOptionsStringConstantsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_pageRankStringConstants_edges(final GremlinParser.GremlinStringConstants_pageRankStringConstants_edgesContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_pageRankStringConstants_times(final GremlinParser.GremlinStringConstants_pageRankStringConstants_timesContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_pageRankStringConstants_propertyName(final GremlinParser.GremlinStringConstants_pageRankStringConstants_propertyNameContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_peerPressureStringConstants_edges(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_edgesContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_peerPressureStringConstants_times(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_timesContext ctx) { notImplemented(ctx);return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_peerPressureStringConstants_propertyName(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_propertyNameContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_shortestPathStringConstants_target(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_targetContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_shortestPathStringConstants_edges(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_edgesContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_shortestPathStringConstants_distance(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_distanceContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_shortestPathStringConstants_maxDistance(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_maxDistanceContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_shortestPathStringConstants_includeEdges(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_includeEdgesContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_tokens(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_tokensContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_none(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_noneContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_ids(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_idsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_labels(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_labelsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_keys(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_keysContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_values(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_valuesContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_all(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_allContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_indexer(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_indexerContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_list(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_listContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_withOptionsStringConstants_map(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_mapContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override public T visitPageRankStringConstant(final GremlinParser.PageRankStringConstantContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -1331,46 +1386,10 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitIoOptionsStringConstants(final GremlinParser.IoOptionsStringConstantsContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_ioOptionsStringConstants_reader(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_readerContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_ioOptionsStringConstants_writer(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_writerContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_ioOptionsStringConstants_gryo(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_gryoContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_ioOptionsStringConstants_graphson(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_graphsonContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_ioOptionsStringConstants_graphml(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_graphmlContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override public T visitConnectedComponentConstants(final GremlinParser.ConnectedComponentConstantsContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitGremlinStringConstants_connectedComponentStringConstants_component(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_componentContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_connectedComponentStringConstants_edges(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_edgesContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitGremlinStringConstants_connectedComponentStringConstants_propertyName(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_propertyNameContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override public T visitConnectedComponentStringConstant(final GremlinParser.ConnectedComponentStringConstantContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
@@ -1432,4 +1451,277 @@
 	 * {@inheritDoc}
 	 */
 	@Override public T visitTraversalMethod_mergeE_empty(final GremlinParser.TraversalMethod_mergeE_emptyContext ctx) { notImplemented(ctx); return null; }
-}
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalSourceSpawnMethod_union(final GremlinParser.TraversalSourceSpawnMethod_unionContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitBooleanArgument(final GremlinParser.BooleanArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitVariable(final GremlinParser.VariableContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIntegerArgument(final GremlinParser.IntegerArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitFloatArgument(final GremlinParser.FloatArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+    @Override public T visitStringArgument(final GremlinParser.StringArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitStringNullableArgument(final GremlinParser.StringNullableArgumentContext ctx) { notImplemented(ctx); return null;}
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T visitDateArgument(final GremlinParser.DateArgumentContext ctx) { notImplemented(ctx); return null; }
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitStringNullableLiteral(final GremlinParser.StringNullableLiteralContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionKeys(final GremlinParser. WithOptionKeysContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPageRankConstants(final GremlinParser. PageRankConstantsContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPeerPressureConstants(final GremlinParser. PeerPressureConstantsContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitShortestPathConstants(final GremlinParser. ShortestPathConstantsContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsValues(final GremlinParser. WithOptionsValuesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIoOptionsKeys(final GremlinParser. IoOptionsKeysContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIoOptionsValues(final GremlinParser. IoOptionsValuesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitConnectedComponentConstants_component(final GremlinParser. ConnectedComponentConstants_componentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitConnectedComponentConstants_edges(final GremlinParser. ConnectedComponentConstants_edgesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitConnectedComponentConstants_propertyName(final GremlinParser. ConnectedComponentConstants_propertyNameContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPageRankConstants_edges(final GremlinParser. PageRankConstants_edgesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPageRankConstants_times(final GremlinParser. PageRankConstants_timesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPageRankConstants_propertyName(final GremlinParser. PageRankConstants_propertyNameContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPeerPressureConstants_edges(final GremlinParser. PeerPressureConstants_edgesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPeerPressureConstants_times(final GremlinParser. PeerPressureConstants_timesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitPeerPressureConstants_propertyName(final GremlinParser. PeerPressureConstants_propertyNameContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitShortestPathConstants_target(final GremlinParser. ShortestPathConstants_targetContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitShortestPathConstants_edges(final GremlinParser. ShortestPathConstants_edgesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitShortestPathConstants_distance(final GremlinParser. ShortestPathConstants_distanceContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitShortestPathConstants_maxDistance(final GremlinParser. ShortestPathConstants_maxDistanceContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitShortestPathConstants_includeEdges(final GremlinParser. ShortestPathConstants_includeEdgesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_tokens(final GremlinParser. WithOptionsConstants_tokensContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_none(final GremlinParser. WithOptionsConstants_noneContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_ids(final GremlinParser. WithOptionsConstants_idsContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_labels(final GremlinParser. WithOptionsConstants_labelsContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_keys(final GremlinParser. WithOptionsConstants_keysContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_values(final GremlinParser. WithOptionsConstants_valuesContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_all(final GremlinParser. WithOptionsConstants_allContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_indexer(final GremlinParser. WithOptionsConstants_indexerContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_list(final GremlinParser. WithOptionsConstants_listContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitWithOptionsConstants_map(final GremlinParser. WithOptionsConstants_mapContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIoOptionsConstants_reader(final GremlinParser. IoOptionsConstants_readerContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIoOptionsConstants_writer(final GremlinParser. IoOptionsConstants_writerContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIoOptionsConstants_gryo(final GremlinParser. IoOptionsConstants_gryoContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIoOptionsConstants_graphson(final GremlinParser. IoOptionsConstants_graphsonContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitIoOptionsConstants_graphml(final GremlinParser. IoOptionsConstants_graphmlContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitGenericLiteralArgument(final GremlinParser.GenericLiteralArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitGenericLiteralListArgument(GremlinParser.GenericLiteralListArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitStructureVertexArgument(GremlinParser.StructureVertexArgumentContext ctx) { notImplemented(ctx);  return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalDirectionArgument(GremlinParser.TraversalDirectionArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalOrderArgument(final GremlinParser.TraversalOrderArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalScopeArgument(final GremlinParser.TraversalScopeArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalTokenArgument(final GremlinParser.TraversalTokenArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalCardinalityArgument(final GremlinParser.TraversalCardinalityArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalMergeArgument(final GremlinParser.TraversalMergeArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalPopArgument(final GremlinParser.TraversalPopArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalColumnArgument(final GremlinParser.TraversalColumnArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalComparatorArgument(final GremlinParser.TraversalComparatorArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalFunctionArgument(final GremlinParser.TraversalFunctionArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalBiFunctionArgument(final GremlinParser.TraversalBiFunctionArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override public T visitTraversalDTArgument(final GremlinParser.TraversalDTArgumentContext ctx) { notImplemented(ctx); return null; }
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T visitTraversalSackMethodArgument(final GremlinParser.TraversalSackMethodArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T visitGenericLiteralVarargs(final GremlinParser.GenericLiteralVarargsContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T visitGenericLiteralMapArgument(final GremlinParser.GenericLiteralMapArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T visitGenericLiteralMapNullableArgument(final GremlinParser.GenericLiteralMapNullableArgumentContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T visitStringLiteralVarargs(final GremlinParser.StringLiteralVarargsContext ctx) { notImplemented(ctx); return null; }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public T visitTraversalMethod_option_Merge_Map_Cardinality(final GremlinParser.TraversalMethod_option_Merge_Map_CardinalityContext ctx) { notImplemented(ctx); return null; }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java
index 78d1446..7b841de 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java
@@ -32,6 +32,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,88 +48,114 @@
      */
     public static final int TOTAL_INTEGER_RANGE_RESULT_COUNT_LIMIT = 1_000_000;
     protected final GremlinAntlrToJava antlr;
-    protected DefaultGremlinBaseVisitor<TraversalStrategy> traversalStrategyVisitor;
-
-    private static GenericLiteralVisitor instance;
-
-    private GenericLiteralVisitor() {
-        this.antlr = null;
-    }
 
     public GenericLiteralVisitor(final GremlinAntlrToJava antlr) {
         this.antlr = antlr;
     }
 
-    public static GenericLiteralVisitor instance() {
-        if (instance == null) {
-            instance = new GenericLiteralVisitor();
-        }
-
-        return instance;
+    /**
+     * Parse integral literal context and return an integral type number.
+     */
+    public Number parseIntegral(final GremlinParser.IntegerLiteralContext integerLiteral) {
+        return (Number) visitIntegerLiteral(integerLiteral);
     }
 
     /**
-     * @deprecated As of release 3.5.2, replaced by {@link #instance()}.
+     * Parse floating literal context and return a floating type number.
      */
-    @Deprecated
-    public static GenericLiteralVisitor getInstance() {
-        return instance();
+    public Number parseFloating(final GremlinParser.FloatLiteralContext floatLiteral) {
+        return (Number) visitFloatLiteral(floatLiteral);
     }
 
     /**
-     * Parse a string literal context and return the string literal
+     * Parse a string based literal context and return the string.
      */
-    public static String getStringLiteral(final GremlinParser.StringBasedLiteralContext stringLiteral) {
-        return (String) (instance().visitStringBasedLiteral(stringLiteral));
+    public String parseString(final GremlinParser.StringLiteralContext stringLiteral) {
+        return (String) visitStringLiteral(stringLiteral);
+    }
+
+    /**
+     * Parse a string based literal context and return the string.
+     */
+    public String parseString(final GremlinParser.StringNullableLiteralContext stringLiteral) {
+        return (String) visitStringNullableLiteral(stringLiteral);
+    }
+
+    /**
+     * Parse a Date based literal context and return the Date.
+     */
+    public Date parseDate(final GremlinParser.DateLiteralContext dateLiteral) {
+        return (Date) visitDateLiteral(dateLiteral);
     }
 
     /**
      * Parse a map literal context and return the map literal
      */
-    public static Map getMapLiteral(final GremlinParser.GenericLiteralMapContext mapLiteral) {
-        return (Map) (instance().visitGenericLiteralMap(mapLiteral));
+    public Map parseMap(final GremlinParser.GenericLiteralMapContext mapLiteral) {
+        return (Map) visitGenericLiteralMap(mapLiteral);
     }
 
     /**
      * Parse a boolean literal context and return the boolean literal
      */
-    public static boolean getBooleanLiteral(final GremlinParser.BooleanLiteralContext booleanLiteral) {
-        return (boolean) (instance().visitBooleanLiteral(booleanLiteral));
+    public boolean parseBoolean(final GremlinParser.BooleanLiteralContext booleanLiteral) {
+        return (boolean) visitBooleanLiteral(booleanLiteral);
     }
 
     /**
      * Parse a String literal list context and return a string array
      */
-    public static String[] getStringLiteralList(final GremlinParser.StringLiteralListContext stringLiteralList) {
-        if (stringLiteralList == null || stringLiteralList.stringLiteralExpr() == null) {
-            return new String[0];
-        }
-        return stringLiteralList.stringLiteralExpr().stringBasedLiteral()
-                .stream()
-                .filter(Objects::nonNull)
-                .map(stringLiteral -> instance().visitStringBasedLiteral(stringLiteral))
-                .toArray(String[]::new);
+    public String[] parseStringList(final GremlinParser.StringLiteralListContext stringLiteralList) {
+        return (String[]) visitStringLiteralList(stringLiteralList);
     }
 
     /**
      * Parse a generic literal list, and return an object array
      */
-    public static Object[] getGenericLiteralList(final GremlinParser.GenericLiteralListContext objectLiteralList) {
+    public Object[] parseObjectList(final GremlinParser.GenericLiteralListContext objectLiteralList) {
         if (objectLiteralList == null || objectLiteralList.genericLiteralExpr() == null) {
             return new Object[0];
         }
         return objectLiteralList.genericLiteralExpr().genericLiteral()
                 .stream()
                 .filter(Objects::nonNull)
-                .map(genericLiteral -> instance().visitGenericLiteral(genericLiteral))
+                .map(antlr.genericVisitor::visitGenericLiteral)
                 .toArray(Object[]::new);
     }
 
     /**
+     * Parse a generic literal varargs, and return an object array
+     */
+    public Object[] parseObjectVarargs(final GremlinParser.GenericLiteralVarargsContext varargsContext) {
+        if (varargsContext == null || varargsContext.genericLiteralArgument() == null) {
+            return new Object[0];
+        }
+        return varargsContext.genericLiteralArgument()
+                .stream()
+                .filter(Objects::nonNull)
+                .map(antlr.argumentVisitor::visitGenericLiteralArgument)
+                .toArray(Object[]::new);
+    }
+
+    /**
+     * Parse a string literal varargs, and return an string array
+     */
+    public String[] parseStringVarargs(final GremlinParser.StringLiteralVarargsContext varargsContext) {
+        if (varargsContext == null || varargsContext.stringNullableArgument() == null) {
+            return new String[0];
+        }
+        return varargsContext.stringNullableArgument()
+                .stream()
+                .filter(Objects::nonNull)
+                .map(antlr.argumentVisitor::parseString)
+                .toArray(String[]::new);
+    }
+
+    /**
      * Parse a TraversalStrategy literal list context and return a string array
      */
-    public static TraversalStrategy[] getTraversalStrategyList(final GremlinParser.TraversalStrategyListContext traversalStrategyListContext,
-                                                               final DefaultGremlinBaseVisitor<TraversalStrategy> traversalStrategyVisitor) {
+    public static TraversalStrategy[] parseTraversalStrategyList(final GremlinParser.TraversalStrategyListContext traversalStrategyListContext,
+                                                                 final DefaultGremlinBaseVisitor<TraversalStrategy> traversalStrategyVisitor) {
         if (traversalStrategyListContext == null || traversalStrategyListContext.traversalStrategyExpr() == null) {
             return new TraversalStrategy[0];
         }
@@ -258,16 +285,12 @@
                 return new Object[0];
             case 1:
                 // handle single generic literal
-                return visitGenericLiteral((GremlinParser.GenericLiteralContext) ctx.getChild(0));
+                return antlr.genericVisitor.visitGenericLiteral(ctx.genericLiteral(0));
             default:
                 // handle multiple generic literal separated by comma
                 final List<Object> genericLiterals = new ArrayList<>();
-                int childIndex = 0;
-                while (childIndex < ctx.getChildCount()) {
-                    genericLiterals.add(visitGenericLiteral(
-                            (GremlinParser.GenericLiteralContext) ctx.getChild(childIndex)));
-                    // skip comma
-                    childIndex += 2;
+                for (GremlinParser.GenericLiteralContext ic : ctx.genericLiteral()) {
+                    genericLiterals.add(antlr.genericVisitor.visitGenericLiteral(ic));
                 }
                 return genericLiterals.toArray();
         }
@@ -315,7 +338,7 @@
             } else if (kctx instanceof TerminalNode) {
                 key = ((TerminalNode) kctx).getText();
             } else {
-                throw new GremlinParserException("Invalid key for map" + ((ParseTree) kctx).getText());
+                throw new GremlinParserException("Invalid key for map " + ((ParseTree) kctx).getText());
             }
 
             final int valueIndex = isKeyExpression ? 4 : 2;
@@ -338,7 +361,7 @@
 
     @Override
     public Object visitStructureVertex(final GremlinParser.StructureVertexContext ctx) {
-        return StructureElementVisitor.instance().visitStructureVertex(ctx);
+        return antlr.structureVisitor.visitStructureVertex(ctx);
     }
 
     /**
@@ -455,7 +478,9 @@
      */
     @Override
     public Object visitDateLiteral(final GremlinParser.DateLiteralContext ctx) {
-        return DatetimeHelper.parse((String) visitStringLiteral(ctx.stringLiteral()));
+        if (ctx.stringArgument() == null)
+            return DatetimeHelper.datetime();
+        return DatetimeHelper.parse((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     /**
@@ -472,25 +497,6 @@
      * {@inheritDoc}
      */
     @Override
-    public Object visitStringBasedLiteral(final GremlinParser.StringBasedLiteralContext ctx) {
-        // Using Java string unescaping because it coincides with the Groovy rules:
-        // https://docs.oracle.com/javase/tutorial/java/data/characters.html
-        // http://groovy-lang.org/syntax.html#_escaping_special_characters
-        if (ctx.gremlinStringConstants() != null) {
-            return GremlinStringConstantsVisitor.instance().visitChildren(ctx);
-        }
-
-        if (ctx.NullLiteral() != null) {
-            return GremlinStringConstantsVisitor.instance().visitChildren(ctx);
-        }
-
-        return StringEscapeUtils.unescapeJava(stripQuotes(ctx.getText()));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     public Object visitStringLiteral(final GremlinParser.StringLiteralContext ctx) {
         return StringEscapeUtils.unescapeJava(stripQuotes(ctx.getText()));
     }
@@ -508,7 +514,23 @@
      */
     @Override
     public Object visitTraversalCardinality(final GremlinParser.TraversalCardinalityContext ctx) {
-        return TraversalEnumParser.parseTraversalEnumFromContext(VertexProperty.Cardinality.class, ctx);
+        // could be Cardinality.single() the method or single the enum so grab the right child index based on
+        // number of children
+        if (ctx.getChildCount() == 1) {
+            return TraversalEnumParser.parseTraversalEnumFromContext(VertexProperty.Cardinality.class, ctx);
+        } else {
+            final int idx = ctx.getChildCount() == 5 ? 1 : 0;
+            final String specifiedCard = ctx.children.get(idx).getText();
+            if (specifiedCard.endsWith(VertexProperty.Cardinality.single.name()))
+                return VertexProperty.Cardinality.single(visitGenericLiteral(ctx.genericLiteral()));
+            else if (specifiedCard.endsWith(VertexProperty.Cardinality.list.name()))
+                return VertexProperty.Cardinality.list(visitGenericLiteral(ctx.genericLiteral()));
+            else if (specifiedCard.endsWith(VertexProperty.Cardinality.set.name()))
+                return VertexProperty.Cardinality.set(visitGenericLiteral(ctx.genericLiteral()));
+            else
+                throw new GremlinParserException(String.format(
+                        "A Cardinality value not recognized: %s", specifiedCard));
+        }
     }
 
     /**
@@ -537,10 +559,7 @@
 
     @Override
     public Object visitTraversalStrategy(final GremlinParser.TraversalStrategyContext ctx) {
-        if (null == traversalStrategyVisitor)
-            traversalStrategyVisitor = new TraversalStrategyVisitor((DefaultGremlinBaseVisitor) antlr.tvisitor);
-
-        return traversalStrategyVisitor.visitTraversalStrategy(ctx);
+        return antlr.traversalStrategyVisitor.visitTraversalStrategy(ctx);
     }
 
     /**
@@ -599,17 +618,29 @@
     @Override
     public Object visitGenericLiteralCollection(final GremlinParser.GenericLiteralCollectionContext ctx) {
         final List<Object> result = new ArrayList<>(ctx.getChildCount() / 2);
-        // first child is "[", so start from 2nd child
-        int childIndex = 1;
-        final int childCount = ctx.getChildCount();
-        if (childCount > 2) {
-            while (childIndex < childCount) {
-                result.add(visitGenericLiteral((GremlinParser.GenericLiteralContext) ctx.getChild(childIndex)));
-                // comma is also child, so we need skip it.
-                childIndex += 2;
-            }
+        for (GremlinParser.GenericLiteralContext ic : ctx.genericLiteral()) {
+            result.add(antlr.genericVisitor.visitGenericLiteral(ic));
         }
         return result;
     }
 
+    @Override
+    public Object visitStringLiteralList(final GremlinParser.StringLiteralListContext ctx) {
+        if (ctx == null || ctx.stringLiteralExpr() == null) {
+            return new String[0];
+        }
+        return ctx.stringLiteralExpr().stringNullableLiteral()
+                .stream()
+                .filter(Objects::nonNull)
+                .map(this::visitStringNullableLiteral)
+                .toArray(String[]::new);
+    }
+
+    @Override
+    public Object visitStringNullableLiteral(final GremlinParser.StringNullableLiteralContext ctx) {
+        if (ctx.NullLiteral() != null)
+            return null;
+        else
+            return StringEscapeUtils.unescapeJava(stripQuotes(ctx.getText()));
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java
index cdf7274..f77e0a8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java
@@ -20,13 +20,16 @@
 
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 
 import java.util.function.Supplier;
@@ -77,6 +80,31 @@
     final Supplier<GraphTraversal<?,?>> createAnonymous;
 
     /**
+     * Parses arguments, which may or may not be variables.
+     */
+    final ArgumentVisitor argumentVisitor;
+
+    /**
+     * Parses literals.
+     */
+    final GenericLiteralVisitor genericVisitor;
+
+    /**
+     * Parses {@link TraversalStrategy} instances.
+     */
+    final TraversalStrategyVisitor traversalStrategyVisitor;
+
+    /**
+     * Parses {@link P} instances.
+     */
+    final TraversalPredicateVisitor traversalPredicateVisitor;
+
+    /**
+     * Parses structure instances like {@link Vertex}.
+     */
+    final StructureElementVisitor structureVisitor;
+
+    /**
      * Constructs a new instance and is bound to an {@link EmptyGraph}. This form of construction is helpful for
      * generating {@link Bytecode} or for various forms of testing. {@link Traversal} instances constructed from this
      * form will not be capable of iterating. Assumes that "g" is the name of the {@link GraphTraversalSource}.
@@ -94,6 +122,14 @@
     }
 
     /**
+     * Constructs a new instance that is bound to the specified {@link Graph} instance. Assumes that "g" is the name
+     * of the {@link GraphTraversalSource}.
+     */
+    public GremlinAntlrToJava(final Graph graph, final VariableResolver variableResolver) {
+        this(GraphTraversalSourceVisitor.TRAVERSAL_ROOT, graph, __::start, null, variableResolver);
+    }
+
+    /**
      * Constructs a new instance that is bound to the specified {@link GraphTraversalSource} and thus spawns the
      * {@link Traversal} from this "g" rather than from a fresh one constructed from the {@link Graph} instance.
      */
@@ -102,6 +138,15 @@
     }
 
     /**
+     * Constructs a new instance that is bound to the specified {@link GraphTraversalSource} and thus spawns the
+     * {@link Traversal} from this "g" rather than from a fresh one constructed from the {@link Graph} instance.
+     * Allows for specification of a {@link VariableResolver} to allow parameters to be resolved.
+     */
+    public GremlinAntlrToJava(final GraphTraversalSource g, final VariableResolver variableResolver) {
+        this(GraphTraversalSourceVisitor.TRAVERSAL_ROOT, g.getGraph(), __::start, g, variableResolver);
+    }
+
+    /**
      * Constructs a new instance that is bound to the specified {@link Graph} instance with an override to using
      * {@link __} for constructing anonymous {@link Traversal} instances. Assumes that "g" is the name of the
      * {@link GraphTraversalSource}.
@@ -115,7 +160,7 @@
      * {@link Traversal} from this "g" rather than from a fresh one constructed from the {@link Graph} instance.
      */
     protected GremlinAntlrToJava(final GraphTraversalSource g, final Supplier<GraphTraversal<?,?>> createAnonymous) {
-        this(GraphTraversalSourceVisitor.TRAVERSAL_ROOT, g.getGraph(), createAnonymous, g);
+        this(GraphTraversalSourceVisitor.TRAVERSAL_ROOT, g.getGraph(), createAnonymous, g, VariableResolver.NoVariableResolver.instance());
     }
 
     /**
@@ -126,19 +171,21 @@
      */
     protected GremlinAntlrToJava(final String traversalSourceName, final Graph graph,
                                  final Supplier<GraphTraversal<?,?>> createAnonymous) {
-        this(traversalSourceName, graph, createAnonymous, null);
+        this(traversalSourceName, graph, createAnonymous, null, VariableResolver.NoVariableResolver.instance());
     }
 
     /**
      * Constructs a new instance that is bound to the specified {@link Graph} instance with an override to using
      * {@link __} for constructing anonymous {@link Traversal} instances. If the {@link GraphTraversalSource} is
-     * provided then the {@link Traversal} will spawn from it as opposed to a fresh one from the {@link Graph} instance.
+     * provided then the {@link Traversal} will spawn from it as opposed to a fresh one from the {@link Graph}
+     * instance. When a {@link VariableResolver} is supplied it will attempt to resolve parameters in the Gremlin to
+     * objects.
      *
      * @param traversalSourceName The name of the traversal source which will be "g" if not specified.
      */
     protected GremlinAntlrToJava(final String traversalSourceName, final Graph graph,
                                  final Supplier<GraphTraversal<?,?>> createAnonymous,
-                                 final GraphTraversalSource g) {
+                                 final GraphTraversalSource g, final VariableResolver variableResolver) {
         this.g = g;
         this.graph = graph;
         this.gvisitor = new GraphTraversalSourceVisitor(
@@ -147,6 +194,11 @@
         this.tListVisitor = new NestedTraversalSourceListVisitor(this);
         this.createAnonymous = createAnonymous;
         this.txVisitor = new TraversalSourceTxVisitor(g, this);
+        this.traversalPredicateVisitor = new TraversalPredicateVisitor(this);
+        this.traversalStrategyVisitor = new TraversalStrategyVisitor(this);
+        this.structureVisitor = new StructureElementVisitor(this);
+        this.genericVisitor = new GenericLiteralVisitor(this);
+        this.argumentVisitor = new ArgumentVisitor(variableResolver, this);
     }
 
     /**
@@ -190,7 +242,8 @@
     /**
      * {@inheritDoc}
      */
-    @Override public Object visitQueryList(final GremlinParser.QueryListContext ctx) {
+    @Override
+    public Object visitQueryList(final GremlinParser.QueryListContext ctx) {
         return visitChildren(ctx);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinParserException.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinParserException.java
index 946e715..07530bc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinParserException.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinParserException.java
@@ -33,10 +33,10 @@
         super(message);
     }
 
-    public GremlinParserException(final int line_number, final int charPositionInLine, final String message) {
+    public GremlinParserException(final int lineNumber, final int charPositionInLine, final String message) {
         super(new StringBuilder()
                 .append("Query parsing failed at line ")
-                .append(line_number)
+                .append(lineNumber)
                 .append(", character position at ")
                 .append(charPositionInLine)
                 .append(", error message : ")
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParser.java
index a02d19f..7ab7392 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParser.java
@@ -22,17 +22,29 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.atn.PredictionMode;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
+/**
+ * Parses Gremlin strings to an {@code Object}, typically to a {@link Traversal}.
+ */
 public class GremlinQueryParser {
     private static final Logger log = LoggerFactory.getLogger(GremlinQueryParser.class);
     private static final GremlinErrorListener errorListener = new GremlinErrorListener();
 
+    /**
+     * Parse Gremlin string using a default {@link GremlinAntlrToJava} object.
+     */
     public static Object parse(final String query) {
         return parse(query, new GremlinAntlrToJava());
     }
 
+    /**
+     * Parse Gremlin string using a specified {@link GremlinAntlrToJava} object.
+     */
     public static Object parse(final String query, final GremlinVisitor<Object> visitor)  {
         final CharStream in = CharStreams.fromString(query);
         final GremlinLexer lexer = new GremlinLexer(in);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinStringConstantsVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinStringConstantsVisitor.java
deleted file mode 100644
index 18f1d36..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinStringConstantsVisitor.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.language.grammar;
-
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ConnectedComponent;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PageRank;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressure;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ShortestPath;
-import org.apache.tinkerpop.gremlin.process.traversal.IO;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.WithOptions;
-
-/**
- * Covers {@code String} oriented constants used as arguments to {@link GraphTraversal#with(String)} steps.
- */
-public class GremlinStringConstantsVisitor extends DefaultGremlinBaseVisitor<Object> {
-
-    private GremlinStringConstantsVisitor() {}
-
-    private static GremlinStringConstantsVisitor instance;
-
-    public static GremlinStringConstantsVisitor instance() {
-        if (instance == null) {
-            instance = new GremlinStringConstantsVisitor();
-        }
-        return instance;
-    }
-
-    /**
-     * @deprecated As of release 3.5.2, replaced by {@link #instance()}
-     */
-    public static GremlinStringConstantsVisitor getInstance() {
-        return instance();
-    }
-
-    @Override
-    public Object visitGremlinStringConstants(final GremlinParser.GremlinStringConstantsContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    @Override
-    public Object visitConnectedComponentStringConstant(final GremlinParser.ConnectedComponentStringConstantContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    @Override
-    public Object visitPageRankStringConstants(final GremlinParser.PageRankStringConstantsContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    @Override
-    public Object visitPeerPressureStringConstants(final GremlinParser.PeerPressureStringConstantsContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    @Override
-    public Object visitShortestPathStringConstants(final GremlinParser.ShortestPathStringConstantsContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    @Override
-    public Object visitWithOptionsStringConstants(final GremlinParser.WithOptionsStringConstantsContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    @Override
-    public Object visitIoOptionsStringConstants(final GremlinParser.IoOptionsStringConstantsContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_connectedComponentStringConstants_edges(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_edgesContext ctx) {
-        return ConnectedComponent.edges;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_connectedComponentStringConstants_component(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_componentContext ctx) {
-        return ConnectedComponent.component;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_connectedComponentStringConstants_propertyName(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_propertyNameContext ctx) {
-        return ConnectedComponent.propertyName;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_pageRankStringConstants_edges(final GremlinParser.GremlinStringConstants_pageRankStringConstants_edgesContext ctx) {
-        return PageRank.edges;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_pageRankStringConstants_times(final GremlinParser.GremlinStringConstants_pageRankStringConstants_timesContext ctx) {
-        return PageRank.times;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_pageRankStringConstants_propertyName(final GremlinParser.GremlinStringConstants_pageRankStringConstants_propertyNameContext ctx) {
-        return PageRank.propertyName;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_peerPressureStringConstants_edges(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_edgesContext ctx) {
-        return PeerPressure.edges;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_peerPressureStringConstants_times(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_timesContext ctx) {
-        return PeerPressure.times;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_peerPressureStringConstants_propertyName(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_propertyNameContext ctx) {
-        return PeerPressure.propertyName;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_shortestPathStringConstants_target(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_targetContext ctx) {
-        return ShortestPath.target;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_shortestPathStringConstants_edges(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_edgesContext ctx) {
-        return ShortestPath.edges;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_shortestPathStringConstants_distance(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_distanceContext ctx) {
-        return ShortestPath.distance;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_shortestPathStringConstants_maxDistance(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_maxDistanceContext ctx) {
-        return ShortestPath.maxDistance;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_shortestPathStringConstants_includeEdges(final GremlinParser.GremlinStringConstants_shortestPathStringConstants_includeEdgesContext ctx) {
-        return ShortestPath.includeEdges;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_tokens(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_tokensContext ctx) {
-        return WithOptions.tokens;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_none(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_noneContext ctx) {
-        return WithOptions.none;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_ids(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_idsContext ctx) {
-        return WithOptions.ids;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_labels(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_labelsContext ctx) {
-        return WithOptions.labels;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_keys(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_keysContext ctx) {
-        return WithOptions.keys;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_values(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_valuesContext ctx) {
-        return WithOptions.values;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_all(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_allContext ctx) {
-        return WithOptions.all;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_indexer(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_indexerContext ctx) {
-        return WithOptions.indexer;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_list(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_listContext ctx) {
-        return WithOptions.list;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_withOptionsStringConstants_map(final GremlinParser.GremlinStringConstants_withOptionsStringConstants_mapContext ctx) {
-        return WithOptions.map;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_ioOptionsStringConstants_reader(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_readerContext ctx) {
-        return IO.reader;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_ioOptionsStringConstants_writer(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_writerContext ctx) {
-        return IO.writer;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_ioOptionsStringConstants_gryo(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_gryoContext ctx) {
-        return IO.gryo;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_ioOptionsStringConstants_graphson(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_graphsonContext ctx) {
-        return IO.graphson;
-    }
-
-    @Override
-    public Object visitGremlinStringConstants_ioOptionsStringConstants_graphml(final GremlinParser.GremlinStringConstants_ioOptionsStringConstants_graphmlContext ctx) {
-        return IO.graphml;
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java
index 8cf90af..21803b1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/NoOpTerminalVisitor.java
@@ -21,7 +21,11 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+
+import java.util.function.Supplier;
 
 /**
  * {@inheritDoc}
@@ -35,6 +39,16 @@
         super();
     }
 
+    public NoOpTerminalVisitor(final Graph graph, final VariableResolver variableResolver) {
+        super(graph, variableResolver);
+    }
+
+    public NoOpTerminalVisitor(final String traversalSourceName, final Graph graph,
+                               final Supplier<GraphTraversal<?,?>> createAnonymous,
+                               final GraphTraversalSource g, final VariableResolver variableResolver) {
+        super(traversalSourceName, graph, createAnonymous, g, variableResolver);
+    }
+
     /**
      * Returns {@link Bytecode} of {@link Traversal} or {@link GraphTraversalSource}, overriding any terminal step
      * operations to prevent them from being executed using the {@link TraversalTerminalMethodVisitor} to append
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ParseTreeContextCastHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ParseTreeContextCastHelper.java
index 18bbe0f..5d665ae 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ParseTreeContextCastHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ParseTreeContextCastHelper.java
@@ -31,17 +31,7 @@
      * @param childIndex : child index
      * @return casted GenericLiteralContext
      */
-    public static GremlinParser.GenericLiteralContext castChildToGenericLiteral(final ParseTree ctx, final int childIndex) {
-        return (GremlinParser.GenericLiteralContext)(ctx.getChild(childIndex));
-    }
-
-    /**
-     * Cast ParseTree node child into GenericLiteralListContext
-     * @param ctx : ParseTree node
-     * @param childIndex : child index
-     * @return casted GenericLiteralListContext
-     */
-    public static GremlinParser.GenericLiteralListContext castChildToGenericLiteralList(final ParseTree ctx, final int childIndex) {
-        return (GremlinParser.GenericLiteralListContext)(ctx.getChild(childIndex));
+    public static GremlinParser.GenericLiteralArgumentContext castChildToGenericLiteral(final ParseTree ctx, final int childIndex) {
+        return (GremlinParser.GenericLiteralArgumentContext)(ctx.getChild(childIndex));
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/StructureElementVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/StructureElementVisitor.java
index 0e9c68b..0079858 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/StructureElementVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/StructureElementVisitor.java
@@ -24,20 +24,15 @@
 
 public class StructureElementVisitor extends GremlinBaseVisitor<Element> {
 
-    private StructureElementVisitor() {}
+    protected final GremlinAntlrToJava antlr;
 
-    private static StructureElementVisitor instance;
-
-    public static StructureElementVisitor instance() {
-        if (instance == null) {
-            instance = new StructureElementVisitor();
-        }
-        return instance;
+    public StructureElementVisitor(final GremlinAntlrToJava antlr) {
+        this.antlr = antlr;
     }
 
     @Override
     public Vertex visitStructureVertex(final GremlinParser.StructureVertexContext ctx) {
-        return new ReferenceVertex(GenericLiteralVisitor.instance().visitGenericLiteral(ctx.genericLiteral()),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return new ReferenceVertex(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()),
+                (String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalFunctionVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalFunctionVisitor.java
deleted file mode 100644
index 71a7260..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalFunctionVisitor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.language.grammar;
-
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.T;
-
-import java.util.function.Function;
-
-/**
- * Traversal Function parser parses Function enums.
- */
-public class TraversalFunctionVisitor extends DefaultGremlinBaseVisitor<Function> {
-
-    private TraversalFunctionVisitor() {}
-
-    private static TraversalFunctionVisitor instance;
-
-    public static TraversalFunctionVisitor instance() {
-        if (instance == null) {
-            instance = new TraversalFunctionVisitor();
-        }
-        return instance;
-    }
-
-    /**
-     * @deprecated As of release 3.5.2, replaced by {@link #instance()}.
-     */
-    @Deprecated
-    public static TraversalFunctionVisitor getInstance() {
-        return instance();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Function visitTraversalFunction(final GremlinParser.TraversalFunctionContext ctx) {
-        return this.visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Function visitTraversalToken(final GremlinParser.TraversalTokenContext ctx) {
-        return TraversalEnumParser.parseTraversalEnumFromContext(T.class, ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Function visitTraversalColumn(final GremlinParser.TraversalColumnContext ctx) {
-        return TraversalEnumParser.parseTraversalEnumFromContext(Column.class, ctx);
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
index 72511bd..d5124e2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java
@@ -21,14 +21,8 @@
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality;
 
 import java.util.LinkedHashMap;
@@ -66,11 +60,15 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_V(final GremlinParser.TraversalMethod_VContext ctx) {
-        if (ctx.genericLiteralList().getChildCount() != 0) {
-            return this.graphTraversal.V(GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
-        } else {
-            return this.graphTraversal.V();
-        }
+        return this.graphTraversal.V(antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_E(final GremlinParser.TraversalMethod_EContext ctx) {
+        return this.graphTraversal.E(antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     /**
@@ -86,7 +84,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_addV_String(final GremlinParser.TraversalMethod_addV_StringContext ctx) {
-        return this.graphTraversal.addV(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return this.graphTraversal.addV(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -94,10 +92,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_mergeV_Map(final GremlinParser.TraversalMethod_mergeV_MapContext ctx) {
-        if (ctx.nullLiteral() != null) {
-            return this.graphTraversal.mergeV((Map) null);
-        }
-        return this.graphTraversal.mergeV(GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()));
+        return this.graphTraversal.mergeV(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
     }
 
     /**
@@ -129,10 +124,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_mergeE_Map(final GremlinParser.TraversalMethod_mergeE_MapContext ctx) {
-        if (ctx.nullLiteral() != null) {
-            return this.graphTraversal.mergeE((Map) null);
-        }
-        return this.graphTraversal.mergeE(GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()));
+        return this.graphTraversal.mergeE(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
     }
 
     /**
@@ -164,10 +156,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_addE_String(final GremlinParser.TraversalMethod_addE_StringContext ctx) {
-        final int childIndexOfParameterEdgeLabel = 2;
-        final GremlinParser.StringBasedLiteralContext stringLiteralContext =
-                (GremlinParser.StringBasedLiteralContext) (ctx.getChild(childIndexOfParameterEdgeLabel));
-        return this.graphTraversal.addE(GenericLiteralVisitor.getStringLiteral(stringLiteralContext));
+        return this.graphTraversal.addE(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -175,7 +164,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_aggregate_String(final GremlinParser.TraversalMethod_aggregate_StringContext ctx) {
-        return graphTraversal.aggregate(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.aggregate(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -184,8 +173,16 @@
     @Override
     public GraphTraversal visitTraversalMethod_aggregate_Scope_String(final GremlinParser.TraversalMethod_aggregate_Scope_StringContext ctx) {
         return graphTraversal.aggregate(
-                TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+                antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseString(ctx.stringArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_all_P(final GremlinParser.TraversalMethod_all_PContext ctx) {
+        return graphTraversal.all(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -201,12 +198,20 @@
      * {@inheritDoc}
      */
     @Override
+    public GraphTraversal visitTraversalMethod_any_P(final GremlinParser.TraversalMethod_any_PContext ctx) {
+        return graphTraversal.any(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public GraphTraversal visitTraversalMethod_as(final GremlinParser.TraversalMethod_asContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return graphTraversal.as(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+            return graphTraversal.as(antlr.argumentVisitor.parseString(ctx.stringArgument()));
         } else {
-            return graphTraversal.as(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                    GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+            return graphTraversal.as(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                    antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
         }
     }
 
@@ -233,7 +238,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_barrier_int(final GremlinParser.TraversalMethod_barrier_intContext ctx) {
-        return graphTraversal.barrier(Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.barrier(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).intValue());
     }
 
     /**
@@ -241,7 +246,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_both(final GremlinParser.TraversalMethod_bothContext ctx) {
-        return graphTraversal.both(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.both(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -249,7 +254,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_bothE(final GremlinParser.TraversalMethod_bothEContext ctx) {
-        return graphTraversal.bothE(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.bothE(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -289,7 +294,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_by_Function(final GremlinParser.TraversalMethod_by_FunctionContext ctx) {
-        return graphTraversal.by(TraversalFunctionVisitor.instance().visitTraversalFunction(ctx.traversalFunction()));
+        return graphTraversal.by(antlr.argumentVisitor.parseFunction(ctx.traversalFunctionArgument()));
     }
 
     /**
@@ -297,8 +302,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_by_Function_Comparator(final GremlinParser.TraversalMethod_by_Function_ComparatorContext ctx) {
-        return graphTraversal.by(TraversalFunctionVisitor.instance().visitTraversalFunction(ctx.traversalFunction()),
-                TraversalEnumParser.parseTraversalEnumFromContext(Order.class, ctx.getChild(4)));
+        return graphTraversal.by(antlr.argumentVisitor.parseFunction(ctx.traversalFunctionArgument()),
+                antlr.argumentVisitor.parseComparator(ctx.traversalComparatorArgument()));
     }
 
     /**
@@ -314,7 +319,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_by_String(final GremlinParser.TraversalMethod_by_StringContext ctx) {
-        return graphTraversal.by(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.by(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -322,7 +327,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_by_String_Comparator(final GremlinParser.TraversalMethod_by_String_ComparatorContext ctx) {
-        return graphTraversal.by(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
+        return graphTraversal.by(antlr.argumentVisitor.parseString(ctx.stringArgument()),
                 TraversalEnumParser.parseTraversalEnumFromContext(Order.class, ctx.getChild(4)));
     }
 
@@ -331,7 +336,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_by_T(final GremlinParser.TraversalMethod_by_TContext ctx) {
-        return graphTraversal.by(TraversalEnumParser.parseTraversalEnumFromContext(T.class, ctx.getChild(2)));
+        return graphTraversal.by(antlr.argumentVisitor.parseT(ctx.traversalTokenArgument()));
     }
 
     /**
@@ -357,10 +362,10 @@
     @Override
     public GraphTraversal visitTraversalMethod_cap(final GremlinParser.TraversalMethod_capContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return graphTraversal.cap(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+            return graphTraversal.cap(antlr.argumentVisitor.parseString(ctx.stringArgument()));
         } else {
-            return graphTraversal.cap(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                    GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+            return graphTraversal.cap(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                    antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
         }
     }
 
@@ -369,7 +374,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_choose_Function(final GremlinParser.TraversalMethod_choose_FunctionContext ctx) {
-        return graphTraversal.choose(TraversalFunctionVisitor.instance().visitTraversalFunction(ctx.traversalFunction()));
+        return graphTraversal.choose(antlr.argumentVisitor.parseFunction(ctx.traversalFunctionArgument()));
     }
 
     /**
@@ -377,7 +382,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_choose_Predicate_Traversal(final GremlinParser.TraversalMethod_choose_Predicate_TraversalContext ctx) {
-        return graphTraversal.choose(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()),
+        return graphTraversal.choose(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -386,7 +391,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_choose_Predicate_Traversal_Traversal(final GremlinParser.TraversalMethod_choose_Predicate_Traversal_TraversalContext ctx) {
-        return graphTraversal.choose(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()),
+        return graphTraversal.choose(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal(0)),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal(1)));
     }
@@ -431,8 +436,24 @@
      * {@inheritDoc}
      */
     @Override
+    public GraphTraversal visitTraversalMethod_combine_Object(final GremlinParser.TraversalMethod_combine_ObjectContext ctx) {
+        return graphTraversal.combine(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public GraphTraversal visitTraversalMethod_coin(final GremlinParser.TraversalMethod_coinContext ctx) {
-        return graphTraversal.coin(Double.valueOf(ctx.floatLiteral().getText()));
+        return graphTraversal.coin(((Number) antlr.argumentVisitor.visitFloatArgument(ctx.floatArgument())).doubleValue());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_conjoin_String(final GremlinParser.TraversalMethod_conjoin_StringContext ctx) {
+        return graphTraversal.conjoin(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -441,7 +462,7 @@
     @Override
     public GraphTraversal visitTraversalMethod_constant(final GremlinParser.TraversalMethod_constantContext ctx) {
         return graphTraversal
-                .constant(new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()));
+                .constant(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -457,7 +478,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_count_Scope(final GremlinParser.TraversalMethod_count_ScopeContext ctx) {
-        return graphTraversal.count(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)));
+        return graphTraversal.count(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
     }
 
     /**
@@ -473,8 +494,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_dedup_Scope_String(final GremlinParser.TraversalMethod_dedup_Scope_StringContext ctx) {
-        return graphTraversal.dedup(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)),
-                GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.dedup(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -482,7 +503,23 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_dedup_String(final GremlinParser.TraversalMethod_dedup_StringContext ctx) {
-        return graphTraversal.dedup(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.dedup(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_difference_Object(final GremlinParser.TraversalMethod_difference_ObjectContext ctx) {
+        return graphTraversal.difference(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_disjunct_Object(final GremlinParser.TraversalMethod_disjunct_ObjectContext ctx) {
+        return graphTraversal.disjunct(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -506,7 +543,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_emit_Predicate(final GremlinParser.TraversalMethod_emit_PredicateContext ctx) {
-        return graphTraversal.emit(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.emit(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -530,7 +567,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_fail_String(final GremlinParser.TraversalMethod_fail_StringContext ctx) {
-        return this.graphTraversal.fail(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return this.graphTraversal.fail(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -538,7 +575,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_filter_Predicate(final GremlinParser.TraversalMethod_filter_PredicateContext ctx) {
-        return graphTraversal.filter(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.filter(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -571,7 +608,7 @@
     @Override
     public GraphTraversal visitTraversalMethod_fold_Object_BiFunction(final GremlinParser.TraversalMethod_fold_Object_BiFunctionContext ctx) {
         return graphTraversal.fold(
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()),
+                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()),
                 (BiFunction) TraversalEnumParser.parseTraversalEnumFromContext(Operator.class, ctx.getChild(4)));
     }
 
@@ -580,7 +617,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_from_String(final GremlinParser.TraversalMethod_from_StringContext ctx) {
-        return graphTraversal.from(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.from(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -604,7 +641,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_groupCount_String(final GremlinParser.TraversalMethod_groupCount_StringContext ctx) {
-        return graphTraversal.groupCount(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.groupCount(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -620,7 +657,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_group_String(final GremlinParser.TraversalMethod_group_StringContext ctx) {
-        return graphTraversal.group(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.group(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -628,8 +665,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_hasId_Object_Object(final GremlinParser.TraversalMethod_hasId_Object_ObjectContext ctx) {
-        return graphTraversal.hasId(new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()),
-                GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
+        return graphTraversal.hasId(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()),
+                antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     /**
@@ -637,7 +674,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_hasId_P(final GremlinParser.TraversalMethod_hasId_PContext ctx) {
-        return graphTraversal.hasId(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.hasId(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -645,7 +682,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_hasKey_P(final GremlinParser.TraversalMethod_hasKey_PContext ctx) {
-        return graphTraversal.hasKey(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.hasKey(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -654,10 +691,10 @@
     @Override
     public GraphTraversal visitTraversalMethod_hasKey_String_String(final GremlinParser.TraversalMethod_hasKey_String_StringContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return graphTraversal.hasKey(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+            return graphTraversal.hasKey(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()));
         } else {
-            return graphTraversal.hasKey(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                    GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+            return graphTraversal.hasKey(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()),
+                    antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
         }
     }
 
@@ -666,7 +703,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_hasLabel_P(final GremlinParser.TraversalMethod_hasLabel_PContext ctx) {
-        return graphTraversal.hasLabel(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.hasLabel(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -675,10 +712,10 @@
     @Override
     public GraphTraversal visitTraversalMethod_hasLabel_String_String(final GremlinParser.TraversalMethod_hasLabel_String_StringContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return graphTraversal.hasLabel(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+            return graphTraversal.hasLabel(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()));
         } else {
-            return graphTraversal.hasLabel(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                    GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+            return graphTraversal.hasLabel(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()),
+                    antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
         }
     }
 
@@ -687,7 +724,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_hasNot(final GremlinParser.TraversalMethod_hasNotContext ctx) {
-        return graphTraversal.hasNot(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.hasNot(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()));
     }
 
     /**
@@ -695,8 +732,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_hasValue_Object_Object(final GremlinParser.TraversalMethod_hasValue_Object_ObjectContext ctx) {
-        return graphTraversal.hasValue(new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()),
-                GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
+        return graphTraversal.hasValue(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()),
+                antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     /**
@@ -704,7 +741,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_hasValue_P(final GremlinParser.TraversalMethod_hasValue_PContext ctx) {
-        return graphTraversal.hasValue(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.hasValue(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -712,7 +749,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_String(final GremlinParser.TraversalMethod_has_StringContext ctx) {
-        return graphTraversal.has(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.has(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()));
     }
 
     /**
@@ -720,8 +757,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_String_Object(final GremlinParser.TraversalMethod_has_String_ObjectContext ctx) {
-        return graphTraversal.has(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()));
+        return graphTraversal.has(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()),
+                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -729,8 +766,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_String_P(final GremlinParser.TraversalMethod_has_String_PContext ctx) {
-        return graphTraversal.has(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.has(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()),
+                antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -738,9 +775,9 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_String_String_Object(final GremlinParser.TraversalMethod_has_String_String_ObjectContext ctx) {
-        return graphTraversal.has(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(0)),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(1)),
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()));
+        return graphTraversal.has(antlr.argumentVisitor.parseString(ctx.stringNullableArgument(0)),
+                antlr.argumentVisitor.parseString(ctx.stringNullableArgument(1)),
+                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -748,9 +785,9 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_String_String_P(final GremlinParser.TraversalMethod_has_String_String_PContext ctx) {
-        return graphTraversal.has(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(0)),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(1)),
-                TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.has(antlr.argumentVisitor.parseString(ctx.stringNullableArgument(0)),
+                antlr.argumentVisitor.parseString(ctx.stringNullableArgument(1)),
+                antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -758,7 +795,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_String_Traversal(final GremlinParser.TraversalMethod_has_String_TraversalContext ctx) {
-        return graphTraversal.has(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
+        return graphTraversal.has(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -767,8 +804,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_T_Object(final GremlinParser.TraversalMethod_has_T_ObjectContext ctx) {
-        return graphTraversal.has(TraversalEnumParser.parseTraversalEnumFromContext(T.class, ctx.getChild(2)),
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()));
+        return graphTraversal.has(antlr.argumentVisitor.parseT(ctx.traversalTokenArgument()),
+                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -776,8 +813,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_T_P(final GremlinParser.TraversalMethod_has_T_PContext ctx) {
-        return graphTraversal.has(TraversalEnumParser.parseTraversalEnumFromContext(T.class, ctx.getChild(2)),
-                TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.has(antlr.argumentVisitor.parseT(ctx.traversalTokenArgument()),
+                antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -785,7 +822,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_has_T_Traversal(final GremlinParser.TraversalMethod_has_T_TraversalContext ctx) {
-        return graphTraversal.has(TraversalEnumParser.parseTraversalEnumFromContext(T.class, ctx.getChild(2)),
+        return graphTraversal.has(antlr.argumentVisitor.parseT(ctx.traversalTokenArgument()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -810,7 +847,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_in(final GremlinParser.TraversalMethod_inContext ctx) {
-        return graphTraversal.in(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.in(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -818,7 +855,15 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_inE(final GremlinParser.TraversalMethod_inEContext ctx) {
-        return graphTraversal.inE(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.inE(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_intersect_Object(final GremlinParser.TraversalMethod_intersect_ObjectContext ctx) {
+        return graphTraversal.intersect(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -834,7 +879,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_inject(final GremlinParser.TraversalMethod_injectContext ctx) {
-        return graphTraversal.inject(GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
+        return graphTraversal.inject(antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     @Override
@@ -847,7 +892,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_is_Object(final GremlinParser.TraversalMethod_is_ObjectContext ctx) {
-        return graphTraversal.is(new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()));
+        return graphTraversal.is(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -855,7 +900,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_is_P(final GremlinParser.TraversalMethod_is_PContext ctx) {
-        return graphTraversal.is(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.is(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -879,8 +924,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_limit_Scope_long(final GremlinParser.TraversalMethod_limit_Scope_longContext ctx) {
-        return graphTraversal.limit(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)),
-                Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.limit(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
     }
 
     /**
@@ -888,7 +933,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_limit_long(final GremlinParser.TraversalMethod_limit_longContext ctx) {
-        return graphTraversal.limit(Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.limit(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
     }
 
     /**
@@ -906,12 +951,12 @@
 
     @Override
     public GraphTraversal visitTraversalMethod_loops_String(final GremlinParser.TraversalMethod_loops_StringContext ctx) {
-        return graphTraversal.loops(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.loops(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     @Override
     public GraphTraversal visitTraversalMethod_repeat_String_Traversal(final GremlinParser.TraversalMethod_repeat_String_TraversalContext ctx) {
-        return graphTraversal.repeat((GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral())),
+        return graphTraversal.repeat((antlr.argumentVisitor.parseString(ctx.stringArgument())),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -932,13 +977,31 @@
 
     @Override
     public GraphTraversal visitTraversalMethod_with_String(final GremlinParser.TraversalMethod_with_StringContext ctx) {
-        return graphTraversal.with(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        if (ctx.withOptionKeys() != null) {
+            return graphTraversal.with((String) WithOptionsVisitor.instance().visitWithOptionKeys(ctx.withOptionKeys()));
+        } else {
+            return graphTraversal.with(antlr.argumentVisitor.parseString(ctx.stringArgument()));
+        }
     }
 
     @Override
     public GraphTraversal visitTraversalMethod_with_String_Object(final GremlinParser.TraversalMethod_with_String_ObjectContext ctx) {
-        return graphTraversal.with(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()));
+        final String k;
+        if (ctx.withOptionKeys() != null) {
+            k = (String) WithOptionsVisitor.instance().visitWithOptionKeys(ctx.withOptionKeys());
+        } else {
+            k = antlr.argumentVisitor.parseString(ctx.stringArgument());
+        }
+
+        final Object o;
+        if (ctx.withOptionsValues() != null) {
+            o = WithOptionsVisitor.instance().visitWithOptionsValues(ctx.withOptionsValues());
+        } else if (ctx.ioOptionsValues() != null) {
+            o = WithOptionsVisitor.instance().visitIoOptionsValues(ctx.ioOptionsValues());
+        } else {
+            o = antlr.argumentVisitor.parseObject(ctx.genericLiteralArgument());
+        }
+        return graphTraversal.with(k, o);
     }
 
     @Override
@@ -976,7 +1039,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_max_Scope(final GremlinParser.TraversalMethod_max_ScopeContext ctx) {
-        return graphTraversal.max(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)));
+        return graphTraversal.max(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
     }
 
     /**
@@ -992,7 +1055,15 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_mean_Scope(final GremlinParser.TraversalMethod_mean_ScopeContext ctx) {
-        return graphTraversal.mean(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)));
+        return graphTraversal.mean(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_merge_Object(final GremlinParser.TraversalMethod_merge_ObjectContext ctx) {
+        return graphTraversal.merge(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     /**
@@ -1008,7 +1079,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_min_Scope(final GremlinParser.TraversalMethod_min_ScopeContext ctx) {
-        return graphTraversal.min(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)));
+        return graphTraversal.min(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
     }
 
     /**
@@ -1024,7 +1095,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_option_Object_Traversal(final GremlinParser.TraversalMethod_option_Object_TraversalContext ctx) {
-        return graphTraversal.option(new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral()),
+        return graphTraversal.option(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -1041,12 +1112,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_option_Merge_Map(final GremlinParser.TraversalMethod_option_Merge_MapContext ctx) {
-        if (ctx.nullLiteral() != null) {
-            return this.graphTraversal.option(TraversalEnumParser.parseTraversalEnumFromContext(Merge.class, ctx.traversalMerge()), (Map) null);
-        }
-
-        return graphTraversal.option(TraversalEnumParser.parseTraversalEnumFromContext(Merge.class, ctx.traversalMerge()),
-                (Map) new GenericLiteralVisitor(antlr).visitGenericLiteralMap(ctx.genericLiteralMap()));
+        return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()),
+                (Map) antlr.argumentVisitor.visitGenericLiteralMapNullableArgument(ctx.genericLiteralMapNullableArgument()));
     }
 
     /**
@@ -1054,7 +1121,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_option_Merge_Traversal(final GremlinParser.TraversalMethod_option_Merge_TraversalContext ctx) {
-        return this.graphTraversal.option(TraversalEnumParser.parseTraversalEnumFromContext(Merge.class, ctx.traversalMerge()),
+        return this.graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -1062,6 +1129,20 @@
      * {@inheritDoc}
      */
     @Override
+    public Traversal visitTraversalMethod_option_Merge_Map_Cardinality(final GremlinParser.TraversalMethod_option_Merge_Map_CardinalityContext ctx) {
+        if (ctx.genericLiteralMapNullableArgument().nullLiteral() != null) {
+            return this.graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()), (Map) null);
+        }
+
+        return graphTraversal.option(antlr.argumentVisitor.parseMerge(ctx.traversalMergeArgument()),
+                (Map) new GenericLiteralVisitor(antlr).visitGenericLiteralMap(ctx.genericLiteralMapNullableArgument().genericLiteralMap()),
+                TraversalEnumParser.parseTraversalEnumFromContext(Cardinality.class, ctx.traversalCardinality()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public GraphTraversal visitTraversalMethod_optional(final GremlinParser.TraversalMethod_optionalContext ctx) {
         return this.graphTraversal.optional(antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
@@ -1088,7 +1169,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_order_Scope(final GremlinParser.TraversalMethod_order_ScopeContext ctx) {
-        return graphTraversal.order(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)));
+        return graphTraversal.order(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
     }
 
     /**
@@ -1104,7 +1185,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_out(final GremlinParser.TraversalMethod_outContext ctx) {
-        return graphTraversal.out(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.out(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1112,7 +1193,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_outE(final GremlinParser.TraversalMethod_outEContext ctx) {
-        return graphTraversal.outE(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.outE(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1141,7 +1222,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_pageRank_double(final GremlinParser.TraversalMethod_pageRank_doubleContext ctx) {
-        return graphTraversal.pageRank(Double.valueOf(ctx.floatLiteral().getText()));
+        return graphTraversal.pageRank(((Number) antlr.argumentVisitor.visitFloatArgument(ctx.floatArgument())).doubleValue());
     }
 
     /**
@@ -1164,6 +1245,14 @@
      * {@inheritDoc}
      */
     @Override
+    public GraphTraversal visitTraversalMethod_product_Object(final GremlinParser.TraversalMethod_product_ObjectContext ctx) {
+        return graphTraversal.product(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public GraphTraversal visitTraversalMethod_profile_Empty(final GremlinParser.TraversalMethod_profile_EmptyContext ctx) {
         return graphTraversal.profile();
     }
@@ -1173,7 +1262,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_profile_String(final GremlinParser.TraversalMethod_profile_StringContext ctx) {
-        return graphTraversal.profile(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.profile(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1182,10 +1271,10 @@
     @Override
     public GraphTraversal visitTraversalMethod_project(final GremlinParser.TraversalMethod_projectContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return graphTraversal.project(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+            return graphTraversal.project(antlr.argumentVisitor.parseString(ctx.stringArgument()));
         } else {
-            return graphTraversal.project(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                    GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+            return graphTraversal.project(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                    antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
         }
     }
 
@@ -1194,7 +1283,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_properties(final GremlinParser.TraversalMethod_propertiesContext ctx) {
-        return graphTraversal.properties(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.properties(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1202,7 +1291,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_elementMap(final GremlinParser.TraversalMethod_elementMapContext ctx) {
-        return graphTraversal.elementMap(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.elementMap(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1210,7 +1299,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_propertyMap(final GremlinParser.TraversalMethod_propertyMapContext ctx) {
-        return graphTraversal.propertyMap(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.propertyMap(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1218,10 +1307,10 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_property_Cardinality_Object_Object_Object(final GremlinParser.TraversalMethod_property_Cardinality_Object_Object_ObjectContext ctx) {
-        return graphTraversal.property(TraversalEnumParser.parseTraversalEnumFromContext(VertexProperty.Cardinality.class, ctx.getChild(2)),
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral(0)),
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral(1)),
-                GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
+        return graphTraversal.property(antlr.argumentVisitor.parseCardinality(ctx.traversalCardinalityArgument()),
+                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument(0)),
+                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument(1)),
+                antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     /**
@@ -1229,9 +1318,14 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_property_Object_Object_Object(final GremlinParser.TraversalMethod_property_Object_Object_ObjectContext ctx) {
-        return graphTraversal.property(new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral(0)),
-                new GenericLiteralVisitor(antlr).visitGenericLiteral(ctx.genericLiteral(1)),
-                GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
+        if (ctx.getChildCount() == 6) {
+            return graphTraversal.property(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument(0)),
+                    antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument(1)));
+        } else {
+            return graphTraversal.property(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument(0)),
+                    antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument(1)),
+                    antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
+        }
     }
 
     /**
@@ -1239,7 +1333,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_property_Cardinality_Object(final GremlinParser.TraversalMethod_property_Cardinality_ObjectContext  ctx) {
-        return graphTraversal.property(Cardinality.list, new GenericLiteralVisitor(antlr).visitGenericLiteralMap(ctx.genericLiteralMap()));
+        return graphTraversal.property(Cardinality.list, antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
     }
 
     /**
@@ -1247,7 +1341,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_property_Object(final GremlinParser.TraversalMethod_property_ObjectContext ctx) {
-        return graphTraversal.property((LinkedHashMap<Object, Object>) new GenericLiteralVisitor(antlr).visitGenericLiteralMap(ctx.genericLiteralMap()));
+        return graphTraversal.property(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
     }
 
     /**
@@ -1255,9 +1349,9 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_range_Scope_long_long(final GremlinParser.TraversalMethod_range_Scope_long_longContext ctx) {
-        return graphTraversal.range(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)),
-                Integer.valueOf(ctx.integerLiteral(0).getText()),
-                Integer.valueOf(ctx.integerLiteral(1).getText()));
+        return graphTraversal.range(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument(0)).longValue(),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument(1)).longValue());
     }
 
     /**
@@ -1265,8 +1359,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_range_long_long(final GremlinParser.TraversalMethod_range_long_longContext ctx) {
-        return graphTraversal.range(Integer.valueOf(ctx.integerLiteral(0).getText()),
-                Integer.valueOf(ctx.integerLiteral(1).getText()));
+        return graphTraversal.range(antlr.argumentVisitor.parseNumber(ctx.integerArgument(0)).longValue(),
+               antlr.argumentVisitor.parseNumber(ctx.integerArgument(1)).longValue());
     }
 
     /**
@@ -1290,8 +1384,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_sample_Scope_int(final GremlinParser.TraversalMethod_sample_Scope_intContext ctx) {
-        return graphTraversal.sample(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)),
-                Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.sample(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument()).intValue());
     }
 
     /**
@@ -1299,7 +1393,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_sample_int(final GremlinParser.TraversalMethod_sample_intContext ctx) {
-        return graphTraversal.sample(Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.sample(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).intValue());
     }
 
     /**
@@ -1307,7 +1401,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_select_Column(final GremlinParser.TraversalMethod_select_ColumnContext ctx) {
-        return graphTraversal.select(TraversalEnumParser.parseTraversalEnumFromContext(Column.class, ctx.getChild(2)));
+        return graphTraversal.select(antlr.argumentVisitor.parseColumn(ctx.traversalColumnArgument()));
     }
 
     /**
@@ -1315,8 +1409,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_select_Pop_String(final GremlinParser.TraversalMethod_select_Pop_StringContext ctx) {
-        return graphTraversal.select(TraversalEnumParser.parseTraversalEnumFromContext(Pop.class, ctx.getChild(2)),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.select(antlr.argumentVisitor.parsePop(ctx.traversalPopArgument()),
+                antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1324,15 +1418,15 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_select_Pop_String_String_String(final GremlinParser.TraversalMethod_select_Pop_String_String_StringContext ctx) {
-        return graphTraversal.select(TraversalEnumParser.parseTraversalEnumFromContext(Pop.class, ctx.getChild(2)),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(0)),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(1)),
-                GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.select(antlr.argumentVisitor.parsePop(ctx.traversalPopArgument()),
+                antlr.argumentVisitor.parseString(ctx.stringArgument(0)),
+                antlr.argumentVisitor.parseString(ctx.stringArgument(1)),
+                antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     @Override
     public GraphTraversal visitTraversalMethod_select_Pop_Traversal(final GremlinParser.TraversalMethod_select_Pop_TraversalContext ctx) {
-        return graphTraversal.select(TraversalEnumParser.parseTraversalEnumFromContext(Pop.class, ctx.getChild(2)),
+        return graphTraversal.select(antlr.argumentVisitor.parsePop(ctx.traversalPopArgument()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -1341,7 +1435,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_select_String(final GremlinParser.TraversalMethod_select_StringContext ctx) {
-        return graphTraversal.select(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.select(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1349,9 +1443,9 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_select_String_String_String(final GremlinParser.TraversalMethod_select_String_String_StringContext ctx) {
-        return graphTraversal.select(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(0)),
-                GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral(1)),
-                GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.select(antlr.argumentVisitor.parseString(ctx.stringArgument(0)),
+                antlr.argumentVisitor.parseString(ctx.stringArgument(1)),
+                antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     @Override
@@ -1380,8 +1474,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_skip_Scope_long(final GremlinParser.TraversalMethod_skip_Scope_longContext ctx) {
-        return graphTraversal.skip(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)),
-                Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.skip(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
     }
 
     /**
@@ -1389,7 +1483,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_skip_long(final GremlinParser.TraversalMethod_skip_longContext ctx) {
-        return graphTraversal.skip(Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.skip(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
     }
 
     /**
@@ -1397,7 +1491,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_store(final GremlinParser.TraversalMethod_storeContext ctx) {
-        return graphTraversal.store(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.store(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1405,7 +1499,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_subgraph(final GremlinParser.TraversalMethod_subgraphContext ctx) {
-        return graphTraversal.subgraph(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.subgraph(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1421,7 +1515,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_sum_Scope(final GremlinParser.TraversalMethod_sum_ScopeContext ctx) {
-        return graphTraversal.sum(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)));
+        return graphTraversal.sum(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
     }
 
     /**
@@ -1437,7 +1531,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_tail_Scope(final GremlinParser.TraversalMethod_tail_ScopeContext ctx) {
-        return graphTraversal.tail(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)));
+        return graphTraversal.tail(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
     }
 
     /**
@@ -1445,8 +1539,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_tail_Scope_long(final GremlinParser.TraversalMethod_tail_Scope_longContext ctx) {
-        return graphTraversal.tail(TraversalEnumParser.parseTraversalEnumFromContext(Scope.class, ctx.getChild(2)),
-                Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.tail(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
     }
 
     /**
@@ -1454,7 +1548,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_tail_long(final GremlinParser.TraversalMethod_tail_longContext ctx) {
-        return graphTraversal.tail(Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.tail(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
     }
 
     /**
@@ -1462,7 +1556,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_timeLimit(final GremlinParser.TraversalMethod_timeLimitContext ctx) {
-        return graphTraversal.timeLimit(Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.timeLimit(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
     }
 
     /**
@@ -1470,7 +1564,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_times(final GremlinParser.TraversalMethod_timesContext ctx) {
-        return graphTraversal.times(Integer.valueOf(ctx.integerLiteral().getText()));
+        return graphTraversal.times(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).intValue());
     }
 
     /**
@@ -1478,8 +1572,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_toE(final GremlinParser.TraversalMethod_toEContext ctx) {
-        return graphTraversal.toE(TraversalEnumParser.parseTraversalEnumFromContext(Direction.class, ctx.getChild(2)),
-                GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.toE(antlr.argumentVisitor.parseDirection(ctx.traversalDirectionArgument()),
+                antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1487,7 +1581,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_toV(final GremlinParser.TraversalMethod_toVContext ctx) {
-        return graphTraversal.toV(TraversalEnumParser.parseTraversalEnumFromContext(Direction.class, ctx.getChild(2)));
+        return graphTraversal.toV(antlr.argumentVisitor.parseDirection(ctx.traversalDirectionArgument()));
     }
 
     /**
@@ -1495,8 +1589,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_to_Direction_String(final GremlinParser.TraversalMethod_to_Direction_StringContext ctx) {
-        return graphTraversal.to(TraversalEnumParser.parseTraversalEnumFromContext(Direction.class, ctx.getChild(2)),
-                GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.to(antlr.argumentVisitor.parseDirection(ctx.traversalDirectionArgument()),
+                antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1504,7 +1598,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_to_String(final GremlinParser.TraversalMethod_to_StringContext ctx) {
-        return graphTraversal.to(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.to(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1528,7 +1622,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_tree_String(final GremlinParser.TraversalMethod_tree_StringContext ctx) {
-        return graphTraversal.tree(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.tree(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1553,7 +1647,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_until_Predicate(final GremlinParser.TraversalMethod_until_PredicateContext ctx) {
-        return graphTraversal.until(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.until(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -1577,7 +1671,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_valueMap_String(final GremlinParser.TraversalMethod_valueMap_StringContext ctx) {
-        return graphTraversal.valueMap(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.valueMap(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1586,10 +1680,10 @@
     @Override
     public GraphTraversal visitTraversalMethod_valueMap_boolean_String(final GremlinParser.TraversalMethod_valueMap_boolean_StringContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return graphTraversal.valueMap(Boolean.valueOf(ctx.booleanLiteral().getText()));
+            return graphTraversal.valueMap((boolean) antlr.argumentVisitor.visitBooleanArgument(ctx.booleanArgument()));
         } else {
-            return graphTraversal.valueMap(Boolean.valueOf(ctx.booleanLiteral().getText()),
-                    GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+            return graphTraversal.valueMap((boolean) antlr.argumentVisitor.visitBooleanArgument(ctx.booleanArgument()),
+                    antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
         }
     }
 
@@ -1598,7 +1692,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_values(final GremlinParser.TraversalMethod_valuesContext ctx) {
-        return graphTraversal.values(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()));
+        return graphTraversal.values(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
     }
 
     /**
@@ -1606,7 +1700,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_where_P(final GremlinParser.TraversalMethod_where_PContext ctx) {
-        return graphTraversal.where(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.where(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -1614,8 +1708,8 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_where_String_P(final GremlinParser.TraversalMethod_where_String_PContext ctx) {
-        return graphTraversal.where(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()));
+        return graphTraversal.where(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     /**
@@ -1631,7 +1725,7 @@
      */
     @Override
     public GraphTraversal visitTraversalMethod_math(final GremlinParser.TraversalMethod_mathContext ctx) {
-        return graphTraversal.math(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.math(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1639,7 +1733,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_option_Predicate_Traversal(final GremlinParser.TraversalMethod_option_Predicate_TraversalContext ctx) {
-        return graphTraversal.option(TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx.traversalPredicate()),
+        return graphTraversal.option(antlr.traversalPredicateVisitor.visitTraversalPredicate(ctx.traversalPredicate()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -1648,7 +1742,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) {
-        return graphTraversal.from(StructureElementVisitor.instance().visitStructureVertex(ctx.structureVertex()));
+        return graphTraversal.from(antlr.argumentVisitor.parseVertex(ctx.structureVertexArgument()));
     }
 
     /**
@@ -1656,7 +1750,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) {
-        return graphTraversal.to(StructureElementVisitor.instance().visitStructureVertex(ctx.structureVertex()));
+        return graphTraversal.to(antlr.argumentVisitor.parseVertex(ctx.structureVertexArgument()));
     }
 
     /**
@@ -1672,7 +1766,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_call_string(final GremlinParser.TraversalMethod_call_stringContext ctx) {
-        return graphTraversal.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -1680,8 +1774,8 @@
      */
     @Override
     public Traversal visitTraversalMethod_call_string_map(final GremlinParser.TraversalMethod_call_string_mapContext ctx) {
-        return graphTraversal.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                                   GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()));
+        return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                                   antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()));
     }
 
     /**
@@ -1689,7 +1783,7 @@
      */
     @Override
     public Traversal visitTraversalMethod_call_string_traversal(final GremlinParser.TraversalMethod_call_string_traversalContext ctx) {
-        return graphTraversal.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
+        return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -1698,11 +1792,265 @@
      */
     @Override
     public Traversal visitTraversalMethod_call_string_map_traversal(final GremlinParser.TraversalMethod_call_string_map_traversalContext ctx) {
-        return graphTraversal.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()),
+        return graphTraversal.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()),
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_concat_Traversal_Traversal(final GremlinParser.TraversalMethod_concat_Traversal_TraversalContext ctx) {
+        if (ctx.getChildCount() == 4) {
+            return this.graphTraversal.concat(antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+        }
+        return this.graphTraversal.concat(antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()),
+                antlr.tListVisitor.visitNestedTraversalList(ctx.nestedTraversalList()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_concat_String(final GremlinParser.TraversalMethod_concat_StringContext ctx) {
+        return graphTraversal.concat(antlr.genericVisitor.parseStringVarargs(ctx.stringLiteralVarargs()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_format_String(GremlinParser.TraversalMethod_format_StringContext ctx)  {
+        return graphTraversal.format(antlr.argumentVisitor.parseString(ctx.stringArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_asString_Empty(final GremlinParser.TraversalMethod_asString_EmptyContext ctx) {
+        return graphTraversal.asString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_asString_Scope(final GremlinParser.TraversalMethod_asString_ScopeContext ctx) {
+        return graphTraversal.asString(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_toUpper_Empty(final GremlinParser.TraversalMethod_toUpper_EmptyContext ctx) {
+        return graphTraversal.toUpper();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_toUpper_Scope(final GremlinParser.TraversalMethod_toUpper_ScopeContext ctx) {
+        return graphTraversal.toUpper(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_toLower_Empty(final GremlinParser.TraversalMethod_toLower_EmptyContext ctx) {
+        return graphTraversal.toLower();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_toLower_Scope(final GremlinParser.TraversalMethod_toLower_ScopeContext ctx) {
+        return graphTraversal.toLower(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_length_Empty(final GremlinParser.TraversalMethod_length_EmptyContext ctx) {
+        return graphTraversal.length();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_length_Scope(final GremlinParser.TraversalMethod_length_ScopeContext ctx) {
+        return graphTraversal.length(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_trim_Empty(final GremlinParser.TraversalMethod_trim_EmptyContext ctx) {
+        return graphTraversal.trim();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_trim_Scope(final GremlinParser.TraversalMethod_trim_ScopeContext ctx) {
+        return graphTraversal.trim(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_lTrim_Empty(final GremlinParser.TraversalMethod_lTrim_EmptyContext ctx) {
+        return graphTraversal.lTrim();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_lTrim_Scope(final GremlinParser.TraversalMethod_lTrim_ScopeContext ctx) {
+        return graphTraversal.lTrim(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_rTrim_Empty(final GremlinParser.TraversalMethod_rTrim_EmptyContext ctx) {
+        return graphTraversal.rTrim();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_rTrim_Scope(final GremlinParser.TraversalMethod_rTrim_ScopeContext ctx) {
+        return graphTraversal.rTrim(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_reverse_Empty(final GremlinParser.TraversalMethod_reverse_EmptyContext ctx) {
+        return graphTraversal.reverse();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_replace_String_String(final GremlinParser.TraversalMethod_replace_String_StringContext ctx) {
+        return graphTraversal.replace(antlr.argumentVisitor.parseString(ctx.stringNullableArgument(0)),
+                antlr.argumentVisitor.parseString(ctx.stringNullableArgument(1)));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_replace_Scope_String_String(final GremlinParser.TraversalMethod_replace_Scope_String_StringContext ctx) {
+        return graphTraversal.replace(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseString(ctx.stringNullableArgument(0)),
+                antlr.argumentVisitor.parseString(ctx.stringNullableArgument(1)));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_split_String(final GremlinParser.TraversalMethod_split_StringContext ctx) {
+        return graphTraversal.split(antlr.argumentVisitor.parseString(ctx.stringNullableArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_split_Scope_String(final GremlinParser.TraversalMethod_split_Scope_StringContext ctx) {
+        return graphTraversal.split(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseString(ctx.stringNullableArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_substring_int(final GremlinParser.TraversalMethod_substring_intContext ctx) {
+        return graphTraversal.substring(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).intValue());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_substring_Scope_int(final GremlinParser.TraversalMethod_substring_Scope_intContext ctx) {
+        return graphTraversal.substring(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument()).intValue());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_substring_int_int(final GremlinParser.TraversalMethod_substring_int_intContext ctx) {
+        return graphTraversal.substring(antlr.argumentVisitor.parseNumber(ctx.integerArgument(0)).intValue(),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument(1)).intValue());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_substring_Scope_int_int(final GremlinParser.TraversalMethod_substring_Scope_int_intContext ctx) {
+        return graphTraversal.substring(antlr.argumentVisitor.parseScope(ctx.traversalScopeArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument(0)).intValue(),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument(1)).intValue());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_asDate(final GremlinParser.TraversalMethod_asDateContext ctx) {
+        return graphTraversal.asDate();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_dateAdd(final GremlinParser.TraversalMethod_dateAddContext ctx) {
+        return graphTraversal.dateAdd(antlr.argumentVisitor.parseDT(ctx.traversalDTArgument()),
+                antlr.argumentVisitor.parseNumber(ctx.integerArgument()).intValue());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_dateDiff_Traversal(final GremlinParser.TraversalMethod_dateDiff_TraversalContext ctx) {
+        return graphTraversal.dateDiff(antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_dateDiff_Date(final GremlinParser.TraversalMethod_dateDiff_DateContext ctx) {
+        return graphTraversal.dateDiff(antlr.argumentVisitor.parseDate(ctx.dateArgument()));
+    }
+
+
     public GraphTraversal[] getNestedTraversalList(final GremlinParser.NestedTraversalListContext ctx) {
         return ctx.nestedTraversalExpr().nestedTraversal()
                 .stream()
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitor.java
index b80679b..e2cad13 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitor.java
@@ -27,33 +27,11 @@
 import java.util.Set;
 
 public class TraversalPredicateVisitor extends DefaultGremlinBaseVisitor<P> {
-    private static TraversalPredicateVisitor instance;
 
-    public static TraversalPredicateVisitor instance() {
-        if (instance == null) {
-            instance = new TraversalPredicateVisitor();
-        }
-        return instance;
-    }
+    protected final GremlinAntlrToJava antlr;
 
-    /**
-     * @deprecated As of release 3.5.2, replaced by {@link #instance()}.
-     */
-    @Deprecated
-    public static TraversalPredicateVisitor getInstance() {
-        return instance();
-    }
-
-    private TraversalPredicateVisitor() {}
-
-    /**
-     * Cast ParseTree node child into TraversalPredicateContext
-     * @param ctx : ParseTree node
-     * @param childIndex : child index
-     * @return casted TraversalPredicateContext
-     */
-    private GremlinParser.TraversalPredicateContext castChildToTraversalPredicate(final ParseTree ctx, final int childIndex) {
-        return (GremlinParser.TraversalPredicateContext)(ctx.getChild(childIndex));
+    public TraversalPredicateVisitor(final GremlinAntlrToJava antlr) {
+        this.antlr = antlr;
     }
 
     /**
@@ -86,17 +64,6 @@
     }
 
     /**
-     * get 1 generic literal argument from the antlr parse tree context,
-     * where the arguments has the child index of 2
-     */
-    private Object getSingleGenericLiteralArgument(final ParseTree ctx) {
-        final int childIndexOfParameterValue = 2;
-
-        return GenericLiteralVisitor.instance().visitGenericLiteral(
-                ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterValue));
-    }
-
-    /**
      * {@inheritDoc}
      */
     @Override
@@ -145,22 +112,6 @@
     }
 
     /**
-     * get 2 generic literal arguments from the antlr parse tree context,
-     * where the arguments has the child index of 2 and 4
-     */
-    private Object[] getDoubleGenericLiteralArgument(ParseTree ctx) {
-        final int childIndexOfParameterFirst = 2;
-        final int childIndexOfParameterSecond = 4;
-
-        final Object first = GenericLiteralVisitor.instance().visitGenericLiteral(
-                ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterFirst));
-        final Object second = GenericLiteralVisitor.instance().visitGenericLiteral(
-                ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterSecond));
-
-        return new Object[]{first, second};
-    }
-
-    /**
      * {@inheritDoc}
      */
     @Override
@@ -192,13 +143,10 @@
      */
     @Override
     public P visitTraversalPredicate_within(final GremlinParser.TraversalPredicate_withinContext ctx) {
-        final int childIndexOfParameterValues = 2;
-
         // called with no args which is valid for java/groovy
         if (ctx.getChildCount() == 3) return P.within();
 
-        final Object arguments = GenericLiteralVisitor.instance().visitGenericLiteralList(
-                ParseTreeContextCastHelper.castChildToGenericLiteralList(ctx, childIndexOfParameterValues));
+        final Object arguments = antlr.argumentVisitor.visitGenericLiteralListArgument(ctx.genericLiteralListArgument());
 
         if (arguments instanceof Object[]) {
             // when generic literal list is consist of a comma separated generic literals
@@ -217,13 +165,10 @@
      */
     @Override
     public P visitTraversalPredicate_without(final GremlinParser.TraversalPredicate_withoutContext ctx) {
-        final int childIndexOfParameterValues = 2;
-
         // called with no args which is valid for java/groovy
         if (ctx.getChildCount() == 3) return P.without();
 
-        final Object arguments = GenericLiteralVisitor.instance().visitGenericLiteralList(
-                ParseTreeContextCastHelper.castChildToGenericLiteralList(ctx, childIndexOfParameterValues));
+        final Object arguments = antlr.argumentVisitor.visitGenericLiteralListArgument(ctx.genericLiteralListArgument());
 
         if (arguments instanceof Object[]) {
             // when generic literal list is consist of a comma separated generic literals
@@ -242,48 +187,73 @@
      */
     @Override
     public P visitTraversalPredicate_not(final GremlinParser.TraversalPredicate_notContext ctx) {
-        final int childIndexOfParameterPredicate = 2;
-
-        return P.not(visitTraversalPredicate(castChildToTraversalPredicate(ctx, childIndexOfParameterPredicate)));
+        return P.not(visitTraversalPredicate(ctx.traversalPredicate()));
     }
 
     @Override
     public P visitTraversalPredicate_containing(final GremlinParser.TraversalPredicate_containingContext ctx) {
-        return TextP.containing(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.containing((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     @Override
     public P visitTraversalPredicate_notContaining(final GremlinParser.TraversalPredicate_notContainingContext ctx) {
-        return TextP.notContaining(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.notContaining((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     @Override
     public P visitTraversalPredicate_notEndingWith(final GremlinParser.TraversalPredicate_notEndingWithContext ctx) {
-        return TextP.notEndingWith(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.notEndingWith((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     @Override
     public P visitTraversalPredicate_endingWith(final GremlinParser.TraversalPredicate_endingWithContext ctx) {
-        return TextP.endingWith(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.endingWith((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     @Override
     public P visitTraversalPredicate_startingWith(final GremlinParser.TraversalPredicate_startingWithContext ctx) {
-        return TextP.startingWith(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.startingWith((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     @Override
     public P visitTraversalPredicate_notStartingWith(final GremlinParser.TraversalPredicate_notStartingWithContext ctx) {
-        return TextP.notStartingWith(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.notStartingWith((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     @Override
     public P visitTraversalPredicate_regex(final GremlinParser.TraversalPredicate_regexContext ctx) {
-        return TextP.regex(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.regex((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
     }
 
     @Override
     public P visitTraversalPredicate_notRegex(final GremlinParser.TraversalPredicate_notRegexContext ctx) {
-        return TextP.notRegex(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return TextP.notRegex((String) antlr.argumentVisitor.visitStringArgument(ctx.stringArgument()));
+    }
+
+    /**
+     * Get 2 generic literal arguments from the antlr parse tree context, where the arguments have the child index
+     * of 2 and 4
+     */
+    private Object[] getDoubleGenericLiteralArgument(final ParseTree ctx) {
+        final int childIndexOfParameterFirst = 2;
+        final int childIndexOfParameterSecond = 4;
+
+        final Object first = antlr.argumentVisitor.visitGenericLiteralArgument(
+                ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterFirst));
+        final Object second = antlr.argumentVisitor.visitGenericLiteralArgument(
+                ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterSecond));
+
+        return new Object[]{first, second};
+    }
+
+    /**
+     * Get 1 generic literal argument from the antlr parse tree context, where the arguments have the child index
+     * of 2
+     */
+    private Object getSingleGenericLiteralArgument(final ParseTree ctx) {
+        final int childIndexOfParameterValue = 2;
+
+        return antlr.argumentVisitor.visitGenericLiteralArgument(
+                ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterValue));
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitor.java
index 3d3ca4f..0e52b60 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitor.java
@@ -75,7 +75,7 @@
                 (GremlinParser.TraversalSourceContext) ctx.getChild(childIndexOfTraversalSource));
         // call traversal source spawn method
         final int childIndexOfTraversalSourceSpawnMethod = 2;
-        final GraphTraversal traversal = new TraversalSourceSpawnMethodVisitor(source, this).visitTraversalSourceSpawnMethod(
+        final GraphTraversal traversal = new TraversalSourceSpawnMethodVisitor(source, this, antlr).visitTraversalSourceSpawnMethod(
                 (GremlinParser.TraversalSourceSpawnMethodContext) ctx.getChild(childIndexOfTraversalSourceSpawnMethod));
 
         if (ctx.getChildCount() == 5) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitor.java
index 77eca7a..1df2b54 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitor.java
@@ -25,6 +25,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
 
 /**
  * A {@link GraphTraversalSource} self method visitor.
@@ -52,13 +54,8 @@
      * {@inheritDoc}
      */
     @Override
-    public GraphTraversalSource visitTraversalSourceSelfMethod_withBulk(final GremlinParser.TraversalSourceSelfMethod_withBulkContext ctx)
-    {
-        final int childIndexOfParameterUseBulk = 2;
-
-        final Boolean useBulk = (Boolean)(new GenericLiteralVisitor(antlr).visitBooleanLiteral(
-                (GremlinParser.BooleanLiteralContext)(ctx.getChild(childIndexOfParameterUseBulk))));
-
+    public GraphTraversalSource visitTraversalSourceSelfMethod_withBulk(final GremlinParser.TraversalSourceSelfMethod_withBulkContext ctx) {
+        final boolean useBulk = (boolean) antlr.argumentVisitor.visitBooleanArgument(ctx.booleanArgument());
         return source.withBulk(useBulk);
     }
 
@@ -66,8 +63,7 @@
      * {@inheritDoc}
      */
     @Override
-    public GraphTraversalSource visitTraversalSourceSelfMethod_withPath(final GremlinParser.TraversalSourceSelfMethod_withPathContext ctx)
-    {
+    public GraphTraversalSource visitTraversalSourceSelfMethod_withPath(final GremlinParser.TraversalSourceSelfMethod_withPathContext ctx) {
         return source.withPath();
     }
 
@@ -75,19 +71,12 @@
      * {@inheritDoc}
      */
     @Override
-    public GraphTraversalSource visitTraversalSourceSelfMethod_withSack(final GremlinParser.TraversalSourceSelfMethod_withSackContext ctx)
-    {
-        final int childIndexOfParameterInitialValue = 2;
-
+    public GraphTraversalSource visitTraversalSourceSelfMethod_withSack(final GremlinParser.TraversalSourceSelfMethod_withSackContext ctx) {
         if (ctx.getChildCount() == 4) {
-            return source.withSack(new GenericLiteralVisitor(antlr).visitGenericLiteral(
-                    ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterInitialValue)));
+            return source.withSack(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
         } else {
-            final int childIndexOfParameterMergeOperator = 4;
-
-            return source.withSack(new GenericLiteralVisitor(antlr).visitGenericLiteral(
-                    ParseTreeContextCastHelper.castChildToGenericLiteral(ctx, childIndexOfParameterInitialValue)),
-                    TraversalEnumParser.parseTraversalEnumFromContext(Operator.class, ctx.getChild(childIndexOfParameterMergeOperator)));
+            return source.withSack(antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()),
+                    (BinaryOperator) antlr.argumentVisitor.visitTraversalBiFunctionArgument(ctx.traversalBiFunctionArgument()));
         }
     }
 
@@ -95,31 +84,23 @@
      * {@inheritDoc}
      */
     @Override
-    public GraphTraversalSource visitTraversalSourceSelfMethod_withSideEffect(final GremlinParser.TraversalSourceSelfMethod_withSideEffectContext ctx)
-    {
-        final int childIndexOfParameterKey = 2;
-        final int childIndexOfParameterInitialValue = 4;
-
-        final String argument1 = (String)(new GenericLiteralVisitor(antlr).visitStringBasedLiteral(
-                (GremlinParser.StringBasedLiteralContext)(ctx.getChild(childIndexOfParameterKey))));
-        final Object argument2 = new GenericLiteralVisitor(antlr).visitGenericLiteral(
-                (GremlinParser.GenericLiteralContext)(ctx.getChild(childIndexOfParameterInitialValue)));
-
-        return source.withSideEffect(argument1, argument2);
+    public GraphTraversalSource visitTraversalSourceSelfMethod_withSideEffect(final GremlinParser.TraversalSourceSelfMethod_withSideEffectContext ctx) {
+        return source.withSideEffect(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
     }
 
     @Override
     public GraphTraversalSource visitTraversalSourceSelfMethod_withStrategies(final GremlinParser.TraversalSourceSelfMethod_withStrategiesContext ctx) {
 
         if (null == traversalStrategyVisitor)
-            traversalStrategyVisitor = new TraversalStrategyVisitor((DefaultGremlinBaseVisitor) antlr.tvisitor);
+            traversalStrategyVisitor = new TraversalStrategyVisitor(antlr);
 
         // with 4 children withStrategies() was called with a single TraversalStrategy, otherwise multiple were
         // specified.
         if (ctx.getChildCount() < 5) {
             return source.withStrategies(traversalStrategyVisitor.visitTraversalStrategy((GremlinParser.TraversalStrategyContext) ctx.getChild(2)));
         } else {
-            final Object[] vargs = GenericLiteralVisitor.getTraversalStrategyList(
+            final Object[] vargs = GenericLiteralVisitor.parseTraversalStrategyList(
                     (GremlinParser.TraversalStrategyListContext) ctx.getChild(4), traversalStrategyVisitor);
             final List<TraversalStrategy> strats = new ArrayList<>(Arrays.asList(Arrays.copyOf(vargs, vargs.length, TraversalStrategy[].class)));
             strats.add(0, traversalStrategyVisitor.visitTraversalStrategy((GremlinParser.TraversalStrategyContext) ctx.getChild(2)));
@@ -131,22 +112,12 @@
      * {@inheritDoc}
      */
     @Override
-    public GraphTraversalSource visitTraversalSourceSelfMethod_with(final GremlinParser.TraversalSourceSelfMethod_withContext ctx)
-    {
-        final int childIndexOfParameterKey = 2;
-
+    public GraphTraversalSource visitTraversalSourceSelfMethod_with(final GremlinParser.TraversalSourceSelfMethod_withContext ctx) {
         if (ctx.getChildCount() == 4) {
-            final String argument1 = (String)(new GenericLiteralVisitor(antlr).visitStringBasedLiteral(
-                    (GremlinParser.StringBasedLiteralContext)(ctx.getChild(childIndexOfParameterKey))));
-            return source.with(argument1);
+            return source.with(antlr.argumentVisitor.parseString(ctx.stringArgument()));
         } else {
-            final int childIndexOfParameterInitialValue = 4;
-
-            final String argument1 = (String)(new GenericLiteralVisitor(antlr).visitStringBasedLiteral(
-                    (GremlinParser.StringBasedLiteralContext)(ctx.getChild(childIndexOfParameterKey))));
-            final Object argument2 = new GenericLiteralVisitor(antlr).visitGenericLiteral(
-                    (GremlinParser.GenericLiteralContext)(ctx.getChild(childIndexOfParameterInitialValue)));
-            return source.with(argument1, argument2);
+            return source.with(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                    antlr.argumentVisitor.visitGenericLiteralArgument(ctx.genericLiteralArgument()));
         }
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
index 5d1ebaa..2227635 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnMethodVisitor.java
@@ -33,10 +33,14 @@
     protected GraphTraversal graphTraversal;
     protected final DefaultGremlinBaseVisitor<Traversal> anonymousVisitor;
 
+    protected final GremlinAntlrToJava antlr;
+
     public TraversalSourceSpawnMethodVisitor(final GraphTraversalSource traversalSource,
-                                             final DefaultGremlinBaseVisitor<Traversal> anonymousVisitor) {
+                                             final DefaultGremlinBaseVisitor<Traversal> anonymousVisitor,
+                                             final GremlinAntlrToJava antlr) {
         this.traversalSource = traversalSource;
         this.anonymousVisitor = anonymousVisitor;
+        this.antlr = antlr;
     }
 
     /**
@@ -52,8 +56,8 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_addE(final GremlinParser.TraversalSourceSpawnMethod_addEContext ctx) {
-        if (ctx.stringBasedLiteral() != null) {
-            return this.traversalSource.addE(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        if (ctx.stringArgument() != null) {
+            return this.traversalSource.addE(antlr.argumentVisitor.parseString(ctx.stringArgument()));
         } else if (ctx.nestedTraversal() != null) {
             return this.traversalSource.addE(anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
         } else {
@@ -66,8 +70,8 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_addV(final GremlinParser.TraversalSourceSpawnMethod_addVContext ctx) {
-        if (ctx.stringBasedLiteral() != null) {
-            return this.traversalSource.addV(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        if (ctx.stringArgument() != null) {
+            return this.traversalSource.addV(antlr.argumentVisitor.parseString(ctx.stringArgument()));
         } else if (ctx.nestedTraversal() != null) {
             return this.traversalSource.addV(anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
         } else {
@@ -80,11 +84,7 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_E(final GremlinParser.TraversalSourceSpawnMethod_EContext ctx) {
-        if (ctx.genericLiteralList().getChildCount() > 0) {
-            return this.traversalSource.E(GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
-        } else {
-            return this.traversalSource.E();
-        }
+        return this.traversalSource.E(antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     /**
@@ -92,11 +92,7 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_V(final GremlinParser.TraversalSourceSpawnMethod_VContext ctx) {
-        if (ctx.genericLiteralList().getChildCount() > 0) {
-            return this.traversalSource.V(GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
-        } else {
-            return this.traversalSource.V();
-        }
+        return this.traversalSource.V(antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     /**
@@ -104,7 +100,7 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_inject(final GremlinParser.TraversalSourceSpawnMethod_injectContext ctx) {
-        return this.traversalSource.inject(GenericLiteralVisitor.getGenericLiteralList(ctx.genericLiteralList()));
+        return this.traversalSource.inject(antlr.genericVisitor.parseObjectVarargs(ctx.genericLiteralVarargs()));
     }
 
     /**
@@ -113,7 +109,7 @@
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_io(final GremlinParser.TraversalSourceSpawnMethod_ioContext ctx) {
         if (ctx.getChildCount() > 2) {
-            this.graphTraversal = this.traversalSource.io(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+            this.graphTraversal = this.traversalSource.io(antlr.argumentVisitor.parseString(ctx.stringArgument()));
         }
         return graphTraversal;
     }
@@ -123,10 +119,7 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeV_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeV_MapContext ctx) {
-        if (ctx.nullLiteral() != null) {
-            return this.traversalSource.mergeV((Map) null);
-        }
-        return this.traversalSource.mergeV(GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()));
+        return this.traversalSource.mergeV(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
     }
 
     /**
@@ -150,10 +143,7 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_mergeE_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeE_MapContext ctx) {
-        if (ctx.nullLiteral() != null) {
-            return this.traversalSource.mergeE((Map) null);
-        }
-        return this.traversalSource.mergeE(GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()));
+        return this.traversalSource.mergeE(antlr.argumentVisitor.parseMap(ctx.genericLiteralMapNullableArgument()));
     }
 
     /**
@@ -169,7 +159,7 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string(final GremlinParser.TraversalSourceSpawnMethod_call_stringContext ctx) {
-        return this.traversalSource.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+        return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()));
     }
 
     /**
@@ -177,8 +167,8 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map(final GremlinParser.TraversalSourceSpawnMethod_call_string_mapContext ctx) {
-        return this.traversalSource.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()));
+        return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()));
     }
 
     /**
@@ -186,7 +176,7 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_traversal(final GremlinParser.TraversalSourceSpawnMethod_call_string_traversalContext ctx) {
-        return this.traversalSource.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
+        return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
                 anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
@@ -195,9 +185,16 @@
      */
     @Override
     public GraphTraversal visitTraversalSourceSpawnMethod_call_string_map_traversal(final GremlinParser.TraversalSourceSpawnMethod_call_string_map_traversalContext ctx) {
-        return this.traversalSource.call(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()),
-                GenericLiteralVisitor.getMapLiteral(ctx.genericLiteralMap()),
+        return this.traversalSource.call(antlr.argumentVisitor.parseString(ctx.stringArgument()),
+                antlr.argumentVisitor.parseMap(ctx.genericLiteralMapArgument()),
                 anonymousVisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalSourceSpawnMethod_union(final GremlinParser.TraversalSourceSpawnMethod_unionContext ctx) {
+        return this.traversalSource.union(antlr.tListVisitor.visitNestedTraversalList(ctx.nestedTraversalList()));
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitor.java
index 4d498b8..7fd0497 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitor.java
@@ -18,7 +18,6 @@
  */
 package org.apache.tinkerpop.gremlin.language.grammar;
 
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
@@ -34,10 +33,10 @@
 import java.util.List;
 
 public class TraversalStrategyVisitor extends DefaultGremlinBaseVisitor<TraversalStrategy> {
-    protected final DefaultGremlinBaseVisitor<Traversal> tvisitor;
+    protected final GremlinAntlrToJava antlr;
 
-    public TraversalStrategyVisitor(final DefaultGremlinBaseVisitor<Traversal> tvisitor) {
-        this.tvisitor = tvisitor;
+    public TraversalStrategyVisitor(final GremlinAntlrToJava antlrToJava) {
+        this.antlr = antlrToJava;
     }
 
     @Override
@@ -61,14 +60,14 @@
             else if (strategyName.equals(SubgraphStrategy.class.getSimpleName()))
                 return getSubgraphStrategy(ctx.traversalStrategyArgs_SubgraphStrategy());
             else if (strategyName.equals(SeedStrategy.class.getSimpleName()))
-                return new SeedStrategy(Long.parseLong(ctx.integerLiteral().getText()));
+                return new SeedStrategy(antlr.argumentVisitor.parseNumber(ctx.integerArgument()).longValue());
             else if (strategyName.equals(ProductiveByStrategy.class.getSimpleName()))
                 return getProductiveByStrategy(ctx.traversalStrategyArgs_ProductiveByStrategy());
         }
         throw new IllegalStateException("Unexpected TraversalStrategy specification - " + ctx.getText());
     }
 
-    private static EdgeLabelVerificationStrategy getEdgeLabelVerificationStrategy(final List<GremlinParser.TraversalStrategyArgs_EdgeLabelVerificationStrategyContext> ctxs) {
+    private EdgeLabelVerificationStrategy getEdgeLabelVerificationStrategy(final List<GremlinParser.TraversalStrategyArgs_EdgeLabelVerificationStrategyContext> ctxs) {
         if (null == ctxs || ctxs.isEmpty())
             return EdgeLabelVerificationStrategy.build().create();
 
@@ -76,10 +75,10 @@
         ctxs.forEach(ctx -> {
             switch (ctx.getChild(0).getText()) {
                 case AbstractWarningVerificationStrategy.LOG_WARNING:
-                    builder.logWarning(GenericLiteralVisitor.getBooleanLiteral(ctx.booleanLiteral()));
+                    builder.logWarning(antlr.argumentVisitor.parseBoolean(ctx.booleanArgument()));
                     break;
                 case AbstractWarningVerificationStrategy.THROW_EXCEPTION:
-                    builder.throwException(GenericLiteralVisitor.getBooleanLiteral(ctx.booleanLiteral()));
+                    builder.throwException(antlr.argumentVisitor.parseBoolean(ctx.booleanArgument()));
                     break;
             }
         });
@@ -87,7 +86,7 @@
         return builder.create();
     }
 
-    private static ReservedKeysVerificationStrategy getReservedKeysVerificationStrategy(final List<GremlinParser.TraversalStrategyArgs_ReservedKeysVerificationStrategyContext> ctxs) {
+    private ReservedKeysVerificationStrategy getReservedKeysVerificationStrategy(final List<GremlinParser.TraversalStrategyArgs_ReservedKeysVerificationStrategyContext> ctxs) {
         if (null == ctxs || ctxs.isEmpty())
             return ReservedKeysVerificationStrategy.build().create();
 
@@ -95,13 +94,13 @@
         ctxs.forEach(ctx -> {
             switch (ctx.getChild(0).getText()) {
                 case AbstractWarningVerificationStrategy.LOG_WARNING:
-                    builder.logWarning(GenericLiteralVisitor.getBooleanLiteral(ctx.booleanLiteral()));
+                    builder.logWarning(antlr.argumentVisitor.parseBoolean(ctx.booleanArgument()));
                     break;
                 case AbstractWarningVerificationStrategy.THROW_EXCEPTION:
-                    builder.throwException(GenericLiteralVisitor.getBooleanLiteral(ctx.booleanLiteral()));
+                    builder.throwException(antlr.argumentVisitor.parseBoolean(ctx.booleanArgument()));
                     break;
                 case ReservedKeysVerificationStrategy.KEYS:
-                    builder.reservedKeys(new HashSet<>(Arrays.asList(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList()))));
+                    builder.reservedKeys(new HashSet<>(Arrays.asList(antlr.genericVisitor.parseStringList(ctx.stringLiteralList()))));
                     break;
             }
         });
@@ -109,21 +108,21 @@
         return builder.create();
     }
 
-    private static PartitionStrategy getPartitionStrategy(final List<GremlinParser.TraversalStrategyArgs_PartitionStrategyContext> ctxs) {
+    private PartitionStrategy getPartitionStrategy(final List<GremlinParser.TraversalStrategyArgs_PartitionStrategyContext> ctxs) {
         final PartitionStrategy.Builder builder = PartitionStrategy.build();
         ctxs.forEach(ctx -> {
             switch (ctx.getChild(0).getText()) {
                 case PartitionStrategy.INCLUDE_META_PROPERTIES:
-                    builder.includeMetaProperties(GenericLiteralVisitor.getBooleanLiteral(ctx.booleanLiteral()));
+                    builder.includeMetaProperties(antlr.argumentVisitor.parseBoolean(ctx.booleanArgument()));
                     break;
                 case PartitionStrategy.READ_PARTITIONS:
-                    builder.readPartitions(Arrays.asList(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList())));
+                    builder.readPartitions(Arrays.asList(antlr.genericVisitor.parseStringList(ctx.stringLiteralList())));
                     break;
                 case PartitionStrategy.WRITE_PARTITION:
-                    builder.writePartition(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+                    builder.writePartition(antlr.argumentVisitor.parseString(ctx.stringArgument()));
                     break;
                 case PartitionStrategy.PARTITION_KEY:
-                    builder.partitionKey(GenericLiteralVisitor.getStringLiteral(ctx.stringBasedLiteral()));
+                    builder.partitionKey(antlr.argumentVisitor.parseString(ctx.stringArgument()));
                     break;
             }
         });
@@ -136,16 +135,16 @@
         ctxs.forEach(ctx -> {
             switch (ctx.getChild(0).getText()) {
                 case SubgraphStrategy.VERTICES:
-                    builder.vertices(tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+                    builder.vertices(antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
                     break;
                 case SubgraphStrategy.EDGES:
-                    builder.edges(tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+                    builder.edges(antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
                     break;
                 case SubgraphStrategy.VERTEX_PROPERTIES:
-                    builder.vertexProperties(tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
+                    builder.vertexProperties(antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
                     break;
                 case SubgraphStrategy.CHECK_ADJACENT_VERTICES:
-                    builder.checkAdjacentVertices(GenericLiteralVisitor.getBooleanLiteral(ctx.booleanLiteral()));
+                    builder.checkAdjacentVertices(antlr.argumentVisitor.parseBoolean(ctx.booleanArgument()));
                     break;
             }
         });
@@ -153,9 +152,9 @@
         return builder.create();
     }
 
-    private static ProductiveByStrategy getProductiveByStrategy(final GremlinParser.TraversalStrategyArgs_ProductiveByStrategyContext ctx) {
+    private ProductiveByStrategy getProductiveByStrategy(final GremlinParser.TraversalStrategyArgs_ProductiveByStrategyContext ctx) {
         final ProductiveByStrategy.Builder builder = ProductiveByStrategy.build();
-        builder.productiveKeys(Arrays.asList(GenericLiteralVisitor.getStringLiteralList(ctx.stringLiteralList())));
+        builder.productiveKeys(Arrays.asList(antlr.genericVisitor.parseStringList(ctx.stringLiteralList())));
         return builder.create();
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolver.java
new file mode 100644
index 0000000..a97bd4b
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolver.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.language.grammar;
+
+import java.util.Map;
+import java.util.function.BiFunction;
+
+/**
+ * Resolves parameters in Gremlin to objects.
+ */
+public interface VariableResolver extends BiFunction<String, GremlinParser.VariableContext, Object> {
+
+    /**
+     * This function resolves a variable name and the given parsers context to an object.
+     */
+    @Override
+    Object apply(final String varName, final GremlinParser.VariableContext variableContext);
+
+    /**
+     * This {@link VariableResolver} implementation throws exceptions for all variable names.
+     */
+    class NoVariableResolver implements VariableResolver {
+        private static NoVariableResolver instance = new NoVariableResolver();
+
+        public static VariableResolver instance() {
+            return instance;
+        }
+
+        @Override
+        public Object apply(final String s, final GremlinParser.VariableContext variableContext) {
+            throw new VariableResolverException(String.format("No variable found for %s", s));
+        }
+    }
+
+    /**
+     * This {@link VariableResolver} simply provides a {@code null} value for all variable names. It's typical use
+     * is for when you really don't intend to execute the traversal and just want to get an instance of one when
+     * bindings are being used as with {@link NoOpTerminalVisitor}.
+     */
+    class NullVariableResolver implements VariableResolver {
+        private static NullVariableResolver instance = new NullVariableResolver();
+
+        public static VariableResolver instance() {
+            return instance;
+        }
+
+        @Override
+        public Object apply(final String s, final GremlinParser.VariableContext variableContext) {
+            return null;
+        }
+    }
+
+    /**
+     * Allows for a provided variable set in the form of a {@code Map}, where the keys are variable names and the
+     * values are the parameter values to be injected into the traversal in their place.
+     */
+    class DefaultVariableResolver implements VariableResolver {
+
+        private final Map<String, Object> variables;
+
+        public DefaultVariableResolver(final Map<String, Object> variables) {
+            this.variables = variables;
+        }
+
+        @Override
+        public Object apply(final String s, final GremlinParser.VariableContext variableContext) {
+            if (!variables.containsKey(s)) {
+                throw new VariableResolverException(String.format("No variable found for %s", s));
+            }
+
+            return variables.get(s);
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolverException.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolverException.java
new file mode 100644
index 0000000..dc78d03
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/VariableResolverException.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.language.grammar;
+
+/**
+ * The exception thrown when a variable cannot be resolved for a particular parameter name.
+ */
+public class VariableResolverException extends RuntimeException {
+    public VariableResolverException(final String message) {
+        super(message);
+    }
+
+    public VariableResolverException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/WithOptionsVisitor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/WithOptionsVisitor.java
new file mode 100644
index 0000000..623dc06
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/WithOptionsVisitor.java
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.language.grammar;
+
+import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PageRank;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressure;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ShortestPath;
+import org.apache.tinkerpop.gremlin.process.traversal.IO;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.WithOptions;
+
+/**
+ * Covers {@code String} oriented constants used as arguments to {@link GraphTraversal#with(String)} steps.
+ */
+public class WithOptionsVisitor extends DefaultGremlinBaseVisitor<Object> {
+
+    private WithOptionsVisitor() {}
+
+    private static WithOptionsVisitor instance;
+
+    public static WithOptionsVisitor instance() {
+        if (instance == null) {
+            instance = new WithOptionsVisitor();
+        }
+        return instance;
+    }
+
+    @Override
+    public Object visitConnectedComponentConstants(GremlinParser.ConnectedComponentConstantsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitWithOptionKeys(GremlinParser.WithOptionKeysContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitPageRankConstants(GremlinParser.PageRankConstantsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitPeerPressureConstants(GremlinParser.PeerPressureConstantsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitShortestPathConstants(GremlinParser.ShortestPathConstantsContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitWithOptionsValues(GremlinParser.WithOptionsValuesContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitIoOptionsKeys(GremlinParser.IoOptionsKeysContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitIoOptionsValues(GremlinParser.IoOptionsValuesContext ctx) {
+        return visitChildren(ctx);
+    }
+
+    @Override
+    public Object visitConnectedComponentConstants_component(GremlinParser.ConnectedComponentConstants_componentContext ctx) {
+        return super.visitConnectedComponentConstants_component(ctx);
+    }
+
+    @Override
+    public Object visitConnectedComponentConstants_edges(GremlinParser.ConnectedComponentConstants_edgesContext ctx) {
+        return super.visitConnectedComponentConstants_edges(ctx);
+    }
+
+    @Override
+    public Object visitConnectedComponentConstants_propertyName(GremlinParser.ConnectedComponentConstants_propertyNameContext ctx) {
+        return super.visitConnectedComponentConstants_propertyName(ctx);
+    }
+
+    @Override
+    public Object visitPageRankConstants_edges(final GremlinParser.PageRankConstants_edgesContext ctx) {
+        return PageRank.edges;
+    }
+
+    @Override
+    public Object visitPageRankConstants_times(final GremlinParser.PageRankConstants_timesContext ctx) {
+        return PageRank.times;
+    }
+
+    @Override
+    public Object visitPageRankConstants_propertyName(final GremlinParser.PageRankConstants_propertyNameContext ctx) {
+        return PageRank.propertyName;
+    }
+
+    @Override
+    public Object visitPeerPressureConstants_edges(final GremlinParser.PeerPressureConstants_edgesContext ctx) {
+        return PeerPressure.edges;
+    }
+
+    @Override
+    public Object visitPeerPressureConstants_times(final GremlinParser.PeerPressureConstants_timesContext ctx) {
+        return PeerPressure.times;
+    }
+
+    @Override
+    public Object visitPeerPressureConstants_propertyName(final GremlinParser.PeerPressureConstants_propertyNameContext ctx) {
+        return PeerPressure.propertyName;
+    }
+
+    @Override
+    public Object visitShortestPathConstants_target(final GremlinParser.ShortestPathConstants_targetContext ctx) {
+        return ShortestPath.target;
+    }
+
+    @Override
+    public Object visitShortestPathConstants_edges(final GremlinParser.ShortestPathConstants_edgesContext ctx) {
+        return ShortestPath.edges;
+    }
+
+    @Override
+    public Object visitShortestPathConstants_distance(final GremlinParser.ShortestPathConstants_distanceContext ctx) {
+        return ShortestPath.distance;
+    }
+
+    @Override
+    public Object visitShortestPathConstants_maxDistance(final GremlinParser.ShortestPathConstants_maxDistanceContext ctx) {
+        return ShortestPath.maxDistance;
+    }
+
+    @Override
+    public Object visitShortestPathConstants_includeEdges(final GremlinParser.ShortestPathConstants_includeEdgesContext ctx) {
+        return ShortestPath.includeEdges;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_tokens(final GremlinParser.WithOptionsConstants_tokensContext ctx) {
+        return WithOptions.tokens;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_none(final GremlinParser.WithOptionsConstants_noneContext ctx) {
+        return WithOptions.none;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_ids(final GremlinParser.WithOptionsConstants_idsContext ctx) {
+        return WithOptions.ids;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_labels(final GremlinParser.WithOptionsConstants_labelsContext ctx) {
+        return WithOptions.labels;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_keys(final GremlinParser.WithOptionsConstants_keysContext ctx) {
+        return WithOptions.keys;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_values(final GremlinParser.WithOptionsConstants_valuesContext ctx) {
+        return WithOptions.values;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_all(final GremlinParser.WithOptionsConstants_allContext ctx) {
+        return WithOptions.all;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_indexer(final GremlinParser.WithOptionsConstants_indexerContext ctx) {
+        return WithOptions.indexer;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_list(final GremlinParser.WithOptionsConstants_listContext ctx) {
+        return WithOptions.list;
+    }
+
+    @Override
+    public Object visitWithOptionsConstants_map(final GremlinParser.WithOptionsConstants_mapContext ctx) {
+        return WithOptions.map;
+    }
+
+    @Override
+    public Object visitIoOptionsConstants_reader(final GremlinParser.IoOptionsConstants_readerContext ctx) {
+        return IO.reader;
+    }
+
+    @Override
+    public Object visitIoOptionsConstants_writer(final GremlinParser.IoOptionsConstants_writerContext ctx) {
+        return IO.writer;
+    }
+
+    @Override
+    public Object visitIoOptionsConstants_gryo(final GremlinParser.IoOptionsConstants_gryoContext ctx) {
+        return IO.gryo;
+    }
+
+    @Override
+    public Object visitIoOptionsConstants_graphson(final GremlinParser.IoOptionsConstants_graphsonContext ctx) {
+        return IO.graphson;
+    }
+
+    @Override
+    public Object visitIoOptionsConstants_graphml(final GremlinParser.IoOptionsConstants_graphmlContext ctx) {
+        return IO.graphml;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
index 0ca3dc0..7d920ab 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
@@ -82,7 +82,7 @@
         while (!(currentStep instanceof EmptyStep)) {
             if (currentStep instanceof VertexComputing && !(currentStep instanceof ProgramVertexProgramStep)) {  // todo: is there a general solution?
                 currentLabels.addAll(currentStep.getLabels());
-                currentStep.getLabels().forEach(currentStep::removeLabel);
+                currentStep.clearLabels();
             } else {
                 currentLabels.forEach(currentStep::addLabel);
                 currentLabels.clear();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
index dc8eca3..5b88cea 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bytecode.java
@@ -47,7 +47,7 @@
  *
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class Bytecode implements Cloneable, Serializable {
+public class Bytecode implements Cloneable, Serializable {
 
     private static final Object[] EMPTY_ARRAY = new Object[]{};
 
@@ -56,7 +56,7 @@
 
     public Bytecode() {}
 
-    Bytecode(final String sourceName, final Object... arguments) {
+    public Bytecode(final String sourceName, final Object... arguments) {
         this.sourceInstructions.add(new Instruction(sourceName, flattenArguments(arguments)));
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java
index a7a8e72..0938761 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java
@@ -20,8 +20,6 @@
 
 import org.apache.tinkerpop.gremlin.util.GremlinValueComparator;
 
-import java.util.function.BiPredicate;
-
 /**
  * {@code Compare} is a {@code BiPredicate} that determines whether the first argument is {@code ==}, {@code !=},
  * {@code >}, {@code >=}, {@code <}, {@code <=} to the second argument.
@@ -31,7 +29,7 @@
  * @author Matt Frantz (http://github.com/mhfrantz)
  * @author Daniel Kuppitz (http://gemlin.guru)
  */
-public enum Compare implements BiPredicate<Object, Object> {
+public enum Compare implements PBiPredicate<Object, Object> {
 
     /**
      * Evaluates if the first object is equal to the second per Gremlin Comparison semantics.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java
index 916ba24..3231f60 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java
@@ -41,7 +41,7 @@
  * @author Pierre De Wilde
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public enum Contains implements BiPredicate<Object, Collection> {
+public enum Contains implements PBiPredicate<Object, Collection> {
 
     /**
      * The first object is within the {@code Collection} provided in the second object. The second object may not be
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DT.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DT.java
new file mode 100644
index 0000000..e6f4689
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DT.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal;
+
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DateAddStep;
+
+/**
+ * Tokens that are used to denote different periods of time.
+ * Used with {@link DateAddStep} step.
+ */
+public enum DT {
+    second,
+    minute,
+    hour,
+    day
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
index 002e0e9..917a138 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
@@ -24,7 +24,6 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 /**
@@ -35,17 +34,17 @@
  */
 public class P<V> implements Predicate<V>, Serializable, Cloneable {
 
-    protected BiPredicate<V, V> biPredicate;
+    protected PBiPredicate<V, V> biPredicate;
     protected V value;
     protected V originalValue;
 
-    public P(final BiPredicate<V, V> biPredicate, final V value) {
+    public P(final PBiPredicate<V, V> biPredicate, final V value) {
         this.value = value;
         this.originalValue = value;
         this.biPredicate = biPredicate;
     }
 
-    public BiPredicate<V, V> getBiPredicate() {
+    public PBiPredicate<V, V> getBiPredicate() {
         return this.biPredicate;
     }
 
@@ -60,7 +59,7 @@
     /*
      * Get the name of the predicate
      */
-    public String getPredicateName() { return biPredicate.toString(); }
+    public String getPredicateName() { return biPredicate.getPredicateName(); }
 
     /**
      * Gets the current value to be passed to the predicate for testing.
@@ -258,7 +257,7 @@
      *
      * @since 3.0.0-incubating
      */
-    public static P test(final BiPredicate biPredicate, final Object value) {
+    public static P test(final PBiPredicate biPredicate, final Object value) {
         return new P(biPredicate, value);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PBiPredicate.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PBiPredicate.java
new file mode 100644
index 0000000..aadca69
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PBiPredicate.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.process.traversal;
+
+import java.util.function.BiPredicate;
+
+/**
+ * Marker interface for predefined {@code BiPredicate} predicates that can be used in {@code Predicate}}.
+ *
+ * Allows to set the name of the predicate that will be used for serialization.
+ * Restricts the use of random {@code BiPredicate} with {@link P}.
+ **/
+public interface PBiPredicate<T, U> extends BiPredicate<T, U> {
+
+    /**
+     * Gets predicate name that can be used for serialization.
+     **/
+    default String getPredicateName() {
+        return toString();
+    }
+
+    /**
+     * Returns a predicate that represents the logical negation of this predicate.
+     **/
+    default PBiPredicate<T, U> negate() {
+        return (T t, U u) -> !test(t, u);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Step.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Step.java
index 99fdd91..818d15b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Step.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Step.java
@@ -147,6 +147,11 @@
     public void removeLabel(final String label);
 
     /**
+     * Removes all labels on the step.
+     */
+    public void clearLabels();
+
+    /**
      * Get the unique id of the step.
      * These ids can change when strategies are applied and anonymous traversals are embedded in the parent traversal.
      * A developer should typically not need to call this method.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Text.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Text.java
index b1d37cc..15c7177 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Text.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Text.java
@@ -20,8 +20,7 @@
 
 import java.io.Serializable;
 import java.util.Objects;
-import java.util.function.BiPredicate;
-import java.util.regex.Pattern; 
+import java.util.regex.Pattern;
 import java.util.regex.Matcher; 
 
 /**
@@ -31,7 +30,7 @@
  * @author Daniel Kuppitz (http://gremlin.guru)
  * @since 3.4.0
  */
-public enum Text implements BiPredicate<String, String> {
+public enum Text implements PBiPredicate<String, String> {
 
     /**
      * Evaluates if the first string starts with the second.
@@ -171,7 +170,7 @@
     /**
      * Allows for a compiled version of the regex pattern.
      */
-    public static class RegexPredicate implements BiPredicate<String, String>, Serializable {
+    public static class RegexPredicate implements PBiPredicate<String, String>, Serializable {
 
         private final Pattern pattern;
         private final boolean negate;
@@ -197,7 +196,7 @@
         }
 
         @Override
-        public BiPredicate<String, String> negate() {
+        public PBiPredicate<String, String> negate() {
             return new RegexPredicate(pattern.pattern(), !negate);
         }
 
@@ -218,5 +217,10 @@
         public String toString() {
             return String.format("regex(%s)", pattern.pattern());
         }
+
+        @Override
+        public String getPredicateName() {
+            return isNegate() ? "notRegex" : "regex";
+        }
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TextP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TextP.java
index 2e03578..2e599c3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TextP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TextP.java
@@ -18,8 +18,6 @@
  */
 package org.apache.tinkerpop.gremlin.process.traversal;
 
-import java.util.function.BiPredicate;
-
 /**
  * Predefined {@code Predicate} values that can be used as {@code String} filters.
  *
@@ -27,8 +25,7 @@
  */
 public class TextP extends P<String> {
 
-    @SuppressWarnings("WeakerAccess")
-    public TextP(final BiPredicate<String, String> biPredicate, final String value) {
+    public TextP(final PBiPredicate<String, String> biPredicate, final String value) {
         super(biPredicate, value);
     }
 
@@ -43,13 +40,6 @@
     }
 
     @Override
-    public String getPredicateName() {
-        return biPredicate instanceof Text.RegexPredicate ?
-                ((Text.RegexPredicate) biPredicate).isNegate() ? "notRegex" : "regex" :
-                biPredicate.toString();
-    }
-
-    @Override
     public TextP negate() {
         return new TextP(this.biPredicate.negate(), this.originalValue);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
index 0be7555..1201768 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
@@ -19,6 +19,7 @@
 
 package org.apache.tinkerpop.gremlin.process.traversal;
 
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -232,6 +233,11 @@
             protected abstract Script produceScript(final P<?> p);
 
             /**
+             * Take the {@link Bytecode} and write the syntax for it directly to the member {@link #script} variable.
+             */
+            protected abstract Script produceCardinalityValue(final Bytecode o);
+
+            /**
              *  For each operator argument, if withParameters set true, try parametrization as follows:
              *
              *  -----------------------------------------------
@@ -272,7 +278,13 @@
                 if (object instanceof Bytecode.Binding) {
                     return script.getBoundKeyOrAssign(withParameters, ((Bytecode.Binding) object).variable());
                 } else if (object instanceof Bytecode) {
-                    return produceScript(getAnonymousTraversalPrefix(), (Bytecode) object);
+                    final Bytecode bc = (Bytecode) object;
+                    if (bc.getSourceInstructions().size() == 1 &&
+                            bc.getSourceInstructions().get(0).getOperator().equals(CardinalityValueTraversal.class.getSimpleName())) {
+                        return produceCardinalityValue(bc);
+                    } else {
+                        return produceScript(getAnonymousTraversalPrefix(), bc);
+                    }
                 } else if (object instanceof Traversal) {
                     return convertToScript(((Traversal) object).asAdmin().getBytecode());
                 } else if (object instanceof String) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 01deea1..fc97198 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -44,7 +44,7 @@
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.gremlin.util.tools.MultiMap;
+import org.apache.tinkerpop.gremlin.util.MultiMap;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 7fbfbd8..f01afa8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -25,6 +25,7 @@
 import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressureVertexProgramStep;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ProgramVertexProgramStep;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ShortestPathVertexProgramStep;
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
 import org.apache.tinkerpop.gremlin.process.traversal.Failure;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.Order;
@@ -36,6 +37,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ColumnTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.FunctionTraverser;
@@ -55,7 +57,9 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.OptionalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AllStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AnyStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
@@ -78,26 +82,42 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsDateStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsStringGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsStringLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CallStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CoalesceStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CombineStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConcatStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConjoinStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DateAddStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DateDiffStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.DedupLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DifferenceStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DisjunctStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ElementMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ElementStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FormatStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.IndexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.IntersectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LTrimGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LTrimLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaCollectingBarrierStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaFlatMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LengthGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LengthLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LoopsStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.MathStep;
@@ -113,23 +133,40 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProductStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyKeyStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.RTrimGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.RTrimLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReplaceGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReplaceLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReverseStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SackStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SampleLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SplitGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SplitLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SubstringGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SubstringLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TailLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToLowerGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToLowerLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalFlatMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMergeStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalSelectStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
@@ -172,11 +209,13 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -332,6 +371,21 @@
     }
 
     /**
+     * A {@code E} step is usually used to start a traversal but it may also be used mid-traversal.
+     *
+     * @param edgeIdsOrElements edges to inject into the traversal
+     * @return the traversal with an appended {@link GraphStep}
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#e-step" target="_blank">Reference Documentation - E Step</a>
+     * @since 3.7.0
+     */
+    public default GraphTraversal<S, Edge> E(final Object... edgeIdsOrElements) {
+        // a single null is [null]
+        final Object[] ids = null == edgeIdsOrElements ? new Object[] { null } : edgeIdsOrElements;
+        this.asAdmin().getBytecode().addStep(Symbols.E, ids);
+        return this.asAdmin().addStep(new GraphStep<>(this.asAdmin(), Edge.class, false, ids));
+    }
+
+    /**
      * Map the {@link Vertex} to its adjacent vertices given a direction and edge labels.
      *
      * @param direction  the direction to traverse from the current vertex
@@ -1396,6 +1450,527 @@
         return this.asAdmin().addStep(step);
     }
 
+    /**
+     * Concatenate values of an arbitrary number of string traversals to the incoming traverser.
+     *
+     * @return the traversal with an appended {@link ConcatStep}.
+     * @param concatTraversal the traversal to concatenate.
+     * @param otherConcatTraversals additional traversals to concatenate.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#concat-step" target="_blank">Reference Documentation - Concat Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> concat(final Traversal<?, String> concatTraversal, final Traversal<?, String>... otherConcatTraversals) {
+        this.asAdmin().getBytecode().addStep(Symbols.concat, concatTraversal, otherConcatTraversals);
+        return this.asAdmin().addStep(new ConcatStep<>(this.asAdmin(), concatTraversal, otherConcatTraversals));
+    }
+
+    /**
+     * Concatenate an arbitrary number of strings to the incoming traverser.
+     *
+     * @return the traversal with an appended {@link ConcatStep}.
+     * @param concatStrings the String values to concatenate.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#concat-step" target="_blank">Reference Documentation - Concat Step</a>
+     * @since 3.7.0
+     */
+    public default GraphTraversal<S, String> concat(final String... concatStrings) {
+        this.asAdmin().getBytecode().addStep(Symbols.concat, concatStrings);
+        return this.asAdmin().addStep(new ConcatStep<>(this.asAdmin(), concatStrings));
+    }
+
+    /**
+     * Returns the value of incoming traverser as strings. Null values are returned as a string value "null".
+     *
+     * @return the traversal with an appended {@link AsStringGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#asString-step" target="_blank">Reference Documentation - AsString Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> asString() {
+        this.asAdmin().getBytecode().addStep(Symbols.asString);
+        return this.asAdmin().addStep(new AsStringGlobalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the value of incoming traverser as strings. Null values are returned as a string value "null".
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @return the traversal with an appended {@link AsStringGlobalStep} or {@link AsStringLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#asString-step" target="_blank">Reference Documentation - AsString Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> asString(final Scope scope) {
+        this.asAdmin().getBytecode().addStep(Symbols.asString, scope);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ? new AsStringGlobalStep<>(this.asAdmin()) : new AsStringLocalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the length incoming string traverser. Null values are not processed and remain as null when returned.
+     * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @return the traversal with an appended {@link LengthGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#length-step" target="_blank">Reference Documentation - Length Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Integer> length() {
+        this.asAdmin().getBytecode().addStep(Symbols.length);
+        return this.asAdmin().addStep(new LengthGlobalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the length incoming string or list. Null values are not processed and remain as null when returned.
+     * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within lists, global will operate on current traversal as a single object.
+     * @return the traversal with an appended {@link LengthGlobalStep} or {@link LengthLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#length-step" target="_blank">Reference Documentation - Length Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> length(final Scope scope) {
+        this.asAdmin().getBytecode().addStep(Symbols.length, scope);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ? new LengthGlobalStep<>(this.asAdmin()) : new LengthLocalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the lowercase representation of incoming string traverser. Null values are not processed and remain
+     * as null when returned. If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @return the traversal with an appended {@link ToLowerGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#toLower-step" target="_blank">Reference Documentation - ToLower Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> toLower() {
+        this.asAdmin().getBytecode().addStep(Symbols.toLower);
+        return this.asAdmin().addStep(new ToLowerGlobalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the lowercase representation of incoming string or list of strings. Null values are not processed and remain
+     * as null when returned. If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will accept lists of string and operate on individual strings within the list, global will only accept string objects.
+     * @return the traversal with an appended {@link ToLowerGlobalStep} or {@link ToLowerLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#toLower-step" target="_blank">Reference Documentation - ToLower Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> toLower(final Scope scope) {
+        this.asAdmin().getBytecode().addStep(Symbols.toLower, scope);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ? new ToLowerGlobalStep<>(this.asAdmin()) : new ToLowerLocalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the uppercase representation of incoming string traverser. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @return the traversal with an appended {@link ToUpperGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#toUpper-step" target="_blank">Reference Documentation - ToUpper Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> toUpper() {
+        this.asAdmin().getBytecode().addStep(Symbols.toUpper);
+        return this.asAdmin().addStep(new ToUpperGlobalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the uppercase representation of incoming string or list of strings. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will accept lists of string and operate on individual strings within the list, global will only accept string objects.
+     * @return the traversal with an appended {@link ToUpperGlobalStep} or {@link ToUpperLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#toUpper-step" target="_blank">Reference Documentation - ToUpper Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> toUpper(final Scope scope) {
+        this.asAdmin().getBytecode().addStep(Symbols.toUpper, scope);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ? new ToUpperGlobalStep<>(this.asAdmin()) : new ToUpperLocalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns a string with leading and trailing whitespace removed. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @return the traversal with an appended {@link TrimGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#trim-step" target="_blank">Reference Documentation - Trim Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> trim() {
+        this.asAdmin().getBytecode().addStep(Symbols.trim);
+        return this.asAdmin().addStep(new TrimGlobalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns a string with leading and trailing whitespace removed. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @return the traversal with an appended {@link TrimGlobalStep} or {@link TrimLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#trim-step" target="_blank">Reference Documentation - Trim Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> trim(final Scope scope) {
+        this.asAdmin().getBytecode().addStep(Symbols.trim, scope);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ? new TrimGlobalStep<>(this.asAdmin()) : new TrimLocalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns a string with leading whitespace removed. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @return the traversal with an appended {@link LTrimGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#lTrim-step" target="_blank">Reference Documentation - LTrim Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> lTrim() {
+        this.asAdmin().getBytecode().addStep(Symbols.lTrim);
+        return this.asAdmin().addStep(new LTrimGlobalStep<>(this.asAdmin()));
+    }
+
+
+    /**
+     * Returns a string with leading whitespace removed. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @return the traversal with an appended {@link LTrimGlobalStep} or {@link LTrimLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#lTrim-step" target="_blank">Reference Documentation - LTrim Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> lTrim(final Scope scope) {
+        this.asAdmin().getBytecode().addStep(Symbols.lTrim, scope);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ? new LTrimGlobalStep<>(this.asAdmin()) : new LTrimLocalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns a string with trailing whitespace removed. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @return the traversal with an appended {@link RTrimGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#rTrim-step" target="_blank">Reference Documentation - RTrim Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> rTrim() {
+        this.asAdmin().getBytecode().addStep(Symbols.rTrim);
+        return this.asAdmin().addStep(new RTrimGlobalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns a string with trailing whitespace removed. Null values are not processed and
+     * remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @return the traversal with an appended {@link RTrimGlobalStep} or {@link RTrimLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#rTrim-step" target="_blank">Reference Documentation - RTrim Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> rTrim(final Scope scope) {
+        this.asAdmin().getBytecode().addStep(Symbols.rTrim, scope);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ? new RTrimGlobalStep<>(this.asAdmin()) : new RTrimLocalStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns the reverse of the incoming traverser. Null values are not processed and remain as null when returned.
+     *
+     * @return the traversal with an appended {@link ReverseStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#reverse-step" target="_blank">Reference Documentation - Reverse Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> reverse() {
+        this.asAdmin().getBytecode().addStep(Symbols.reverse);
+        return this.asAdmin().addStep(new ReverseStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Returns a string with the specified characters in the original string replaced with the new characters. Any null
+     * arguments will be a no-op and the original string is returned. Null values from incoming traversers are not
+     * processed and remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @param newChar the character to replace.
+     * @param oldChar the character to be replaced.
+     * @return the traversal with an appended {@link ReplaceGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#replace-step" target="_blank">Reference Documentation - Replace Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> replace(final String oldChar, final String newChar) {
+        this.asAdmin().getBytecode().addStep(Symbols.replace, oldChar, newChar);
+        return this.asAdmin().addStep(new ReplaceGlobalStep<>(this.asAdmin(), oldChar, newChar));
+    }
+
+    /**
+     * Returns a string with the specified characters in the original string replaced with the new characters. Any null
+     * arguments will be a no-op and the original string is returned. Null values from incoming traversers are not
+     * processed and remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @param newChar the character to replace.
+     * @param oldChar the character to be replaced.
+     * @return the traversal with an appended {@link ReplaceGlobalStep} or {@link ReplaceLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#replace-step" target="_blank">Reference Documentation - Replace Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> replace(final Scope scope, final String oldChar, final String newChar) {
+        this.asAdmin().getBytecode().addStep(Symbols.replace, scope, oldChar, newChar);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ?
+                new ReplaceGlobalStep<>(this.asAdmin(), oldChar, newChar) : new ReplaceLocalStep<>(this.asAdmin(), oldChar, newChar));
+    }
+
+    /**
+     * Returns a list of strings created by splitting the incoming string traverser around the matches of the given separator.
+     * A null separator will split the string by whitespaces. Null values from incoming traversers are not processed
+     * and remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @param separator the character to split the string on.
+     * @return the traversal with an appended {@link SplitGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#split-step" target="_blank">Reference Documentation - Split Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, List<String>> split(final String separator) {
+        this.asAdmin().getBytecode().addStep(Symbols.split, separator);
+        return this.asAdmin().addStep(new SplitGlobalStep<>(this.asAdmin(), separator));
+    }
+
+    /**
+     * Returns a list of strings created by splitting the incoming string traverser around the matches of the given separator.
+     * A null separator will split the string by whitespaces. Null values from incoming traversers are not processed
+     * and remain as null when returned. If the incoming traverser is a non-String value then an
+     * {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @param separator the character to split the string on.
+     * @return the traversal with an appended {@link SplitGlobalStep} or {@link SplitLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#split-step" target="_blank">Reference Documentation - Split Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, List<E2>> split(final Scope scope, final String separator) {
+        this.asAdmin().getBytecode().addStep(Symbols.split, scope, separator);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ?
+                new SplitGlobalStep<>(this.asAdmin(), separator) : new SplitLocalStep<>(this.asAdmin(), separator));
+    }
+
+    /**
+     * Returns a substring of the incoming string traverser with a 0-based start index (inclusive) specified,
+     * to the end of the string. If the start index is negative then it will begin at the specified index counted from the
+     * end of the string, or 0 if exceeding the string length. Null values are not processed and remain as null when returned.
+     * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @param startIndex the start index of the substring, inclusive.
+     * @return the traversal with an appended {@link SubstringGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#replace-step" target="_blank">Reference Documentation - Substring Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> substring(final int startIndex) {
+        this.asAdmin().getBytecode().addStep(Symbols.substring, startIndex);
+        return this.asAdmin().addStep(new SubstringGlobalStep<>(this.asAdmin(), startIndex));
+    }
+
+    /**
+     * Returns a substring of the incoming string traverser with a 0-based start index (inclusive) specified,
+     * to the end of the string. If the start index is negative then it will begin at the specified index counted from the
+     * end of the string, or 0 if exceeding the string length. Null values are not processed and remain as null when returned.
+     * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @param startIndex the start index of the substring, inclusive.
+     * @return the traversal with an appended {@link SubstringGlobalStep} or {@link SubstringLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#replace-step" target="_blank">Reference Documentation - Substring Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> substring(final Scope scope, final int startIndex) {
+        this.asAdmin().getBytecode().addStep(Symbols.substring, scope, startIndex);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ?
+                new SubstringGlobalStep<>(this.asAdmin(), startIndex) : new SubstringLocalStep<>(this.asAdmin(), startIndex));
+    }
+
+    /**
+     * Returns a substring of the incoming string traverser with a 0-based start index (inclusive) and end index
+     * (exclusive). If the start index is negative then it will begin at the specified index counted from the end of the
+     * string, or 0 if exceeding the string length. If the end index is negative then it will end at the specified index
+     * counted from the end, or at the end of the string if exceeding the string length. End index <= start index will
+     * return the empty string. Null values are not processed and remain as null when returned. If the incoming
+     * traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @param startIndex the start index of the substring, inclusive.
+     * @param endIndex the end index of the substring, exclusive.
+     * @return the traversal with an appended {@link SubstringGlobalStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#replace-step" target="_blank">Reference Documentation - Substring Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> substring(final int startIndex, final int endIndex) {
+        this.asAdmin().getBytecode().addStep(Symbols.substring, startIndex, endIndex);
+        return this.asAdmin().addStep(new SubstringGlobalStep<>(this.asAdmin(), startIndex, endIndex));
+    }
+
+    /**
+     * Returns a substring of the incoming string traverser with a 0-based start index (inclusive) and end index
+     * (exclusive). If the start index is negative then it will begin at the specified index counted from the end of the
+     * string, or 0 if exceeding the string length. If the end index is negative then it will end at the specified index
+     * counted from the end, or at the end of the string if exceeding the string length. End index <= start index will
+     * return the empty string. Null values are not processed and remain as null when returned. If the incoming
+     * traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+     *
+     * @param scope local will operate on individual strings within incoming lists, global will operate on current traversal as a single object.
+     * @param startIndex the start index of the substring, inclusive.
+     * @param endIndex the end index of the substring, exclusive.
+     * @return the traversal with an appended {@link SubstringGlobalStep} or {@link SubstringLocalStep} depending on the {@link Scope}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#replace-step" target="_blank">Reference Documentation - Substring Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> substring(final Scope scope, final int startIndex, final int endIndex) {
+        this.asAdmin().getBytecode().addStep(Symbols.substring, scope, startIndex, endIndex);
+        return this.asAdmin().addStep(scope.equals(Scope.global) ?
+                new SubstringGlobalStep<>(this.asAdmin(), startIndex, endIndex) : new SubstringLocalStep<>(this.asAdmin(), startIndex, endIndex));
+    }
+
+    /**
+     * A mid-traversal step which will handle result formatting to string values.
+     *
+     * @return the traversal with an appended {@link FormatStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#format-step" target="_blank">Reference Documentation - format Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> format(final String format) {
+        this.asAdmin().getBytecode().addStep(Symbols.format, format);
+        return this.asAdmin().addStep(new FormatStep<>(this.asAdmin(), format));
+    }
+
+    /**
+     * Parse value of the incoming traverser as an ISO-8601 {@link Date}.
+     *
+     * @return the traversal with an appended {@link AsDateStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#asDate-step" target="_blank">Reference Documentation - asDate Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Date> asDate() {
+        this.asAdmin().getBytecode().addStep(Symbols.asDate);
+        return this.asAdmin().addStep(new AsDateStep<>(this.asAdmin()));
+    }
+
+    /**
+     * Increase value of input {@link Date}.
+     *
+     * @return the traversal with an appended {@link DateAddStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#dateAdd-step" target="_blank">Reference Documentation - dateAdd Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Date> dateAdd(final DT dateToken, final int value) {
+        this.asAdmin().getBytecode().addStep(Symbols.dateAdd, dateToken, value);
+        return this.asAdmin().addStep(new DateAddStep<>(this.asAdmin(), dateToken, value));
+    }
+
+    /**
+     * Returns the difference between two {@link Date} in epoch time.
+     *
+     * @return the traversal with an appended {@link DateDiffStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#dateDiff-step" target="_blank">Reference Documentation - dateDiff Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Long> dateDiff(final Date value) {
+        this.asAdmin().getBytecode().addStep(Symbols.dateDiff, value);
+        return this.asAdmin().addStep(new DateDiffStep<>(this.asAdmin(), value));
+    }
+
+    /**
+     * Returns the difference between two {@link Date} in epoch time.
+     *
+     * @return the traversal with an appended {@link DateDiffStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#dateDiff-step" target="_blank">Reference Documentation - dateDiff Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Long> dateDiff(final Traversal<?, Date> dateTraversal) {
+        this.asAdmin().getBytecode().addStep(Symbols.dateDiff, dateTraversal);
+        return this.asAdmin().addStep(new DateDiffStep<>(this.asAdmin(), dateTraversal));
+    }
+
+    /**
+     * Calculates the difference between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link DifferenceStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#difference-step" target="_blank">Reference Documentation - Difference Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Set<?>> difference(final Object values) {
+        this.asAdmin().getBytecode().addStep(Symbols.difference, values);
+        return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values));
+    }
+
+    /**
+     * Calculates the disjunction between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link DisjunctStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#disjunct-step" target="_blank">Reference Documentation - Disjunct Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Set<?>> disjunct(final Object values) {
+        this.asAdmin().getBytecode().addStep(Symbols.disjunct, values);
+        return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values));
+    }
+
+    /**
+     * Calculates the intersection between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link IntersectStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#intersect-step" target="_blank">Reference Documentation - Intersect Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, Set<?>> intersect(final Object values) {
+        this.asAdmin().getBytecode().addStep(Symbols.intersect, values);
+        return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values));
+    }
+
+    /**
+     * Joins together the elements of the incoming list traverser together with the provided delimiter.
+     *
+     * @return the traversal with an appended {@link ConjoinStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#conjoin-step" target="_blank">Reference Documentation - Conjoin Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, String> conjoin(final String delimiter) {
+        this.asAdmin().getBytecode().addStep(Symbols.conjoin, delimiter);
+        return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter));
+    }
+
+    /**
+     * Merges the list traverser and list argument. Also known as union.
+     *
+     * @return the traversal with an appended {@link TraversalMergeStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#merge-step" target="_blank">Reference Documentation - Merge Step</a>
+     * @since 3.7.1
+     */
+    public default <E2> GraphTraversal<S, E2> merge(final Object values) {
+        this.asAdmin().getBytecode().addStep(Symbols.merge, values);
+        return this.asAdmin().addStep(new TraversalMergeStep<>(this.asAdmin(), values));
+    }
+
+    /**
+     * Combines the list traverser and list argument. Also known as concatenation or append.
+     *
+     * @return the traversal with an appended {@link CombineStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#combine-step" target="_blank">Reference Documentation - Combine Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, List<?>> combine(final Object values) {
+        this.asAdmin().getBytecode().addStep(Symbols.combine, values);
+        return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values));
+    }
+
+    /**
+     * Calculates the cartesian product between the list traverser and list argument.
+     *
+     * @return the traversal with an appended {@link ProductStep}.
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#product-step" target="_blank">Reference Documentation - Product Step</a>
+     * @since 3.7.1
+     */
+    public default GraphTraversal<S, List<List<?>>> product(final Object values) {
+        this.asAdmin().getBytecode().addStep(Symbols.product, values);
+        return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values));
+    }
+
     ///////////////////// FILTER STEPS /////////////////////
 
     /**
@@ -2240,6 +2815,32 @@
         return this.asAdmin().addStep(new DropStep<>(this.asAdmin()));
     }
 
+    /**
+     * Filters <code>E</code> lists given the provided {@code predicate}.
+     *
+     * @param predicate the filter to apply
+     * @return the traversal with an appended {@link AllStep}
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#all-step" target="_blank">Reference Documentation - All Step</a>
+     * @since 3.7.1
+     */
+    public default <S2> GraphTraversal<S, E> all(final P<S2> predicate) {
+        this.asAdmin().getBytecode().addStep(Symbols.all, predicate);
+        return this.asAdmin().addStep(new AllStep<>(this.asAdmin(), predicate));
+    }
+
+    /**
+     * Filters <code>E</code> lists given the provided {@code predicate}.
+     *
+     * @param predicate the filter to apply
+     * @return the traversal with an appended {@link AnyStep}
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#any-step" target="_blank">Reference Documentation - Any Step</a>
+     * @since 3.7.1
+     */
+    public default <S2> GraphTraversal<S, E> any(final P<S2> predicate) {
+        this.asAdmin().getBytecode().addStep(Symbols.any, predicate);
+        return this.asAdmin().addStep(new AnyStep<>(this.asAdmin(), predicate));
+    }
+
     ///////////////////// SIDE-EFFECT STEPS /////////////////////
 
     /**
@@ -2538,6 +3139,8 @@
      * If a {@link Map} is supplied then each of the key/value pairs in the map will
      * be added as property.  This method is the long-hand version of looping through the 
      * {@link #property(Object, Object, Object...)} method for each key/value pair supplied.
+     * If a {@link CardinalityValueTraversal} is specified as a value then it will override any
+     * {@link VertexProperty.Cardinality} specified for the {@code key}.
      * <p />
      * This method is effectively calls {@link #property(VertexProperty.Cardinality, Object, Object, Object...)}
      * as {@code property(null, key, value, keyValues}.
@@ -2551,13 +3154,25 @@
      */
     public default GraphTraversal<S, E> property(final Object key, final Object value, final Object... keyValues) {
         if (key instanceof VertexProperty.Cardinality) {
-            if (value instanceof Map) { //Handle the property(Cardinality, Map) signature
-                final Map<Object, Object> map = (Map)value;
+            // expect property(Cardinality, Map) where Map has entry type of either:
+            // + <String<k>,CardinalityValue<v>> = property(v.cardinality, k, v.value) - overrides the Cardinality provided by "key"
+            // + <String<k>,Object<v>> = property(key, k, v) - uses Cardinality of key
+            if (value instanceof Map) {
+                // Handle the property(Cardinality, Map) signature
+                final Map<Object, Object> map = (Map) value;
                 for (Map.Entry<Object, Object> entry : map.entrySet()) {
-                    property(key, entry.getKey(), entry.getValue());
+                    final Object val = entry.getValue();
+                    if (val instanceof CardinalityValueTraversal) {
+                        final CardinalityValueTraversal cardVal = (CardinalityValueTraversal) val;
+                        property(cardVal.getCardinality(), entry.getKey(), cardVal.getValue());
+                    } else {
+                        // explicitly cast to avoid a possible recursive call.
+                        property((VertexProperty.Cardinality) key, entry.getKey(), entry.getValue());
+                    }
                 }
                 return this;
-            } else if (value == null) { // Just return the input if you pass a null
+            } else if (value == null) {
+                // Just return the input if you pass a null
                 return this;
             } else {
                 return this.property((VertexProperty.Cardinality) key, value, null == keyValues ? null : keyValues[0],
@@ -2565,7 +3180,8 @@
                                 Arrays.copyOfRange(keyValues, 1, keyValues.length) :
                                 new Object[]{});
             }
-        } else  { //handles if cardinality is not the first parameter
+        } else  {
+            // handles if cardinality is not the first parameter
             return this.property(null, key, value, keyValues);
         }
     }
@@ -2575,6 +3191,9 @@
      * be added as property.  This method is the long-hand version of looping through the 
      * {@link #property(Object, Object, Object...)} method for each key/value pair supplied.
      * <p/>
+     * A value may use a {@link CardinalityValueTraversal} to allow specification of the
+     * {@link VertexProperty.Cardinality} along with the property value itself.
+     * <p/>
      * If a {@link Map} is not supplied then an exception is thrown.
      * <p />
      * This method is effectively calls {@link #property(VertexProperty.Cardinality, Object, Object, Object...)}
@@ -2588,7 +3207,13 @@
     public default GraphTraversal<S, E> property(final Map<Object, Object> value) {
         if (value != null) {
             for (Map.Entry<Object, Object> entry : value.entrySet()) {
-                property(null, entry.getKey(), entry.getValue());
+                final Object val = entry.getValue();
+                if (val instanceof CardinalityValueTraversal) {
+                    final CardinalityValueTraversal cardVal = (CardinalityValueTraversal) val;
+                    property(cardVal.getCardinality(), entry.getKey(), cardVal.getValue());
+                } else {
+                    property(null, entry.getKey(), entry.getValue());
+                }
             }
         }
         return this;
@@ -3284,6 +3909,29 @@
     }
 
     /**
+     * This is a step modulator to a {@link TraversalOptionParent} like {@code choose()} or {@code mergeV()} where the
+     * provided argument associated to the {@code token} is applied according to the semantics of the step. Please see
+     * the documentation of such steps to understand the usage context.
+     *
+     * @param m Provides a {@code Map} as the option which is the same as doing {@code constant(m)}.
+     * @return the traversal with the modulated step
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergev-step" target="_blank">Reference Documentation - MergeV Step</a>
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#mergee-step" target="_blank">Reference Documentation - MergeE Step</a>
+     * @since 3.7.0
+     */
+    public default <M, E2> GraphTraversal<S, E> option(final Merge merge, final Map<Object, Object> m, final VertexProperty.Cardinality cardinality) {
+        this.asAdmin().getBytecode().addStep(Symbols.option, merge, m, cardinality);
+        // do explicit cardinality for every single pair in the map
+        for (Object k : m.keySet()) {
+            final Object o = m.get(k);
+            if (!(o instanceof CardinalityValueTraversal))
+                m.put(k, new CardinalityValueTraversal(cardinality, o));
+        }
+        ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption((M) merge, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin());
+        return this;
+    }
+
+    /**
      * This step modifies {@link #choose(Function)} to specifies the available choices that might be executed.
      *
      * @param traversalOption the option as a traversal
@@ -3412,6 +4060,7 @@
         public static final String hasKey = "hasKey";
         public static final String hasValue = "hasValue";
         public static final String is = "is";
+        public static final String conjoin = "conjoin";
         public static final String not = "not";
         public static final String range = "range";
         public static final String limit = "limit";
@@ -3423,6 +4072,30 @@
         public static final String write = "write";
         public static final String call = "call";
         public static final String element = "element";
+        public static final String concat = "concat";
+        public static final String asString = "asString";
+        public static final String toUpper = "toUpper";
+        public static final String toLower = "toLower";
+        public static final String length = "length";
+        public static final String trim = "trim";
+        public static final String lTrim = "lTrim";
+        public static final String rTrim = "rTrim";
+        public static final String reverse = "reverse";
+        public static final String replace = "replace";
+        public static final String substring = "substring";
+        public static final String split = "split";
+        public static final String format = "format";
+        public static final String asDate = "asDate";
+        public static final String dateAdd = "dateAdd";
+        public static final String dateDiff = "dateDiff";
+        public static final String all = "all";
+        public static final String any = "any";
+        public static final String merge = "merge";
+        public static final String product = "product";
+        public static final String combine = "combine";
+        public static final String difference = "difference";
+        public static final String disjunct = "disjunct";
+        public static final String intersect = "intersect";
 
         public static final String timeLimit = "timeLimit";
         public static final String simplePath = "simplePath";
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index a4bc9e3..dc15306 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -27,6 +27,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStartStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CallStep;
@@ -46,6 +47,7 @@
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -556,6 +558,21 @@
     }
 
     /**
+     * Merges the results of an arbitrary number of traversals.
+     *
+     * @param unionTraversals the traversals to merge
+     * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#union-step" target="_blank">Reference Documentation - Union Step</a>
+     * @since 3.7.0
+     */
+    public <S> GraphTraversal<S, S> union(final Traversal<?, S>... unionTraversals) {
+        final GraphTraversalSource clone = this.clone();
+        clone.bytecode.addStep(GraphTraversal.Symbols.union, unionTraversals);
+        final GraphTraversal.Admin traversal = new DefaultGraphTraversal(clone);
+        final UnionStep<?, S> step = new UnionStep<>(traversal, true, Arrays.copyOf(unionTraversals, unionTraversals.length, Traversal.Admin[].class));
+        return traversal.addStep(step);
+    }
+
+    /**
      * Performs a read or write based operation on the {@link Graph} backing this {@code GraphTraversalSource}. This
      * step can be accompanied by the {@link GraphTraversal#with(String, Object)} modulator for further configuration
      * and must be accompanied by a {@link GraphTraversal#read()} or {@link GraphTraversal#write()} modulator step
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 6274b45..d6cdc1e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -18,13 +18,14 @@
  */
 package org.apache.tinkerpop.gremlin.process.traversal.dsl.graph;
 
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
 import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CallStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FormatStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
 import org.apache.tinkerpop.gremlin.structure.Column;
@@ -37,10 +38,11 @@
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -130,6 +132,13 @@
     }
 
     /**
+     * @see GraphTraversal#E(Object...)
+     */
+    public static <A> GraphTraversal<A, Edge> E(final Object... edgeIdsOrElements) {
+        return __.<A>start().E(edgeIdsOrElements);
+    }
+
+    /**
      * @see GraphTraversal#to(Direction, String...)
      */
     public static GraphTraversal<Vertex, Vertex> to(final Direction direction, final String... edgeLabels) {
@@ -580,6 +589,265 @@
         return __.<A>start().math(expression);
     }
 
+    /**
+     * @see GraphTraversal#concat(Traversal, Traversal...)
+     */
+    public static <A> GraphTraversal<A, String> concat(final Traversal<A, String> concatTraversal, final Traversal<A, String>... otherConcatTraversals) {
+        return __.<A>start().concat(concatTraversal, otherConcatTraversals);
+    }
+
+    /**
+     * @see GraphTraversal#concat(String...)
+     */
+    public static <A> GraphTraversal<A, String> concat(final String... concatString) {
+        return __.<A>start().concat(concatString);
+    }
+
+    /**
+     * @see GraphTraversal#asString()
+     */
+    public static <A> GraphTraversal<A, String> asString() {
+        return __.<A>start().asString();
+    }
+
+    /**
+     * @see GraphTraversal#asString()
+     */
+    public static <A, B> GraphTraversal<A, B> asString(final Scope scope) {
+        return __.<A>start().asString(scope);
+    }
+
+    /**
+     * @see GraphTraversal#length()
+     */
+    public static <A> GraphTraversal<A, Integer> length() {
+        return __.<A>start().length();
+    }
+
+    /**
+     * @see GraphTraversal#length()
+     */
+    public static <A, B> GraphTraversal<A, B> length(final Scope scope) {
+        return __.<A>start().length(scope);
+    }
+
+    /**
+     * @see GraphTraversal#toLower()
+     */
+    public static <A> GraphTraversal<A, String> toLower() {
+        return __.<A>start().toLower();
+    }
+
+    /**
+     * @see GraphTraversal#toLower()
+     */
+    public static <A, B> GraphTraversal<A, B> toLower(final Scope scope) {
+        return __.<A>start().toLower(scope);
+    }
+
+    /**
+     * @see GraphTraversal#toUpper()
+     */
+    public static <A> GraphTraversal<A, String> toUpper() {
+        return __.<A>start().toUpper();
+    }
+
+    /**
+     * @see GraphTraversal#toUpper(Scope)
+     */
+    public static <A, B> GraphTraversal<A, B> toUpper(final Scope scope) {
+        return __.<A>start().toUpper(scope);
+    }
+
+    /**
+     * @see GraphTraversal#trim()
+     */
+    public static <A> GraphTraversal<A, String> trim() {
+        return __.<A>start().trim();
+    }
+
+    /**
+     * @see GraphTraversal#trim(Scope)
+     */
+    public static <A, B> GraphTraversal<A, B> trim(final Scope scope) {
+        return __.<A>start().trim(scope);
+    }
+
+    /**
+     * @see GraphTraversal#lTrim()
+     */
+    public static <A> GraphTraversal<A, String> lTrim() {
+        return __.<A>start().lTrim();
+    }
+
+    /**
+     * @see GraphTraversal#lTrim(Scope)
+     */
+    public static <A, B> GraphTraversal<A, B> lTrim(final Scope scope) {
+        return __.<A>start().lTrim(scope);
+    }
+
+    /**
+     * @see GraphTraversal#rTrim()
+     */
+    public static <A> GraphTraversal<A, String> rTrim() {
+        return __.<A>start().rTrim();
+    }
+
+    /**
+     * @see GraphTraversal#rTrim(Scope)
+     */
+    public static <A, B> GraphTraversal<A, B> rTrim(final Scope scope) {
+        return __.<A>start().rTrim(scope);
+    }
+
+    /**
+     * @see GraphTraversal#reverse()
+     */
+    public static <A, B> GraphTraversal<A, B> reverse() {
+        return __.<A>start().reverse();
+    }
+
+    /**
+     * @see GraphTraversal#replace(String, String)
+     */
+    public static <A> GraphTraversal<A, String> replace(final String oldChar, final String newChar) {
+        return __.<A>start().replace(oldChar, newChar);
+    }
+
+    /**
+     * @see GraphTraversal#replace(Scope, String, String)
+     */
+    public static <A, B> GraphTraversal<A, B> replace(final Scope scope, final String oldChar, final String newChar) {
+        return __.<A>start().replace(scope, oldChar, newChar);
+    }
+
+    /**
+     * @see GraphTraversal#split(String)
+     */
+    public static <A> GraphTraversal<A, List<String>> split(final String separator) {
+        return __.<A>start().split(separator);
+    }
+
+    /**
+     * @see GraphTraversal#split(Scope, String)
+     */
+    public static <A, B> GraphTraversal<A, List<B>> split(final Scope scope, final String separator) {
+        return __.<A>start().split(scope, separator);
+    }
+
+    /**
+     * @see GraphTraversal#substring(int)
+     */
+    public static <A> GraphTraversal<A, String> substring(final int startIndex) {
+        return __.<A>start().substring(startIndex);
+    }
+
+    /**
+     * @see GraphTraversal#substring(Scope, int)
+     */
+    public static <A, B> GraphTraversal<A, B> substring(final Scope scope, final int startIndex) {
+        return __.<A>start().substring(scope, startIndex);
+    }
+
+    /**
+     * @see GraphTraversal#substring(int, int)
+     */
+    public static <A> GraphTraversal<A, String> substring(final int startIndex, final int endIndex) {
+        return __.<A>start().substring(startIndex, endIndex);
+    }
+
+    /**
+     * @see GraphTraversal#substring(Scope, int, int)
+     */
+    public static <A, B> GraphTraversal<A, B> substring(final Scope scope, final int startIndex, final int endIndex) {
+        return __.<A>start().substring(scope, startIndex, endIndex);
+    }
+
+    /**
+     * @see GraphTraversal#format(String)
+     */
+    public static <A> GraphTraversal<A, String> format(final String format) {
+        return __.<A>start().format(format);
+    }
+
+    /**
+     * @see GraphTraversal#asDate()
+     */
+    public static <A> GraphTraversal<A, Date> asDate() {
+        return __.<A>start().asDate();
+    }
+
+    /**
+     * @see GraphTraversal#dateAdd(DT, int)
+     */
+    public static <A> GraphTraversal<A, Date> dateAdd(final DT dateToken, final int value) {
+        return __.<A>start().dateAdd(dateToken, value);
+    }
+
+    /**
+     * @see GraphTraversal#dateDiff(Date)
+     */
+    public static <A> GraphTraversal<A, Long> dateDiff(final Date value) {
+        return __.<A>start().dateDiff(value);
+    }
+
+    /**
+     * @see GraphTraversal#dateDiff(Traversal)
+     */
+    public static <A> GraphTraversal<A, Long> dateDiff(final Traversal<?, Date> dateTraversal) {
+        return __.<A>start().dateDiff(dateTraversal);
+    }
+
+    /**
+     * @see GraphTraversal#difference(Object)
+     */
+    public static <A> GraphTraversal<A, Set<?>> difference(final Object values) {
+        return __.<A>start().difference(values);
+    }
+
+    /**
+     * @see GraphTraversal#disjunct(Object)
+     */
+    public static <A> GraphTraversal<A, Set<?>> disjunct(final Object values) {
+        return __.<A>start().disjunct(values);
+    }
+
+    /**
+     * @see GraphTraversal#intersect(Object)
+     */
+    public static <A> GraphTraversal<A, Set<?>> intersect(final Object values) {
+        return __.<A>start().intersect(values);
+    }
+
+    /**
+     * @see GraphTraversal#conjoin(String)
+     */
+    public static <A> GraphTraversal<A, String> conjoin(final String values) {
+        return __.<A>start().conjoin(values);
+    }
+
+    /**
+     * @see GraphTraversal#merge(Object)
+     */
+    public static <A, B> GraphTraversal<A, B> merge(final Object values) {
+        return __.<A>start().merge(values);
+    }
+
+    /**
+     * @see GraphTraversal#combine(Object)
+     */
+    public static <A> GraphTraversal<A, List<?>> combine(final Object values) {
+        return __.<A>start().combine(values);
+    }
+
+    /**
+     * @see GraphTraversal#product(Object)
+     */
+    public static <A> GraphTraversal<A, List<List<?>>> product(final Object values) {
+        return __.<A>start().product(values);
+    }
+
     ///////////////////// FILTER STEPS /////////////////////
 
     /**
@@ -911,6 +1179,16 @@
         return __.<A>start().drop();
     }
 
+    /**
+     * @see GraphTraversal#all(P)
+     */
+    public static <A> GraphTraversal<A, A> all(final P<A> predicate) { return __.<A>start().all(predicate); }
+
+    /**
+     * @see GraphTraversal#any(P)
+     */
+    public static <A> GraphTraversal<A, A> any(final P<A> predicate) { return __.<A>start().any(predicate); }
+
     ///////////////////// SIDE-EFFECT STEPS /////////////////////
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/CardinalityValueTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/CardinalityValueTraversal.java
new file mode 100644
index 0000000..8c13e06
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/CardinalityValueTraversal.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.lambda;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+
+import java.util.Objects;
+
+public final class CardinalityValueTraversal extends AbstractLambdaTraversal {
+
+    private final VertexProperty.Cardinality cardinality;
+
+    private final Object value;
+
+    private final Bytecode bytecode;
+
+    public CardinalityValueTraversal(final VertexProperty.Cardinality cardinality, final Object value) {
+        this.cardinality = cardinality;
+        this.value = value;
+        this.bytecode = new Bytecode(CardinalityValueTraversal.class.getSimpleName(), cardinality.name(), value);
+    }
+
+    public static CardinalityValueTraversal from(final Bytecode.Instruction inst) {
+        return new CardinalityValueTraversal(VertexProperty.Cardinality.valueOf(inst.getArguments()[0].toString()),
+                inst.getArguments()[1]);
+    }
+
+    @Override
+    public Bytecode getBytecode() {
+        return this.bytecode;
+    }
+
+    public VertexProperty.Cardinality getCardinality() {
+        return cardinality;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "[" + cardinality + ", " + value + "]";
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (!(o instanceof CardinalityValueTraversal)) return false;
+        if (!super.equals(o)) return false;
+
+        final CardinalityValueTraversal that = (CardinalityValueTraversal) o;
+
+        if (cardinality != that.cardinality) return false;
+        return Objects.equals(value, that.value);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + cardinality.hashCode();
+        result = 31 * result + (value != null ? value.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionStep.java
index 1ce6137..eb4a32c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionStep.java
@@ -19,25 +19,80 @@
 package org.apache.tinkerpop.gremlin.process.traversal.step.branch;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Pick;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.TraverserGenerator;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
 import java.util.Collections;
+import java.util.Iterator;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class UnionStep<S, E> extends BranchStep<S, E, Pick> {
+public class UnionStep<S, E> extends BranchStep<S, E, Pick> {
 
-    public UnionStep(final Traversal.Admin traversal, final Traversal.Admin<?, E>... unionTraversals) {
+    /**
+     * Determines if this step is configured to be used as a start step.
+     */
+    private final boolean isStart;
+
+    /**
+     * Is this the first iteration through the step.
+     */
+    protected boolean first = true;
+
+    /**
+     * A placeholder object used to kick off the first traverser in the union.
+     */
+    static final Object UNION_STARTER = new Object();
+
+    public UnionStep(final Traversal.Admin traversal, final boolean isStart, final Traversal.Admin<?, E>... unionTraversals) {
         super(traversal);
+        this.isStart = isStart;
         this.setBranchTraversal(new ConstantTraversal<>(Pick.any));
         for (final Traversal.Admin<?, E> union : unionTraversals) {
             this.addChildOption(Pick.any, (Traversal.Admin) union);
         }
     }
 
+    public UnionStep(final Traversal.Admin traversal, final Traversal.Admin<?, E>... unionTraversals) {
+        this(traversal, false, unionTraversals);
+    }
+
+    public boolean isStart() {
+        return isStart;
+    }
+
+    @Override
+    protected Traverser.Admin<E> processNextStart() {
+        // when it's a start step a traverser needs to be created to kick off the traversal.
+        if (isStart && first) {
+            first = false;
+            final TraverserGenerator generator = this.getTraversal().getTraverserGenerator();
+            final Traverser.Admin<S> traverser = generator.generate(UNION_STARTER, (Step) this, 1L);
+
+            // immediately drop the path which would include "false" otherwise. let the path start with the
+            // traversers produced from the children to the union()
+            traverser.dropPath();
+            this.addStart(traverser);
+        }
+
+        // if this isStart then loop through the next starts until we find one that doesn't hold the
+        // UNION_STARTER and return that. this deals with inject() which is always a start step even
+        // when used mid-traversal.
+        Traverser.Admin<E> t = super.processNextStart();
+        if (isStart) {
+            while (t != null && t.get() == UNION_STARTER) {
+                t = super.processNextStart();
+            }
+        }
+
+        return t;
+    }
+
     @Override
     public void addChildOption(final Pick pickToken, final Traversal.Admin<S, E> traversalOption) {
         if (Pick.any != pickToken)
@@ -46,6 +101,12 @@
     }
 
     @Override
+    public void reset() {
+        super.reset();
+        first = true;
+    }
+
+    @Override
     public String toString() {
         return StringFactory.stepString(this, this.traversalPickOptions.getOrDefault(Pick.any, Collections.emptyList()));
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AllStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AllStep.java
new file mode 100644
index 0000000..6f002bb
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AllStep.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
+
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinTypeErrorException;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public final class AllStep<S, S2> extends FilterStep<S> {
+
+    private P<S2> predicate;
+
+    public AllStep(final Traversal.Admin traversal, final P<S2> predicate) {
+        super(traversal);
+
+        if (null == predicate) {
+            throw new IllegalArgumentException("Input predicate to all step can't be null.");
+        }
+
+        this.predicate = predicate;
+    }
+
+    @Override
+    protected boolean filter(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+
+        if (item instanceof Iterable || item instanceof Iterator || ((item != null) && item.getClass().isArray())) {
+            GremlinTypeErrorException typeError = null;
+            final Iterator<S2> iterator = IteratorUtils.asIterator(item);
+            while (iterator.hasNext()) {
+                try {
+                    if (!this.predicate.test(iterator.next())) {
+                        return false;
+                    }
+                } catch (GremlinTypeErrorException gtee) {
+                    // hold onto it until the end in case any other element evaluates to FALSE
+                    typeError = gtee;
+                }
+            }
+            if (typeError != null) throw typeError;
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.stepString(this, this.predicate);
+    }
+
+    @Override
+    public AllStep<S, S2> clone() {
+        final AllStep<S, S2> clone = (AllStep<S, S2>) super.clone();
+        clone.predicate = this.predicate.clone();
+        return clone;
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return EnumSet.of(TraverserRequirement.OBJECT);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AnyStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AnyStep.java
new file mode 100644
index 0000000..4144dd5
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AnyStep.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
+
+import org.apache.tinkerpop.gremlin.process.traversal.GremlinTypeErrorException;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public final class AnyStep<S, S2> extends FilterStep<S> {
+
+    private P<S2> predicate;
+
+    public AnyStep(final Traversal.Admin traversal, final P<S2> predicate) {
+        super(traversal);
+
+        if (null == predicate) {
+            throw new IllegalArgumentException("Input predicate to any step can't be null.");
+        }
+
+        this.predicate = predicate;
+    }
+
+    @Override
+    protected boolean filter(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+
+        if (item instanceof Iterable || item instanceof Iterator || ((item != null) && item.getClass().isArray())) {
+            GremlinTypeErrorException typeError = null;
+            final Iterator<S2> iterator = IteratorUtils.asIterator(item);
+            while (iterator.hasNext()) {
+                try {
+                    if (this.predicate.test(iterator.next())) {
+                        return true;
+                    }
+                } catch (GremlinTypeErrorException gtee) {
+                    // hold onto it until the end in case any other element evaluates to TRUE
+                    typeError = gtee;
+                }
+            }
+
+            if (typeError != null) throw typeError;
+        }
+
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.stepString(this, this.predicate);
+    }
+
+    @Override
+    public AnyStep<S, S2> clone() {
+        final AnyStep<S, S2> clone = (AnyStep<S, S2>) super.clone();
+        clone.predicate = this.predicate.clone();
+        return clone;
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return EnumSet.of(TraverserRequirement.OBJECT);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsDateStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsDateStep.java
new file mode 100644
index 0000000..22ea8db
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsDateStep.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.util.DatetimeHelper;
+
+import java.time.format.DateTimeParseException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for date parsing step.
+ *
+ * @author Valentyn Kahamlyk
+ */
+public final class AsDateStep<S> extends ScalarMapStep<S, Date> {
+
+    public AsDateStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected Date map(final Traverser.Admin<S> traverser) {
+        final Object object = traverser.get();
+        if (object == null)
+            throw new IllegalArgumentException("Can't parse null as Date.");
+        if (object instanceof Date)
+            return (Date) object;
+        if (object instanceof Number)
+            // numbers handled as milliseconds since January 1, 1970, 00:00:00 GMT.
+            return new Date(((Number) object).longValue());
+        if (object instanceof String) {
+            try {
+                return DatetimeHelper.parse((String) object);
+            }
+            catch (DateTimeParseException e) {
+                throw new IllegalArgumentException("Can't parse " + object + " as Date.");
+            }
+        }
+
+        throw new IllegalArgumentException("Can't parse " + object.getClass().getName() + " as Date.");
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.stepString(this);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringGlobalStep.java
new file mode 100644
index 0000000..eea78d8
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringGlobalStep.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for asString() step, a mid-traversal step which returns the incoming traverser value
+ * as a string. Null values are returned unchanged.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class AsStringGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public AsStringGlobalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        S traverserObject = traverser.get();
+        return (E) ((traverserObject == null) ? null : String.valueOf(traverserObject));
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringLocalStep.java
new file mode 100644
index 0000000..4a2120d
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringLocalStep.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for asString() step, a mid-traversal step which returns the incoming traverser value
+ * as a string. Null values are returned unchanged.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class AsStringLocalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public AsStringLocalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+
+        if (null == item) {
+            // we will pass null lists to next step
+            return null;
+        } else if ((item instanceof Iterable) || (item instanceof Iterator) || item.getClass().isArray()) {
+            final List<String> resList = new ArrayList<>();
+            final Iterator<E> iterator = IteratorUtils.asIterator(item);
+            while (iterator.hasNext()) {
+                final E i = iterator.next();
+                resList.add((i == null) ? null : String.valueOf(i));
+            }
+            return (E) resList;
+        } else {
+            return (E) String.valueOf(item);
+        }
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
new file mode 100644
index 0000000..ae854eb
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A map step that returns the combination of the traverser and the provided arguments. This is also commonly known as
+ * concatenation or append.
+ */
+public final class CombineStep<S, E> extends ScalarMapStep<S, List<?>> implements TraversalParent, ListFunction {
+    private Traversal.Admin<S, E> valueTraversal;
+    private Object parameterItems;
+
+    public CombineStep(final Traversal.Admin traversal, final Object values) {
+        super(traversal);
+
+        if (values instanceof Traversal) {
+            valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
+        } else {
+            parameterItems = values;
+        }
+    }
+
+    @Override
+    public String getStepName() { return "combine"; }
+
+    @Override
+    protected List<?> map(Traverser.Admin<S> traverser) {
+        final Collection listA = convertTraverserToCollection(traverser);
+        final Collection listB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems);
+
+        final List combined = new ArrayList(listA);
+        combined.addAll(listB);
+
+        return combined;
+    }
+
+    @Override
+    public List<Traversal.Admin<S, E>> getLocalChildren() {
+        return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() { return this.getSelfAndChildRequirements(); }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        if (valueTraversal != null) { this.integrateChild(this.valueTraversal); }
+    }
+
+    @Override
+    public CombineStep<S, E> clone() {
+        final CombineStep<S, E> clone = (CombineStep<S, E>) super.clone();
+        if (null != this.valueTraversal) {
+            clone.valueTraversal = this.valueTraversal.clone();
+        } else {
+            clone.parameterItems = this.parameterItems;
+        }
+        return clone;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, valueTraversal, parameterItems);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java
new file mode 100644
index 0000000..04811d8
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Reference implementation for String concatenation step, a mid-traversal step which concatenates one or more
+ * String values together to the incoming String traverser. If the incoming traverser is a non-String value then an
+ * {@code IllegalArgumentException} will be thrown.
+ *
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ConcatStep<S> extends ScalarMapStep<S, String> implements TraversalParent {
+
+    private List<Traversal.Admin<S, String>> concatTraversals;
+    private List<String> concatStrings;
+    private String stringArgsResult;
+
+    // flag used to propagate the null value through if all strings to be concatenated are null
+    private boolean isNullTraverser = true;
+    private boolean isNullTraversal = true;
+    private boolean isNullString = true;
+
+    public ConcatStep(final Traversal.Admin traversal, final String... concatStrings) {
+        super(traversal);
+        this.concatStrings = null == concatStrings? null : Collections.unmodifiableList(Arrays.asList(concatStrings));
+        this.stringArgsResult = processStrings(concatStrings);
+    }
+
+    public ConcatStep(final Traversal.Admin traversal, final Traversal<?, String> concatTraversal, final Traversal<?, String>... otherConcatTraversals) {
+        super(traversal);
+        this.concatTraversals = null == concatTraversal? new ArrayList<>() : new ArrayList<>(Collections.singletonList((Traversal.Admin<S, String>) concatTraversal.asAdmin()));
+        if (null != otherConcatTraversals) {
+            this.concatTraversals.addAll(Stream.of(otherConcatTraversals).filter(Objects::nonNull).map(ct -> (Traversal.Admin<S, String>) ct.asAdmin()).collect(Collectors.toList()));
+        }
+        this.concatTraversals.forEach(this::integrateChild);
+    }
+
+    @Override
+    protected String map(final Traverser.Admin<S> traverser) {
+        // throws when incoming traverser isn't a string
+        if (null != traverser.get() && !(traverser.get() instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("String concat() can only take string as argument, encountered %s", traverser.get().getClass()));
+        }
+
+        final StringBuilder sb = new StringBuilder();
+        // all null values are skipped during appending, as StringBuilder will otherwise append "null" as a string
+        if (null != traverser.get()) {
+            // we know there is one non-null part in the string we concat
+            this.isNullTraverser = false;
+            sb.append(traverser.get());
+        }
+
+        if (null != this.concatTraversals) {
+            this.concatTraversals.forEach(ct -> {
+                final String result = TraversalUtil.apply(traverser, ct);
+                if (null != result) {
+                    this.isNullTraversal = false;
+                    sb.append(result);
+                }
+            });
+        }
+
+        if (!this.isNullString) {
+            sb.append(this.stringArgsResult);
+        }
+
+        if (this.isNullTraverser && this.isNullTraversal && this.isNullString) {
+            return null;
+        } else {
+            this.isNullTraverser = true;
+            this.isNullTraversal = true;
+            return sb.toString();
+        }
+    }
+
+    private String processStrings(final String[] concatStrings) {
+        final StringBuilder sb = new StringBuilder();
+        if (null != concatStrings && concatStrings.length != 0) {
+            for (final String s : concatStrings) {
+                if (null != s) {
+                    // we know there is one non-null part in the string we concat
+                    this.isNullString = false;
+                    sb.append(s);
+                }
+            }
+        }
+        return this.isNullString? null : sb.toString();
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return this.getSelfAndChildRequirements(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        if (null != this.concatTraversals)
+            for (final Traversal.Admin<S, String> traversal : this.concatTraversals) {
+                this.integrateChild(traversal);
+            }
+    }
+
+    @Override
+    public ConcatStep<S> clone() {
+        final ConcatStep<S> clone = (ConcatStep<S>) super.clone();
+        if (null != this.concatTraversals) {
+            clone.concatTraversals = new ArrayList<>();
+            for (final Traversal.Admin<S, String> concatTraversals : this.concatTraversals) {
+                clone.concatTraversals.add(concatTraversals.clone());
+            }
+        }
+        if (null != this.concatStrings) {
+            clone.concatStrings = new ArrayList<>();
+            clone.concatStrings.addAll(this.concatStrings);
+        }
+        return clone;
+    }
+
+    @Override
+    public List<Traversal.Admin<S, String>> getLocalChildren() {
+        return null == this.concatTraversals ? Collections.emptyList() : this.concatTraversals;
+    }
+
+    @Override
+    public String toString() {
+        if (null != this.concatTraversals)
+            return StringFactory.stepString(this, this.concatTraversals);
+        return StringFactory.stepString(this, this.concatStrings);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        if (null != this.concatTraversals) {
+            for (final Traversal t : this.concatTraversals) {
+                result = 31 * result + (null != t ? t.hashCode() : 0);
+            }
+        }
+        if (null != this.concatStrings) {
+            for (final String s : this.concatStrings) {
+                result = 31 * result + (null != s ? s.hashCode() : 0);
+            }
+        }
+        return result;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
new file mode 100644
index 0000000..0f38739
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A map step that returns the result of joining every element in the traverser using the delimiter argument.
+ */
+public final class ConjoinStep<S> extends ScalarMapStep<S, String> implements ListFunction {
+    private String delimiter;
+
+    public ConjoinStep(final Traversal.Admin traversal, final String delimiter) {
+        super(traversal);
+        if (null == delimiter) { throw new IllegalArgumentException("Input delimiter to conjoin step can't be null."); }
+        this.delimiter = delimiter;
+    }
+
+    @Override
+    public String getStepName() { return "conjoin"; }
+
+    @Override
+    protected String map(Traverser.Admin<S> traverser) {
+        final Collection elements = convertTraverserToCollection(traverser);
+        if (elements.isEmpty()) { return ""; }
+
+        final StringBuilder joinResult = new StringBuilder();
+
+        for (Object elem : elements) {
+            if (elem != null) {
+                joinResult.append(String.valueOf(elem)).append(delimiter);
+            }
+        }
+
+        if (joinResult.length() != 0) {
+            joinResult.delete(joinResult.length() - delimiter.length(), joinResult.length());
+            return joinResult.toString();
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() { return Collections.singleton(TraverserRequirement.OBJECT); }
+
+    @Override
+    public ConjoinStep<S> clone() {
+        final ConjoinStep<S> clone = (ConjoinStep<S>) super.clone();
+        clone.delimiter = this.delimiter;
+        return clone;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, delimiter);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateAddStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateAddStep.java
new file mode 100644
index 0000000..366c11b
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateAddStep.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Reference implementation for date concatenation step.
+ *
+ * @author Valentyn Kahamlyk
+ */
+public final class DateAddStep<S> extends ScalarMapStep<S, Date> {
+
+    final static Map<DT, Integer> DTtoCalendar = new HashMap<>();
+
+    static {
+        DTtoCalendar.put(DT.second, Calendar.SECOND);
+        DTtoCalendar.put(DT.minute, Calendar.MINUTE);
+        DTtoCalendar.put(DT.hour, Calendar.HOUR_OF_DAY);
+        DTtoCalendar.put(DT.day, Calendar.DAY_OF_MONTH);
+    }
+
+    private DT dateToken;
+    private int value;
+
+    public DateAddStep(final Traversal.Admin traversal, final DT dateToken, final int value) {
+        super(traversal);
+        this.dateToken = dateToken;
+        this.value = value;
+    }
+
+    @Override
+    protected Date map(final Traverser.Admin<S> traverser) {
+        final Object object = traverser.get();
+
+        if (!(object instanceof Date)) throw new IllegalArgumentException("dateAdd accept only Date.");
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime((Date) object);
+        cal.add(DTtoCalendar.get(dateToken), value);
+
+        return cal.getTime();
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + dateToken.hashCode();
+        result = 31 * result + value;
+        return result;
+    }
+
+    @Override
+    public DateAddStep<S> clone() {
+        final DateAddStep<S> clone = (DateAddStep<S>) super.clone();
+        clone.value = this.value;
+        clone.dateToken = this.dateToken;
+        return clone;
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.stepString(this);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateDiffStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateDiffStep.java
new file mode 100644
index 0000000..184d72f
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateDiffStep.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.Set;
+
+/**
+ * Reference implementation for date difference step.
+ *
+ * @author Valentyn Kahamlyk
+ */
+public final class DateDiffStep<S> extends ScalarMapStep<S, Long> implements TraversalParent {
+
+    private Date value;
+    private Traversal.Admin<S, Date> dateTraversal;
+
+    public DateDiffStep(final Traversal.Admin traversal, final Date value) {
+        super(traversal);
+        this.value = value;
+    }
+
+    public DateDiffStep(final Traversal.Admin traversal, final Traversal<?, Date> dateTraversal) {
+        super(traversal);
+        this.dateTraversal = this.integrateChild(dateTraversal.asAdmin());
+    }
+
+    @Override
+    protected Long map(final Traverser.Admin<S> traverser) {
+        final Object object = traverser.get();
+
+        if (!(object instanceof Date))
+            throw new IllegalArgumentException(
+                    String.format("DateDiff can only take Date as argument, encountered %s", object.getClass()));
+
+        final Date otherDate = value != null ? value :
+                dateTraversal != null ? TraversalUtil.apply(traverser, dateTraversal) : null;
+
+        // let's not throw exception and assume null date == 0
+        final long otherDateMs = otherDate == null ? 0 : otherDate.getTime();
+
+        return (((Date) object).getTime() - otherDateMs) / 1000;
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (value != null ? value.hashCode() : dateTraversal.hashCode());
+        return result;
+    }
+
+    @Override
+    public DateDiffStep<S> clone() {
+        final DateDiffStep<S> clone = (DateDiffStep<S>) super.clone();
+        clone.value = this.value;
+        clone.dateTraversal = this.dateTraversal;
+        return clone;
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.stepString(this);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
new file mode 100644
index 0000000..1317f93
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A map step that returns the difference of the traverser and the provided arguments without duplicates.
+ */
+public final class DifferenceStep<S, E> extends ScalarMapStep<S, Set<?>> implements TraversalParent, ListFunction {
+    private Traversal.Admin<S, E> valueTraversal;
+    private Object parameterItems;
+    public DifferenceStep(final Traversal.Admin traversal, final Object values) {
+        super(traversal);
+
+        if (values instanceof Traversal) {
+            valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
+        } else {
+            parameterItems = values;
+        }
+    }
+
+    @Override
+    public String getStepName() { return "difference"; }
+
+    @Override
+    protected Set<?> map(Traverser.Admin<S> traverser) {
+        final Collection setA = convertTraverserToCollection(traverser);
+        final Collection setB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems);
+        final Set differenceSet = new HashSet();
+
+        for (Object element : setA) {
+            if (!setB.contains(element)) {
+                differenceSet.add(element);
+            }
+        }
+
+        return differenceSet;
+    }
+
+    @Override
+    public List<Traversal.Admin<S, E>> getLocalChildren() {
+        return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() { return this.getSelfAndChildRequirements(); }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        if (valueTraversal != null) { this.integrateChild(this.valueTraversal); }
+    }
+
+    @Override
+    public DifferenceStep<S, E> clone() {
+        final DifferenceStep<S, E> clone = (DifferenceStep<S, E>) super.clone();
+        if (null != this.valueTraversal) {
+            clone.valueTraversal = this.valueTraversal.clone();
+        } else {
+            clone.parameterItems = this.parameterItems;
+        }
+        return clone;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, valueTraversal, parameterItems);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
new file mode 100644
index 0000000..d42c317
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A map step that returns the disjunction of the traverser and the provided arguments without duplicates.
+ */
+public final class DisjunctStep<S, E> extends ScalarMapStep<S, Set<?>> implements TraversalParent, ListFunction {
+    private Traversal.Admin<S, E> valueTraversal;
+    private Object parameterItems;
+    public DisjunctStep(final Traversal.Admin traversal, final Object values) {
+        super(traversal);
+
+        if (values instanceof Traversal) {
+            valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
+        } else {
+            parameterItems = values;
+        }
+    }
+
+    @Override
+    public String getStepName() { return "disjunct"; }
+
+    @Override
+    protected Set<?> map(Traverser.Admin<S> traverser) {
+        final Set setA = convertTraverserToSet(traverser);
+        final Set setB = (null != valueTraversal) ? convertTraversalToSet(traverser, this.valueTraversal) : convertArgumentToSet(parameterItems);
+        final Set disjunctSet = new HashSet();
+
+        if (setA.size() == 0) {
+            return setB;
+        } else if (setB.size() == 0) {
+            return setA;
+        } else {
+            for (Object item : setA) {
+                if (!setB.contains(item)) {
+                    disjunctSet.add(item);
+                }
+            }
+
+            for (Object item : setB) {
+                if (!setA.contains(item)) {
+                    disjunctSet.add(item);
+                }
+            }
+        }
+
+        return disjunctSet;
+    }
+
+    @Override
+    public List<Traversal.Admin<S, E>> getLocalChildren() {
+        return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() { return this.getSelfAndChildRequirements(); }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        if (valueTraversal != null) { this.integrateChild(this.valueTraversal); }
+    }
+
+    @Override
+    public DisjunctStep<S, E> clone() {
+        final DisjunctStep<S, E> clone = (DisjunctStep<S, E>) super.clone();
+        if (null != this.valueTraversal) {
+            clone.valueTraversal = this.valueTraversal.clone();
+        } else {
+            clone.parameterItems = this.parameterItems;
+        }
+        return clone;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, valueTraversal, parameterItems);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FormatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FormatStep.java
new file mode 100644
index 0000000..c4b5095
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FormatStep.java
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor;
+import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.EmptyTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalProduct;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalRing;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Reference implementation for String format step, a mid-traversal step which will handle result formatting
+ * to string values. If the incoming traverser is a non-String value then an {@code IllegalArgumentException}
+ * will be thrown.
+ *
+ * @author Valentyn Kahamlyk
+ */
+public final class FormatStep<S> extends MapStep<S, String> implements ByModulating, TraversalParent, Scoping, PathProcessor {
+
+    private static final String FROM_BY = "_";
+    /* Negative Lookbehind (?<!%)
+     * Assert that the Regex does not match %
+     * 1st Capturing Group (.*?).
+     * . matches any character (except for line terminators)
+     * *? matches the previous token between zero and unlimited times, as few times as possible, expanding as needed (lazy)
+     */
+    private static final Pattern VARIABLE_PATTERN = Pattern.compile("(?<!%)%\\{(.*?)\\}");
+
+    private String format;
+    private Set<String> variables;
+    private TraversalRing<S, String> traversalRing = new TraversalRing<>();
+    private Set<String> keepLabels;
+
+    public FormatStep(final Traversal.Admin traversal, final String format) {
+        super(traversal);
+
+        if (null == format) {
+            throw new IllegalArgumentException("Format string for Format step can't be null.");
+        }
+        this.format = format;
+        this.variables = getVariables();
+    }
+
+    @Override
+    protected Traverser.Admin<String> processNextStart() {
+        final Traverser.Admin traverser = this.starts.next();
+
+        boolean productive = true;
+        int lastIndex = 0;
+        final StringBuilder output = new StringBuilder();
+        final Matcher matcher = VARIABLE_PATTERN.matcher(format);
+        final Object current = traverser.get();
+
+        while (matcher.find()) {
+            final String varName = matcher.group(1);
+            if (varName == null) continue;
+
+            if (!varName.equals(FROM_BY) && current instanceof Element) {
+                final Property prop = ((Element) current).property(varName);
+                if (prop != null && prop.isPresent()) {
+                    output.append(format, lastIndex, matcher.start()).append(prop.value());
+                    lastIndex = matcher.end();
+                    continue;
+                }
+            }
+
+            final TraversalProduct product = varName.equals(FROM_BY) ?
+                    TraversalUtil.produce(traverser, this.traversalRing.next()) :
+                    TraversalUtil.produce((S) this.getNullableScopeValue(Pop.last, varName, traverser), null);
+
+            if (!product.isProductive() || product.get() == null) {
+                productive = false;
+                break;
+            }
+
+            output.append(format, lastIndex, matcher.start()).append(product.get());
+            lastIndex = matcher.end();
+        }
+
+        if (lastIndex < format.length()) {
+            output.append(format, lastIndex, format.length());
+        }
+
+        this.traversalRing.reset();
+
+        return productive ?
+                PathProcessor.processTraverserPathLabels(traverser.split(output.toString(), this), this.keepLabels) :
+                EmptyTraverser.instance();
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.stepString(this, this.format, this.traversalRing);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, format, traversalRing);
+    }
+
+    @Override
+    public List<Traversal.Admin<S, String>> getLocalChildren() {
+        return this.traversalRing.getTraversals();
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        this.traversalRing.reset();
+    }
+
+    @Override
+    public FormatStep<S> clone() {
+        final FormatStep<S> clone = (FormatStep<S>) super.clone();
+        clone.format = this.format;
+        clone.variables = this.variables;
+        clone.traversalRing = this.traversalRing;
+        return clone;
+    }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        this.traversalRing.getTraversals().forEach(this::integrateChild);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return this.getSelfAndChildRequirements(TraverserRequirement.OBJECT, TraverserRequirement.SIDE_EFFECTS);
+    }
+
+    @Override
+    public Set<String> getScopeKeys() {
+        return variables;
+    }
+
+    @Override
+    public void setKeepLabels(final Set<String> labels) {
+        this.keepLabels = labels;
+    }
+
+    @Override
+    public Set<String> getKeepLabels() {
+        return this.keepLabels;
+    }
+
+    @Override
+    public void modulateBy(final Traversal.Admin<?, ?> selectTraversal) {
+        this.traversalRing.addTraversal(this.integrateChild(selectTraversal));
+    }
+
+    @Override
+    public void replaceLocalChild(final Traversal.Admin<?, ?> oldTraversal, final Traversal.Admin<?, ?> newTraversal) {
+        this.traversalRing.replaceTraversal(
+                (Traversal.Admin<S, String>) oldTraversal,
+                this.integrateChild(newTraversal));
+    }
+
+    // private methods
+
+    private Set<String> getVariables() {
+        final Matcher matcher = VARIABLE_PATTERN.matcher(format);
+        final Set<String> variables = new LinkedHashSet<>();
+        while (matcher.find()) {
+            final String varName = matcher.group(1);
+            if (varName != null && !varName.equals(FROM_BY)) {
+                variables.add(varName);
+            }
+        }
+        return variables;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
new file mode 100644
index 0000000..232042b
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A map step that returns the intersection of the traverser and the provided arguments.
+ */
+public final class IntersectStep<S, E> extends ScalarMapStep<S, Set<?>> implements TraversalParent, ListFunction {
+    private Traversal.Admin<S, E> valueTraversal;
+    private Object parameterItems;
+
+    public IntersectStep(final Traversal.Admin traversal, final Object values) {
+        super(traversal);
+
+        if (values instanceof Traversal) {
+            valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
+        } else {
+            parameterItems = values;
+        }
+    }
+
+    @Override
+    public String getStepName() { return "intersect"; }
+
+    @Override
+    protected Set<?> map(Traverser.Admin<S> traverser) {
+        final Set setA = convertTraverserToSet(traverser);
+        final Collection setB = (null != valueTraversal) ? convertTraversalToCollection(traverser, this.valueTraversal) : convertArgumentToCollection(parameterItems);
+        final Set intersection = new HashSet();
+
+        for (Object element : setB) {
+            if (setA.contains(element)) {
+                intersection.add(element);
+            }
+        }
+
+        return intersection;
+    }
+
+    @Override
+    public List<Traversal.Admin<S, E>> getLocalChildren() {
+        return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() { return this.getSelfAndChildRequirements(); }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        if (valueTraversal != null) { this.integrateChild(this.valueTraversal); }
+    }
+
+    @Override
+    public IntersectStep<S, E> clone() {
+        final IntersectStep<S, E> clone = (IntersectStep<S, E>) super.clone();
+        if (null != this.valueTraversal) {
+            clone.valueTraversal = this.valueTraversal.clone();
+        } else {
+            clone.parameterItems = this.parameterItems;
+        }
+        return clone;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, valueTraversal, parameterItems);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimGlobalStep.java
new file mode 100644
index 0000000..84dbd5c
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimGlobalStep.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for lTrim() step, a mid-traversal step which returns a string with leading
+ * whitespace removed. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class LTrimGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public LTrimGlobalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The lTrim() step can only take string as argument, encountered %s", item.getClass()));
+        }
+
+        // we will pass null values to next step
+        if (null == item)
+                return null;
+
+        int i = 0;
+        while (i < ((String) item).length() && Character.isWhitespace(((String) item).charAt(i))) {
+            i++;
+        }
+
+        return (E) ((String) item).substring(i);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimLocalStep.java
new file mode 100644
index 0000000..1592067
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimLocalStep.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for lTrim() step, a mid-traversal step which returns a string with leading
+ * whitespace removed. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class LTrimLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    public LTrimLocalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) item.substring(getIdx(item));
+    }
+
+    @Override
+    public String getStepName() { return "lTrim(local)"; }
+
+    private int getIdx(final String str) {
+        int idx = 0;
+        while (idx < str.length() && Character.isWhitespace(str.charAt(idx))) {
+            idx++;
+        }
+        return idx;
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthGlobalStep.java
new file mode 100644
index 0000000..44ea43e
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthGlobalStep.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for length() step, a mid-traversal step which returns the length of the incoming string
+ * traverser. Null values are not processed and remain as null when returned. If the incoming traverser is a non-String
+ * value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class LengthGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public LengthGlobalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+
+        if (null == item) {
+            // we will pass null values to next step
+            return null;
+        } else if (item instanceof String) {
+            return (E) Integer.valueOf(((String) item).length());
+        } else {
+            throw new IllegalArgumentException(
+                    String.format("The length() step can only take string as argument, encountered %s", item.getClass()));
+        }
+
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthLocalStep.java
new file mode 100644
index 0000000..20de1ae
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthLocalStep.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for length() step, a mid-traversal step which returns the length of the incoming string
+ * traverser. Null values are not processed and remain as null when returned. If the incoming traverser is a non-String
+ * value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class LengthLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    public LengthLocalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) Integer.valueOf(item.length());
+    }
+
+    @Override
+    public String getStepName() { return "length(local)"; }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
index 70eca71..c3e259e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
@@ -28,7 +28,7 @@
 
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.Event;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategy;
@@ -36,6 +36,7 @@
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
@@ -105,18 +106,28 @@
                 validateMapInput(onMatchMap, true);
 
                 onMatchMap.forEach((key, value) -> {
+                    Object val = value;
+                    VertexProperty.Cardinality card = graph.features().vertex().getCardinality(key);
+
+                    // a value can be a traversal in the case where the user specifies the cardinality for the value.
+                    if (value instanceof CardinalityValueTraversal) {
+                        final CardinalityValueTraversal cardinalityValueTraversal =  (CardinalityValueTraversal) value;
+                        card = cardinalityValueTraversal.getCardinality();
+                        val = cardinalityValueTraversal.getValue();
+                    }
+
                     // trigger callbacks for eventing - in this case, it's a VertexPropertyChangedEvent. if there's no
                     // registry/callbacks then just set the property
                     if (this.callbackRegistry != null && !callbackRegistry.getCallbacks().isEmpty()) {
                         final EventStrategy eventStrategy = getTraversal().getStrategies().getStrategy(EventStrategy.class).get();
                         final Property<?> p = v.property(key);
                         final Property<Object> oldValue = p.isPresent() ? eventStrategy.detach(v.property(key)) : null;
-                        final Event.VertexPropertyChangedEvent vpce = new Event.VertexPropertyChangedEvent(eventStrategy.detach(v), oldValue, value);
+                        final Event.VertexPropertyChangedEvent vpce = new Event.VertexPropertyChangedEvent(eventStrategy.detach(v), oldValue, val);
                         this.callbackRegistry.getCallbacks().forEach(c -> c.accept(vpce));
                     }
 
                     // try to detect proper cardinality for the key according to the graph
-                    v.property(graph.features().vertex().getCardinality(key), key, value);
+                    v.property(card, key, val);
                 });
             });
         }
@@ -137,10 +148,23 @@
          */
         final Map<?,?> onCreateMap = onCreateMap(traverser, mergeMap);
 
-        final Object[] flatArgs = onCreateMap.entrySet().stream()
-                .flatMap(e -> Stream.of(e.getKey(), e.getValue())).collect(toList()).toArray();
+        // extract the key/value pairs from the map and flatten them into an array but exclude any that have a
+        // CardinalityValueTraversal as the value. you have to ignore those in a call to addVertex because that would
+        // make it so that the Graph had to know how to deal with the CardinalityValueTraversal which it doesn't. this
+        // allows this feature to work out of the box.
+        final Object[] flatArgsWithoutExplicitCardinality = onCreateMap.entrySet().stream().
+                filter(e -> !(e.getValue() instanceof CardinalityValueTraversal)).
+                flatMap(e -> Stream.of(e.getKey(), e.getValue())).collect(toList()).toArray();
 
-        final Vertex vertex = graph.addVertex(flatArgs);
+        final Vertex vertex = graph.addVertex(flatArgsWithoutExplicitCardinality);
+
+        // deal with values that have the cardinality explicitly set which should only occur on string keys
+        onCreateMap.entrySet().stream().
+                filter(e -> e.getKey() instanceof String && e.getValue() instanceof CardinalityValueTraversal).
+                forEach(e -> {
+                    final CardinalityValueTraversal cardinalityValueTraversal = (CardinalityValueTraversal) e.getValue();
+                    vertex.property(cardinalityValueTraversal.getCardinality(), (String) e.getKey(), cardinalityValueTraversal.getValue());
+                });
 
         // trigger callbacks for eventing - in this case, it's a VertexAddedEvent
         if (this.callbackRegistry != null && !callbackRegistry.getCallbacks().isEmpty()) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
new file mode 100644
index 0000000..b14c02b
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A map step that returns the cartesian product of the traverser and the provided arguments.
+ */
+public final class ProductStep<S, E> extends ScalarMapStep<S, List<List<?>>> implements TraversalParent, ListFunction {
+    private Traversal.Admin<S, E> valueTraversal;
+    private Object parameterItems;
+
+    public ProductStep(final Traversal.Admin traversal, final Object values) {
+        super(traversal);
+
+        if (values instanceof Traversal) {
+            valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
+        } else {
+            parameterItems = values;
+        }
+    }
+
+    @Override
+    public String getStepName() { return "product"; }
+
+    @Override
+    protected List<List<?>> map(Traverser.Admin<S> traverser) {
+        final Collection listA = convertTraverserToCollection(traverser);
+        final Collection listB = (null != valueTraversal) ? convertTraversalToCollection(traverser, valueTraversal) : convertArgumentToCollection(parameterItems);
+        final List elements = new ArrayList();
+
+        for (Object elementInA : listA) {
+            for (Object elementInB : listB) {
+                final List pair = new ArrayList(2);
+                pair.add(elementInA);
+                pair.add(elementInB);
+                elements.add(pair);
+            }
+        }
+
+        return elements;
+    }
+
+    @Override
+    public List<Traversal.Admin<S, E>> getLocalChildren() {
+        return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() { return this.getSelfAndChildRequirements(); }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        if (valueTraversal != null) { this.integrateChild(this.valueTraversal); }
+    }
+
+    @Override
+    public ProductStep<S, E> clone() {
+        final ProductStep<S, E> clone = (ProductStep<S, E>) super.clone();
+        if (null != this.valueTraversal) {
+            clone.valueTraversal = this.valueTraversal.clone();
+        } else {
+            clone.parameterItems = this.parameterItems;
+        }
+        return clone;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, valueTraversal, parameterItems);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimGlobalStep.java
new file mode 100644
index 0000000..aae0c50
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimGlobalStep.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for rTrim() step, a mid-traversal step which a string with trailing
+ * whitespace removed. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class RTrimGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public RTrimGlobalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The rTrim() step can only take string as argument, encountered %s", item.getClass()));
+        }
+
+        // we will pass null values to next step
+        if (null == item)
+                return null;
+
+        int i = ((String) item).length() - 1;
+        while (i >= 0 && Character.isWhitespace(((String) item).charAt(i))) {
+            i--;
+        }
+
+        return (E) ((String) item).substring(0,i+1);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimLocalStep.java
new file mode 100644
index 0000000..1b1182d
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimLocalStep.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+
+/**
+ * Reference implementation for rTrim() step, a mid-traversal step which a string with trailing
+ * whitespace removed. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class RTrimLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    public RTrimLocalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) item.substring(0,getEndIdx(item)+1);
+    }
+
+    @Override
+    public String getStepName() { return "rTrim(local)"; }
+
+    private int getEndIdx(final String str) {
+        int idx = str.length() - 1;
+        while (idx >= 0 && Character.isWhitespace(str.charAt(idx))) {
+            idx--;
+        }
+        return idx;
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceGlobalStep.java
new file mode 100644
index 0000000..8e13aaf
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceGlobalStep.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for substring step, a mid-traversal step which returns a string with the specified
+ * characters in the original string replaced with the new characters. Any null arguments will be a no-op and the
+ * original string is returned. Null values are not processed and remain as null when returned. If the incoming
+ * traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ReplaceGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    private final String oldChar;
+    private final String newChar;
+
+    public ReplaceGlobalStep(final Traversal.Admin traversal, final String oldChar, final String newChar ) {
+        super(traversal);
+        this.oldChar=oldChar;
+        this.newChar=newChar;
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The replace() step can only take string as argument, encountered %s.", item.getClass()));
+        }
+
+        // we will pass null values to next step
+        return null == item? null : (E) StringUtils.replace(((String) item), this.oldChar, this.newChar);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (null != this.oldChar ? this.oldChar.hashCode() : 0);
+        result = 31 * result + (null != this.newChar ? this.newChar.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceLocalStep.java
new file mode 100644
index 0000000..6d5a615
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceLocalStep.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for substring step, a mid-traversal step which returns a string with the specified
+ * characters in the original string replaced with the new characters. Any null arguments will be a no-op and the
+ * original string is returned. Null values are not processed and remain as null when returned. If the incoming
+ * traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ReplaceLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    private final String oldChar;
+    private final String newChar;
+
+    public ReplaceLocalStep(final Traversal.Admin traversal, final String oldChar, final String newChar ) {
+        super(traversal);
+        this.oldChar=oldChar;
+        this.newChar=newChar;
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) StringUtils.replace(item, this.oldChar, this.newChar);
+    }
+
+    @Override
+    public String getStepName() { return "replace(local)"; }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (null != this.oldChar ? this.oldChar.hashCode() : 0);
+        result = 31 * result + (null != this.newChar ? this.newChar.hashCode() : 0);
+        return result;
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseStep.java
new file mode 100644
index 0000000..fc1a143
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseStep.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asList;
+
+/**
+ * Reference implementation for reverse() step, a mid-traversal step which returns the reverse value.
+ * Null values are not processed and remain as null when returned.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ReverseStep<S, E> extends ScalarMapStep<S, E> {
+
+    public ReverseStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S items = traverser.get();
+
+        if (null == items) {
+            return null;
+        } else if (items instanceof String) {
+            return (E) new StringBuilder(((String) items)).reverse().toString();
+        } else if ((items instanceof Iterable) || (items instanceof Iterator) || items.getClass().isArray()) {
+            final List itemsAsList = IteratorUtils.asList(items);
+            Collections.reverse(itemsAsList);
+            return (E) itemsAsList;
+        } else {
+            // null traversers are passed on without throwing an exception so the same should be done with other types.
+            return (E) items;
+        }
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java
new file mode 100644
index 0000000..2465e72
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for substring step, a mid-traversal step which returns a list of strings created by
+ * splitting the incoming string traverser around the matches of the given separator. A null separator will split the
+ * string by whitespaces. Null values from incoming traversers are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class SplitGlobalStep<S, E> extends ScalarMapStep<S, E> implements TraversalParent {
+
+    private final String separator;
+
+    public SplitGlobalStep(final Traversal.Admin traversal, final String separator) {
+        super(traversal);
+        this.separator = separator;
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The split() step can only take string as argument, encountered %s.", item.getClass()));
+        }
+
+        // we will pass null values to next step
+        return null == item? null : (E) Arrays.asList(StringUtils.splitByWholeSeparator((String) item, this.separator));
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (null != this.separator ? this.separator.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java
new file mode 100644
index 0000000..61a9901
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for substring step, a mid-traversal step which returns a list of strings created by
+ * splitting the incoming string traverser around the matches of the given separator. A null separator will split the
+ * string by whitespaces. Null values from incoming traversers are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class SplitLocalStep<S, E> extends StringLocalStep<S, E> implements TraversalParent {
+
+    private final String separator;
+
+    public SplitLocalStep(final Traversal.Admin traversal, final String separator) {
+        super(traversal);
+        this.separator = separator;
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) Arrays.asList((StringUtils.splitByWholeSeparator(item, this.separator)));
+    }
+
+    @Override
+    public String getStepName() { return "split(local)"; }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (null != this.separator ? this.separator.hashCode() : 0);
+        return result;
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringGlobalStep.java
new file mode 100644
index 0000000..b752a57
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringGlobalStep.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for substring step, a mid-traversal step which returns a substring of the incoming string
+ * traverser with a 0-based start index (inclusive) and optionally an end index (exclusive). If the start index is negative then it will
+ * begin at the specified index counted from the end of the string, or 0 if exceeding the string length. Likewise, if
+ * the end index is negative then it will end at the specified index counted from the end of the string, or 0 if exceeding the string length.
+ * End index is optional, if it is not specified or if it exceeds the length of the string then all remaining characters will
+ * be returned. End index <= start index will return the empty string. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class SubstringGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    private final Integer start;
+    private final Integer end;
+
+    public SubstringGlobalStep(final Traversal.Admin traversal, final Integer startIndex, final Integer endIndex) {
+        super(traversal);
+        this.start = startIndex;
+        this.end = endIndex;
+    }
+
+    public SubstringGlobalStep(final Traversal.Admin traversal, final Integer startIndex) {
+        this(traversal, startIndex, null);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The substring() step can only take string as argument, encountered %s", item.getClass()));
+        }
+
+        // to preserve null items
+        final String strItem = (String) item;
+
+        if (null == strItem)
+            return null;
+
+        final int newStart = processStringIndex(strItem.length(), this.start);
+        if (null == this.end)
+            return (E) strItem.substring(newStart);
+
+        final int newEnd = processStringIndex(strItem.length(), this.end);
+        if (newEnd <= newStart)
+            return (E) "";
+
+        return (E) strItem.substring(newStart, newEnd);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.start.hashCode();
+        result = 31 * result + (null != this.end ? this.end.hashCode() : 0);
+        return result;
+    }
+
+    // Helper function to process indices. If it is negative (which counts from end of string) it is converted
+    // to the positive index position or 0 when negative index exceeds the string length. If it is positive and exceeds
+    // the length of the string, it is assumed to equal to the length, which means an empty string will be returned.
+    private int processStringIndex(int strLen, int index) {
+        if (index < 0) {
+            return Math.max(0, (strLen + index) % strLen);
+        } else {
+            return Math.min(index, strLen);
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringLocalStep.java
new file mode 100644
index 0000000..fd95fd0
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringLocalStep.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for substring step, a mid-traversal step which returns a substring of the incoming string
+ * traverser with a 0-based start index (inclusive) and optionally an end index (exclusive). If the start index is negative then it will
+ * begin at the specified index counted from the end of the string, or 0 if exceeding the string length. Likewise, if
+ * the end index is negative then it will end at the specified index counted from the end of the string, or 0 if exceeding the string length.
+ * End index is optional, if it is not specified or if it exceeds the length of the string then all remaining characters will
+ * be returned. End index <= start index will return the empty string. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class SubstringLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    private final Integer start;
+    private final Integer end;
+
+    public SubstringLocalStep(final Traversal.Admin traversal, final Integer startIndex, final Integer endIndex) {
+        super(traversal);
+        this.start = startIndex;
+        this.end = endIndex;
+    }
+
+    public SubstringLocalStep(final Traversal.Admin traversal, final Integer startIndex) {
+        this(traversal, startIndex, null);
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        final int newStart = processStringIndex(item.length(), this.start);
+        if (null == this.end)
+            return (E) item.substring(newStart);
+
+        final int newEnd = processStringIndex(item.length(), this.end);
+        if (newEnd <= newStart)
+            return (E) "";
+
+        return (E) item.substring(newStart, newEnd);
+    }
+
+    @Override
+    public String getStepName() { return "substring(local)"; }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + this.start.hashCode();
+        result = 31 * result + (null != this.end ? this.end.hashCode() : 0);
+        return result;
+    }
+
+    // Helper function to process indices. If it is negative (which counts from end of string) it is converted
+    // to the positive index position or 0 when negative index exceeds the string length. If it is positive and exceeds
+    // the length of the string, it is assumed to equal to the length, which means an empty string will be returned.
+    private int processStringIndex(int strLen, int index) {
+        if (index < 0) {
+            return Math.max(0, (strLen + index) % strLen);
+        } else {
+            return Math.min(index, strLen);
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerGlobalStep.java
new file mode 100644
index 0000000..0315ab6
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerGlobalStep.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for toLower() step, a mid-traversal step which returns a lower case string representation
+ * of the incoming string traverser. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ToLowerGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public ToLowerGlobalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The toLower() step can only take string as argument, encountered %s", item.getClass()));
+        }
+
+        // we will pass null values to next step
+        return null == item? null : (E) ((String) item).toLowerCase();
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerLocalStep.java
new file mode 100644
index 0000000..e327c69
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerLocalStep.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for the local scope of the toUpper() step, a mid-traversal step which returns an upper case
+ * string representation of all elements inside the incoming list traverser. Null values are not processed and remain as
+ * null when returned. If the incoming traverser is not a list or a non-String list then an {@code IllegalArgumentException}
+ * will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ToLowerLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    public ToLowerLocalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) item.toLowerCase();
+    }
+
+    @Override
+    public String getStepName() { return "toLower(local)"; }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperGlobalStep.java
new file mode 100644
index 0000000..9acf213
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperGlobalStep.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for toUpper() step, a mid-traversal step which returns an upper case string representation
+ * of the incoming string traverser. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ToUpperGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public ToUpperGlobalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The toUpper() step can only take string as argument, encountered %s", item.getClass()));
+        }
+
+        // we will pass null values to next step
+        return null == item? null : (E) ((String) item).toUpperCase();
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperLocalStep.java
new file mode 100644
index 0000000..7426c8c
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperLocalStep.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Reference implementation for the local scope of the toUpper() step, a mid-traversal step which returns an upper case
+ * string representation of all elements inside the incoming list traverser. Null values are not processed and remain as
+ * null when returned. If the incoming traverser is not a list or a non-String list then an {@code IllegalArgumentException}
+ * will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class ToUpperLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    public ToUpperLocalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) item.toUpperCase();
+    }
+
+    @Override
+    public String getStepName() { return "toUpper(local)"; }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
new file mode 100644
index 0000000..3e33948
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ListFunction;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * A map step that returns the merger of the traverser and the provided arguments without duplicates. This is commonly
+ * known as a union.
+ */
+public final class TraversalMergeStep<S, E> extends ScalarMapStep<S, E> implements TraversalParent, ListFunction {
+    private Traversal.Admin<S, E> valueTraversal;
+    private Object parameterItems;
+
+    public TraversalMergeStep(final Traversal.Admin traversal, final Object values) {
+        super(traversal);
+
+        if (values instanceof Traversal) {
+            valueTraversal = integrateChild(((Traversal<S, E>) values).asAdmin());
+        } else {
+            parameterItems = values;
+        }
+    }
+
+    @Override
+    public String getStepName() { return "merge"; }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S incoming = traverser.get();
+
+        final Map mapA = (incoming instanceof Map) ? (Map) incoming : null;
+        if (mapA != null) {
+            final Object mapB = (valueTraversal != null) ? TraversalUtil.apply(traverser, valueTraversal) : parameterItems;
+            if (!(mapB instanceof Map)) {
+                throw new IllegalArgumentException(
+                        String.format(
+                                "%s step expected provided argument to evaluate to a Map, encountered %s",
+                                getStepName(),
+                                mapB.getClass()));
+            }
+
+            final Map mergedMap = new HashMap(mapA);
+            mergedMap.putAll((Map) mapB);
+            return (E) mergedMap;
+        } else {
+            final Collection listA = convertTraverserToCollection(traverser);
+
+            if (parameterItems instanceof Map) {
+                throw new IllegalArgumentException(getStepName() + " step type mismatch: expected argument to be Iterable but got Map");
+            }
+            final Collection listB =
+                    (null != valueTraversal)
+                            ? convertTraversalToCollection(traverser, valueTraversal)
+                            : convertArgumentToCollection(parameterItems);
+
+            final Set elements = new HashSet();
+
+            elements.addAll(listA);
+            elements.addAll(listB);
+
+            return (E) elements;
+        }
+    }
+
+    @Override
+    public List<Traversal.Admin<S, E>> getLocalChildren() {
+        return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() { return this.getSelfAndChildRequirements(); }
+
+    @Override
+    public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+        super.setTraversal(parentTraversal);
+        if (valueTraversal != null) { this.integrateChild(this.valueTraversal); }
+    }
+
+    @Override
+    public TraversalMergeStep<S, E> clone() {
+        final TraversalMergeStep<S, E> clone = (TraversalMergeStep<S, E>) super.clone();
+        if (null != this.valueTraversal) {
+            clone.valueTraversal = this.valueTraversal.clone();
+        } else {
+            clone.parameterItems = this.parameterItems;
+        }
+        return clone;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        return Objects.hash(result, valueTraversal, parameterItems);
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimGlobalStep.java
new file mode 100644
index 0000000..72f2a41
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimGlobalStep.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Reference implementation for trim() step, a mid-traversal step which returns a string with leading and trailing
+ * whitespace removed. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class TrimGlobalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public TrimGlobalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+        // throws when incoming traverser isn't a string
+        if (null != item && !(item instanceof String)) {
+            throw new IllegalArgumentException(
+                    String.format("The trim() step can only take string as argument, encountered %s", item.getClass()));
+        }
+
+        // we will pass null values to next step
+        return null == item? null : (E) ((String) item).trim();
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimLocalStep.java
new file mode 100644
index 0000000..dd6752f
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimLocalStep.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.StringLocalStep;
+
+/**
+ * Reference implementation for trim() step, a mid-traversal step which returns a string with leading and trailing
+ * whitespace removed. Null values are not processed and remain as null when returned.
+ * If the incoming traverser is a non-String value then an {@code IllegalArgumentException} will be thrown.
+ *
+ * @author David Bechberger (http://bechberger.com)
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public final class TrimLocalStep<S, E> extends StringLocalStep<S, E> {
+
+    public TrimLocalStep(final Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E applyStringOperation(String item) {
+        return (E) item.trim();
+    }
+
+    @Override
+    public String getStepName() { return "trim(local)"; }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
index 89dbc06..d4545ea 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/AbstractStep.java
@@ -76,6 +76,11 @@
     }
 
     @Override
+    public void clearLabels() {
+        this.labels.clear();
+    }
+
+    @Override
     public Set<String> getLabels() {
         return Collections.unmodifiableSet(this.labels);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyStep.java
index 704cce3..01e745e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyStep.java
@@ -41,13 +41,10 @@
         return INSTANCE;
     }
 
-    private EmptyStep() {
-    }
+    private EmptyStep() { }
 
     @Override
-    public void addStarts(final Iterator<Traverser.Admin<S>> starts) {
-
-    }
+    public void addStarts(final Iterator<Traverser.Admin<S>> starts) { }
 
     @Override
     public boolean hasStarts() {
@@ -55,19 +52,13 @@
     }
 
     @Override
-    public void addStart(final Traverser.Admin<S> start) {
-
-    }
+    public void addStart(final Traverser.Admin<S> start) { }
 
     @Override
-    public void setPreviousStep(final Step<?, S> step) {
-
-    }
+    public void setPreviousStep(final Step<?, S> step) { }
 
     @Override
-    public void reset() {
-
-    }
+    public void reset() { }
 
     @Override
     public Step<?, S> getPreviousStep() {
@@ -75,9 +66,7 @@
     }
 
     @Override
-    public void setNextStep(final Step<E, ?> step) {
-
-    }
+    public void setNextStep(final Step<E, ?> step) { }
 
     @Override
     public Step<E, ?> getNextStep() {
@@ -90,9 +79,7 @@
     }
 
     @Override
-    public void setTraversal(final Traversal.Admin<?, ?> traversal) {
-
-    }
+    public void setTraversal(final Traversal.Admin<?, ?> traversal) { }
 
     @Override
     @SuppressWarnings("CloneDoesntCallSuperClone")
@@ -106,19 +93,16 @@
     }
 
     @Override
-    public void addLabel(final String label) {
-
-    }
+    public void addLabel(final String label) { }
 
     @Override
-    public void removeLabel(final String label) {
-
-    }
+    public void removeLabel(final String label) { }
 
     @Override
-    public void setId(final String id) {
+    public void clearLabels() { }
 
-    }
+    @Override
+    public void setId(final String id) { }
 
     @Override
     public String getId() {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
index 55d6936..d1654a3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Parameters.java
@@ -135,7 +135,6 @@
     public <E> List<E> get(final Object key, final Supplier<E> defaultValue) {
         final List<E> list = (List<E>) this.parameters.get(key);
         return (null == list) ? (null == defaultValue ? Collections.emptyList() : Collections.singletonList(defaultValue.get())) : list;
-
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/StringLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/StringLocalStep.java
new file mode 100644
index 0000000..d27a454
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/StringLocalStep.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ScalarMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+public abstract class StringLocalStep<S, E> extends ScalarMapStep<S, E> {
+
+    public StringLocalStep(Traversal.Admin traversal) {
+        super(traversal);
+    }
+
+    @Override
+    protected E map(final Traverser.Admin<S> traverser) {
+        final S item = traverser.get();
+
+        if (null == item) {
+            // we will pass null values to next step
+            return null;
+        } else if ((item instanceof Iterable) || (item instanceof Iterator) || item.getClass().isArray()) {
+            final List<E> resList = new ArrayList<>();
+            final Iterator<E> iterator = IteratorUtils.asIterator(item);
+            while (iterator.hasNext()) {
+                final E i = iterator.next();
+                if (null == i) {
+                    // we will pass null values to next step
+                    resList.add(null);
+                } else if (i instanceof String) {
+                    resList.add(applyStringOperation((String) i));
+                } else {
+                    throw new IllegalArgumentException(
+                            String.format("The %s step can only take string or list of strings, encountered %s in list", getStepName(), i.getClass()));
+                }
+            }
+            return (E) resList;
+        } else if (item instanceof String) {
+            return applyStringOperation((String) item);
+        } else {
+            throw new IllegalArgumentException(
+                    String.format("The %s step can only take string or list of strings, encountered %s", getStepName(), item.getClass()));
+        }
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    protected abstract E applyStringOperation(final String item);
+
+    protected abstract String getStepName();
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java
index 3deab6d..d314b4d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java
@@ -95,7 +95,7 @@
                     }
                     i++;
                     currentStep.addLocalChild(connectiveTraversal = connectiveTraversal(connectiveTraversal, currentStep));
-                    currentStep.getLabels().forEach(currentStep::removeLabel);
+                    currentStep.clearLabels();
                     while (i < steps.size()) {
                         final Step nextStep = steps.get(i);
                         if (legalCurrentStep(nextStep)) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java
index fbc2c1d..40d4054 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslator.java
@@ -19,12 +19,14 @@
 
 package org.apache.tinkerpop.gremlin.process.traversal.translator;
 
+import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Pick;
 import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Script;
 import org.apache.tinkerpop.gremlin.process.traversal.Text;
 import org.apache.tinkerpop.gremlin.process.traversal.TextP;
@@ -73,6 +75,11 @@
     private static final List<String> methodsWithArgsNotNeedingGeneric = Arrays.asList(GraphTraversal.Symbols.group,
             GraphTraversal.Symbols.groupCount, GraphTraversal.Symbols.sack);
 
+    private static final List<String> stringMethodsWithScopes = Arrays.asList(GraphTraversal.Symbols.asString,
+            GraphTraversal.Symbols.length, GraphTraversal.Symbols.lTrim, GraphTraversal.Symbols.replace,
+            GraphTraversal.Symbols.rTrim, GraphTraversal.Symbols.split, GraphTraversal.Symbols.substring,
+            GraphTraversal.Symbols.toLower, GraphTraversal.Symbols.toUpper, GraphTraversal.Symbols.trim);
+
     private DotNetTranslator(final String traversalSource, final TypeTranslator typeTranslator) {
         this.traversalSource = traversalSource;
         this.typeTranslator = typeTranslator;
@@ -195,6 +202,16 @@
         }
 
         @Override
+        protected Script produceCardinalityValue(final Bytecode o) {
+            final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
+            final String card = inst.getArguments()[0].toString();
+            script.append("CardinalityValue." + card.substring(0, 1).toUpperCase() + card.substring(1) + "(");
+            convertToScript(inst.getArguments()[1]);
+            script.append(")");
+            return script;
+        }
+
+        @Override
         protected Script produceScript(final Set<?> o) {
             return produceScriptForHashSet(o, "object");
         }
@@ -344,11 +361,15 @@
                     if (methodName.equals(GraphTraversal.Symbols.fold) && o.getSourceInstructions().size() + o.getStepInstructions().size() > 1 ||
                             (methodName.equals(GraphTraversal.Symbols.inject) && instructionPosition > 0))
                         script.append(".").append(resolveSymbol(methodName).replace("<object>", "")).append("()");
+                    else if (stringMethodsWithScopes.contains(methodName))
+                        // string functions with doesn't use generics if no scope is specified
+                        script.append(".").append(resolveSymbol(methodName).replace("<object>", "")).append("()");
                     else
                         script.append(".").append(resolveSymbol(methodName)).append("()");
                 } else {
                     if (methodsWithArgsNotNeedingGeneric.contains(methodName) ||
-                            (methodName.equals(GraphTraversal.Symbols.inject) && (Arrays.stream(instruction.getArguments()).noneMatch(Objects::isNull) || instructionPosition > 0)))
+                            (methodName.equals(GraphTraversal.Symbols.inject) && (Arrays.stream(instruction.getArguments()).noneMatch(Objects::isNull) || instructionPosition > 0)) ||
+                            (stringMethodsWithScopes.contains(methodName) && (Arrays.stream(instruction.getArguments()).noneMatch(EnumUtils.getEnumList(Scope.class)::contains))))
                         script.append(".").append(resolveSymbol(methodName).replace("<object>", "").replace("<object,object>", "")).append("(");
                     else
                         script.append(".").append(resolveSymbol(methodName)).append("(");
@@ -517,6 +538,7 @@
         private final static Map<String, String> FROM_CS_MAP = new HashMap<>();
 
         static {
+            TO_CS_MAP.put(GraphTraversal.Symbols.asString, "AsString<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.branch, "Branch<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.call, "Call<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.cap, "Cap<object>");
@@ -531,8 +553,10 @@
             TO_CS_MAP.put(GraphTraversal.Symbols.index, "Index<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.inject, "Inject<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.io, "Io<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.length, "Length<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.limit, "Limit<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.local, "Local<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.lTrim, "LTrim<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.match, "Match<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.map, "Map<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.max, "Max<object>");
@@ -542,11 +566,18 @@
             TO_CS_MAP.put(GraphTraversal.Symbols.project, "Project<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.properties, "Properties<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.range, "Range<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.replace, "Replace<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.rTrim, "RTrim<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.sack, "Sack<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.select, "Select<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.skip, "Skip<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.split, "Split<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.substring, "Substring<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.sum, "Sum<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.tail, "Tail<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.toLower, "ToLower<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.toUpper, "ToUpper<object>");
+            TO_CS_MAP.put(GraphTraversal.Symbols.trim, "Trim<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.unfold, "Unfold<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.union, "Union<object>");
             TO_CS_MAP.put(GraphTraversal.Symbols.value, "Value<object>");
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
index 8f9628b..577bc7e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslator.java
@@ -132,14 +132,15 @@
         protected String getSyntax(final Boolean o) {
             return o.toString();
         }
+
         @Override
         protected String getSyntax(final Date o) {
-            return "time.Unix(" + o.getTime() + ", 0)";
+            return "time.UnixMilli(" + o.getTime() + ")";
         }
 
         @Override
         protected String getSyntax(final Timestamp o) {
-            return "time.Unix(" + o.getTime() + ", 0)";
+            return "time.UnixMilli(" + o.getTime() + ")";
         }
 
         @Override
@@ -181,6 +182,16 @@
         }
 
         @Override
+        protected Script produceCardinalityValue(final Bytecode o) {
+            final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
+            final String card = inst.getArguments()[0].toString();
+            script.append(GO_PACKAGE_NAME + "CardinalityValue." + card.substring(0, 1).toUpperCase() + card.substring(1) + "(");
+            convertToScript(inst.getArguments()[1]);
+            script.append(")");
+            return script;
+        }
+
+        @Override
         protected Script produceScript(final Set<?> o) {
             final Iterator<?> iterator = o.iterator();
             script.append(GO_PACKAGE_NAME + "NewSimpleSet(");
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java
index 7d35e65..969cd00 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslator.java
@@ -207,6 +207,15 @@
         }
 
         @Override
+        protected Script produceCardinalityValue(final Bytecode o) {
+            final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
+            script.append("VertexProperty.Cardinality." + inst.getArguments()[0] + "(");
+            convertToScript(inst.getArguments()[1]);
+            script.append(")");
+            return script;
+        }
+
+        @Override
         protected Script produceScript(final Set<?> o) {
             return produceScript(new ArrayList<>(o)).append(" as Set");
         }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java
index a81a3d5..a1a507a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslator.java
@@ -51,7 +51,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.function.BiPredicate;
 import java.util.function.BinaryOperator;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
@@ -189,6 +188,15 @@
         }
 
         @Override
+        protected Script produceCardinalityValue(final Bytecode o) {
+            final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
+            script.append("CardinalityValue." + inst.getArguments()[0] + "(");
+            convertToScript(inst.getArguments()[1]);
+            script.append(")");
+            return script;
+        }
+
+        @Override
         protected Script produceScript(final Set<?> o) {
             return produceScript(new ArrayList<>(o));
         }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java
index 659b90f..3ad7b39 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslator.java
@@ -184,7 +184,11 @@
             if (o instanceof Byte)
                 return "SingleByte(" + o + ")";
 
-            // all int/short/BigInteger/long are just python int/bignum
+            // for large numbers need to specify the type
+            if (o.longValue() > Integer.MAX_VALUE) {
+                return "long(" + o + ")";
+            }
+            // otherwise just use python int/bignum
             return o.toString();
         }
 
@@ -370,6 +374,15 @@
             return script;
         }
 
+        @Override
+        protected Script produceCardinalityValue(final Bytecode o) {
+            final Bytecode.Instruction inst = o.getSourceInstructions().get(0);
+            script.append("CardinalityValue." + resolveSymbol(inst.getArguments()[0].toString()) + "(");
+            convertToScript(inst.getArguments()[1]);
+            script.append(")");
+            return script;
+        }
+
         protected String resolveSymbol(final String methodName) {
             return SymbolHelper.toPython(methodName);
         }
@@ -428,8 +441,14 @@
             TO_PYTHON_MAP.put("global", "global_");
             TO_PYTHON_MAP.put("all", "all_");
             TO_PYTHON_MAP.put("and", "and_");
+            TO_PYTHON_MAP.put("any", "any_");
             TO_PYTHON_MAP.put("as", "as_");
+            TO_PYTHON_MAP.put("asString", "as_string");
+            TO_PYTHON_MAP.put("asDate", "as_date");
+            TO_PYTHON_MAP.put("dateAdd", "date_add");
+            TO_PYTHON_MAP.put("dateDiff", "date_diff");
             TO_PYTHON_MAP.put("filter", "filter_");
+            TO_PYTHON_MAP.put("format", "format_");
             TO_PYTHON_MAP.put("from", "from_");
             TO_PYTHON_MAP.put("id", "id_");
             TO_PYTHON_MAP.put("in", "in_");
@@ -448,6 +467,8 @@
             TO_PYTHON_MAP.put("range", "range_");
             TO_PYTHON_MAP.put("set", "set_");
             TO_PYTHON_MAP.put("sum", "sum_");
+            TO_PYTHON_MAP.put("toLower", "to_lower");
+            TO_PYTHON_MAP.put("toUpper", "to_upper");
             TO_PYTHON_MAP.put("with", "with_");
             //
             TO_PYTHON_MAP.forEach((k, v) -> FROM_PYTHON_MAP.put(v, k));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
index 7e603dc..ae9fef3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_O_P_S_SE_SL_Traverser.java
@@ -74,6 +74,11 @@
     }
 
     @Override
+    public void dropPath() {
+        path = ImmutablePath.make();
+    }
+
+    @Override
     public void addLabels(final Set<String> labels) {
         this.path = this.path.extend(labels);
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
index d07d095..6f0a93b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
@@ -20,13 +20,11 @@
 
 import org.apache.tinkerpop.gremlin.process.traversal.GremlinTypeErrorException;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.PBiPredicate;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.List;
-import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 /**
@@ -65,16 +63,13 @@
     }
 
     @Override
-    public String getPredicateName() { return "and"; }
-
-    @Override
     public AndP<V> clone() {
         final AndP<V> clone = (AndP<V>) super.clone();
         clone.biPredicate = new AndBiPredicate(clone);
         return clone;
     }
 
-    private class AndBiPredicate implements BiPredicate<V, V>, Serializable {
+    private class AndBiPredicate implements PBiPredicate<V, V>, Serializable {
 
         private final AndP<V> andP;
 
@@ -98,5 +93,10 @@
                 throw typeError;
             return true;
         }
+
+        @Override
+        public String getPredicateName() {
+            return "and";
+        }
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
index 7fa26c5..7d93c7f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/BytecodeHelper.java
@@ -42,7 +42,9 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.OptionalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AllStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AnyStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
@@ -62,25 +64,41 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsDateStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsStringGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AsStringLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CallStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CoalesceStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CombineStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConcatStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConjoinStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DateAddStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DateDiffStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.DedupLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DifferenceStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DisjunctStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ElementMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ElementStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FormatStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.IndexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.IntersectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LTrimGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LTrimLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaCollectingBarrierStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaFlatMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LengthGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LengthLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.LoopsStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.MathStep;
@@ -95,23 +113,39 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProductStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyKeyStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.RTrimGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.RTrimLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReplaceGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReplaceLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ReverseStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SackStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SampleLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SplitGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SplitLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SubstringGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TailLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToLowerGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToLowerLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ToUpperLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalFlatMapStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMergeStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalSelectStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TrimLocalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
@@ -196,6 +230,31 @@
             put(GraphTraversal.Symbols.max, Arrays.asList(MaxGlobalStep.class, MaxLocalStep.class));
             put(GraphTraversal.Symbols.min, Arrays.asList(MinGlobalStep.class, MinGlobalStep.class));
             put(GraphTraversal.Symbols.mean, Arrays.asList(MeanGlobalStep.class, MeanLocalStep.class));
+            put(GraphTraversal.Symbols.concat, Collections.singletonList(ConcatStep.class));
+            put(GraphTraversal.Symbols.format, Collections.singletonList(FormatStep.class));
+            put(GraphTraversal.Symbols.asString, Arrays.asList(AsStringGlobalStep.class, AsStringLocalStep.class));
+            put(GraphTraversal.Symbols.length, Arrays.asList(LengthGlobalStep.class, LengthLocalStep.class));
+            put(GraphTraversal.Symbols.toLower, Arrays.asList(ToLowerGlobalStep.class, ToLowerLocalStep.class));
+            put(GraphTraversal.Symbols.toUpper, Arrays.asList(ToUpperGlobalStep.class, ToUpperLocalStep.class));
+            put(GraphTraversal.Symbols.trim, Arrays.asList(TrimGlobalStep.class, TrimLocalStep.class));
+            put(GraphTraversal.Symbols.lTrim, Arrays.asList(LTrimGlobalStep.class, LTrimLocalStep.class));
+            put(GraphTraversal.Symbols.rTrim, Arrays.asList(RTrimGlobalStep.class, RTrimLocalStep.class));
+            put(GraphTraversal.Symbols.reverse, Collections.singletonList(ReverseStep.class));
+            put(GraphTraversal.Symbols.replace, Arrays.asList(ReplaceGlobalStep.class, ReplaceLocalStep.class));
+            put(GraphTraversal.Symbols.substring, Arrays.asList(SubstringGlobalStep.class, ReplaceLocalStep.class));
+            put(GraphTraversal.Symbols.split, Arrays.asList(SplitGlobalStep.class, SplitLocalStep.class));
+            put(GraphTraversal.Symbols.asDate, Collections.singletonList(AsDateStep.class));
+            put(GraphTraversal.Symbols.dateAdd, Collections.singletonList(DateAddStep.class));
+            put(GraphTraversal.Symbols.dateDiff, Collections.singletonList(DateDiffStep.class));
+            put(GraphTraversal.Symbols.all, Collections.singletonList(AllStep.class));
+            put(GraphTraversal.Symbols.any, Collections.singletonList(AnyStep.class));
+            put(GraphTraversal.Symbols.combine, Collections.singletonList(CombineStep.class));
+            put(GraphTraversal.Symbols.difference, Collections.singletonList(DifferenceStep.class));
+            put(GraphTraversal.Symbols.disjunct, Collections.singletonList(DisjunctStep.class));
+            put(GraphTraversal.Symbols.merge, Collections.singletonList(TraversalMergeStep.class));
+            put(GraphTraversal.Symbols.conjoin, Collections.singletonList(ConjoinStep.class));
+            put(GraphTraversal.Symbols.product, Collections.singletonList(ProductStep.class));
+            put(GraphTraversal.Symbols.intersect, Collections.singletonList(IntersectStep.class));
             put(GraphTraversal.Symbols.group, Arrays.asList(GroupStep.class, GroupSideEffectStep.class));
             put(GraphTraversal.Symbols.groupCount, Arrays.asList(GroupCountStep.class, GroupCountSideEffectStep.class));
             put(GraphTraversal.Symbols.tree, Arrays.asList(TreeStep.class, TreeSideEffectStep.class));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ListFunction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ListFunction.java
new file mode 100644
index 0000000..ab693b9
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ListFunction.java
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * List functions are a separate paradigm for Steps as they behave in a Scope.Local manner by default. This class
+ * provides helper methods that are common amongst these steps and should be used to keep behavior consistent in terms
+ * of handling of incoming traversers and argument types.
+ */
+public interface ListFunction {
+
+    /**
+     * Turn an iterable type into a collection. Doesn't wrap any non-iterable type into an iterable (e.g. single Object
+     * into list), but will transform one iterable type to another (e.g. array to list).
+     *
+     * @param iterable an Iterable or array.
+     * @return The iterable type as a Collection or null if argument isn't iterable.
+     */
+    public static Collection asCollection(Object iterable) {
+        if (iterable instanceof Collection) {
+            return (Collection) iterable;
+        } else if ((iterable != null && iterable.getClass().isArray()) || iterable instanceof Iterable) {
+            return (Collection) IteratorUtils.asList(iterable);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Turn an iterable type into a set. Doesn't wrap any non-iterable type into an iterable (e.g. single Object
+     * into set), but will transform one iterable type to another (e.g. array to set).
+     *
+     * @param iterable an Iterable or array.
+     * @return The iterable type as a Collection or null if argument isn't iterable.
+     */
+    public static Set asSet(Object iterable) {
+        if (iterable instanceof Iterable || iterable != null && iterable.getClass().isArray()) {
+            return IteratorUtils.asSet(iterable);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Template method used for retrieving the implementing Step's name.
+     *
+     * @return this step's name.
+     */
+    public String getStepName();
+
+    public default Collection convertArgumentToCollection(Object arg) {
+        if (null == arg) {
+            throw new IllegalArgumentException(
+                    String.format("Argument provided for %s step can't be null.", getStepName()));
+        }
+
+        final Collection incoming = asCollection(arg);
+
+        if (null == incoming) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "%s step can only take an array or an Iterable as an argument, encountered %s",
+                            getStepName(),
+                            arg.getClass()));
+        }
+
+        return incoming;
+    }
+
+    public default <S> Collection convertTraverserToCollection(Traverser.Admin<S> traverser) {
+        final S items = traverser.get();
+
+        if (null == items) {
+            throw new IllegalArgumentException(
+                    String.format("Incoming traverser for %s step can't be null.", getStepName()));
+        }
+
+        final Collection incoming = asCollection(items);
+
+        if (null == incoming) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "%s step can only take an array or an Iterable type for incoming traversers, encountered %s",
+                            getStepName(),
+                            items.getClass()));
+        }
+
+        return incoming;
+    }
+
+    public default <S, E> Collection convertTraversalToCollection(Traverser.Admin<S> traverser, final Traversal.Admin<S, E> traversal) {
+        final Object array = TraversalUtil.apply(traverser, traversal);
+
+        if (null == array) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Provided traversal argument for %s step must yield an iterable type, not null",
+                            getStepName()));
+        }
+
+        final Collection input = asCollection(array);
+
+        if (null == input) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Provided traversal argument for %s step must yield an iterable type, encountered %s",
+                            getStepName(),
+                            array.getClass()));
+        }
+
+        return input;
+    }
+
+    public default Set convertArgumentToSet(Object arg) {
+        if (null == arg) {
+            throw new IllegalArgumentException(
+                    String.format("Argument provided for %s step can't be null.", getStepName()));
+        }
+
+        final Set incoming = asSet(arg);
+
+        if (null == incoming) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "%s step can only take an array or an Iterable as an argument, encountered %s",
+                            getStepName(),
+                            arg.getClass()));
+        }
+
+        return incoming;
+    }
+
+    public default <S> Set convertTraverserToSet(Traverser.Admin<S> traverser) {
+        final S items = traverser.get();
+
+        if (null == items) {
+            throw new IllegalArgumentException(
+                    String.format("Incoming traverser for %s step can't be null.", getStepName()));
+        }
+
+        final Set incoming = asSet(items);
+
+        if (null == incoming) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "%s step can only take an array or an Iterable type for incoming traversers, encountered %s",
+                            getStepName(),
+                            items.getClass()));
+        }
+
+        return incoming;
+    }
+
+    public default <S, E> Set convertTraversalToSet(Traverser.Admin<S> traverser, final Traversal.Admin<S, E> traversal) {
+        final Object array = TraversalUtil.apply(traverser, traversal);
+
+        if (null == array) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Provided traversal argument for %s step must yield an iterable type, not null",
+                            getStepName()));
+        }
+
+        final Set input = asSet(array);
+
+        if (null == input) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Provided traversal argument for %s step must yield an iterable type, encountered %s",
+                            getStepName(),
+                            array.getClass()));
+        }
+
+        return input;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
index 59ee9e5..4e270d8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
@@ -20,13 +20,11 @@
 
 import org.apache.tinkerpop.gremlin.process.traversal.GremlinTypeErrorException;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.PBiPredicate;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.List;
-import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 /**
@@ -65,16 +63,13 @@
     }
 
     @Override
-    public String getPredicateName() { return "or"; }
-
-    @Override
     public OrP<V> clone() {
         final OrP<V> clone = (OrP<V>) super.clone();
         clone.biPredicate = new OrBiPredicate(clone);
         return clone;
     }
 
-    private class OrBiPredicate implements BiPredicate<V, V>, Serializable {
+    private class OrBiPredicate implements PBiPredicate<V, V>, Serializable {
 
         private final OrP<V> orP;
 
@@ -98,5 +93,10 @@
                 throw typeError;
             return false;
         }
+
+        @Override
+        public String getPredicateName() {
+            return "or";
+        }
     }
 }
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
index 4460f7d..af7a18a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
@@ -18,6 +18,10 @@
  */
 package org.apache.tinkerpop.gremlin.structure;
 
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyVertexProperty;
 
 import java.util.Iterator;
@@ -40,7 +44,19 @@
     public static final String DEFAULT_LABEL = "vertexProperty";
 
     public enum Cardinality {
-        single, list, set
+        single, list, set;
+
+        public static CardinalityValueTraversal single(final Object value) {
+            return new CardinalityValueTraversal(single, value);
+        }
+
+        public static CardinalityValueTraversal list(final Object value) {
+            return new CardinalityValueTraversal(list, value);
+        }
+
+        public static CardinalityValueTraversal set(final Object value) {
+            return new CardinalityValueTraversal(set, value);
+        }
     }
 
     /**
@@ -104,7 +120,7 @@
         }
 
         public static UnsupportedOperationException metaPropertiesNotSupported() {
-            return new UnsupportedOperationException("Properties on a vertex property is not supported");
+            return new UnsupportedOperationException("Adding properties to a vertex property is not supported");
         }
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java
index 7c0a885..b8c5957 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java
@@ -37,7 +37,7 @@
  */
 public final class GraphMigrator {
 
-    private GraphMigrator() {}
+    private GraphMigrator() { }
 
     /**
      * Use Gryo to pipe the data from one graph to another graph.  Uses readers and writers generated from each
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/DataType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/DataType.java
index 75b8060..e3fd09f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/DataType.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/DataType.java
@@ -71,6 +71,7 @@
     METRICS(0x2C),
     TRAVERSALMETRICS(0x2D),
     MERGE(0x2E),
+    DT(0x2F),
 
     CHAR(0X80),
     DURATION(0X81),
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java
index ab0b094..80b1df0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/GraphBinaryWriter.java
@@ -102,7 +102,7 @@
         if (serializer instanceof TransformSerializer) {
             // For historical reasons, there are types that need to be transformed into another type
             // before serialization, e.g., Map.Entry
-            TransformSerializer<T> transformSerializer = (TransformSerializer<T>) serializer;
+            final TransformSerializer<T> transformSerializer = (TransformSerializer<T>) serializer;
             write(transformSerializer.transform(value), buffer);
             return;
         }
@@ -118,7 +118,7 @@
      * <p>Note that for simple types, the provided information will be <code>null</code>.</p>
      */
     public <T> void writeFullyQualifiedNull(final Class<T> objectClass, Buffer buffer, final Object information) throws IOException {
-        TypeSerializer<T> serializer = registry.getSerializer(objectClass);
+        final TypeSerializer<T> serializer = registry.getSerializer(objectClass);
         serializer.write(null, buffer, this);
     }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
index 4edcad2..9958179 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
@@ -18,14 +18,14 @@
  */
 package org.apache.tinkerpop.gremlin.structure.io.binary;
 
-import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.*;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
+import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 import org.apache.tinkerpop.gremlin.process.traversal.Order;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Pick;
 import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
@@ -48,6 +48,52 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.BigDecimalSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.BigIntegerSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.BindingSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.BulkSetSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.ByteBufferSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.ByteCodeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.CharSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.ClassSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.DateSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.DurationSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.EdgeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.EnumSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.GraphSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.InetAddressSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.InstantSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.LambdaSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.ListSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.LocalDateSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.LocalDateTimeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.LocalTimeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.MapEntrySerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.MapSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.MetricsSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.MonthDaySerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.OffsetDateTimeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.OffsetTimeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.PSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.PathSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.PeriodSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.PropertySerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.SetSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.SingleTypeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.StringSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.TransformSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraversalExplanationSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraversalMetricsSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraversalStrategySerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.TraverserSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.TreeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.UUIDSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.VertexPropertySerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.VertexSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.YearMonthSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.ZoneOffsetSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.ZonedDateTimeSerializer;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.javatuples.Pair;
 
@@ -118,6 +164,7 @@
             new RegistryEntry<>(VertexProperty.Cardinality.class, EnumSerializer.CardinalitySerializer),
             new RegistryEntry<>(Column.class, EnumSerializer.ColumnSerializer),
             new RegistryEntry<>(Direction.class, EnumSerializer.DirectionSerializer),
+            new RegistryEntry<>(DT.class, EnumSerializer.DTSerializer),
             new RegistryEntry<>(Merge.class, EnumSerializer.MergeSerializer),
             new RegistryEntry<>(Operator.class, EnumSerializer.OperatorSerializer),
             new RegistryEntry<>(Order.class, EnumSerializer.OrderSerializer),
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java
index de88180..fdfb94f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EdgeSerializer.java
@@ -18,15 +18,18 @@
  */
 package org.apache.tinkerpop.gremlin.structure.io.binary.types;
 
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
 import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
@@ -41,20 +44,28 @@
         final Object id = context.read(buffer);
         final String label = context.readValue(buffer, String.class, false);
 
-        final ReferenceVertex inV = new ReferenceVertex(context.read(buffer),
-                                                        context.readValue(buffer, String.class, false));
-        final ReferenceVertex outV = new ReferenceVertex(context.read(buffer),
-                                                         context.readValue(buffer, String.class, false));
+        final Object inVId = context.read(buffer);
+        final String inVLabel = context.readValue(buffer, String.class, false);
+        final Object outVId = context.read(buffer);
+        final String outVLabel = context.readValue(buffer, String.class, false);
 
-        // discard the parent vertex - we only send "references so this should always be null, but will we change our
-        // minds someday????
+        // discard the parent vertex
         context.read(buffer);
 
-        // discard the properties - as we only send "references" this should always be null, but will we change our
-        // minds some day????
-        context.read(buffer);
+        final List<Property> properties = context.read(buffer);
 
-        return new ReferenceEdge(id, label, inV, outV);
+        final DetachedVertex inV = DetachedVertex.build().setId(inVId).setLabel(inVLabel).create();
+        final DetachedVertex outV = DetachedVertex.build().setId(outVId).setLabel(outVLabel).create();
+
+        final DetachedEdge.Builder builder = DetachedEdge.build().setId(id).setLabel(label).setInV(inV).setOutV(outV);
+
+        if (properties != null) {
+            for (final Property p : properties) {
+                builder.addProperty(p);
+            }
+        }
+
+        return builder.create();
     }
 
     @Override
@@ -68,11 +79,14 @@
         context.write(value.outVertex().id(), buffer);
         context.writeValue(value.outVertex().label(), buffer, false);
 
-        // we don't serialize the parent Vertex for edges. they are "references", but we leave a place holder
-        // here as an option for the future as we've waffled this soooooooooo many times now
+        // we don't serialize the parent Vertex for edges.
         context.write(null, buffer);
-        // we don't serialize properties for graph vertices/edges. they are "references", but we leave a place holder
-        // here as an option for the future as we've waffled this soooooooooo many times now
-        context.write(null, buffer);
+        if (value.properties() == null) {
+            context.write(null, buffer);
+        }
+        else {
+            final List<?> asList = IteratorUtils.toList(value.properties());
+            context.write(asList, buffer);
+        }
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java
index 41cf7fc..dcd1469 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/EnumSerializer.java
@@ -18,16 +18,17 @@
  */
 package org.apache.tinkerpop.gremlin.structure.io.binary.types;
 
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
 import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Pick;
 import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
 import org.apache.tinkerpop.gremlin.structure.Column;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.T;
@@ -48,6 +49,7 @@
     public static final EnumSerializer<VertexProperty.Cardinality> CardinalitySerializer = new EnumSerializer<>(DataType.CARDINALITY, VertexProperty.Cardinality::valueOf);
     public static final EnumSerializer<Column> ColumnSerializer = new EnumSerializer<>(DataType.COLUMN, Column::valueOf);
     public static final EnumSerializer<Direction> DirectionSerializer = new EnumSerializer<>(DataType.DIRECTION, Direction::valueOf);
+    public static final EnumSerializer<DT> DTSerializer = new EnumSerializer<>(DataType.DT, DT::valueOf);
     public static final EnumSerializer<Merge> MergeSerializer = new EnumSerializer<>(DataType.MERGE, Merge::valueOf);
     public static final EnumSerializer<Operator> OperatorSerializer = new EnumSerializer<>(DataType.OPERATOR, Operator::valueOf);
     public static final EnumSerializer<Order> OrderSerializer = new EnumSerializer<>(DataType.ORDER, Order::valueOf);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TransformSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TransformSerializer.java
index 97ccbba..7275b1c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TransformSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TransformSerializer.java
@@ -24,5 +24,5 @@
  * Represents a special TypeSerializer placeholder that transforms the value into another before serializing it.
  */
 public interface TransformSerializer<T> extends TypeSerializer<T> {
-    Object transform(T value);
+    Object transform(final T value);
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java
index bb9ba8b..9850c13 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexPropertySerializer.java
@@ -18,14 +18,18 @@
  */
 package org.apache.tinkerpop.gremlin.structure.io.binary.types;
 
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
@@ -38,17 +42,20 @@
 
     @Override
     protected VertexProperty readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
-        final VertexProperty v = new ReferenceVertexProperty<>(context.read(buffer),
-                context.readValue(buffer, String.class, false),
-                context.read(buffer));
+        final DetachedVertexProperty.Builder builder = DetachedVertexProperty.build()
+                .setId(context.read(buffer))
+                .setLabel(context.readValue(buffer, String.class, false))
+                .setValue(context.read(buffer));
 
         // discard the parent vertex - we only send "references"
         context.read(buffer);
 
-        // discard the properties - as we only send "references" this should always be null, but will we change our
-        // minds some day????
-        context.read(buffer);
-        return v;
+        final List<Property> properties = context.read(buffer);
+        if (properties != null && !properties.isEmpty()) {
+            for (Property p : properties) builder.addProperty(p);
+        }
+
+        return builder.create();
     }
 
     @Override
@@ -57,10 +64,12 @@
         context.writeValue(value.label(), buffer, false);
         context.write(value.value(), buffer);
 
-        // we don't serialize the parent vertex even as a "reference", but, let's hold a place for it
+        // we don't serialize the parent vertex, let's hold a place for it
         context.write(null, buffer);
-        // we don't serialize properties for graph elements. they are "references", but we leave a place holder
-        // here as an option for the future as we've waffled this soooooooooo many times now
-        context.write(null, buffer);
+
+        final List<?> asList = value.graph().features().vertex().supportsMetaProperties() ?
+                IteratorUtils.toList(value.properties()) :
+                Collections.emptyList();
+        context.write(asList, buffer);
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java
index 18909f3..5dbdfd1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/VertexSerializer.java
@@ -18,14 +18,18 @@
  */
 package org.apache.tinkerpop.gremlin.structure.io.binary.types;
 
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
 import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
@@ -37,19 +41,31 @@
 
     @Override
     protected Vertex readValue(final Buffer buffer, final GraphBinaryReader context) throws IOException {
-        final Vertex v = new ReferenceVertex(context.read(buffer), 
-                                             context.readValue(buffer, String.class, false));
-        
-        // discard the properties - as we only send "references" this should always be null, but will we change our
-        // minds some day????
-        context.read(buffer);
-        return v;
+        final Object id = context.read(buffer);
+        final String label = context.readValue(buffer, String.class, false);
+        final List<DetachedVertexProperty> properties = context.read(buffer);
+
+        final DetachedVertex.Builder builder = DetachedVertex.build().setId(id).setLabel(label);
+
+        if (properties != null) {
+            for (final DetachedVertexProperty vp : properties) {
+                builder.addProperty(vp);
+            }
+        }
+
+        return builder.create();
     }
 
     @Override
     protected void writeValue(final Vertex value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
         context.write(value.id(), buffer);
         context.writeValue(value.label(), buffer, false);
-        context.write(null, buffer);
+        if (value.properties() == null) {
+            context.write(null, buffer);
+        }
+        else {
+            final List<?> asList = IteratorUtils.toList(value.properties());
+            context.write(asList, buffer);
+        }
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 562f2a1..9e65594 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -78,11 +78,7 @@
         this.normalize = builder.normalize;
         this.version = builder.version;
         this.streamReadConstraints = builder.streamReadConstraintsBuilder.build();
-
-        if (null == builder.typeInfo)
-            this.typeInfo = builder.version == GraphSONVersion.V1_0 ? TypeInfo.NO_TYPES : TypeInfo.PARTIAL_TYPES;
-        else
-            this.typeInfo = builder.typeInfo;
+        this.typeInfo = builder.typeInfo;
     }
 
     @Override
@@ -90,7 +86,7 @@
         final ObjectMapper om = new ObjectMapper(JsonFactory.builder().streamReadConstraints(streamReadConstraints).build());
         om.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
 
-        final GraphSONModule graphSONModule = version.getBuilder().create(normalize);
+        final GraphSONModule graphSONModule = version.getBuilder().create(normalize, typeInfo);
         om.registerModule(graphSONModule);
         customModules.forEach(om::registerModule);
 
@@ -98,11 +94,7 @@
         if (loadCustomSerializers)
             om.findAndRegisterModules();
 
-        // graphson 3.0 only allows type - there is no option to remove embedded types
-        if (version == GraphSONVersion.V3_0 && typeInfo == TypeInfo.NO_TYPES)
-            throw new IllegalStateException(String.format("GraphSON 3.0 does not support %s", TypeInfo.NO_TYPES));
-
-        if (version == GraphSONVersion.V3_0 || (version == GraphSONVersion.V2_0 && typeInfo != TypeInfo.NO_TYPES)) {
+        if ((version == GraphSONVersion.V3_0 || version == GraphSONVersion.V2_0) && typeInfo != TypeInfo.NO_TYPES) {
             final GraphSONTypeIdResolver graphSONTypeIdResolver = new GraphSONTypeIdResolver();
             final TypeResolverBuilder typer = new GraphSONTypeResolverBuilder(version)
                     .typesEmbedding(this.typeInfo)
@@ -142,8 +134,10 @@
                         .typeProperty(GraphSONTokens.CLASS);
                 om.setDefaultTyping(typer);
             }
+        } else if (version == GraphSONVersion.V3_0) {
+
         } else {
-            throw new IllegalStateException("Unknown GraphSONVersion : " + version);
+            throw new IllegalStateException("Unknown GraphSONVersion: " + version);
         }
 
         // this provider toStrings all unknown classes and converts keys in Map objects that are Object to String.
@@ -201,6 +195,7 @@
 
     public static class Builder implements Mapper.Builder<Builder> {
         private List<SimpleModule> customModules = new ArrayList<>();
+        private List<GraphSONModule.GraphSONModuleBuilder> customModuleBuilders = new ArrayList<>();
         private boolean loadCustomModules = false;
         private boolean normalize = false;
         private List<IoRegistry> registries = new ArrayList<>();
@@ -208,11 +203,6 @@
         private boolean includeDefaultXModule = false;
         private StreamReadConstraints.Builder streamReadConstraintsBuilder = StreamReadConstraints.builder()
                 .maxNumberLength(DEFAULT_MAX_NUMBER_LENGTH);
-
-        /**
-         * GraphSON 2.0/3.0 should have types activated by default (3.0 does not have a typeless option), and 1.0
-         * should use no types by default.
-         */
         private TypeInfo typeInfo = null;
 
         private Builder() {
@@ -252,6 +242,17 @@
         }
 
         /**
+         * Supplies a mapper module builder to be lazily constructed. The advantage to using this mechanism over
+         * {@link #addCustomModule(SimpleModule)} is that if the module is constructed with {@link TypeInfo} it can
+         * inherit it from the value supplied to {@link #typeInfo(TypeInfo)} (as well as the {@link #normalize(boolean)}
+         * option.
+         */
+        public Builder addCustomModule(final GraphSONModule.GraphSONModuleBuilder moduleBuilder) {
+            this.customModuleBuilders.add(moduleBuilder);
+            return this;
+        }
+
+        /**
          * Supply a default extension module of V2_0 and V3_0 for serialization/deserialization.
          */
         public Builder addDefaultXModule(final boolean includeDefaultXModule) {
@@ -308,16 +309,33 @@
                 simpleModules.stream().map(Pair::getValue1).forEach(this.customModules::add);
             });
 
+            typeInfo = inferTypeInfo(typeInfo, version);
+
+            // finish building off the modules.
+            customModuleBuilders.forEach(b -> {
+                this.addCustomModule(b.create(this.normalize, typeInfo));
+            });
+
             if (includeDefaultXModule) {
                 if (this.version == GraphSONVersion.V2_0) {
-                    this.addCustomModule(GraphSONXModuleV2d0.build().create(false));
+                    this.addCustomModule(GraphSONXModuleV2.build().create(this.normalize, typeInfo));
                 } else if (this.version == GraphSONVersion.V3_0) {
-                    this.addCustomModule(GraphSONXModuleV3d0.build().create(false));
+                    this.addCustomModule(GraphSONXModuleV3.build().create(this.normalize, typeInfo));
                 }
             }
 
             return new GraphSONMapper(this);
         }
 
+        /**
+         * User the version to infer the {@link TypeInfo} if it is not explicitly supplied. GraphSON 1.0 defaults to
+         * no types, since it's Jackson type system is fairly impenetrable, but we otherwise use types.
+         */
+        private static TypeInfo inferTypeInfo(final TypeInfo typeInfo, final GraphSONVersion version) {
+            if (null == typeInfo)
+                return version == GraphSONVersion.V1_0 ? TypeInfo.NO_TYPES : TypeInfo.PARTIAL_TYPES;
+            else
+                return typeInfo;
+        }
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index 32a29e7..a274ec9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -21,6 +21,7 @@
 import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 import org.apache.tinkerpop.gremlin.process.traversal.Order;
@@ -79,9 +80,9 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV1d0;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV2d0;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV3d0;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV1;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV2;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV3;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
 
 import java.time.Duration;
@@ -137,7 +138,7 @@
     /**
      * Version 3.0 of GraphSON.
      */
-    static final class GraphSONModuleV3d0 extends GraphSONModule {
+    static final class GraphSONModuleV3 extends GraphSONModule {
 
         private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
                 new LinkedHashMap<Class, String>() {{
@@ -175,6 +176,7 @@
                             VertexProperty.Cardinality.class,
                             Column.class,
                             Direction.class,
+                            DT.class,
                             Merge.class,
                             Operator.class,
                             Order.class,
@@ -225,40 +227,43 @@
         /**
          * Constructs a new object.
          */
-        protected GraphSONModuleV3d0(final boolean normalize) {
+        protected GraphSONModuleV3(final boolean normalize, final TypeInfo typeInfo) {
             super("graphson-3.0");
 
             /////////////////////// SERIALIZERS ////////////////////////////
 
             // graph
-            addSerializer(Edge.class, new GraphSONSerializersV3d0.EdgeJacksonSerializer(normalize));
-            addSerializer(Vertex.class, new GraphSONSerializersV3d0.VertexJacksonSerializer(normalize));
-            addSerializer(VertexProperty.class, new GraphSONSerializersV3d0.VertexPropertyJacksonSerializer(normalize, true));
-            addSerializer(Property.class, new GraphSONSerializersV3d0.PropertyJacksonSerializer());
-            addSerializer(Metrics.class, new GraphSONSerializersV3d0.MetricsJacksonSerializer());
-            addSerializer(TraversalMetrics.class, new GraphSONSerializersV3d0.TraversalMetricsJacksonSerializer());
-            addSerializer(TraversalExplanation.class, new GraphSONSerializersV3d0.TraversalExplanationJacksonSerializer());
-            addSerializer(Path.class, new GraphSONSerializersV3d0.PathJacksonSerializer());
-            addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV3d0(normalize));
-            addSerializer(Tree.class, new GraphSONSerializersV3d0.TreeJacksonSerializer());
+            addSerializer(Edge.class, new GraphSONSerializersV3.EdgeJacksonSerializer(normalize, typeInfo));
+            addSerializer(Vertex.class, new GraphSONSerializersV3.VertexJacksonSerializer(normalize, typeInfo));
+            addSerializer(VertexProperty.class, new GraphSONSerializersV3.VertexPropertyJacksonSerializer(normalize, true));
+            addSerializer(Property.class, new GraphSONSerializersV3.PropertyJacksonSerializer());
+            addSerializer(Metrics.class, new GraphSONSerializersV3.MetricsJacksonSerializer());
+            addSerializer(TraversalMetrics.class, new GraphSONSerializersV3.TraversalMetricsJacksonSerializer());
+            addSerializer(TraversalExplanation.class, new GraphSONSerializersV3.TraversalExplanationJacksonSerializer());
+            addSerializer(Path.class, new GraphSONSerializersV3.PathJacksonSerializer());
+            addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV3(normalize));
+            addSerializer(Tree.class, new GraphSONSerializersV3.TreeJacksonSerializer());
 
-            // java.util
-            addSerializer(Map.Entry.class, new JavaUtilSerializersV3d0.MapEntryJacksonSerializer());
-            addSerializer(Map.class, new JavaUtilSerializersV3d0.MapJacksonSerializer());
-            addSerializer(List.class, new JavaUtilSerializersV3d0.ListJacksonSerializer());
-            addSerializer(Set.class, new JavaUtilSerializersV3d0.SetJacksonSerializer());
+            // java.util - use the standard jackson serializers for collections when types aren't embedded
+            if (typeInfo != TypeInfo.NO_TYPES) {
+                addSerializer(Map.Entry.class, new JavaUtilSerializersV3.MapEntryJacksonSerializer());
+                addSerializer(Map.class, new JavaUtilSerializersV3.MapJacksonSerializer());
+                addSerializer(List.class, new JavaUtilSerializersV3.ListJacksonSerializer());
+                addSerializer(Set.class, new JavaUtilSerializersV3.SetJacksonSerializer());
+            }
 
-            // need to explicitly add serializers for those types because Jackson doesn't do it at all.
-            addSerializer(Integer.class, new GraphSONSerializersV3d0.IntegerGraphSONSerializer());
-            addSerializer(Double.class, new GraphSONSerializersV3d0.DoubleGraphSONSerializer());
+            // need to explicitly add serializers for these types because Jackson doesn't do it at all.
+            addSerializer(Integer.class, new GraphSONSerializersV3.IntegerGraphSONSerializer());
+            addSerializer(Double.class, new GraphSONSerializersV3.DoubleGraphSONSerializer());
 
             // traversal
-            addSerializer(BulkSet.class, new TraversalSerializersV3d0.BulkSetJacksonSerializer());
-            addSerializer(Traversal.class, new TraversalSerializersV3d0.TraversalJacksonSerializer());
-            addSerializer(Bytecode.class, new TraversalSerializersV3d0.BytecodeJacksonSerializer());
+            addSerializer(BulkSet.class, new TraversalSerializersV3.BulkSetJacksonSerializer());
+            addSerializer(Traversal.class, new TraversalSerializersV3.TraversalJacksonSerializer());
+            addSerializer(Bytecode.class, new TraversalSerializersV3.BytecodeJacksonSerializer());
             Stream.of(VertexProperty.Cardinality.class,
                     Column.class,
                     Direction.class,
+                    DT.class,
                     Merge.class,
                     Operator.class,
                     Order.class,
@@ -266,42 +271,45 @@
                     SackFunctions.Barrier.class,
                     Scope.class,
                     Pick.class,
-                    T.class).forEach(e -> addSerializer(e, new TraversalSerializersV3d0.EnumJacksonSerializer()));
-            addSerializer(P.class, new TraversalSerializersV3d0.PJacksonSerializer());
-            addSerializer(Lambda.class, new TraversalSerializersV3d0.LambdaJacksonSerializer());
-            addSerializer(Bytecode.Binding.class, new TraversalSerializersV3d0.BindingJacksonSerializer());
-            addSerializer(Traverser.class, new TraversalSerializersV3d0.TraverserJacksonSerializer());
-            addSerializer(TraversalStrategy.class, new TraversalSerializersV3d0.TraversalStrategyJacksonSerializer());
+                    T.class).forEach(e -> addSerializer(e, new TraversalSerializersV3.EnumJacksonSerializer()));
+            addSerializer(P.class, new TraversalSerializersV3.PJacksonSerializer());
+            addSerializer(Lambda.class, new TraversalSerializersV3.LambdaJacksonSerializer());
+            addSerializer(Bytecode.Binding.class, new TraversalSerializersV3.BindingJacksonSerializer());
+            addSerializer(Traverser.class, new TraversalSerializersV3.TraverserJacksonSerializer());
+            addSerializer(TraversalStrategy.class, new TraversalSerializersV3.TraversalStrategyJacksonSerializer());
 
             /////////////////////// DESERIALIZERS ////////////////////////////
 
             // Tinkerpop Graph
-            addDeserializer(Vertex.class, new GraphSONSerializersV3d0.VertexJacksonDeserializer());
-            addDeserializer(Edge.class, new GraphSONSerializersV3d0.EdgeJacksonDeserializer());
-            addDeserializer(Property.class, new GraphSONSerializersV3d0.PropertyJacksonDeserializer());
-            addDeserializer(Path.class, new GraphSONSerializersV3d0.PathJacksonDeserializer());
-            addDeserializer(TraversalExplanation.class, new GraphSONSerializersV3d0.TraversalExplanationJacksonDeserializer());
-            addDeserializer(VertexProperty.class, new GraphSONSerializersV3d0.VertexPropertyJacksonDeserializer());
-            addDeserializer(Metrics.class, new GraphSONSerializersV3d0.MetricsJacksonDeserializer());
-            addDeserializer(TraversalMetrics.class, new GraphSONSerializersV3d0.TraversalMetricsJacksonDeserializer());
-            addDeserializer(Tree.class, new GraphSONSerializersV3d0.TreeJacksonDeserializer());
+            addDeserializer(Vertex.class, new GraphSONSerializersV3.VertexJacksonDeserializer());
+            addDeserializer(Edge.class, new GraphSONSerializersV3.EdgeJacksonDeserializer());
+            addDeserializer(Property.class, new GraphSONSerializersV3.PropertyJacksonDeserializer());
+            addDeserializer(Path.class, new GraphSONSerializersV3.PathJacksonDeserializer());
+            addDeserializer(TraversalExplanation.class, new GraphSONSerializersV3.TraversalExplanationJacksonDeserializer());
+            addDeserializer(VertexProperty.class, new GraphSONSerializersV3.VertexPropertyJacksonDeserializer());
+            addDeserializer(Metrics.class, new GraphSONSerializersV3.MetricsJacksonDeserializer());
+            addDeserializer(TraversalMetrics.class, new GraphSONSerializersV3.TraversalMetricsJacksonDeserializer());
+            addDeserializer(Tree.class, new GraphSONSerializersV3.TreeJacksonDeserializer());
 
-            // java.util
-            addDeserializer(Map.class, new JavaUtilSerializersV3d0.MapJacksonDeserializer());
-            addDeserializer(List.class, new JavaUtilSerializersV3d0.ListJacksonDeserializer());
-            addDeserializer(Set.class, new JavaUtilSerializersV3d0.SetJacksonDeserializer());
+            // java.util - use the standard jackson serializers for collections when types aren't embedded
+            if (typeInfo != TypeInfo.NO_TYPES) {
+                addDeserializer(Map.class, new JavaUtilSerializersV3.MapJacksonDeserializer());
+                addDeserializer(List.class, new JavaUtilSerializersV3.ListJacksonDeserializer());
+                addDeserializer(Set.class, new JavaUtilSerializersV3.SetJacksonDeserializer());
+            }
 
             // numbers
-            addDeserializer(Integer.class, new GraphSONSerializersV3d0.IntegerJackonsDeserializer());
-            addDeserializer(Double.class, new GraphSONSerializersV3d0.DoubleJacksonDeserializer());
+            addDeserializer(Integer.class, new GraphSONSerializersV3.IntegerJackonsDeserializer());
+            addDeserializer(Double.class, new GraphSONSerializersV3.DoubleJacksonDeserializer());
 
             // traversal
-            addDeserializer(BulkSet.class, new TraversalSerializersV3d0.BulkSetJacksonDeserializer());
-            addDeserializer(Bytecode.class, new TraversalSerializersV3d0.BytecodeJacksonDeserializer());
-            addDeserializer(Bytecode.Binding.class, new TraversalSerializersV3d0.BindingJacksonDeserializer());
+            addDeserializer(BulkSet.class, new TraversalSerializersV3.BulkSetJacksonDeserializer());
+            addDeserializer(Bytecode.class, new TraversalSerializersV3.BytecodeJacksonDeserializer());
+            addDeserializer(Bytecode.Binding.class, new TraversalSerializersV3.BindingJacksonDeserializer());
             Stream.of(VertexProperty.Cardinality.values(),
                     Column.values(),
                     Direction.values(),
+                    DT.values(),
                     Merge.values(),
                     Operator.values(),
                     Order.values(),
@@ -309,11 +317,11 @@
                     SackFunctions.Barrier.values(),
                     Scope.values(),
                     Pick.values(),
-                    T.values()).flatMap(Stream::of).forEach(e -> addDeserializer(e.getClass(), new TraversalSerializersV3d0.EnumJacksonDeserializer(e.getDeclaringClass())));
-            addDeserializer(P.class, new TraversalSerializersV3d0.PJacksonDeserializer());
-            addDeserializer(TextP.class, new TraversalSerializersV3d0.TextPJacksonDeserializer());
-            addDeserializer(Lambda.class, new TraversalSerializersV3d0.LambdaJacksonDeserializer());
-            addDeserializer(Traverser.class, new TraversalSerializersV3d0.TraverserJacksonDeserializer());
+                    T.values()).flatMap(Stream::of).forEach(e -> addDeserializer(e.getClass(), new TraversalSerializersV3.EnumJacksonDeserializer(e.getDeclaringClass())));
+            addDeserializer(P.class, new TraversalSerializersV3.PJacksonDeserializer());
+            addDeserializer(TextP.class, new TraversalSerializersV3.TextPJacksonDeserializer());
+            addDeserializer(Lambda.class, new TraversalSerializersV3.LambdaJacksonDeserializer());
+            addDeserializer(Traverser.class, new TraversalSerializersV3.TraverserJacksonDeserializer());
             Arrays.asList(
                     ConnectiveStrategy.class,
                     ElementIdStrategy.class,
@@ -348,9 +356,9 @@
                     //
                     GraphFilterStrategy.class,
                     VertexProgramStrategy.class
-            ).forEach(strategy -> addDeserializer(strategy, new TraversalSerializersV3d0.TraversalStrategyProxyJacksonDeserializer(strategy)));
+            ).forEach(strategy -> addDeserializer(strategy, new TraversalSerializersV3.TraversalStrategyProxyJacksonDeserializer(strategy)));
 
-            GraphSONModule.tryLoadSparqlStrategy().ifPresent(s -> addDeserializer(s, new TraversalSerializersV3d0.TraversalStrategyProxyJacksonDeserializer(s)));
+            GraphSONModule.tryLoadSparqlStrategy().ifPresent(s -> addDeserializer(s, new TraversalSerializersV3.TraversalStrategyProxyJacksonDeserializer(s)));
         }
 
         public static Builder build() {
@@ -373,8 +381,8 @@
             }
 
             @Override
-            public GraphSONModule create(final boolean normalize) {
-                return new GraphSONModuleV3d0(normalize);
+            public GraphSONModule create(final boolean normalize, final TypeInfo typeInfo) {
+                return new GraphSONModuleV3(normalize, typeInfo);
             }
 
         }
@@ -383,7 +391,7 @@
     /**
      * Version 2.0 of GraphSON.
      */
-    static final class GraphSONModuleV2d0 extends GraphSONModule {
+    static final class GraphSONModuleV2 extends GraphSONModule {
 
         private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
                 new LinkedHashMap<Class, String>() {{
@@ -416,6 +424,7 @@
                             VertexProperty.Cardinality.class,
                             Column.class,
                             Direction.class,
+                            DT.class,
                             Merge.class,
                             Operator.class,
                             Order.class,
@@ -466,36 +475,37 @@
         /**
          * Constructs a new object.
          */
-        protected GraphSONModuleV2d0(final boolean normalize) {
+        protected GraphSONModuleV2(final boolean normalize) {
             super("graphson-2.0");
 
             /////////////////////// SERIALIZERS ////////////////////////////
 
             // graph
-            addSerializer(Edge.class, new GraphSONSerializersV2d0.EdgeJacksonSerializer(normalize));
-            addSerializer(Vertex.class, new GraphSONSerializersV2d0.VertexJacksonSerializer(normalize));
-            addSerializer(VertexProperty.class, new GraphSONSerializersV2d0.VertexPropertyJacksonSerializer(normalize, true));
-            addSerializer(Property.class, new GraphSONSerializersV2d0.PropertyJacksonSerializer());
-            addSerializer(Metrics.class, new GraphSONSerializersV2d0.MetricsJacksonSerializer());
-            addSerializer(TraversalMetrics.class, new GraphSONSerializersV2d0.TraversalMetricsJacksonSerializer());
-            addSerializer(TraversalExplanation.class, new GraphSONSerializersV2d0.TraversalExplanationJacksonSerializer());
-            addSerializer(Path.class, new GraphSONSerializersV2d0.PathJacksonSerializer());
-            addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV2d0(normalize));
-            addSerializer(Tree.class, new GraphSONSerializersV2d0.TreeJacksonSerializer());
+            addSerializer(Edge.class, new GraphSONSerializersV2.EdgeJacksonSerializer(normalize));
+            addSerializer(Vertex.class, new GraphSONSerializersV2.VertexJacksonSerializer(normalize));
+            addSerializer(VertexProperty.class, new GraphSONSerializersV2.VertexPropertyJacksonSerializer(normalize, true));
+            addSerializer(Property.class, new GraphSONSerializersV2.PropertyJacksonSerializer());
+            addSerializer(Metrics.class, new GraphSONSerializersV2.MetricsJacksonSerializer());
+            addSerializer(TraversalMetrics.class, new GraphSONSerializersV2.TraversalMetricsJacksonSerializer());
+            addSerializer(TraversalExplanation.class, new GraphSONSerializersV2.TraversalExplanationJacksonSerializer());
+            addSerializer(Path.class, new GraphSONSerializersV2.PathJacksonSerializer());
+            addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV2(normalize));
+            addSerializer(Tree.class, new GraphSONSerializersV2.TreeJacksonSerializer());
 
             // java.util
-            addSerializer(Map.Entry.class, new JavaUtilSerializersV2d0.MapEntryJacksonSerializer());
+            addSerializer(Map.Entry.class, new JavaUtilSerializersV2.MapEntryJacksonSerializer());
 
             // need to explicitly add serializers for those types because Jackson doesn't do it at all.
-            addSerializer(Integer.class, new GraphSONSerializersV2d0.IntegerGraphSONSerializer());
-            addSerializer(Double.class, new GraphSONSerializersV2d0.DoubleGraphSONSerializer());
+            addSerializer(Integer.class, new GraphSONSerializersV2.IntegerGraphSONSerializer());
+            addSerializer(Double.class, new GraphSONSerializersV2.DoubleGraphSONSerializer());
 
             // traversal
-            addSerializer(Traversal.class, new TraversalSerializersV2d0.TraversalJacksonSerializer());
-            addSerializer(Bytecode.class, new TraversalSerializersV2d0.BytecodeJacksonSerializer());
+            addSerializer(Traversal.class, new TraversalSerializersV2.TraversalJacksonSerializer());
+            addSerializer(Bytecode.class, new TraversalSerializersV2.BytecodeJacksonSerializer());
             Stream.of(VertexProperty.Cardinality.class,
                     Column.class,
                     Direction.class,
+                    DT.class,
                     Merge.class,
                     Operator.class,
                     Order.class,
@@ -503,36 +513,37 @@
                     SackFunctions.Barrier.class,
                     Scope.class,
                     Pick.class,
-                    T.class).forEach(e -> addSerializer(e, new TraversalSerializersV2d0.EnumJacksonSerializer()));
-            addSerializer(P.class, new TraversalSerializersV2d0.PJacksonSerializer());
-            addSerializer(Lambda.class, new TraversalSerializersV2d0.LambdaJacksonSerializer());
-            addSerializer(Bytecode.Binding.class, new TraversalSerializersV2d0.BindingJacksonSerializer());
-            addSerializer(Traverser.class, new TraversalSerializersV2d0.TraverserJacksonSerializer());
-            addSerializer(TraversalStrategy.class, new TraversalSerializersV2d0.TraversalStrategyJacksonSerializer());
+                    T.class).forEach(e -> addSerializer(e, new TraversalSerializersV2.EnumJacksonSerializer()));
+            addSerializer(P.class, new TraversalSerializersV2.PJacksonSerializer());
+            addSerializer(Lambda.class, new TraversalSerializersV2.LambdaJacksonSerializer());
+            addSerializer(Bytecode.Binding.class, new TraversalSerializersV2.BindingJacksonSerializer());
+            addSerializer(Traverser.class, new TraversalSerializersV2.TraverserJacksonSerializer());
+            addSerializer(TraversalStrategy.class, new TraversalSerializersV2.TraversalStrategyJacksonSerializer());
 
             /////////////////////// DESERIALIZERS ////////////////////////////
 
             // Tinkerpop Graph
-            addDeserializer(Vertex.class, new GraphSONSerializersV2d0.VertexJacksonDeserializer());
-            addDeserializer(Edge.class, new GraphSONSerializersV2d0.EdgeJacksonDeserializer());
-            addDeserializer(Property.class, new GraphSONSerializersV2d0.PropertyJacksonDeserializer());
-            addDeserializer(Path.class, new GraphSONSerializersV2d0.PathJacksonDeserializer());
-            addDeserializer(VertexProperty.class, new GraphSONSerializersV2d0.VertexPropertyJacksonDeserializer());
-            addDeserializer(TraversalExplanation.class, new GraphSONSerializersV2d0.TraversalExplanationJacksonDeserializer());
-            addDeserializer(Metrics.class, new GraphSONSerializersV2d0.MetricsJacksonDeserializer());
-            addDeserializer(TraversalMetrics.class, new GraphSONSerializersV2d0.TraversalMetricsJacksonDeserializer());
-            addDeserializer(Tree.class, new GraphSONSerializersV2d0.TreeJacksonDeserializer());
+            addDeserializer(Vertex.class, new GraphSONSerializersV2.VertexJacksonDeserializer());
+            addDeserializer(Edge.class, new GraphSONSerializersV2.EdgeJacksonDeserializer());
+            addDeserializer(Property.class, new GraphSONSerializersV2.PropertyJacksonDeserializer());
+            addDeserializer(Path.class, new GraphSONSerializersV2.PathJacksonDeserializer());
+            addDeserializer(VertexProperty.class, new GraphSONSerializersV2.VertexPropertyJacksonDeserializer());
+            addDeserializer(TraversalExplanation.class, new GraphSONSerializersV2.TraversalExplanationJacksonDeserializer());
+            addDeserializer(Metrics.class, new GraphSONSerializersV2.MetricsJacksonDeserializer());
+            addDeserializer(TraversalMetrics.class, new GraphSONSerializersV2.TraversalMetricsJacksonDeserializer());
+            addDeserializer(Tree.class, new GraphSONSerializersV2.TreeJacksonDeserializer());
 
             // numbers
-            addDeserializer(Integer.class, new GraphSONSerializersV2d0.IntegerJacksonDeserializer());
-            addDeserializer(Double.class, new GraphSONSerializersV2d0.DoubleJacksonDeserializer());
+            addDeserializer(Integer.class, new GraphSONSerializersV2.IntegerJacksonDeserializer());
+            addDeserializer(Double.class, new GraphSONSerializersV2.DoubleJacksonDeserializer());
 
             // traversal
-            addDeserializer(Bytecode.class, new TraversalSerializersV2d0.BytecodeJacksonDeserializer());
-            addDeserializer(Bytecode.Binding.class, new TraversalSerializersV2d0.BindingJacksonDeserializer());
+            addDeserializer(Bytecode.class, new TraversalSerializersV2.BytecodeJacksonDeserializer());
+            addDeserializer(Bytecode.Binding.class, new TraversalSerializersV2.BindingJacksonDeserializer());
             Stream.of(VertexProperty.Cardinality.values(),
                     Column.values(),
                     Direction.values(),
+                    DT.values(),
                     Merge.values(),
                     Operator.values(),
                     Order.values(),
@@ -540,11 +551,11 @@
                     SackFunctions.Barrier.values(),
                     Scope.values(),
                     Pick.values(),
-                    T.values()).flatMap(Stream::of).forEach(e -> addDeserializer(e.getClass(), new TraversalSerializersV2d0.EnumJacksonDeserializer(e.getDeclaringClass())));
-            addDeserializer(P.class, new TraversalSerializersV2d0.PJacksonDeserializer());
-            addDeserializer(TextP.class, new TraversalSerializersV2d0.TextPJacksonDeserializer());
-            addDeserializer(Lambda.class, new TraversalSerializersV2d0.LambdaJacksonDeserializer());
-            addDeserializer(Traverser.class, new TraversalSerializersV2d0.TraverserJacksonDeserializer());
+                    T.values()).flatMap(Stream::of).forEach(e -> addDeserializer(e.getClass(), new TraversalSerializersV2.EnumJacksonDeserializer(e.getDeclaringClass())));
+            addDeserializer(P.class, new TraversalSerializersV2.PJacksonDeserializer());
+            addDeserializer(TextP.class, new TraversalSerializersV2.TextPJacksonDeserializer());
+            addDeserializer(Lambda.class, new TraversalSerializersV2.LambdaJacksonDeserializer());
+            addDeserializer(Traverser.class, new TraversalSerializersV2.TraverserJacksonDeserializer());
             Arrays.asList(
                     ConnectiveStrategy.class,
                     ElementIdStrategy.class,
@@ -579,9 +590,9 @@
                     //
                     GraphFilterStrategy.class,
                     VertexProgramStrategy.class
-            ).forEach(strategy -> addDeserializer(strategy, new TraversalSerializersV2d0.TraversalStrategyProxyJacksonDeserializer(strategy)));
+            ).forEach(strategy -> addDeserializer(strategy, new TraversalSerializersV2.TraversalStrategyProxyJacksonDeserializer(strategy)));
 
-            GraphSONModule.tryLoadSparqlStrategy().ifPresent(s -> addDeserializer(s, new TraversalSerializersV2d0.TraversalStrategyProxyJacksonDeserializer(s)));
+            GraphSONModule.tryLoadSparqlStrategy().ifPresent(s -> addDeserializer(s, new TraversalSerializersV2.TraversalStrategyProxyJacksonDeserializer(s)));
         }
 
         public static Builder build() {
@@ -604,8 +615,8 @@
             }
 
             @Override
-            public GraphSONModule create(final boolean normalize) {
-                return new GraphSONModuleV2d0(normalize);
+            public GraphSONModule create(final boolean normalize, final TypeInfo typeInfo) {
+                return new GraphSONModuleV2(normalize);
             }
 
         }
@@ -614,55 +625,55 @@
     /**
      * Version 1.0 of GraphSON.
      */
-    static final class GraphSONModuleV1d0 extends GraphSONModule {
+    static final class GraphSONModuleV1 extends GraphSONModule {
 
         /**
          * Constructs a new object.
          */
-        protected GraphSONModuleV1d0(final boolean normalize) {
+        protected GraphSONModuleV1(final boolean normalize) {
             super("graphson-1.0");
             // graph
-            addSerializer(Edge.class, new GraphSONSerializersV1d0.EdgeJacksonSerializer(normalize));
-            addSerializer(Vertex.class, new GraphSONSerializersV1d0.VertexJacksonSerializer(normalize));
-            addSerializer(VertexProperty.class, new GraphSONSerializersV1d0.VertexPropertyJacksonSerializer(normalize));
-            addSerializer(Property.class, new GraphSONSerializersV1d0.PropertyJacksonSerializer());
-            addSerializer(TraversalMetrics.class, new GraphSONSerializersV1d0.TraversalMetricsJacksonSerializer());
-            addSerializer(TraversalExplanation.class, new GraphSONSerializersV1d0.TraversalExplanationJacksonSerializer());
-            addSerializer(Path.class, new GraphSONSerializersV1d0.PathJacksonSerializer());
-            addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV1d0(normalize));
-            addSerializer(Tree.class, new GraphSONSerializersV1d0.TreeJacksonSerializer());
+            addSerializer(Edge.class, new GraphSONSerializersV1.EdgeJacksonSerializer(normalize));
+            addSerializer(Vertex.class, new GraphSONSerializersV1.VertexJacksonSerializer(normalize));
+            addSerializer(VertexProperty.class, new GraphSONSerializersV1.VertexPropertyJacksonSerializer(normalize));
+            addSerializer(Property.class, new GraphSONSerializersV1.PropertyJacksonSerializer());
+            addSerializer(TraversalMetrics.class, new GraphSONSerializersV1.TraversalMetricsJacksonSerializer());
+            addSerializer(TraversalExplanation.class, new GraphSONSerializersV1.TraversalExplanationJacksonSerializer());
+            addSerializer(Path.class, new GraphSONSerializersV1.PathJacksonSerializer());
+            addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV1(normalize));
+            addSerializer(Tree.class, new GraphSONSerializersV1.TreeJacksonSerializer());
 
             // java.util
-            addSerializer(Map.Entry.class, new JavaUtilSerializersV1d0.MapEntryJacksonSerializer());
+            addSerializer(Map.Entry.class, new JavaUtilSerializersV1.MapEntryJacksonSerializer());
 
             // java.time
-            addSerializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonSerializer());
-            addSerializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonSerializer());
-            addSerializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonSerializer());
-            addSerializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonSerializer());
-            addSerializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonSerializer());
-            addSerializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonSerializer());
-            addSerializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonSerializer());
-            addSerializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonSerializer());
-            addSerializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonSerializer());
-            addSerializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonSerializer());
-            addSerializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonSerializer());
-            addSerializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonSerializer());
-            addSerializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonSerializer());
+            addSerializer(Duration.class, new JavaTimeSerializersV1.DurationJacksonSerializer());
+            addSerializer(Instant.class, new JavaTimeSerializersV1.InstantJacksonSerializer());
+            addSerializer(LocalDate.class, new JavaTimeSerializersV1.LocalDateJacksonSerializer());
+            addSerializer(LocalDateTime.class, new JavaTimeSerializersV1.LocalDateTimeJacksonSerializer());
+            addSerializer(LocalTime.class, new JavaTimeSerializersV1.LocalTimeJacksonSerializer());
+            addSerializer(MonthDay.class, new JavaTimeSerializersV1.MonthDayJacksonSerializer());
+            addSerializer(OffsetDateTime.class, new JavaTimeSerializersV1.OffsetDateTimeJacksonSerializer());
+            addSerializer(OffsetTime.class, new JavaTimeSerializersV1.OffsetTimeJacksonSerializer());
+            addSerializer(Period.class, new JavaTimeSerializersV1.PeriodJacksonSerializer());
+            addSerializer(Year.class, new JavaTimeSerializersV1.YearJacksonSerializer());
+            addSerializer(YearMonth.class, new JavaTimeSerializersV1.YearMonthJacksonSerializer());
+            addSerializer(ZonedDateTime.class, new JavaTimeSerializersV1.ZonedDateTimeJacksonSerializer());
+            addSerializer(ZoneOffset.class, new JavaTimeSerializersV1.ZoneOffsetJacksonSerializer());
 
-            addDeserializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonDeserializer());
-            addDeserializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonDeserializer());
-            addDeserializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonDeserializer());
-            addDeserializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonDeserializer());
-            addDeserializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonDeserializer());
-            addDeserializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonDeserializer());
-            addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonDeserializer());
-            addDeserializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonDeserializer());
-            addDeserializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonDeserializer());
-            addDeserializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonDeserializer());
-            addDeserializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonDeserializer());
-            addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonDeserializer());
-            addDeserializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonDeserializer());
+            addDeserializer(Duration.class, new JavaTimeSerializersV1.DurationJacksonDeserializer());
+            addDeserializer(Instant.class, new JavaTimeSerializersV1.InstantJacksonDeserializer());
+            addDeserializer(LocalDate.class, new JavaTimeSerializersV1.LocalDateJacksonDeserializer());
+            addDeserializer(LocalDateTime.class, new JavaTimeSerializersV1.LocalDateTimeJacksonDeserializer());
+            addDeserializer(LocalTime.class, new JavaTimeSerializersV1.LocalTimeJacksonDeserializer());
+            addDeserializer(MonthDay.class, new JavaTimeSerializersV1.MonthDayJacksonDeserializer());
+            addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV1.OffsetDateTimeJacksonDeserializer());
+            addDeserializer(OffsetTime.class, new JavaTimeSerializersV1.OffsetTimeJacksonDeserializer());
+            addDeserializer(Period.class, new JavaTimeSerializersV1.PeriodJacksonDeserializer());
+            addDeserializer(Year.class, new JavaTimeSerializersV1.YearJacksonDeserializer());
+            addDeserializer(YearMonth.class, new JavaTimeSerializersV1.YearMonthJacksonDeserializer());
+            addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV1.ZonedDateTimeJacksonDeserializer());
+            addDeserializer(ZoneOffset.class, new JavaTimeSerializersV1.ZoneOffsetJacksonDeserializer());
         }
 
         public static Builder build() {
@@ -687,8 +698,8 @@
             }
 
             @Override
-            public GraphSONModule create(final boolean normalize) {
-                return new GraphSONModuleV1d0(normalize);
+            public GraphSONModule create(final boolean normalize, final TypeInfo typeInfo) {
+                return new GraphSONModuleV1(normalize);
             }
         }
     }
@@ -702,9 +713,10 @@
         /**
          * Creates a new {@link GraphSONModule} object.
          *
-         * @param normalize when set to true, keys and objects are ordered to ensure that they are the occur in
+         * @param normalize when set to true, keys and objects are ordered to ensure that they occur in
          *                  the same order.
+         * @param typeInfo allows the module to react to the specified typeinfo given to the mapper
          */
-        GraphSONModule create(final boolean normalize);
+        GraphSONModule create(final boolean normalize, final TypeInfo typeInfo);
     }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java
index 7744b79..5654879 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java
@@ -38,10 +38,10 @@
     public GraphSONSerializerProvider(final GraphSONVersion version) {
         super();
         if (version == GraphSONVersion.V1_0) {
-            setDefaultKeySerializer(new GraphSONSerializersV1d0.GraphSONKeySerializer());
+            setDefaultKeySerializer(new GraphSONSerializersV1.GraphSONKeySerializer());
             unknownTypeSerializer = new ToStringSerializer();
         } else if (version == GraphSONVersion.V2_0) {
-            setDefaultKeySerializer(new GraphSONSerializersV2d0.GraphSONKeySerializer());
+            setDefaultKeySerializer(new GraphSONSerializersV2.GraphSONKeySerializer());
             unknownTypeSerializer = new ToStringGraphSONSerializer();
         } else {
             unknownTypeSerializer = new ToStringGraphSONSerializer();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1.java
new file mode 100644
index 0000000..7f7f1ad
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1.java
@@ -0,0 +1,466 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.javatuples.Pair;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
+ * present a generalized way to serialize the implementations of core interfaces.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+final class GraphSONSerializersV1 {
+
+    private GraphSONSerializersV1() {}
+
+    final static class VertexPropertyJacksonSerializer extends StdSerializer<VertexProperty> {
+
+        private final boolean normalize;
+
+        public VertexPropertyJacksonSerializer(final boolean normalize) {
+            super(VertexProperty.class);
+            this.normalize = normalize;
+        }
+
+        @Override
+        public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            serializerVertexProperty(property, jsonGenerator, serializerProvider, null, normalize, true);
+        }
+
+        @Override
+        public void serializeWithType(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer, normalize, true);
+        }
+    }
+
+    final static class PropertyJacksonSerializer extends StdSerializer<Property> {
+
+        public PropertyJacksonSerializer() {
+            super(Property.class);
+        }
+
+        @Override
+        public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            ser(property, jsonGenerator, serializerProvider, null);
+        }
+
+        @Override
+        public void serializeWithType(final Property property, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            ser(property, jsonGenerator, serializerProvider, typeSerializer);
+        }
+
+        private static void ser(final Property property, final JsonGenerator jsonGenerator,
+                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            jsonGenerator.writeStartObject();
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            serializerProvider.defaultSerializeField(GraphSONTokens.KEY, property.key(), jsonGenerator);
+            serializerProvider.defaultSerializeField(GraphSONTokens.VALUE, property.value(), jsonGenerator);
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class EdgeJacksonSerializer extends StdSerializer<Edge> {
+
+        private final boolean normalize;
+
+        public EdgeJacksonSerializer(final boolean normalize) {
+            super(Edge.class);
+            this.normalize = normalize;
+        }
+
+
+        @Override
+        public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            ser(edge, jsonGenerator, serializerProvider, null);
+        }
+        @Override
+        public void serializeWithType(final Edge edge, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            ser(edge, jsonGenerator, serializerProvider, typeSerializer);
+        }
+
+        private void ser(final Edge edge, final JsonGenerator jsonGenerator,
+                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            jsonGenerator.writeStartObject();
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+
+            jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
+            jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.EDGE);
+            jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
+            jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
+            GraphSONUtil.writeWithType(GraphSONTokens.IN, edge.inVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
+            GraphSONUtil.writeWithType(GraphSONTokens.OUT, edge.outVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
+            writeProperties(edge, jsonGenerator, serializerProvider, typeSerializer);
+            jsonGenerator.writeEndObject();
+        }
+
+        private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator,
+                                            final SerializerProvider serializerProvider,
+                                            final TypeSerializer typeSerializer) throws IOException {
+            final Iterator<Property<Object>> elementProperties = normalize ?
+                    IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+            if (elementProperties.hasNext()) {
+                jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+                if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+                while (elementProperties.hasNext()) {
+                    final Property<Object> elementProperty = elementProperties.next();
+                    GraphSONUtil.writeWithType(elementProperty.key(), elementProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
+                }
+                jsonGenerator.writeEndObject();
+            }
+        }
+
+    }
+
+    final static class VertexJacksonSerializer extends StdSerializer<Vertex> {
+
+        private final boolean normalize;
+
+        public VertexJacksonSerializer(final boolean normalize) {
+            super(Vertex.class);
+            this.normalize = normalize;
+        }
+
+        @Override
+        public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            ser(vertex, jsonGenerator, serializerProvider, null);
+        }
+
+        @Override
+        public void serializeWithType(final Vertex vertex, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            ser(vertex, jsonGenerator, serializerProvider, typeSerializer);
+
+        }
+
+        private void ser(final Vertex vertex, final JsonGenerator jsonGenerator,
+                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            GraphSONUtil.writeWithType(GraphSONTokens.ID, vertex.id(), jsonGenerator, serializerProvider, typeSerializer);
+            jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
+            jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.VERTEX);
+            writeProperties(vertex, jsonGenerator, serializerProvider, typeSerializer);
+            jsonGenerator.writeEndObject();
+        }
+
+        private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
+                                            final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+
+            final List<String> keys = normalize ?
+                    IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
+            for (String key : keys) {
+                final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+                        IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
+
+                if (vertexProperties.hasNext()) {
+                    jsonGenerator.writeArrayFieldStart(key);
+                    if (typeSerializer != null) {
+                        jsonGenerator.writeString(ArrayList.class.getName());
+                        jsonGenerator.writeStartArray();
+                    }
+
+                    while (vertexProperties.hasNext()) {
+                        serializerVertexProperty(vertexProperties.next(), jsonGenerator, serializerProvider, typeSerializer, normalize, false);
+                    }
+
+                    jsonGenerator.writeEndArray();
+                    if (typeSerializer != null) jsonGenerator.writeEndArray();
+                }
+            }
+
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+
+    final static class PathJacksonSerializer extends StdSerializer<Path> {
+
+        public PathJacksonSerializer() {
+            super(Path.class);
+        }
+        @Override
+        public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException, JsonGenerationException {
+            ser(path, jsonGenerator, null);
+        }
+
+        @Override
+        public void serializeWithType(final Path path, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+                throws IOException, JsonProcessingException {
+            ser(path, jsonGenerator, typeSerializer);
+        }
+        private static void ser(final Path path, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            jsonGenerator.writeObjectField(GraphSONTokens.LABELS, path.labels());
+            jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, path.objects());
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+    
+    final static class TreeJacksonSerializer extends StdSerializer<Tree> {
+
+        public TreeJacksonSerializer() {
+            super(Tree.class);
+        }
+
+        @Override
+        public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            ser(tree, jsonGenerator, null);
+        }
+        
+        @Override
+        public void serializeWithType(final Tree tree, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+                throws IOException, JsonProcessingException {
+            ser(tree, jsonGenerator, typeSerializer);
+        }
+        
+        private static void ser(final Tree tree, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
+                throws IOException {
+            jsonGenerator.writeStartObject(); 
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            
+            Set<Map.Entry<Element, Tree>> set = tree.entrySet();
+            for(Map.Entry<Element, Tree> entry : set)
+            {
+                jsonGenerator.writeObjectFieldStart(entry.getKey().id().toString());
+                if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+                jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey()); 
+                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
+                jsonGenerator.writeEndObject();
+            }
+            jsonGenerator.writeEndObject();
+        }
+    } 
+    
+    /**
+     * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
+     */
+    final static class GraphSONKeySerializer extends StdKeySerializer {
+
+        @Override
+        public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+            ser(o, jsonGenerator, serializerProvider);
+        }
+        @Override
+        public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            ser(o, jsonGenerator, serializerProvider);
+        }
+
+        private void ser(final Object o, final JsonGenerator jsonGenerator,
+                         final SerializerProvider serializerProvider) throws IOException {
+            if (Element.class.isAssignableFrom(o.getClass()))
+                jsonGenerator.writeFieldName((((Element) o).id()).toString());
+            else
+                super.serialize(o, jsonGenerator, serializerProvider);
+        }
+    }
+
+    final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
+        public TraversalExplanationJacksonSerializer() {
+            super(TraversalExplanation.class);
+        }
+
+        @Override
+        public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            ser(traversalExplanation, jsonGenerator);
+        }
+
+        @Override
+        public void serializeWithType(final TraversalExplanation value, final JsonGenerator gen,
+                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+            ser(value, gen);
+        }
+
+        public void ser(final TraversalExplanation te, final JsonGenerator jsonGenerator) throws IOException {
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.ORIGINAL, getStepsAsList(te.getOriginalTraversal()));
+
+            final List<Pair<TraversalStrategy, Traversal.Admin<?,?>>> strategyTraversals = te.getStrategyTraversals();
+
+            final List<Map<String,Object>> intermediates = new ArrayList<>();
+            for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
+                final Map<String,Object> intermediate = new HashMap<>();
+                intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
+                intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
+                intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
+                intermediates.add(intermediate);
+            }
+            m.put(GraphSONTokens.INTERMEDIATE, intermediates);
+
+            if (strategyTraversals.isEmpty())
+                m.put(GraphSONTokens.FINAL, getStepsAsList(te.getOriginalTraversal()));
+            else
+                m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
+
+            jsonGenerator.writeObject(m);
+        }
+
+        private List<String> getStepsAsList(final Traversal.Admin<?,?> t) {
+            final List<String> steps = new ArrayList<>();
+            t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
+            return steps;
+        }
+    }
+
+    final static class TraversalMetricsJacksonSerializer extends StdSerializer<TraversalMetrics> {
+        public TraversalMetricsJacksonSerializer() {
+            super(TraversalMetrics.class);
+        }
+
+        @Override
+        public void serialize(final TraversalMetrics property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            serializeInternal(property, jsonGenerator);
+        }
+
+        @Override
+        public void serializeWithType(final TraversalMetrics property, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            serializeInternal(property, jsonGenerator);
+        }
+
+        private static void serializeInternal(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator) throws IOException {
+            // creation of the map enables all the fields to be properly written with their type if required
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+            final List<Map<String, Object>> metrics = new ArrayList<>();
+            traversalMetrics.getMetrics().forEach(it -> metrics.add(metricsToMap(it)));
+            m.put(GraphSONTokens.METRICS, metrics);
+
+            jsonGenerator.writeObject(m);
+        }
+
+        private static Map<String, Object> metricsToMap(final Metrics metrics) {
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.ID, metrics.getId());
+            m.put(GraphSONTokens.NAME, metrics.getName());
+            m.put(GraphSONTokens.COUNTS, metrics.getCounts());
+            m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+
+            if (!metrics.getAnnotations().isEmpty()) {
+                m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
+            }
+
+            if (!metrics.getNested().isEmpty()) {
+                final List<Map<String, Object>> nested = new ArrayList<>();
+                metrics.getNested().forEach(it -> nested.add(metricsToMap(it)));
+                m.put(GraphSONTokens.METRICS, nested);
+            }
+            return m;
+        }
+    }
+
+    private static void serializerVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                                 final SerializerProvider serializerProvider,
+                                                 final TypeSerializer typeSerializer, final boolean normalize,
+                                                 final boolean includeLabel) throws IOException {
+        jsonGenerator.writeStartObject();
+        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+        GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+        GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+        if (includeLabel) jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
+        tryWriteMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+        jsonGenerator.writeEndObject();
+    }
+
+    private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                               final SerializerProvider serializerProvider,
+                                               final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
+        // when "detached" you can't check features of the graph it detached from so it has to be
+        // treated differently from a regular VertexProperty implementation.
+        if (property instanceof DetachedVertexProperty) {
+            // only write meta properties key if they exist
+            if (property.properties().hasNext()) {
+                writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+            }
+        } else {
+            // still attached - so we can check the features to see if it's worth even trying to write the
+            // meta properties key
+            if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
+                writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+            }
+        }
+    }
+
+    private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                            final SerializerProvider serializerProvider,
+                                            final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
+        jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+        final Iterator<Property<Object>> metaProperties = normalize ?
+                IteratorUtils.list(( Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+        while (metaProperties.hasNext()) {
+            final Property<Object> metaProperty = metaProperties.next();
+            GraphSONUtil.writeWithType(metaProperty.key(), metaProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
+        }
+        jsonGenerator.writeEndObject();
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
deleted file mode 100644
index c5c2ded..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.javatuples.Pair;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
- * present a generalized way to serialize the implementations of core interfaces.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-final class GraphSONSerializersV1d0 {
-
-    private GraphSONSerializersV1d0() {}
-
-    final static class VertexPropertyJacksonSerializer extends StdSerializer<VertexProperty> {
-
-        private final boolean normalize;
-
-        public VertexPropertyJacksonSerializer(final boolean normalize) {
-            super(VertexProperty.class);
-            this.normalize = normalize;
-        }
-
-        @Override
-        public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            serializerVertexProperty(property, jsonGenerator, serializerProvider, null, normalize, true);
-        }
-
-        @Override
-        public void serializeWithType(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer, normalize, true);
-        }
-    }
-
-    final static class PropertyJacksonSerializer extends StdSerializer<Property> {
-
-        public PropertyJacksonSerializer() {
-            super(Property.class);
-        }
-
-        @Override
-        public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            ser(property, jsonGenerator, serializerProvider, null);
-        }
-
-        @Override
-        public void serializeWithType(final Property property, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            ser(property, jsonGenerator, serializerProvider, typeSerializer);
-        }
-
-        private static void ser(final Property property, final JsonGenerator jsonGenerator,
-                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            jsonGenerator.writeStartObject();
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            serializerProvider.defaultSerializeField(GraphSONTokens.KEY, property.key(), jsonGenerator);
-            serializerProvider.defaultSerializeField(GraphSONTokens.VALUE, property.value(), jsonGenerator);
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class EdgeJacksonSerializer extends StdSerializer<Edge> {
-
-        private final boolean normalize;
-
-        public EdgeJacksonSerializer(final boolean normalize) {
-            super(Edge.class);
-            this.normalize = normalize;
-        }
-
-
-        @Override
-        public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            ser(edge, jsonGenerator, serializerProvider, null);
-        }
-        @Override
-        public void serializeWithType(final Edge edge, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            ser(edge, jsonGenerator, serializerProvider, typeSerializer);
-        }
-
-        private void ser(final Edge edge, final JsonGenerator jsonGenerator,
-                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            jsonGenerator.writeStartObject();
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
-
-            jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
-            jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.EDGE);
-            jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
-            jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
-            GraphSONUtil.writeWithType(GraphSONTokens.IN, edge.inVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
-            GraphSONUtil.writeWithType(GraphSONTokens.OUT, edge.outVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
-            writeProperties(edge, jsonGenerator, serializerProvider, typeSerializer);
-            jsonGenerator.writeEndObject();
-        }
-
-        private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator,
-                                            final SerializerProvider serializerProvider,
-                                            final TypeSerializer typeSerializer) throws IOException {
-            final Iterator<Property<Object>> elementProperties = normalize ?
-                    IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
-            if (elementProperties.hasNext()) {
-                jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
-                if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-                while (elementProperties.hasNext()) {
-                    final Property<Object> elementProperty = elementProperties.next();
-                    GraphSONUtil.writeWithType(elementProperty.key(), elementProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
-                }
-                jsonGenerator.writeEndObject();
-            }
-        }
-
-    }
-
-    final static class VertexJacksonSerializer extends StdSerializer<Vertex> {
-
-        private final boolean normalize;
-
-        public VertexJacksonSerializer(final boolean normalize) {
-            super(Vertex.class);
-            this.normalize = normalize;
-        }
-
-        @Override
-        public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            ser(vertex, jsonGenerator, serializerProvider, null);
-        }
-
-        @Override
-        public void serializeWithType(final Vertex vertex, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            ser(vertex, jsonGenerator, serializerProvider, typeSerializer);
-
-        }
-
-        private void ser(final Vertex vertex, final JsonGenerator jsonGenerator,
-                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            GraphSONUtil.writeWithType(GraphSONTokens.ID, vertex.id(), jsonGenerator, serializerProvider, typeSerializer);
-            jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
-            jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.VERTEX);
-            writeProperties(vertex, jsonGenerator, serializerProvider, typeSerializer);
-            jsonGenerator.writeEndObject();
-        }
-
-        private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
-                                            final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-
-            final List<String> keys = normalize ?
-                    IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
-            for (String key : keys) {
-                final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
-                        IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
-
-                if (vertexProperties.hasNext()) {
-                    jsonGenerator.writeArrayFieldStart(key);
-                    if (typeSerializer != null) {
-                        jsonGenerator.writeString(ArrayList.class.getName());
-                        jsonGenerator.writeStartArray();
-                    }
-
-                    while (vertexProperties.hasNext()) {
-                        serializerVertexProperty(vertexProperties.next(), jsonGenerator, serializerProvider, typeSerializer, normalize, false);
-                    }
-
-                    jsonGenerator.writeEndArray();
-                    if (typeSerializer != null) jsonGenerator.writeEndArray();
-                }
-            }
-
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-
-    final static class PathJacksonSerializer extends StdSerializer<Path> {
-
-        public PathJacksonSerializer() {
-            super(Path.class);
-        }
-        @Override
-        public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException, JsonGenerationException {
-            ser(path, jsonGenerator, null);
-        }
-
-        @Override
-        public void serializeWithType(final Path path, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
-                throws IOException, JsonProcessingException {
-            ser(path, jsonGenerator, typeSerializer);
-        }
-        private static void ser(final Path path, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            jsonGenerator.writeObjectField(GraphSONTokens.LABELS, path.labels());
-            jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, path.objects());
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-    
-    final static class TreeJacksonSerializer extends StdSerializer<Tree> {
-
-        public TreeJacksonSerializer() {
-            super(Tree.class);
-        }
-
-        @Override
-        public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-            ser(tree, jsonGenerator, null);
-        }
-        
-        @Override
-        public void serializeWithType(final Tree tree, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
-                throws IOException, JsonProcessingException {
-            ser(tree, jsonGenerator, typeSerializer);
-        }
-        
-        private static void ser(final Tree tree, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
-                throws IOException {
-            jsonGenerator.writeStartObject(); 
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            
-            Set<Map.Entry<Element, Tree>> set = tree.entrySet();
-            for(Map.Entry<Element, Tree> entry : set)
-            {
-                jsonGenerator.writeObjectFieldStart(entry.getKey().id().toString());
-                if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-                jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey()); 
-                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
-                jsonGenerator.writeEndObject();
-            }
-            jsonGenerator.writeEndObject();
-        }
-    } 
-    
-    /**
-     * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
-     */
-    final static class GraphSONKeySerializer extends StdKeySerializer {
-
-        @Override
-        public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
-            ser(o, jsonGenerator, serializerProvider);
-        }
-        @Override
-        public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            ser(o, jsonGenerator, serializerProvider);
-        }
-
-        private void ser(final Object o, final JsonGenerator jsonGenerator,
-                         final SerializerProvider serializerProvider) throws IOException {
-            if (Element.class.isAssignableFrom(o.getClass()))
-                jsonGenerator.writeFieldName((((Element) o).id()).toString());
-            else
-                super.serialize(o, jsonGenerator, serializerProvider);
-        }
-    }
-
-    final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
-        public TraversalExplanationJacksonSerializer() {
-            super(TraversalExplanation.class);
-        }
-
-        @Override
-        public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            ser(traversalExplanation, jsonGenerator);
-        }
-
-        @Override
-        public void serializeWithType(final TraversalExplanation value, final JsonGenerator gen,
-                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
-            ser(value, gen);
-        }
-
-        public void ser(final TraversalExplanation te, final JsonGenerator jsonGenerator) throws IOException {
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.ORIGINAL, getStepsAsList(te.getOriginalTraversal()));
-
-            final List<Pair<TraversalStrategy, Traversal.Admin<?,?>>> strategyTraversals = te.getStrategyTraversals();
-
-            final List<Map<String,Object>> intermediates = new ArrayList<>();
-            for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
-                final Map<String,Object> intermediate = new HashMap<>();
-                intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
-                intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
-                intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
-                intermediates.add(intermediate);
-            }
-            m.put(GraphSONTokens.INTERMEDIATE, intermediates);
-
-            if (strategyTraversals.isEmpty())
-                m.put(GraphSONTokens.FINAL, getStepsAsList(te.getOriginalTraversal()));
-            else
-                m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
-
-            jsonGenerator.writeObject(m);
-        }
-
-        private List<String> getStepsAsList(final Traversal.Admin<?,?> t) {
-            final List<String> steps = new ArrayList<>();
-            t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
-            return steps;
-        }
-    }
-
-    final static class TraversalMetricsJacksonSerializer extends StdSerializer<TraversalMetrics> {
-        public TraversalMetricsJacksonSerializer() {
-            super(TraversalMetrics.class);
-        }
-
-        @Override
-        public void serialize(final TraversalMetrics property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            serializeInternal(property, jsonGenerator);
-        }
-
-        @Override
-        public void serializeWithType(final TraversalMetrics property, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            serializeInternal(property, jsonGenerator);
-        }
-
-        private static void serializeInternal(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator) throws IOException {
-            // creation of the map enables all the fields to be properly written with their type if required
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-            final List<Map<String, Object>> metrics = new ArrayList<>();
-            traversalMetrics.getMetrics().forEach(it -> metrics.add(metricsToMap(it)));
-            m.put(GraphSONTokens.METRICS, metrics);
-
-            jsonGenerator.writeObject(m);
-        }
-
-        private static Map<String, Object> metricsToMap(final Metrics metrics) {
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.ID, metrics.getId());
-            m.put(GraphSONTokens.NAME, metrics.getName());
-            m.put(GraphSONTokens.COUNTS, metrics.getCounts());
-            m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-
-            if (!metrics.getAnnotations().isEmpty()) {
-                m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
-            }
-
-            if (!metrics.getNested().isEmpty()) {
-                final List<Map<String, Object>> nested = new ArrayList<>();
-                metrics.getNested().forEach(it -> nested.add(metricsToMap(it)));
-                m.put(GraphSONTokens.METRICS, nested);
-            }
-            return m;
-        }
-    }
-
-    private static void serializerVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                                 final SerializerProvider serializerProvider,
-                                                 final TypeSerializer typeSerializer, final boolean normalize,
-                                                 final boolean includeLabel) throws IOException {
-        jsonGenerator.writeStartObject();
-        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-        GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
-        GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
-        if (includeLabel) jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
-        tryWriteMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
-        jsonGenerator.writeEndObject();
-    }
-
-    private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                               final SerializerProvider serializerProvider,
-                                               final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
-        // when "detached" you can't check features of the graph it detached from so it has to be
-        // treated differently from a regular VertexProperty implementation.
-        if (property instanceof DetachedVertexProperty) {
-            // only write meta properties key if they exist
-            if (property.properties().hasNext()) {
-                writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
-            }
-        } else {
-            // still attached - so we can check the features to see if it's worth even trying to write the
-            // meta properties key
-            if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
-                writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
-            }
-        }
-    }
-
-    private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                            final SerializerProvider serializerProvider,
-                                            final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
-        jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
-        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-        final Iterator<Property<Object>> metaProperties = normalize ?
-                IteratorUtils.list(( Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
-        while (metaProperties.hasNext()) {
-            final Property<Object> metaProperty = metaProperties.next();
-            GraphSONUtil.writeWithType(metaProperty.key(), metaProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
-        }
-        jsonGenerator.writeEndObject();
-    }
-
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2.java
new file mode 100644
index 0000000..e633efb
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2.java
@@ -0,0 +1,746 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.MutablePath;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ImmutableExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.node.ArrayNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
+import org.javatuples.Pair;
+import org.javatuples.Triplet;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.safeWriteObjectField;
+
+/**
+ * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
+ * present a generalized way to serialize the implementations of core interfaces.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+class GraphSONSerializersV2 {
+
+    private GraphSONSerializersV2() {
+    }
+
+    ////////////////////////////// SERIALIZERS /////////////////////////////////
+
+    final static class VertexJacksonSerializer extends StdScalarSerializer<Vertex> {
+
+        private final boolean normalize;
+
+        public VertexJacksonSerializer(final boolean normalize) {
+            super(Vertex.class);
+            this.normalize = normalize;
+        }
+
+        @Override
+        public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+
+            jsonGenerator.writeObjectField(GraphSONTokens.ID, vertex.id());
+            jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
+            writeProperties(vertex, jsonGenerator);
+
+            jsonGenerator.writeEndObject();
+
+        }
+
+        private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator) throws IOException {
+            if (vertex.keys().size() == 0)
+                return;
+            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+            jsonGenerator.writeStartObject();
+
+            final List<String> keys = normalize ?
+                    IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
+            for (String key : keys) {
+                final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+                        IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
+                if (vertexProperties.hasNext()) {
+                    jsonGenerator.writeFieldName(key);
+
+                    jsonGenerator.writeStartArray();
+                    while (vertexProperties.hasNext()) {
+                        jsonGenerator.writeObject(vertexProperties.next());
+                    }
+                    jsonGenerator.writeEndArray();
+                }
+            }
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class EdgeJacksonSerializer extends StdScalarSerializer<Edge> {
+
+        private final boolean normalize;
+
+        public EdgeJacksonSerializer(final boolean normalize) {
+            super(Edge.class);
+            this.normalize = normalize;
+        }
+
+
+        @Override
+        public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+
+            jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
+            jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
+            jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
+            jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
+            jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
+            jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
+            writeProperties(edge, jsonGenerator);
+
+            jsonGenerator.writeEndObject();
+        }
+
+        private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator) throws IOException {
+            final Iterator<Property<Object>> elementProperties = normalize ?
+                    IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+            if (elementProperties.hasNext()) {
+                jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+
+                jsonGenerator.writeStartObject();
+                elementProperties.forEachRemaining(prop -> safeWriteObjectField(jsonGenerator, prop.key(), prop));
+                jsonGenerator.writeEndObject();
+            }
+        }
+    }
+
+    final static class PropertyJacksonSerializer extends StdScalarSerializer<Property> {
+
+        public PropertyJacksonSerializer() {
+            super(Property.class);
+        }
+
+        @Override
+        public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeObjectField(GraphSONTokens.KEY, property.key());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class VertexPropertyJacksonSerializer extends StdScalarSerializer<VertexProperty> {
+
+        private final boolean normalize;
+        private final boolean includeLabel;
+
+        public VertexPropertyJacksonSerializer(final boolean normalize, final boolean includeLabel) {
+            super(VertexProperty.class);
+            this.normalize = normalize;
+            this.includeLabel = includeLabel;
+        }
+
+        @Override
+        public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+
+            jsonGenerator.writeObjectField(GraphSONTokens.ID, property.id());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+            if (includeLabel)
+                jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
+            tryWriteMetaProperties(property, jsonGenerator, normalize);
+
+            jsonGenerator.writeEndObject();
+        }
+
+        private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                                   final boolean normalize) throws IOException {
+            // when "detached" you can't check features of the graph it detached from so it has to be
+            // treated differently from a regular VertexProperty implementation.
+            if (property instanceof DetachedVertexProperty) {
+                // only write meta properties key if they exist
+                if (property.properties().hasNext()) {
+                    writeMetaProperties(property, jsonGenerator, normalize);
+                }
+            } else {
+                // still attached - so we can check the features to see if it's worth even trying to write the
+                // meta properties key
+                if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
+                    writeMetaProperties(property, jsonGenerator, normalize);
+                }
+            }
+        }
+
+        private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                                final boolean normalize) throws IOException {
+            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+            jsonGenerator.writeStartObject();
+
+            final Iterator<Property<Object>> metaProperties = normalize ?
+                    IteratorUtils.list((Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+            while (metaProperties.hasNext()) {
+                final Property<Object> metaProperty = metaProperties.next();
+                jsonGenerator.writeObjectField(metaProperty.key(), metaProperty.value());
+            }
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class PathJacksonSerializer extends StdScalarSerializer<Path> {
+
+        public PathJacksonSerializer() {
+            super(Path.class);
+        }
+
+        @Override
+        public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException, JsonGenerationException {
+            jsonGenerator.writeStartObject();
+
+            // paths shouldn't serialize with properties if the path contains graph elements
+            final Path p = DetachedFactory.detach(path, false);
+            jsonGenerator.writeObjectField(GraphSONTokens.LABELS, p.labels());
+            jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, p.objects());
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class TreeJacksonSerializer extends StdScalarSerializer<Tree> {
+
+        public TreeJacksonSerializer() {
+            super(Tree.class);
+        }
+
+        @Override
+        public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            jsonGenerator.writeStartArray();
+            final Set<Map.Entry<Element, Tree>> set = tree.entrySet();
+            for (Map.Entry<Element, Tree> entry : set) {
+                jsonGenerator.writeStartObject();
+                jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
+                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
+                jsonGenerator.writeEndObject();
+            }
+            jsonGenerator.writeEndArray();
+        }
+    }
+
+    final static class TraversalExplanationJacksonSerializer extends StdScalarSerializer<TraversalExplanation> {
+        public TraversalExplanationJacksonSerializer() {
+            super(TraversalExplanation.class);
+        }
+
+        @Override
+        public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.ORIGINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
+
+            final List<Pair<TraversalStrategy, Traversal.Admin<?, ?>>> strategyTraversals = traversalExplanation.getStrategyTraversals();
+
+            final List<Map<String, Object>> intermediates = new ArrayList<>();
+            for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
+                final Map<String, Object> intermediate = new HashMap<>();
+                intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
+                intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
+                intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
+                intermediates.add(intermediate);
+            }
+            m.put(GraphSONTokens.INTERMEDIATE, intermediates);
+
+            if (strategyTraversals.isEmpty())
+                m.put(GraphSONTokens.FINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
+            else
+                m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
+
+            jsonGenerator.writeObject(m);
+        }
+
+        private List<String> getStepsAsList(final Traversal.Admin<?, ?> t) {
+            final List<String> steps = new ArrayList<>();
+            t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
+            return steps;
+        }
+    }
+
+    final static class IntegerGraphSONSerializer extends StdScalarSerializer<Integer> {
+        public IntegerGraphSONSerializer() {
+            super(Integer.class);
+        }
+
+        @Override
+        public void serialize(final Integer integer, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            jsonGenerator.writeNumber(((Integer) integer).intValue());
+        }
+    }
+
+    final static class DoubleGraphSONSerializer extends StdScalarSerializer<Double> {
+        public DoubleGraphSONSerializer() {
+            super(Double.class);
+        }
+
+        @Override
+        public void serialize(final Double doubleValue, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            jsonGenerator.writeNumber(doubleValue);
+        }
+    }
+
+    final static class TraversalMetricsJacksonSerializer extends StdScalarSerializer<TraversalMetrics> {
+        public TraversalMetricsJacksonSerializer() {
+            super(TraversalMetrics.class);
+        }
+
+        @Override
+        public void serialize(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            // creation of the map enables all the fields to be properly written with their type if required
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+            final List<Metrics> metrics = new ArrayList<>();
+            metrics.addAll(traversalMetrics.getMetrics());
+            m.put(GraphSONTokens.METRICS, metrics);
+
+            jsonGenerator.writeObject(m);
+        }
+    }
+
+    final static class MetricsJacksonSerializer extends StdScalarSerializer<Metrics> {
+        public MetricsJacksonSerializer() {
+            super(Metrics.class);
+        }
+
+        @Override
+        public void serialize(final Metrics metrics, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.ID, metrics.getId());
+            m.put(GraphSONTokens.NAME, metrics.getName());
+            m.put(GraphSONTokens.COUNTS, metrics.getCounts());
+            m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+
+            if (!metrics.getAnnotations().isEmpty()) {
+                m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
+            }
+            if (!metrics.getNested().isEmpty()) {
+                final List<Metrics> nested = new ArrayList<>();
+                metrics.getNested().forEach(it -> nested.add(it));
+                m.put(GraphSONTokens.METRICS, nested);
+            }
+            jsonGenerator.writeObject(m);
+        }
+    }
+
+
+    /**
+     * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
+     */
+    final static class GraphSONKeySerializer extends StdKeySerializer {
+
+        @Override
+        public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+            ser(o, jsonGenerator, serializerProvider);
+        }
+
+        @Override
+        public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            ser(o, jsonGenerator, serializerProvider);
+        }
+
+        private void ser(final Object o, final JsonGenerator jsonGenerator,
+                         final SerializerProvider serializerProvider) throws IOException {
+            if (Element.class.isAssignableFrom(o.getClass()))
+                jsonGenerator.writeFieldName((((Element) o).id()).toString());
+            else
+                super.serialize(o, jsonGenerator, serializerProvider);
+        }
+    }
+
+
+    //////////////////////////// DESERIALIZERS ///////////////////////////
+
+    static class VertexJacksonDeserializer extends StdDeserializer<Vertex> {
+
+        public VertexJacksonDeserializer() {
+            super(Vertex.class);
+        }
+
+        public Vertex deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final DetachedVertex.Builder v = DetachedVertex.build();
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+                    jsonParser.nextToken();
+                    v.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+                    jsonParser.nextToken();
+                    v.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+                    jsonParser.nextToken();
+                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                        jsonParser.nextToken();
+                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                            v.addProperty((DetachedVertexProperty) deserializationContext.readValue(jsonParser, VertexProperty.class));
+                        }
+                    }
+                }
+            }
+
+            return v.create();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class EdgeJacksonDeserializer extends StdDeserializer<Edge> {
+
+        public EdgeJacksonDeserializer() {
+            super(Edge.class);
+        }
+
+        @Override
+        public Edge deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final DetachedEdge.Builder e = DetachedEdge.build();
+            final DetachedVertex.Builder inV = DetachedVertex.build();
+            final DetachedVertex.Builder outV = DetachedVertex.build();
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+                    jsonParser.nextToken();
+                    e.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+                    jsonParser.nextToken();
+                    e.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT)) {
+                    jsonParser.nextToken();
+                    outV.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT_LABEL)) {
+                    jsonParser.nextToken();
+                    outV.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN)) {
+                    jsonParser.nextToken();
+                    inV.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN_LABEL)) {
+                    jsonParser.nextToken();
+                    inV.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+                    jsonParser.nextToken();
+                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                        jsonParser.nextToken();
+                        e.addProperty(deserializationContext.readValue(jsonParser, Property.class));
+                    }
+                }
+            }
+
+            e.setInV(inV.create());
+            e.setOutV(outV.create());
+
+            return e.create();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class PropertyJacksonDeserializer extends StdDeserializer<Property> {
+
+        public PropertyJacksonDeserializer() {
+            super(Property.class);
+        }
+
+        @Override
+        public Property deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String key = null;
+            Object value = null;
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
+                    jsonParser.nextToken();
+                    key = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    value = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+
+            return new DetachedProperty<>(key, value);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class PathJacksonDeserializer extends StdDeserializer<Path> {
+        private static final JavaType setType = TypeFactory.defaultInstance().constructCollectionType(HashSet.class, String.class);
+
+        public PathJacksonDeserializer() {
+            super(Path.class);
+        }
+
+        @Override
+        public Path deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final JsonNode n = jsonParser.readValueAsTree();
+            final Path p = MutablePath.make();
+
+            final ArrayNode labels = (ArrayNode) n.get(GraphSONTokens.LABELS);
+            final ArrayNode objects = (ArrayNode) n.get(GraphSONTokens.OBJECTS);
+
+            for (int i = 0; i < objects.size(); i++) {
+                final JsonParser po = objects.get(i).traverse();
+                po.nextToken();
+                final JsonParser pl = labels.get(i).traverse();
+                pl.nextToken();
+                p.extend(deserializationContext.readValue(po, Object.class), deserializationContext.readValue(pl, setType));
+            }
+
+            return p;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class VertexPropertyJacksonDeserializer extends StdDeserializer<VertexProperty> {
+        private static final JavaType propertiesType = TypeFactory.defaultInstance().constructMapType(HashMap.class, String.class, Object.class);
+
+        protected VertexPropertyJacksonDeserializer() {
+            super(VertexProperty.class);
+        }
+
+        @Override
+        public VertexProperty deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final DetachedVertexProperty.Builder vp = DetachedVertexProperty.build();
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+                    jsonParser.nextToken();
+                    vp.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+                    jsonParser.nextToken();
+                    vp.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    vp.setValue(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+                    jsonParser.nextToken();
+                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                        final String key = jsonParser.getCurrentName();
+                        jsonParser.nextToken();
+                        final Object val = deserializationContext.readValue(jsonParser, Object.class);
+                        vp.addProperty(new DetachedProperty(key, val));
+                    }
+                }
+            }
+
+            return vp.create();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class TraversalExplanationJacksonDeserializer extends StdDeserializer<TraversalExplanation> {
+        public TraversalExplanationJacksonDeserializer() {
+            super(TraversalExplanation.class);
+        }
+
+        @Override
+        public TraversalExplanation deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Map<String, Object> explainData = deserializationContext.readValue(jsonParser, Map.class);
+            final String originalTraversal = explainData.get(GraphSONTokens.ORIGINAL).toString();
+            final List<Triplet<String, String, String>> intermediates = new ArrayList<>();
+            final List<Map<String,Object>> listMap = (List<Map<String,Object>>) explainData.get(GraphSONTokens.INTERMEDIATE);
+            for (Map<String,Object> m : listMap) {
+                intermediates.add(Triplet.with(m.get(GraphSONTokens.STRATEGY).toString(),
+                        m.get(GraphSONTokens.CATEGORY).toString(),
+                        m.get(GraphSONTokens.TRAVERSAL).toString()));
+            }
+
+            return new ImmutableExplanation(originalTraversal, intermediates);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class MetricsJacksonDeserializer extends AbstractObjectDeserializer<Metrics> {
+        public MetricsJacksonDeserializer() {
+            super(Metrics.class);
+        }
+
+        @Override
+        public Metrics createObject(final Map<String, Object> metricsData) {
+            final MutableMetrics m = new MutableMetrics((String)metricsData.get(GraphSONTokens.ID), (String)metricsData.get(GraphSONTokens.NAME));
+
+            m.setDuration(Math.round((Double) metricsData.get(GraphSONTokens.DURATION) * 1000000), TimeUnit.NANOSECONDS);
+            for (Map.Entry<String, Long> count : ((Map<String, Long>)metricsData.getOrDefault(GraphSONTokens.COUNTS, new HashMap<>(0))).entrySet()) {
+                m.setCount(count.getKey(), count.getValue());
+            }
+            for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.ANNOTATIONS, new HashMap<>(0))).entrySet()) {
+                m.setAnnotation(count.getKey(), count.getValue());
+            }
+            for (MutableMetrics nested : (List<MutableMetrics>)metricsData.getOrDefault(GraphSONTokens.METRICS, new ArrayList<>(0))) {
+                m.addNested(nested);
+            }
+            return m;
+        }
+    }
+
+    static class TraversalMetricsJacksonDeserializer extends AbstractObjectDeserializer<TraversalMetrics> {
+
+        public TraversalMetricsJacksonDeserializer() {
+            super(TraversalMetrics.class);
+        }
+
+        @Override
+        public TraversalMetrics createObject(final Map<String, Object> traversalMetricsData) {
+            return new DefaultTraversalMetrics(
+                    Math.round((Double) traversalMetricsData.get(GraphSONTokens.DURATION) * 1000000),
+                    (List<MutableMetrics>) traversalMetricsData.get(GraphSONTokens.METRICS)
+            );
+        }
+    }
+
+    static class TreeJacksonDeserializer extends StdDeserializer<Tree> {
+
+        public TreeJacksonDeserializer() {
+            super(Tree.class);
+        }
+
+        @Override
+        public Tree deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final List<Map> data = deserializationContext.readValue(jsonParser, List.class);
+            final Tree t = new Tree();
+            for (Map<String, Object> entry : data) {
+                t.put(entry.get(GraphSONTokens.KEY), entry.get(GraphSONTokens.VALUE));
+            }
+            return t;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class IntegerJacksonDeserializer extends StdDeserializer<Integer> {
+
+        protected IntegerJacksonDeserializer() {
+            super(Integer.class);
+        }
+
+        @Override
+        public Integer deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            return jsonParser.getIntValue();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class DoubleJacksonDeserializer extends StdDeserializer<Double> {
+
+        protected DoubleJacksonDeserializer() {
+            super(Double.class);
+        }
+
+        @Override
+        public Double deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            if (jsonParser.getCurrentToken().isNumeric())
+                return jsonParser.getDoubleValue();
+            else  {
+                final String numberText = jsonParser.getValueAsString();
+                if ("NaN".equalsIgnoreCase(numberText))
+                    return Double.NaN;
+                else if ("-Infinity".equals(numberText) || "-INF".equalsIgnoreCase(numberText))
+                    return Double.NEGATIVE_INFINITY;
+                else if ("Infinity".equals(numberText) || "INF".equals(numberText))
+                    return Double.POSITIVE_INFINITY;
+                else
+                    throw new IllegalStateException("Double value unexpected: " + numberText);
+            }
+
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
deleted file mode 100644
index 0cb6e69..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.MutablePath;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ImmutableExplanation;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.node.ArrayNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
-import org.javatuples.Pair;
-import org.javatuples.Triplet;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.safeWriteObjectField;
-
-/**
- * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
- * present a generalized way to serialize the implementations of core interfaces.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-class GraphSONSerializersV2d0 {
-
-    private GraphSONSerializersV2d0() {
-    }
-
-    ////////////////////////////// SERIALIZERS /////////////////////////////////
-
-    final static class VertexJacksonSerializer extends StdScalarSerializer<Vertex> {
-
-        private final boolean normalize;
-
-        public VertexJacksonSerializer(final boolean normalize) {
-            super(Vertex.class);
-            this.normalize = normalize;
-        }
-
-        @Override
-        public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-
-            jsonGenerator.writeObjectField(GraphSONTokens.ID, vertex.id());
-            jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
-            writeProperties(vertex, jsonGenerator);
-
-            jsonGenerator.writeEndObject();
-
-        }
-
-        private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator) throws IOException {
-            if (vertex.keys().size() == 0)
-                return;
-            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-            jsonGenerator.writeStartObject();
-
-            final List<String> keys = normalize ?
-                    IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
-            for (String key : keys) {
-                final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
-                        IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
-                if (vertexProperties.hasNext()) {
-                    jsonGenerator.writeFieldName(key);
-
-                    jsonGenerator.writeStartArray();
-                    while (vertexProperties.hasNext()) {
-                        jsonGenerator.writeObject(vertexProperties.next());
-                    }
-                    jsonGenerator.writeEndArray();
-                }
-            }
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class EdgeJacksonSerializer extends StdScalarSerializer<Edge> {
-
-        private final boolean normalize;
-
-        public EdgeJacksonSerializer(final boolean normalize) {
-            super(Edge.class);
-            this.normalize = normalize;
-        }
-
-
-        @Override
-        public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-
-            jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
-            jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
-            jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
-            jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
-            jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
-            jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
-            writeProperties(edge, jsonGenerator);
-
-            jsonGenerator.writeEndObject();
-        }
-
-        private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator) throws IOException {
-            final Iterator<Property<Object>> elementProperties = normalize ?
-                    IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
-            if (elementProperties.hasNext()) {
-                jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-
-                jsonGenerator.writeStartObject();
-                elementProperties.forEachRemaining(prop -> safeWriteObjectField(jsonGenerator, prop.key(), prop));
-                jsonGenerator.writeEndObject();
-            }
-        }
-    }
-
-    final static class PropertyJacksonSerializer extends StdScalarSerializer<Property> {
-
-        public PropertyJacksonSerializer() {
-            super(Property.class);
-        }
-
-        @Override
-        public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeObjectField(GraphSONTokens.KEY, property.key());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class VertexPropertyJacksonSerializer extends StdScalarSerializer<VertexProperty> {
-
-        private final boolean normalize;
-        private final boolean includeLabel;
-
-        public VertexPropertyJacksonSerializer(final boolean normalize, final boolean includeLabel) {
-            super(VertexProperty.class);
-            this.normalize = normalize;
-            this.includeLabel = includeLabel;
-        }
-
-        @Override
-        public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-
-            jsonGenerator.writeObjectField(GraphSONTokens.ID, property.id());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
-            if (includeLabel)
-                jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
-            tryWriteMetaProperties(property, jsonGenerator, normalize);
-
-            jsonGenerator.writeEndObject();
-        }
-
-        private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                                   final boolean normalize) throws IOException {
-            // when "detached" you can't check features of the graph it detached from so it has to be
-            // treated differently from a regular VertexProperty implementation.
-            if (property instanceof DetachedVertexProperty) {
-                // only write meta properties key if they exist
-                if (property.properties().hasNext()) {
-                    writeMetaProperties(property, jsonGenerator, normalize);
-                }
-            } else {
-                // still attached - so we can check the features to see if it's worth even trying to write the
-                // meta properties key
-                if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
-                    writeMetaProperties(property, jsonGenerator, normalize);
-                }
-            }
-        }
-
-        private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                                final boolean normalize) throws IOException {
-            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-            jsonGenerator.writeStartObject();
-
-            final Iterator<Property<Object>> metaProperties = normalize ?
-                    IteratorUtils.list((Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
-            while (metaProperties.hasNext()) {
-                final Property<Object> metaProperty = metaProperties.next();
-                jsonGenerator.writeObjectField(metaProperty.key(), metaProperty.value());
-            }
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class PathJacksonSerializer extends StdScalarSerializer<Path> {
-
-        public PathJacksonSerializer() {
-            super(Path.class);
-        }
-
-        @Override
-        public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException, JsonGenerationException {
-            jsonGenerator.writeStartObject();
-
-            // paths shouldn't serialize with properties if the path contains graph elements
-            final Path p = DetachedFactory.detach(path, false);
-            jsonGenerator.writeObjectField(GraphSONTokens.LABELS, p.labels());
-            jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, p.objects());
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class TreeJacksonSerializer extends StdScalarSerializer<Tree> {
-
-        public TreeJacksonSerializer() {
-            super(Tree.class);
-        }
-
-        @Override
-        public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-            jsonGenerator.writeStartArray();
-            final Set<Map.Entry<Element, Tree>> set = tree.entrySet();
-            for (Map.Entry<Element, Tree> entry : set) {
-                jsonGenerator.writeStartObject();
-                jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
-                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
-                jsonGenerator.writeEndObject();
-            }
-            jsonGenerator.writeEndArray();
-        }
-    }
-
-    final static class TraversalExplanationJacksonSerializer extends StdScalarSerializer<TraversalExplanation> {
-        public TraversalExplanationJacksonSerializer() {
-            super(TraversalExplanation.class);
-        }
-
-        @Override
-        public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.ORIGINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
-
-            final List<Pair<TraversalStrategy, Traversal.Admin<?, ?>>> strategyTraversals = traversalExplanation.getStrategyTraversals();
-
-            final List<Map<String, Object>> intermediates = new ArrayList<>();
-            for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
-                final Map<String, Object> intermediate = new HashMap<>();
-                intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
-                intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
-                intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
-                intermediates.add(intermediate);
-            }
-            m.put(GraphSONTokens.INTERMEDIATE, intermediates);
-
-            if (strategyTraversals.isEmpty())
-                m.put(GraphSONTokens.FINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
-            else
-                m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
-
-            jsonGenerator.writeObject(m);
-        }
-
-        private List<String> getStepsAsList(final Traversal.Admin<?, ?> t) {
-            final List<String> steps = new ArrayList<>();
-            t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
-            return steps;
-        }
-    }
-
-    final static class IntegerGraphSONSerializer extends StdScalarSerializer<Integer> {
-        public IntegerGraphSONSerializer() {
-            super(Integer.class);
-        }
-
-        @Override
-        public void serialize(final Integer integer, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            jsonGenerator.writeNumber(((Integer) integer).intValue());
-        }
-    }
-
-    final static class DoubleGraphSONSerializer extends StdScalarSerializer<Double> {
-        public DoubleGraphSONSerializer() {
-            super(Double.class);
-        }
-
-        @Override
-        public void serialize(final Double doubleValue, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            jsonGenerator.writeNumber(doubleValue);
-        }
-    }
-
-    final static class TraversalMetricsJacksonSerializer extends StdScalarSerializer<TraversalMetrics> {
-        public TraversalMetricsJacksonSerializer() {
-            super(TraversalMetrics.class);
-        }
-
-        @Override
-        public void serialize(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            // creation of the map enables all the fields to be properly written with their type if required
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-            final List<Metrics> metrics = new ArrayList<>();
-            metrics.addAll(traversalMetrics.getMetrics());
-            m.put(GraphSONTokens.METRICS, metrics);
-
-            jsonGenerator.writeObject(m);
-        }
-    }
-
-    final static class MetricsJacksonSerializer extends StdScalarSerializer<Metrics> {
-        public MetricsJacksonSerializer() {
-            super(Metrics.class);
-        }
-
-        @Override
-        public void serialize(final Metrics metrics, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.ID, metrics.getId());
-            m.put(GraphSONTokens.NAME, metrics.getName());
-            m.put(GraphSONTokens.COUNTS, metrics.getCounts());
-            m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-
-            if (!metrics.getAnnotations().isEmpty()) {
-                m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
-            }
-            if (!metrics.getNested().isEmpty()) {
-                final List<Metrics> nested = new ArrayList<>();
-                metrics.getNested().forEach(it -> nested.add(it));
-                m.put(GraphSONTokens.METRICS, nested);
-            }
-            jsonGenerator.writeObject(m);
-        }
-    }
-
-
-    /**
-     * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
-     */
-    final static class GraphSONKeySerializer extends StdKeySerializer {
-
-        @Override
-        public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
-            ser(o, jsonGenerator, serializerProvider);
-        }
-
-        @Override
-        public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            ser(o, jsonGenerator, serializerProvider);
-        }
-
-        private void ser(final Object o, final JsonGenerator jsonGenerator,
-                         final SerializerProvider serializerProvider) throws IOException {
-            if (Element.class.isAssignableFrom(o.getClass()))
-                jsonGenerator.writeFieldName((((Element) o).id()).toString());
-            else
-                super.serialize(o, jsonGenerator, serializerProvider);
-        }
-    }
-
-
-    //////////////////////////// DESERIALIZERS ///////////////////////////
-
-    static class VertexJacksonDeserializer extends StdDeserializer<Vertex> {
-
-        public VertexJacksonDeserializer() {
-            super(Vertex.class);
-        }
-
-        public Vertex deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final DetachedVertex.Builder v = DetachedVertex.build();
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
-                    jsonParser.nextToken();
-                    v.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
-                    jsonParser.nextToken();
-                    v.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
-                    jsonParser.nextToken();
-                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                        jsonParser.nextToken();
-                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                            v.addProperty((DetachedVertexProperty) deserializationContext.readValue(jsonParser, VertexProperty.class));
-                        }
-                    }
-                }
-            }
-
-            return v.create();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class EdgeJacksonDeserializer extends StdDeserializer<Edge> {
-
-        public EdgeJacksonDeserializer() {
-            super(Edge.class);
-        }
-
-        @Override
-        public Edge deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final DetachedEdge.Builder e = DetachedEdge.build();
-            final DetachedVertex.Builder inV = DetachedVertex.build();
-            final DetachedVertex.Builder outV = DetachedVertex.build();
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
-                    jsonParser.nextToken();
-                    e.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
-                    jsonParser.nextToken();
-                    e.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT)) {
-                    jsonParser.nextToken();
-                    outV.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT_LABEL)) {
-                    jsonParser.nextToken();
-                    outV.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN)) {
-                    jsonParser.nextToken();
-                    inV.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN_LABEL)) {
-                    jsonParser.nextToken();
-                    inV.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
-                    jsonParser.nextToken();
-                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                        jsonParser.nextToken();
-                        e.addProperty(deserializationContext.readValue(jsonParser, Property.class));
-                    }
-                }
-            }
-
-            e.setInV(inV.create());
-            e.setOutV(outV.create());
-
-            return e.create();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class PropertyJacksonDeserializer extends StdDeserializer<Property> {
-
-        public PropertyJacksonDeserializer() {
-            super(Property.class);
-        }
-
-        @Override
-        public Property deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String key = null;
-            Object value = null;
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
-                    jsonParser.nextToken();
-                    key = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    value = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-
-            return new DetachedProperty<>(key, value);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class PathJacksonDeserializer extends StdDeserializer<Path> {
-        private static final JavaType setType = TypeFactory.defaultInstance().constructCollectionType(HashSet.class, String.class);
-
-        public PathJacksonDeserializer() {
-            super(Path.class);
-        }
-
-        @Override
-        public Path deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final JsonNode n = jsonParser.readValueAsTree();
-            final Path p = MutablePath.make();
-
-            final ArrayNode labels = (ArrayNode) n.get(GraphSONTokens.LABELS);
-            final ArrayNode objects = (ArrayNode) n.get(GraphSONTokens.OBJECTS);
-
-            for (int i = 0; i < objects.size(); i++) {
-                final JsonParser po = objects.get(i).traverse();
-                po.nextToken();
-                final JsonParser pl = labels.get(i).traverse();
-                pl.nextToken();
-                p.extend(deserializationContext.readValue(po, Object.class), deserializationContext.readValue(pl, setType));
-            }
-
-            return p;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class VertexPropertyJacksonDeserializer extends StdDeserializer<VertexProperty> {
-        private static final JavaType propertiesType = TypeFactory.defaultInstance().constructMapType(HashMap.class, String.class, Object.class);
-
-        protected VertexPropertyJacksonDeserializer() {
-            super(VertexProperty.class);
-        }
-
-        @Override
-        public VertexProperty deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final DetachedVertexProperty.Builder vp = DetachedVertexProperty.build();
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
-                    jsonParser.nextToken();
-                    vp.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
-                    jsonParser.nextToken();
-                    vp.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    vp.setValue(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
-                    jsonParser.nextToken();
-                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                        final String key = jsonParser.getCurrentName();
-                        jsonParser.nextToken();
-                        final Object val = deserializationContext.readValue(jsonParser, Object.class);
-                        vp.addProperty(new DetachedProperty(key, val));
-                    }
-                }
-            }
-
-            return vp.create();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class TraversalExplanationJacksonDeserializer extends StdDeserializer<TraversalExplanation> {
-        public TraversalExplanationJacksonDeserializer() {
-            super(TraversalExplanation.class);
-        }
-
-        @Override
-        public TraversalExplanation deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Map<String, Object> explainData = deserializationContext.readValue(jsonParser, Map.class);
-            final String originalTraversal = explainData.get(GraphSONTokens.ORIGINAL).toString();
-            final List<Triplet<String, String, String>> intermediates = new ArrayList<>();
-            final List<Map<String,Object>> listMap = (List<Map<String,Object>>) explainData.get(GraphSONTokens.INTERMEDIATE);
-            for (Map<String,Object> m : listMap) {
-                intermediates.add(Triplet.with(m.get(GraphSONTokens.STRATEGY).toString(),
-                        m.get(GraphSONTokens.CATEGORY).toString(),
-                        m.get(GraphSONTokens.TRAVERSAL).toString()));
-            }
-
-            return new ImmutableExplanation(originalTraversal, intermediates);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class MetricsJacksonDeserializer extends AbstractObjectDeserializer<Metrics> {
-        public MetricsJacksonDeserializer() {
-            super(Metrics.class);
-        }
-
-        @Override
-        public Metrics createObject(final Map<String, Object> metricsData) {
-            final MutableMetrics m = new MutableMetrics((String)metricsData.get(GraphSONTokens.ID), (String)metricsData.get(GraphSONTokens.NAME));
-
-            m.setDuration(Math.round((Double) metricsData.get(GraphSONTokens.DURATION) * 1000000), TimeUnit.NANOSECONDS);
-            for (Map.Entry<String, Long> count : ((Map<String, Long>)metricsData.getOrDefault(GraphSONTokens.COUNTS, new HashMap<>(0))).entrySet()) {
-                m.setCount(count.getKey(), count.getValue());
-            }
-            for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.ANNOTATIONS, new HashMap<>(0))).entrySet()) {
-                m.setAnnotation(count.getKey(), count.getValue());
-            }
-            for (MutableMetrics nested : (List<MutableMetrics>)metricsData.getOrDefault(GraphSONTokens.METRICS, new ArrayList<>(0))) {
-                m.addNested(nested);
-            }
-            return m;
-        }
-    }
-
-    static class TraversalMetricsJacksonDeserializer extends AbstractObjectDeserializer<TraversalMetrics> {
-
-        public TraversalMetricsJacksonDeserializer() {
-            super(TraversalMetrics.class);
-        }
-
-        @Override
-        public TraversalMetrics createObject(final Map<String, Object> traversalMetricsData) {
-            return new DefaultTraversalMetrics(
-                    Math.round((Double) traversalMetricsData.get(GraphSONTokens.DURATION) * 1000000),
-                    (List<MutableMetrics>) traversalMetricsData.get(GraphSONTokens.METRICS)
-            );
-        }
-    }
-
-    static class TreeJacksonDeserializer extends StdDeserializer<Tree> {
-
-        public TreeJacksonDeserializer() {
-            super(Tree.class);
-        }
-
-        @Override
-        public Tree deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final List<Map> data = deserializationContext.readValue(jsonParser, List.class);
-            final Tree t = new Tree();
-            for (Map<String, Object> entry : data) {
-                t.put(entry.get(GraphSONTokens.KEY), entry.get(GraphSONTokens.VALUE));
-            }
-            return t;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class IntegerJacksonDeserializer extends StdDeserializer<Integer> {
-
-        protected IntegerJacksonDeserializer() {
-            super(Integer.class);
-        }
-
-        @Override
-        public Integer deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            return jsonParser.getIntValue();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class DoubleJacksonDeserializer extends StdDeserializer<Double> {
-
-        protected DoubleJacksonDeserializer() {
-            super(Double.class);
-        }
-
-        @Override
-        public Double deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            if (jsonParser.getCurrentToken().isNumeric())
-                return jsonParser.getDoubleValue();
-            else  {
-                final String numberText = jsonParser.getValueAsString();
-                if ("NaN".equalsIgnoreCase(numberText))
-                    return Double.NaN;
-                else if ("-Infinity".equals(numberText) || "-INF".equalsIgnoreCase(numberText))
-                    return Double.NEGATIVE_INFINITY;
-                else if ("Infinity".equals(numberText) || "INF".equals(numberText))
-                    return Double.POSITIVE_INFINITY;
-                else
-                    throw new IllegalStateException("Double value unexpected: " + numberText);
-            }
-
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3.java
new file mode 100644
index 0000000..2d9024a
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3.java
@@ -0,0 +1,796 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.MutablePath;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ImmutableExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
+import org.javatuples.Pair;
+import org.javatuples.Triplet;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.safeWriteObjectField;
+
+/**
+ * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
+ * present a generalized way to serialize the implementations of core interfaces.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+class GraphSONSerializersV3 {
+
+    private GraphSONSerializersV3() {
+    }
+
+    ////////////////////////////// SERIALIZERS /////////////////////////////////
+
+    final static class VertexJacksonSerializer extends StdScalarSerializer<Vertex> {
+
+        private final boolean normalize;
+        private final TypeInfo typeInfo;
+
+        public VertexJacksonSerializer(final boolean normalize, final TypeInfo typeInfo) {
+            super(Vertex.class);
+            this.normalize = normalize;
+            this.typeInfo = typeInfo;
+        }
+
+        @Override
+        public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+
+            jsonGenerator.writeObjectField(GraphSONTokens.ID, vertex.id());
+            jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
+            writeTypeForGraphObjectIfUntyped(jsonGenerator, typeInfo, GraphSONTokens.VERTEX);
+            writeProperties(vertex, jsonGenerator, serializerProvider);
+
+            jsonGenerator.writeEndObject();
+
+        }
+
+        private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+            if (vertex.keys().size() == 0)
+                return;
+            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+            jsonGenerator.writeStartObject();
+
+            final List<String> keys = normalize ?
+                    IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
+            for (String key : keys) {
+                final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+                        IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
+                if (vertexProperties.hasNext()) {
+                    jsonGenerator.writeFieldName(key);
+
+                    jsonGenerator.writeStartArray();
+                    while (vertexProperties.hasNext()) {
+                        // if you writeObject the property directly it treats it as a standalone VertexProperty which
+                        // will write the label duplicating it. we really only want that for embedded types
+                        if (typeInfo == TypeInfo.NO_TYPES) {
+                            VertexPropertyJacksonSerializer.writeVertexProperty(vertexProperties.next(), jsonGenerator,
+                                    serializerProvider, normalize, false);
+                        } else {
+                            jsonGenerator.writeObject(vertexProperties.next());
+                        }
+                    }
+                    jsonGenerator.writeEndArray();
+                }
+            }
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class EdgeJacksonSerializer extends StdScalarSerializer<Edge> {
+
+        private final boolean normalize;
+
+        private final TypeInfo typeInfo;
+
+        public EdgeJacksonSerializer(final boolean normalize, final TypeInfo typeInfo) {
+            super(Edge.class);
+            this.normalize = normalize;
+            this.typeInfo = typeInfo;
+        }
+
+
+        @Override
+        public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+
+            jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
+            jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
+            writeTypeForGraphObjectIfUntyped(jsonGenerator, typeInfo, GraphSONTokens.EDGE);
+            jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
+            jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
+            jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
+            jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
+            writeProperties(edge, jsonGenerator);
+
+            jsonGenerator.writeEndObject();
+        }
+
+        private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator) throws IOException {
+            final Iterator<Property<Object>> elementProperties = normalize ?
+                    IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+            if (elementProperties.hasNext()) {
+                jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+
+                jsonGenerator.writeStartObject();
+                if (typeInfo == TypeInfo.NO_TYPES)
+                    elementProperties.forEachRemaining(prop -> safeWriteObjectField(jsonGenerator, prop.key(), prop.value()));
+                else
+                    elementProperties.forEachRemaining(prop -> safeWriteObjectField(jsonGenerator, prop.key(), prop));
+                jsonGenerator.writeEndObject();
+            }
+        }
+    }
+
+    final static class PropertyJacksonSerializer extends StdScalarSerializer<Property> {
+
+        public PropertyJacksonSerializer() {
+            super(Property.class);
+        }
+
+        @Override
+        public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeObjectField(GraphSONTokens.KEY, property.key());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class VertexPropertyJacksonSerializer extends StdScalarSerializer<VertexProperty> {
+
+        private final boolean normalize;
+        private final boolean includeLabel;
+
+        public VertexPropertyJacksonSerializer(final boolean normalize, final boolean includeLabel) {
+            super(VertexProperty.class);
+            this.normalize = normalize;
+            this.includeLabel = includeLabel;
+        }
+
+        @Override
+        public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            writeVertexProperty(property, jsonGenerator, serializerProvider, normalize, includeLabel);
+        }
+
+        private static void writeVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                                final SerializerProvider serializerProvider, final boolean normalize,
+                                                final boolean includeLabel)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+
+            jsonGenerator.writeObjectField(GraphSONTokens.ID, property.id());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+            if (includeLabel)
+                jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
+            tryWriteMetaProperties(property, jsonGenerator, normalize);
+
+            jsonGenerator.writeEndObject();
+        }
+
+        private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                                   final boolean normalize) throws IOException {
+            // when "detached" you can't check features of the graph it detached from so it has to be
+            // treated differently from a regular VertexProperty implementation.
+            if (property instanceof DetachedVertexProperty) {
+                // only write meta properties key if they exist
+                if (property.properties().hasNext()) {
+                    writeMetaProperties(property, jsonGenerator, normalize);
+                }
+            } else {
+                // still attached - so we can check the features to see if it's worth even trying to write the
+                // meta properties key
+                if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
+                    writeMetaProperties(property, jsonGenerator, normalize);
+                }
+            }
+        }
+
+        private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+                                                final boolean normalize) throws IOException {
+            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+            jsonGenerator.writeStartObject();
+
+            final Iterator<Property<Object>> metaProperties = normalize ?
+                    IteratorUtils.list((Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+            while (metaProperties.hasNext()) {
+                final Property<Object> metaProperty = metaProperties.next();
+                jsonGenerator.writeObjectField(metaProperty.key(), metaProperty.value());
+            }
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class PathJacksonSerializer extends StdScalarSerializer<Path> {
+
+        public PathJacksonSerializer() {
+            super(Path.class);
+        }
+
+        @Override
+        public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException, JsonGenerationException {
+            jsonGenerator.writeStartObject();
+
+            // paths shouldn't serialize with properties if the path contains graph elements
+            final Path p = DetachedFactory.detach(path, false);
+            jsonGenerator.writeObjectField(GraphSONTokens.LABELS, p.labels());
+            jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, p.objects());
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class TreeJacksonSerializer extends StdScalarSerializer<Tree> {
+
+        public TreeJacksonSerializer() {
+            super(Tree.class);
+        }
+
+        @Override
+        public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            jsonGenerator.writeStartArray();
+            final Set<Map.Entry<Element, Tree>> set = tree.entrySet();
+            for (Map.Entry<Element, Tree> entry : set) {
+                jsonGenerator.writeStartObject();
+                jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
+                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
+                jsonGenerator.writeEndObject();
+            }
+            jsonGenerator.writeEndArray();
+        }
+    }
+
+    final static class TraversalExplanationJacksonSerializer extends StdScalarSerializer<TraversalExplanation> {
+        public TraversalExplanationJacksonSerializer() {
+            super(TraversalExplanation.class);
+        }
+
+        @Override
+        public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.ORIGINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
+
+            final List<Pair<TraversalStrategy, Traversal.Admin<?, ?>>> strategyTraversals = traversalExplanation.getStrategyTraversals();
+
+            final List<Map<String, Object>> intermediates = new ArrayList<>();
+            for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
+                final Map<String, Object> intermediate = new HashMap<>();
+                intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
+                intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
+                intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
+                intermediates.add(intermediate);
+            }
+            m.put(GraphSONTokens.INTERMEDIATE, intermediates);
+
+            if (strategyTraversals.isEmpty())
+                m.put(GraphSONTokens.FINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
+            else
+                m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
+
+            jsonGenerator.writeObject(m);
+        }
+
+        private List<String> getStepsAsList(final Traversal.Admin<?, ?> t) {
+            final List<String> steps = new ArrayList<>();
+            t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
+            return steps;
+        }
+    }
+
+    final static class IntegerGraphSONSerializer extends StdScalarSerializer<Integer> {
+        public IntegerGraphSONSerializer() {
+            super(Integer.class);
+        }
+
+        @Override
+        public void serialize(final Integer integer, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            jsonGenerator.writeNumber(((Integer) integer).intValue());
+        }
+    }
+
+    final static class DoubleGraphSONSerializer extends StdScalarSerializer<Double> {
+        public DoubleGraphSONSerializer() {
+            super(Double.class);
+        }
+
+        @Override
+        public void serialize(final Double doubleValue, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            jsonGenerator.writeNumber(doubleValue);
+        }
+    }
+
+    final static class TraversalMetricsJacksonSerializer extends StdScalarSerializer<TraversalMetrics> {
+        public TraversalMetricsJacksonSerializer() {
+            super(TraversalMetrics.class);
+        }
+
+        @Override
+        public void serialize(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            // creation of the map enables all the fields to be properly written with their type if required
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+            final List<Metrics> metrics = new ArrayList<>();
+            metrics.addAll(traversalMetrics.getMetrics());
+            m.put(GraphSONTokens.METRICS, metrics);
+
+            jsonGenerator.writeObject(m);
+        }
+    }
+
+    final static class MetricsJacksonSerializer extends StdScalarSerializer<Metrics> {
+        public MetricsJacksonSerializer() {
+            super(Metrics.class);
+        }
+
+        @Override
+        public void serialize(final Metrics metrics, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            final Map<String, Object> m = new HashMap<>();
+            m.put(GraphSONTokens.ID, metrics.getId());
+            m.put(GraphSONTokens.NAME, metrics.getName());
+            m.put(GraphSONTokens.COUNTS, metrics.getCounts());
+            m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+
+            if (!metrics.getAnnotations().isEmpty()) {
+                m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
+            }
+            if (!metrics.getNested().isEmpty()) {
+                final List<Metrics> nested = new ArrayList<>();
+                metrics.getNested().forEach(it -> nested.add(it));
+                m.put(GraphSONTokens.METRICS, nested);
+            }
+            jsonGenerator.writeObject(m);
+        }
+    }
+
+
+    /**
+     * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
+     */
+    final static class GraphSONKeySerializer extends StdKeySerializer {
+
+        @Override
+        public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+            ser(o, jsonGenerator, serializerProvider);
+        }
+
+        @Override
+        public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            ser(o, jsonGenerator, serializerProvider);
+        }
+
+        private void ser(final Object o, final JsonGenerator jsonGenerator,
+                         final SerializerProvider serializerProvider) throws IOException {
+            if (Element.class.isAssignableFrom(o.getClass()))
+                jsonGenerator.writeFieldName((((Element) o).id()).toString());
+            else
+                super.serialize(o, jsonGenerator, serializerProvider);
+        }
+    }
+
+
+    //////////////////////////// DESERIALIZERS ///////////////////////////
+
+    static class VertexJacksonDeserializer extends StdDeserializer<Vertex> {
+
+        public VertexJacksonDeserializer() {
+            super(Vertex.class);
+        }
+
+        public Vertex deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final DetachedVertex.Builder v = DetachedVertex.build();
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+                    jsonParser.nextToken();
+                    v.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+                    jsonParser.nextToken();
+                    v.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+                    jsonParser.nextToken();
+                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                        jsonParser.nextToken();
+                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                            v.addProperty((DetachedVertexProperty) deserializationContext.readValue(jsonParser, VertexProperty.class));
+                        }
+                    }
+                }
+            }
+
+            return v.create();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class EdgeJacksonDeserializer extends StdDeserializer<Edge> {
+
+        public EdgeJacksonDeserializer() {
+            super(Edge.class);
+        }
+
+        @Override
+        public Edge deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final DetachedEdge.Builder e = DetachedEdge.build();
+            final DetachedVertex.Builder inV = DetachedVertex.build();
+            final DetachedVertex.Builder outV = DetachedVertex.build();
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+                    jsonParser.nextToken();
+                    e.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+                    jsonParser.nextToken();
+                    e.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT)) {
+                    jsonParser.nextToken();
+                    outV.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT_LABEL)) {
+                    jsonParser.nextToken();
+                    outV.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN)) {
+                    jsonParser.nextToken();
+                    inV.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN_LABEL)) {
+                    jsonParser.nextToken();
+                    inV.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+                    jsonParser.nextToken();
+                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                        jsonParser.nextToken();
+                        e.addProperty(deserializationContext.readValue(jsonParser, Property.class));
+                    }
+                }
+            }
+
+            e.setInV(inV.create());
+            e.setOutV(outV.create());
+
+            return e.create();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class PropertyJacksonDeserializer extends StdDeserializer<Property> {
+
+        public PropertyJacksonDeserializer() {
+            super(Property.class);
+        }
+
+        @Override
+        public Property deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String key = null;
+            Object value = null;
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
+                    jsonParser.nextToken();
+                    key = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    value = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+
+            return new DetachedProperty<>(key, value);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class PathJacksonDeserializer extends StdDeserializer<Path> {
+        private static final JavaType setType = TypeFactory.defaultInstance().constructCollectionType(HashSet.class, String.class);
+
+        public PathJacksonDeserializer() {
+            super(Path.class);
+        }
+
+        @Override
+        public Path deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Path p = MutablePath.make();
+
+            List<Object> labels = new ArrayList<>();
+            List<Object> objects = new ArrayList<>();
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.LABELS)) {
+                    jsonParser.nextToken();
+                    labels = deserializationContext.readValue(jsonParser, List.class);
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OBJECTS)) {
+                    jsonParser.nextToken();
+                    objects = deserializationContext.readValue(jsonParser, List.class);
+                }
+            }
+
+            for (int i = 0; i < objects.size(); i++) {
+                p.extend(objects.get(i), (Set<String>) labels.get(i));
+            }
+
+            return p;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class VertexPropertyJacksonDeserializer extends StdDeserializer<VertexProperty> {
+        private static final JavaType propertiesType = TypeFactory.defaultInstance().constructMapType(HashMap.class, String.class, Object.class);
+
+        protected VertexPropertyJacksonDeserializer() {
+            super(VertexProperty.class);
+        }
+
+        @Override
+        public VertexProperty deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final DetachedVertexProperty.Builder vp = DetachedVertexProperty.build();
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
+                    jsonParser.nextToken();
+                    vp.setId(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
+                    jsonParser.nextToken();
+                    vp.setLabel(jsonParser.getText());
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    vp.setValue(deserializationContext.readValue(jsonParser, Object.class));
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
+                    jsonParser.nextToken();
+                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                        final String key = jsonParser.getCurrentName();
+                        jsonParser.nextToken();
+                        final Object val = deserializationContext.readValue(jsonParser, Object.class);
+                        vp.addProperty(new DetachedProperty(key, val));
+                    }
+                }
+            }
+
+            return vp.create();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class TraversalExplanationJacksonDeserializer extends StdDeserializer<TraversalExplanation> {
+        public TraversalExplanationJacksonDeserializer() {
+            super(TraversalExplanation.class);
+        }
+
+        @Override
+        public TraversalExplanation deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Map<String, Object> explainData = deserializationContext.readValue(jsonParser, Map.class);
+            final String originalTraversal = explainData.get(GraphSONTokens.ORIGINAL).toString();
+            final List<Triplet<String, String, String>> intermediates = new ArrayList<>();
+            final List<Map<String,Object>> listMap = (List<Map<String,Object>>) explainData.get(GraphSONTokens.INTERMEDIATE);
+            for (Map<String,Object> m : listMap) {
+                intermediates.add(Triplet.with(m.get(GraphSONTokens.STRATEGY).toString(),
+                        m.get(GraphSONTokens.CATEGORY).toString(),
+                        m.get(GraphSONTokens.TRAVERSAL).toString()));
+            }
+
+            return new ImmutableExplanation(originalTraversal, intermediates);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class MetricsJacksonDeserializer extends StdDeserializer<Metrics> {
+        public MetricsJacksonDeserializer() {
+            super(Metrics.class);
+        }
+
+        @Override
+        public Metrics deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Map<String, Object> metricsData = deserializationContext.readValue(jsonParser, Map.class);
+            final MutableMetrics m = new MutableMetrics((String)metricsData.get(GraphSONTokens.ID), (String)metricsData.get(GraphSONTokens.NAME));
+
+            m.setDuration(Math.round((Double) metricsData.get(GraphSONTokens.DURATION) * 1000000), TimeUnit.NANOSECONDS);
+            for (Map.Entry<String, Long> count : ((Map<String, Long>)metricsData.getOrDefault(GraphSONTokens.COUNTS, new LinkedHashMap<>(0))).entrySet()) {
+                m.setCount(count.getKey(), count.getValue());
+            }
+            for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.ANNOTATIONS, new LinkedHashMap<>(0))).entrySet()) {
+                m.setAnnotation(count.getKey(), count.getValue());
+            }
+            for (MutableMetrics nested : (List<MutableMetrics>)metricsData.getOrDefault(GraphSONTokens.METRICS, new ArrayList<>(0))) {
+                m.addNested(nested);
+            }
+            return m;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class TraversalMetricsJacksonDeserializer extends StdDeserializer<TraversalMetrics> {
+
+        public TraversalMetricsJacksonDeserializer() {
+            super(TraversalMetrics.class);
+        }
+
+        @Override
+        public TraversalMetrics deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Map<String, Object> traversalMetricsData = deserializationContext.readValue(jsonParser, Map.class);
+
+            return new DefaultTraversalMetrics(
+                    Math.round((Double) traversalMetricsData.get(GraphSONTokens.DURATION) * 1000000),
+                    (List<MutableMetrics>) traversalMetricsData.get(GraphSONTokens.METRICS)
+            );
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class TreeJacksonDeserializer extends StdDeserializer<Tree> {
+
+        public TreeJacksonDeserializer() {
+            super(Tree.class);
+        }
+
+        @Override
+        public Tree deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final List<Map> data = deserializationContext.readValue(jsonParser, List.class);
+            final Tree t = new Tree();
+            for (Map<String, Object> entry : data) {
+                t.put(entry.get(GraphSONTokens.KEY), entry.get(GraphSONTokens.VALUE));
+            }
+            return t;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class IntegerJackonsDeserializer extends StdDeserializer<Integer> {
+
+        protected IntegerJackonsDeserializer() {
+            super(Integer.class);
+        }
+
+        @Override
+        public Integer deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            return jsonParser.getIntValue();
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class DoubleJacksonDeserializer extends StdDeserializer<Double> {
+
+        protected DoubleJacksonDeserializer() {
+            super(Double.class);
+        }
+
+        @Override
+        public Double deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            if (jsonParser.getCurrentToken().isNumeric())
+                return jsonParser.getDoubleValue();
+            else  {
+                final String numberText = jsonParser.getValueAsString();
+                if ("NaN".equalsIgnoreCase(numberText))
+                    return Double.NaN;
+                else if ("-Infinity".equals(numberText) || "-INF".equalsIgnoreCase(numberText))
+                    return Double.NEGATIVE_INFINITY;
+                else if ("Infinity".equals(numberText) || "INF".equals(numberText))
+                    return Double.POSITIVE_INFINITY;
+                else
+                    throw new IllegalStateException("Double value unexpected: " + numberText);
+            }
+
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    /**
+     * When doing untyped serialization graph objects get a special "type" field appended.
+     */
+    private static void writeTypeForGraphObjectIfUntyped(final JsonGenerator jsonGenerator, final TypeInfo typeInfo,
+                                                         final String type) throws IOException {
+        if (typeInfo == TypeInfo.NO_TYPES) {
+            jsonGenerator.writeStringField(GraphSONTokens.TYPE, type);
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
deleted file mode 100644
index a1b8d0b..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.MutablePath;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ImmutableExplanation;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
-import org.javatuples.Pair;
-import org.javatuples.Triplet;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.safeWriteObjectField;
-
-/**
- * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
- * present a generalized way to serialize the implementations of core interfaces.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-class GraphSONSerializersV3d0 {
-
-    private GraphSONSerializersV3d0() {
-    }
-
-    ////////////////////////////// SERIALIZERS /////////////////////////////////
-
-    final static class VertexJacksonSerializer extends StdScalarSerializer<Vertex> {
-
-        private final boolean normalize;
-
-        public VertexJacksonSerializer(final boolean normalize) {
-            super(Vertex.class);
-            this.normalize = normalize;
-        }
-
-        @Override
-        public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-
-            jsonGenerator.writeObjectField(GraphSONTokens.ID, vertex.id());
-            jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
-            writeProperties(vertex, jsonGenerator);
-
-            jsonGenerator.writeEndObject();
-
-        }
-
-        private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator) throws IOException {
-            if (vertex.keys().size() == 0)
-                return;
-            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-            jsonGenerator.writeStartObject();
-
-            final List<String> keys = normalize ?
-                    IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
-            for (String key : keys) {
-                final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
-                        IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
-                if (vertexProperties.hasNext()) {
-                    jsonGenerator.writeFieldName(key);
-
-                    jsonGenerator.writeStartArray();
-                    while (vertexProperties.hasNext()) {
-                        jsonGenerator.writeObject(vertexProperties.next());
-                    }
-                    jsonGenerator.writeEndArray();
-                }
-            }
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class EdgeJacksonSerializer extends StdScalarSerializer<Edge> {
-
-        private final boolean normalize;
-
-        public EdgeJacksonSerializer(final boolean normalize) {
-            super(Edge.class);
-            this.normalize = normalize;
-        }
-
-
-        @Override
-        public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-
-            jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
-            jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
-            jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
-            jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
-            jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
-            jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
-            writeProperties(edge, jsonGenerator);
-
-            jsonGenerator.writeEndObject();
-        }
-
-        private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator) throws IOException {
-            final Iterator<Property<Object>> elementProperties = normalize ?
-                    IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
-            if (elementProperties.hasNext()) {
-                jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-
-                jsonGenerator.writeStartObject();
-                elementProperties.forEachRemaining(prop -> safeWriteObjectField(jsonGenerator, prop.key(), prop));
-                jsonGenerator.writeEndObject();
-            }
-        }
-    }
-
-    final static class PropertyJacksonSerializer extends StdScalarSerializer<Property> {
-
-        public PropertyJacksonSerializer() {
-            super(Property.class);
-        }
-
-        @Override
-        public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeObjectField(GraphSONTokens.KEY, property.key());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class VertexPropertyJacksonSerializer extends StdScalarSerializer<VertexProperty> {
-
-        private final boolean normalize;
-        private final boolean includeLabel;
-
-        public VertexPropertyJacksonSerializer(final boolean normalize, final boolean includeLabel) {
-            super(VertexProperty.class);
-            this.normalize = normalize;
-            this.includeLabel = includeLabel;
-        }
-
-        @Override
-        public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-
-            jsonGenerator.writeObjectField(GraphSONTokens.ID, property.id());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
-            if (includeLabel)
-                jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
-            tryWriteMetaProperties(property, jsonGenerator, normalize);
-
-            jsonGenerator.writeEndObject();
-        }
-
-        private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                                   final boolean normalize) throws IOException {
-            // when "detached" you can't check features of the graph it detached from so it has to be
-            // treated differently from a regular VertexProperty implementation.
-            if (property instanceof DetachedVertexProperty) {
-                // only write meta properties key if they exist
-                if (property.properties().hasNext()) {
-                    writeMetaProperties(property, jsonGenerator, normalize);
-                }
-            } else {
-                // still attached - so we can check the features to see if it's worth even trying to write the
-                // meta properties key
-                if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
-                    writeMetaProperties(property, jsonGenerator, normalize);
-                }
-            }
-        }
-
-        private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
-                                                final boolean normalize) throws IOException {
-            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-            jsonGenerator.writeStartObject();
-
-            final Iterator<Property<Object>> metaProperties = normalize ?
-                    IteratorUtils.list((Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
-            while (metaProperties.hasNext()) {
-                final Property<Object> metaProperty = metaProperties.next();
-                jsonGenerator.writeObjectField(metaProperty.key(), metaProperty.value());
-            }
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class PathJacksonSerializer extends StdScalarSerializer<Path> {
-
-        public PathJacksonSerializer() {
-            super(Path.class);
-        }
-
-        @Override
-        public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException, JsonGenerationException {
-            jsonGenerator.writeStartObject();
-
-            // paths shouldn't serialize with properties if the path contains graph elements
-            final Path p = DetachedFactory.detach(path, false);
-            jsonGenerator.writeObjectField(GraphSONTokens.LABELS, p.labels());
-            jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, p.objects());
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class TreeJacksonSerializer extends StdScalarSerializer<Tree> {
-
-        public TreeJacksonSerializer() {
-            super(Tree.class);
-        }
-
-        @Override
-        public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-            jsonGenerator.writeStartArray();
-            final Set<Map.Entry<Element, Tree>> set = tree.entrySet();
-            for (Map.Entry<Element, Tree> entry : set) {
-                jsonGenerator.writeStartObject();
-                jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
-                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
-                jsonGenerator.writeEndObject();
-            }
-            jsonGenerator.writeEndArray();
-        }
-    }
-
-    final static class TraversalExplanationJacksonSerializer extends StdScalarSerializer<TraversalExplanation> {
-        public TraversalExplanationJacksonSerializer() {
-            super(TraversalExplanation.class);
-        }
-
-        @Override
-        public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.ORIGINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
-
-            final List<Pair<TraversalStrategy, Traversal.Admin<?, ?>>> strategyTraversals = traversalExplanation.getStrategyTraversals();
-
-            final List<Map<String, Object>> intermediates = new ArrayList<>();
-            for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
-                final Map<String, Object> intermediate = new HashMap<>();
-                intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
-                intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
-                intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
-                intermediates.add(intermediate);
-            }
-            m.put(GraphSONTokens.INTERMEDIATE, intermediates);
-
-            if (strategyTraversals.isEmpty())
-                m.put(GraphSONTokens.FINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
-            else
-                m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
-
-            jsonGenerator.writeObject(m);
-        }
-
-        private List<String> getStepsAsList(final Traversal.Admin<?, ?> t) {
-            final List<String> steps = new ArrayList<>();
-            t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
-            return steps;
-        }
-    }
-
-    final static class IntegerGraphSONSerializer extends StdScalarSerializer<Integer> {
-        public IntegerGraphSONSerializer() {
-            super(Integer.class);
-        }
-
-        @Override
-        public void serialize(final Integer integer, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            jsonGenerator.writeNumber(((Integer) integer).intValue());
-        }
-    }
-
-    final static class DoubleGraphSONSerializer extends StdScalarSerializer<Double> {
-        public DoubleGraphSONSerializer() {
-            super(Double.class);
-        }
-
-        @Override
-        public void serialize(final Double doubleValue, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            jsonGenerator.writeNumber(doubleValue);
-        }
-    }
-
-    final static class TraversalMetricsJacksonSerializer extends StdScalarSerializer<TraversalMetrics> {
-        public TraversalMetricsJacksonSerializer() {
-            super(TraversalMetrics.class);
-        }
-
-        @Override
-        public void serialize(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            // creation of the map enables all the fields to be properly written with their type if required
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-            final List<Metrics> metrics = new ArrayList<>();
-            metrics.addAll(traversalMetrics.getMetrics());
-            m.put(GraphSONTokens.METRICS, metrics);
-
-            jsonGenerator.writeObject(m);
-        }
-    }
-
-    final static class MetricsJacksonSerializer extends StdScalarSerializer<Metrics> {
-        public MetricsJacksonSerializer() {
-            super(Metrics.class);
-        }
-
-        @Override
-        public void serialize(final Metrics metrics, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            final Map<String, Object> m = new HashMap<>();
-            m.put(GraphSONTokens.ID, metrics.getId());
-            m.put(GraphSONTokens.NAME, metrics.getName());
-            m.put(GraphSONTokens.COUNTS, metrics.getCounts());
-            m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-
-            if (!metrics.getAnnotations().isEmpty()) {
-                m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
-            }
-            if (!metrics.getNested().isEmpty()) {
-                final List<Metrics> nested = new ArrayList<>();
-                metrics.getNested().forEach(it -> nested.add(it));
-                m.put(GraphSONTokens.METRICS, nested);
-            }
-            jsonGenerator.writeObject(m);
-        }
-    }
-
-
-    /**
-     * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
-     */
-    final static class GraphSONKeySerializer extends StdKeySerializer {
-
-        @Override
-        public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
-            ser(o, jsonGenerator, serializerProvider);
-        }
-
-        @Override
-        public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            ser(o, jsonGenerator, serializerProvider);
-        }
-
-        private void ser(final Object o, final JsonGenerator jsonGenerator,
-                         final SerializerProvider serializerProvider) throws IOException {
-            if (Element.class.isAssignableFrom(o.getClass()))
-                jsonGenerator.writeFieldName((((Element) o).id()).toString());
-            else
-                super.serialize(o, jsonGenerator, serializerProvider);
-        }
-    }
-
-
-    //////////////////////////// DESERIALIZERS ///////////////////////////
-
-    static class VertexJacksonDeserializer extends StdDeserializer<Vertex> {
-
-        public VertexJacksonDeserializer() {
-            super(Vertex.class);
-        }
-
-        public Vertex deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final DetachedVertex.Builder v = DetachedVertex.build();
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
-                    jsonParser.nextToken();
-                    v.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
-                    jsonParser.nextToken();
-                    v.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
-                    jsonParser.nextToken();
-                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                        jsonParser.nextToken();
-                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                            v.addProperty((DetachedVertexProperty) deserializationContext.readValue(jsonParser, VertexProperty.class));
-                        }
-                    }
-                }
-            }
-
-            return v.create();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class EdgeJacksonDeserializer extends StdDeserializer<Edge> {
-
-        public EdgeJacksonDeserializer() {
-            super(Edge.class);
-        }
-
-        @Override
-        public Edge deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final DetachedEdge.Builder e = DetachedEdge.build();
-            final DetachedVertex.Builder inV = DetachedVertex.build();
-            final DetachedVertex.Builder outV = DetachedVertex.build();
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
-                    jsonParser.nextToken();
-                    e.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
-                    jsonParser.nextToken();
-                    e.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT)) {
-                    jsonParser.nextToken();
-                    outV.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OUT_LABEL)) {
-                    jsonParser.nextToken();
-                    outV.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN)) {
-                    jsonParser.nextToken();
-                    inV.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.IN_LABEL)) {
-                    jsonParser.nextToken();
-                    inV.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
-                    jsonParser.nextToken();
-                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                        jsonParser.nextToken();
-                        e.addProperty(deserializationContext.readValue(jsonParser, Property.class));
-                    }
-                }
-            }
-
-            e.setInV(inV.create());
-            e.setOutV(outV.create());
-
-            return e.create();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class PropertyJacksonDeserializer extends StdDeserializer<Property> {
-
-        public PropertyJacksonDeserializer() {
-            super(Property.class);
-        }
-
-        @Override
-        public Property deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String key = null;
-            Object value = null;
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
-                    jsonParser.nextToken();
-                    key = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    value = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-
-            return new DetachedProperty<>(key, value);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class PathJacksonDeserializer extends StdDeserializer<Path> {
-        private static final JavaType setType = TypeFactory.defaultInstance().constructCollectionType(HashSet.class, String.class);
-
-        public PathJacksonDeserializer() {
-            super(Path.class);
-        }
-
-        @Override
-        public Path deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Path p = MutablePath.make();
-
-            List<Object> labels = new ArrayList<>();
-            List<Object> objects = new ArrayList<>();
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.LABELS)) {
-                    jsonParser.nextToken();
-                    labels = deserializationContext.readValue(jsonParser, List.class);
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.OBJECTS)) {
-                    jsonParser.nextToken();
-                    objects = deserializationContext.readValue(jsonParser, List.class);
-                }
-            }
-
-            for (int i = 0; i < objects.size(); i++) {
-                p.extend(objects.get(i), (Set<String>) labels.get(i));
-            }
-
-            return p;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class VertexPropertyJacksonDeserializer extends StdDeserializer<VertexProperty> {
-        private static final JavaType propertiesType = TypeFactory.defaultInstance().constructMapType(HashMap.class, String.class, Object.class);
-
-        protected VertexPropertyJacksonDeserializer() {
-            super(VertexProperty.class);
-        }
-
-        @Override
-        public VertexProperty deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final DetachedVertexProperty.Builder vp = DetachedVertexProperty.build();
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.ID)) {
-                    jsonParser.nextToken();
-                    vp.setId(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LABEL)) {
-                    jsonParser.nextToken();
-                    vp.setLabel(jsonParser.getText());
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    vp.setValue(deserializationContext.readValue(jsonParser, Object.class));
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.PROPERTIES)) {
-                    jsonParser.nextToken();
-                    while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                        final String key = jsonParser.getCurrentName();
-                        jsonParser.nextToken();
-                        final Object val = deserializationContext.readValue(jsonParser, Object.class);
-                        vp.addProperty(new DetachedProperty(key, val));
-                    }
-                }
-            }
-
-            return vp.create();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class TraversalExplanationJacksonDeserializer extends StdDeserializer<TraversalExplanation> {
-        public TraversalExplanationJacksonDeserializer() {
-            super(TraversalExplanation.class);
-        }
-
-        @Override
-        public TraversalExplanation deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Map<String, Object> explainData = deserializationContext.readValue(jsonParser, Map.class);
-            final String originalTraversal = explainData.get(GraphSONTokens.ORIGINAL).toString();
-            final List<Triplet<String, String, String>> intermediates = new ArrayList<>();
-            final List<Map<String,Object>> listMap = (List<Map<String,Object>>) explainData.get(GraphSONTokens.INTERMEDIATE);
-            for (Map<String,Object> m : listMap) {
-                intermediates.add(Triplet.with(m.get(GraphSONTokens.STRATEGY).toString(),
-                        m.get(GraphSONTokens.CATEGORY).toString(),
-                        m.get(GraphSONTokens.TRAVERSAL).toString()));
-            }
-
-            return new ImmutableExplanation(originalTraversal, intermediates);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class MetricsJacksonDeserializer extends StdDeserializer<Metrics> {
-        public MetricsJacksonDeserializer() {
-            super(Metrics.class);
-        }
-
-        @Override
-        public Metrics deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Map<String, Object> metricsData = deserializationContext.readValue(jsonParser, Map.class);
-            final MutableMetrics m = new MutableMetrics((String)metricsData.get(GraphSONTokens.ID), (String)metricsData.get(GraphSONTokens.NAME));
-
-            m.setDuration(Math.round((Double) metricsData.get(GraphSONTokens.DURATION) * 1000000), TimeUnit.NANOSECONDS);
-            for (Map.Entry<String, Long> count : ((Map<String, Long>)metricsData.getOrDefault(GraphSONTokens.COUNTS, new LinkedHashMap<>(0))).entrySet()) {
-                m.setCount(count.getKey(), count.getValue());
-            }
-            for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.ANNOTATIONS, new LinkedHashMap<>(0))).entrySet()) {
-                m.setAnnotation(count.getKey(), count.getValue());
-            }
-            for (MutableMetrics nested : (List<MutableMetrics>)metricsData.getOrDefault(GraphSONTokens.METRICS, new ArrayList<>(0))) {
-                m.addNested(nested);
-            }
-            return m;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class TraversalMetricsJacksonDeserializer extends StdDeserializer<TraversalMetrics> {
-
-        public TraversalMetricsJacksonDeserializer() {
-            super(TraversalMetrics.class);
-        }
-
-        @Override
-        public TraversalMetrics deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Map<String, Object> traversalMetricsData = deserializationContext.readValue(jsonParser, Map.class);
-
-            return new DefaultTraversalMetrics(
-                    Math.round((Double) traversalMetricsData.get(GraphSONTokens.DURATION) * 1000000),
-                    (List<MutableMetrics>) traversalMetricsData.get(GraphSONTokens.METRICS)
-            );
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class TreeJacksonDeserializer extends StdDeserializer<Tree> {
-
-        public TreeJacksonDeserializer() {
-            super(Tree.class);
-        }
-
-        @Override
-        public Tree deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final List<Map> data = deserializationContext.readValue(jsonParser, List.class);
-            final Tree t = new Tree();
-            for (Map<String, Object> entry : data) {
-                t.put(entry.get(GraphSONTokens.KEY), entry.get(GraphSONTokens.VALUE));
-            }
-            return t;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class IntegerJackonsDeserializer extends StdDeserializer<Integer> {
-
-        protected IntegerJackonsDeserializer() {
-            super(Integer.class);
-        }
-
-        @Override
-        public Integer deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            return jsonParser.getIntValue();
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class DoubleJacksonDeserializer extends StdDeserializer<Double> {
-
-        protected DoubleJacksonDeserializer() {
-            super(Double.class);
-        }
-
-        @Override
-        public Double deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            if (jsonParser.getCurrentToken().isNumeric())
-                return jsonParser.getDoubleValue();
-            else  {
-                final String numberText = jsonParser.getValueAsString();
-                if ("NaN".equalsIgnoreCase(numberText))
-                    return Double.NaN;
-                else if ("-Infinity".equals(numberText) || "-INF".equalsIgnoreCase(numberText))
-                    return Double.NEGATIVE_INFINITY;
-                else if ("Infinity".equals(numberText) || "INF".equals(numberText))
-                    return Double.POSITIVE_INFINITY;
-                else
-                    throw new IllegalStateException("Double value unexpected: " + numberText);
-            }
-
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
index 7b5db33..97bf71e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
@@ -62,8 +62,8 @@
                                               final Collection<NamedType> subtypes) {
         final TypeIdResolver idRes = this.idResolver(config, baseType, typeValidator, subtypes, true, false);
         return version == GraphSONVersion.V2_0 ?
-                new GraphSONTypeSerializerV2d0(idRes, this.getTypeProperty(), typeInfo, valuePropertyName) :
-                new GraphSONTypeSerializerV3d0(idRes, this.getTypeProperty(), typeInfo, valuePropertyName);
+                new GraphSONTypeSerializerV2(idRes, this.getTypeProperty(), typeInfo, valuePropertyName) :
+                new GraphSONTypeSerializerV3(idRes, this.getTypeProperty(), typeInfo, valuePropertyName);
     }
 
     public GraphSONTypeResolverBuilder valuePropertyName(final String valuePropertyName) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2.java
new file mode 100644
index 0000000..0cf360d
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Pick;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+
+/**
+ * GraphSON 2.0 {@code TypeSerializer}.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONTypeSerializerV2 extends AbstractGraphSONTypeSerializer {
+
+    GraphSONTypeSerializerV2(final TypeIdResolver idRes, final String propertyName, final TypeInfo typeInfo,
+                             final String valuePropertyName) {
+        super(idRes, propertyName, typeInfo, valuePropertyName);
+    }
+
+    @Override
+    public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
+        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+            jsonGenerator.writeStartObject();
+        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+            jsonGenerator.writeStartArray();
+        } else if (canWriteTypeId()) {
+            writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+        } else {
+            throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+        }
+
+        return writableTypeId;
+    }
+
+    @Override
+    public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
+        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+            jsonGenerator.writeEndObject();
+        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+            jsonGenerator.writeEndArray();
+        } else if (canWriteTypeId()) {
+            writeTypeSuffix(jsonGenerator);
+        } else {
+            throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+        }
+
+        return writableTypeId;
+    }
+
+    @Override
+    protected Class getClassFromObject(final Object o) {
+        final Class c = o.getClass();
+        if (classMap.containsKey(c))
+            return classMap.get(c);
+
+        final Class mapped;
+        if (Vertex.class.isAssignableFrom(c))
+            mapped = Vertex.class;
+        else if (Edge.class.isAssignableFrom(c))
+            mapped = Edge.class;
+        else if (Path.class.isAssignableFrom(c))
+            mapped = Path.class;
+        else if (VertexProperty.class.isAssignableFrom(c))
+            mapped = VertexProperty.class;
+        else if (Metrics.class.isAssignableFrom(c))
+            mapped = Metrics.class;
+        else if (TraversalMetrics.class.isAssignableFrom(c))
+            mapped = TraversalMetrics.class;
+        else if (Property.class.isAssignableFrom(c))
+            mapped = Property.class;
+        else if (ByteBuffer.class.isAssignableFrom(c))
+            mapped = ByteBuffer.class;
+        else if (InetAddress.class.isAssignableFrom(c))
+            mapped = InetAddress.class;
+        else if (Traverser.class.isAssignableFrom(c))
+            mapped = Traverser.class;
+        else if (Lambda.class.isAssignableFrom(c))
+            mapped = Lambda.class;
+        else if (VertexProperty.Cardinality.class.isAssignableFrom(c))
+            mapped = VertexProperty.Cardinality.class;
+        else if (Column.class.isAssignableFrom(c))
+            mapped = Column.class;
+        else if (Direction.class.isAssignableFrom(c))
+            mapped = Direction.class;
+        else if (Operator.class.isAssignableFrom(c))
+            mapped = Operator.class;
+        else if (Order.class.isAssignableFrom(c))
+            mapped = Order.class;
+        else if (Pop.class.isAssignableFrom(c))
+            mapped = Pop.class;
+        else if (SackFunctions.Barrier.class.isAssignableFrom(c))
+            mapped = SackFunctions.Barrier.class;
+        else if (Pick.class.isAssignableFrom(c))
+            mapped = Pick.class;
+        else if (Scope.class.isAssignableFrom(c))
+            mapped = Scope.class;
+        else if (T.class.isAssignableFrom(c))
+            mapped = T.class;
+        else
+            mapped = c;
+
+        classMap.put(c, mapped);
+        return mapped;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
deleted file mode 100644
index e50037c..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-
-/**
- * GraphSON 2.0 {@code TypeSerializer}.
- *
- * @author Kevin Gallardo (https://kgdo.me)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONTypeSerializerV2d0 extends AbstractGraphSONTypeSerializer {
-
-    GraphSONTypeSerializerV2d0(final TypeIdResolver idRes, final String propertyName, final TypeInfo typeInfo,
-                               final String valuePropertyName) {
-        super(idRes, propertyName, typeInfo, valuePropertyName);
-    }
-
-    @Override
-    public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
-        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
-            jsonGenerator.writeStartObject();
-        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
-            jsonGenerator.writeStartArray();
-        } else if (canWriteTypeId()) {
-            writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
-        } else {
-            throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
-        }
-
-        return writableTypeId;
-    }
-
-    @Override
-    public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
-        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
-            jsonGenerator.writeEndObject();
-        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
-            jsonGenerator.writeEndArray();
-        } else if (canWriteTypeId()) {
-            writeTypeSuffix(jsonGenerator);
-        } else {
-            throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
-        }
-
-        return writableTypeId;
-    }
-
-    @Override
-    protected Class getClassFromObject(final Object o) {
-        final Class c = o.getClass();
-        if (classMap.containsKey(c))
-            return classMap.get(c);
-
-        final Class mapped;
-        if (Vertex.class.isAssignableFrom(c))
-            mapped = Vertex.class;
-        else if (Edge.class.isAssignableFrom(c))
-            mapped = Edge.class;
-        else if (Path.class.isAssignableFrom(c))
-            mapped = Path.class;
-        else if (VertexProperty.class.isAssignableFrom(c))
-            mapped = VertexProperty.class;
-        else if (Metrics.class.isAssignableFrom(c))
-            mapped = Metrics.class;
-        else if (TraversalMetrics.class.isAssignableFrom(c))
-            mapped = TraversalMetrics.class;
-        else if (Property.class.isAssignableFrom(c))
-            mapped = Property.class;
-        else if (ByteBuffer.class.isAssignableFrom(c))
-            mapped = ByteBuffer.class;
-        else if (InetAddress.class.isAssignableFrom(c))
-            mapped = InetAddress.class;
-        else if (Traverser.class.isAssignableFrom(c))
-            mapped = Traverser.class;
-        else if (Lambda.class.isAssignableFrom(c))
-            mapped = Lambda.class;
-        else if (VertexProperty.Cardinality.class.isAssignableFrom(c))
-            mapped = VertexProperty.Cardinality.class;
-        else if (Column.class.isAssignableFrom(c))
-            mapped = Column.class;
-        else if (Direction.class.isAssignableFrom(c))
-            mapped = Direction.class;
-        else if (Operator.class.isAssignableFrom(c))
-            mapped = Operator.class;
-        else if (Order.class.isAssignableFrom(c))
-            mapped = Order.class;
-        else if (Pop.class.isAssignableFrom(c))
-            mapped = Pop.class;
-        else if (SackFunctions.Barrier.class.isAssignableFrom(c))
-            mapped = SackFunctions.Barrier.class;
-        else if (Pick.class.isAssignableFrom(c))
-            mapped = Pick.class;
-        else if (Scope.class.isAssignableFrom(c))
-            mapped = Scope.class;
-        else if (T.class.isAssignableFrom(c))
-            mapped = T.class;
-        else
-            mapped = c;
-
-        classMap.put(c, mapped);
-        return mapped;
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3.java
new file mode 100644
index 0000000..860d37a
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3.java
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Pick;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * GraphSON 2.0 {@code TypeSerializer}.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONTypeSerializerV3 extends AbstractGraphSONTypeSerializer {
+
+    GraphSONTypeSerializerV3(final TypeIdResolver idRes, final String propertyName, final TypeInfo typeInfo,
+                             final String valuePropertyName) {
+        super(idRes, propertyName, typeInfo, valuePropertyName);
+    }
+
+    @Override
+    public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
+        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+            if (writableTypeId.forValue instanceof Map) {
+                writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+                jsonGenerator.writeStartArray();
+            } else {
+                jsonGenerator.writeStartObject();
+            }
+        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+            if (writableTypeId.forValue instanceof List || writableTypeId.forValue instanceof Set) {
+                writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+                jsonGenerator.writeStartArray();
+            } else {
+                jsonGenerator.writeStartArray();
+            }
+        } else if (canWriteTypeId()) {
+            writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+        } else {
+            throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+        }
+
+        return writableTypeId;
+    }
+
+    @Override
+    public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
+        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+            if (writableTypeId.forValue instanceof Map) {
+                jsonGenerator.writeEndArray();
+                writeTypeSuffix(jsonGenerator);
+            } else {
+                jsonGenerator.writeEndObject();
+            }
+        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+            if (writableTypeId.forValue instanceof List || writableTypeId.forValue instanceof Set) {
+                jsonGenerator.writeEndArray();
+                writeTypeSuffix(jsonGenerator);
+            } else {
+                jsonGenerator.writeEndArray();
+            }
+        } else if (canWriteTypeId()) {
+            writeTypeSuffix(jsonGenerator);
+        } else {
+            throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+        }
+
+        return writableTypeId;
+    }
+
+    @Override
+    protected Class getClassFromObject(final Object o) {
+        final Class c = o.getClass();
+        if (classMap.containsKey(c))
+            return classMap.get(c);
+
+        final Class mapped;
+        if (Map.class.isAssignableFrom(c)) {
+            if (Tree.class.isAssignableFrom(c))
+                mapped = Tree.class;
+            else
+                mapped = Map.class;
+        } else if (List.class.isAssignableFrom(c))
+            mapped = List.class;
+        else if (Set.class.isAssignableFrom(c) && !BulkSet.class.isAssignableFrom(c))   // we have special handling of BulkSet
+            mapped = Set.class;
+        else if (Vertex.class.isAssignableFrom(c))
+            mapped = Vertex.class;
+        else if (Edge.class.isAssignableFrom(c))
+            mapped = Edge.class;
+        else if (Path.class.isAssignableFrom(c))
+            mapped = Path.class;
+        else if (VertexProperty.class.isAssignableFrom(c))
+            mapped = VertexProperty.class;
+        else if (Metrics.class.isAssignableFrom(c))
+            mapped = Metrics.class;
+        else if (TraversalMetrics.class.isAssignableFrom(c))
+            mapped = TraversalMetrics.class;
+        else if (Property.class.isAssignableFrom(c))
+            mapped = Property.class;
+        else if (ByteBuffer.class.isAssignableFrom(c))
+            mapped = ByteBuffer.class;
+        else if (InetAddress.class.isAssignableFrom(c))
+            mapped = InetAddress.class;
+        else if (Traverser.class.isAssignableFrom(c))
+            mapped = Traverser.class;
+        else if (Lambda.class.isAssignableFrom(c))
+            mapped = Lambda.class;
+        else if (VertexProperty.Cardinality.class.isAssignableFrom(c))
+            mapped = VertexProperty.Cardinality.class;
+        else if (Column.class.isAssignableFrom(c))
+            mapped = Column.class;
+        else if (Direction.class.isAssignableFrom(c))
+            mapped = Direction.class;
+        else if (Operator.class.isAssignableFrom(c))
+            mapped = Operator.class;
+        else if (Order.class.isAssignableFrom(c))
+            mapped = Order.class;
+        else if (Pop.class.isAssignableFrom(c))
+            mapped = Pop.class;
+        else if (SackFunctions.Barrier.class.isAssignableFrom(c))
+            mapped = SackFunctions.Barrier.class;
+        else if (Pick.class.isAssignableFrom(c))
+            mapped = Pick.class;
+        else if (Scope.class.isAssignableFrom(c))
+            mapped = Scope.class;
+        else if (T.class.isAssignableFrom(c))
+            mapped = T.class;
+        else
+            mapped = c;
+
+        classMap.put(c, mapped);
+        return mapped;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
deleted file mode 100644
index 4349e47..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * GraphSON 2.0 {@code TypeSerializer}.
- *
- * @author Kevin Gallardo (https://kgdo.me)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
-
-    GraphSONTypeSerializerV3d0(final TypeIdResolver idRes, final String propertyName, final TypeInfo typeInfo,
-                               final String valuePropertyName) {
-        super(idRes, propertyName, typeInfo, valuePropertyName);
-    }
-
-    @Override
-    public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
-        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
-            if (writableTypeId.forValue instanceof Map) {
-                writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
-                jsonGenerator.writeStartArray();
-            } else {
-                jsonGenerator.writeStartObject();
-            }
-        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
-            if (writableTypeId.forValue instanceof List || writableTypeId.forValue instanceof Set) {
-                writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
-                jsonGenerator.writeStartArray();
-            } else {
-                jsonGenerator.writeStartArray();
-            }
-        } else if (canWriteTypeId()) {
-            writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
-        } else {
-            throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
-        }
-
-        return writableTypeId;
-    }
-
-    @Override
-    public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
-        if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
-            if (writableTypeId.forValue instanceof Map) {
-                jsonGenerator.writeEndArray();
-                writeTypeSuffix(jsonGenerator);
-            } else {
-                jsonGenerator.writeEndObject();
-            }
-        } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
-            if (writableTypeId.forValue instanceof List || writableTypeId.forValue instanceof Set) {
-                jsonGenerator.writeEndArray();
-                writeTypeSuffix(jsonGenerator);
-            } else {
-                jsonGenerator.writeEndArray();
-            }
-        } else if (canWriteTypeId()) {
-            writeTypeSuffix(jsonGenerator);
-        } else {
-            throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
-        }
-
-        return writableTypeId;
-    }
-
-    @Override
-    protected Class getClassFromObject(final Object o) {
-        final Class c = o.getClass();
-        if (classMap.containsKey(c))
-            return classMap.get(c);
-
-        final Class mapped;
-        if (Map.class.isAssignableFrom(c)) {
-            if (Tree.class.isAssignableFrom(c))
-                mapped = Tree.class;
-            else
-                mapped = Map.class;
-        } else if (List.class.isAssignableFrom(c))
-            mapped = List.class;
-        else if (Set.class.isAssignableFrom(c) && !BulkSet.class.isAssignableFrom(c))   // we have special handling of BulkSet
-            mapped = Set.class;
-        else if (Vertex.class.isAssignableFrom(c))
-            mapped = Vertex.class;
-        else if (Edge.class.isAssignableFrom(c))
-            mapped = Edge.class;
-        else if (Path.class.isAssignableFrom(c))
-            mapped = Path.class;
-        else if (VertexProperty.class.isAssignableFrom(c))
-            mapped = VertexProperty.class;
-        else if (Metrics.class.isAssignableFrom(c))
-            mapped = Metrics.class;
-        else if (TraversalMetrics.class.isAssignableFrom(c))
-            mapped = TraversalMetrics.class;
-        else if (Property.class.isAssignableFrom(c))
-            mapped = Property.class;
-        else if (ByteBuffer.class.isAssignableFrom(c))
-            mapped = ByteBuffer.class;
-        else if (InetAddress.class.isAssignableFrom(c))
-            mapped = InetAddress.class;
-        else if (Traverser.class.isAssignableFrom(c))
-            mapped = Traverser.class;
-        else if (Lambda.class.isAssignableFrom(c))
-            mapped = Lambda.class;
-        else if (VertexProperty.Cardinality.class.isAssignableFrom(c))
-            mapped = VertexProperty.Cardinality.class;
-        else if (Column.class.isAssignableFrom(c))
-            mapped = Column.class;
-        else if (Direction.class.isAssignableFrom(c))
-            mapped = Direction.class;
-        else if (Operator.class.isAssignableFrom(c))
-            mapped = Operator.class;
-        else if (Order.class.isAssignableFrom(c))
-            mapped = Order.class;
-        else if (Pop.class.isAssignableFrom(c))
-            mapped = Pop.class;
-        else if (SackFunctions.Barrier.class.isAssignableFrom(c))
-            mapped = SackFunctions.Barrier.class;
-        else if (Pick.class.isAssignableFrom(c))
-            mapped = Pick.class;
-        else if (Scope.class.isAssignableFrom(c))
-            mapped = Scope.class;
-        else if (T.class.isAssignableFrom(c))
-            mapped = T.class;
-        else
-            mapped = c;
-
-        classMap.put(c, mapped);
-        return mapped;
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
index cb163e7..9738496 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
@@ -24,9 +24,9 @@
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public enum GraphSONVersion {
-    V1_0(GraphSONModule.GraphSONModuleV1d0.build(), "1.0"),
-    V2_0(GraphSONModule.GraphSONModuleV2d0.build(), "2.0"),
-    V3_0(GraphSONModule.GraphSONModuleV3d0.build(), "3.0");
+    V1_0(GraphSONModule.GraphSONModuleV1.build(), "1.0"),
+    V2_0(GraphSONModule.GraphSONModuleV2.build(), "2.0"),
+    V3_0(GraphSONModule.GraphSONModuleV3.build(), "3.0");
 
     private final GraphSONModule.GraphSONModuleBuilder builder;
     private final String versionNumber;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2.java
new file mode 100644
index 0000000..e147e4c
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Version 2.0 of GraphSON extensions.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONXModuleV2 extends GraphSONModule {
+
+    private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
+            new LinkedHashMap<Class, String>() {{
+                put(ByteBuffer.class, "ByteBuffer");
+                put(Short.class, "Int16");
+                put(BigInteger.class, "BigInteger");
+                put(BigDecimal.class, "BigDecimal");
+                put(Byte.class, "Byte");
+                put(Character.class, "Char");
+                put(InetAddress.class, "InetAddress");
+
+                // Time serializers/deserializers
+                put(Duration.class, "Duration");
+                put(Instant.class, "Instant");
+                put(LocalDate.class, "LocalDate");
+                put(LocalDateTime.class, "LocalDateTime");
+                put(LocalTime.class, "LocalTime");
+                put(MonthDay.class, "MonthDay");
+                put(OffsetDateTime.class, "OffsetDateTime");
+                put(OffsetTime.class, "OffsetTime");
+                put(Period.class, "Period");
+                put(Year.class, "Year");
+                put(YearMonth.class, "YearMonth");
+                put(ZonedDateTime.class, "ZonedDateTime");
+                put(ZoneOffset.class, "ZoneOffset");
+            }});
+
+    /**
+     * Constructs a new object.
+     */
+    protected GraphSONXModuleV2(final boolean normalize) {
+        super("graphsonx-2.0");
+
+        /////////////////////// SERIALIZERS ////////////////////////////
+
+        // java.time
+        addSerializer(Duration.class, new JavaTimeSerializersV2.DurationJacksonSerializer());
+        addSerializer(Instant.class, new JavaTimeSerializersV2.InstantJacksonSerializer());
+        addSerializer(LocalDate.class, new JavaTimeSerializersV2.LocalDateJacksonSerializer());
+        addSerializer(LocalDateTime.class, new JavaTimeSerializersV2.LocalDateTimeJacksonSerializer());
+        addSerializer(LocalTime.class, new JavaTimeSerializersV2.LocalTimeJacksonSerializer());
+        addSerializer(MonthDay.class, new JavaTimeSerializersV2.MonthDayJacksonSerializer());
+        addSerializer(OffsetDateTime.class, new JavaTimeSerializersV2.OffsetDateTimeJacksonSerializer());
+        addSerializer(OffsetTime.class, new JavaTimeSerializersV2.OffsetTimeJacksonSerializer());
+        addSerializer(Period.class, new JavaTimeSerializersV2.PeriodJacksonSerializer());
+        addSerializer(Year.class, new JavaTimeSerializersV2.YearJacksonSerializer());
+        addSerializer(YearMonth.class, new JavaTimeSerializersV2.YearMonthJacksonSerializer());
+        addSerializer(ZonedDateTime.class, new JavaTimeSerializersV2.ZonedDateTimeJacksonSerializer());
+        addSerializer(ZoneOffset.class, new JavaTimeSerializersV2.ZoneOffsetJacksonSerializer());
+
+        /////////////////////// DESERIALIZERS ////////////////////////////
+
+        // java.time
+        addDeserializer(Duration.class, new JavaTimeSerializersV2.DurationJacksonDeserializer());
+        addDeserializer(Instant.class, new JavaTimeSerializersV2.InstantJacksonDeserializer());
+        addDeserializer(LocalDate.class, new JavaTimeSerializersV2.LocalDateJacksonDeserializer());
+        addDeserializer(LocalDateTime.class, new JavaTimeSerializersV2.LocalDateTimeJacksonDeserializer());
+        addDeserializer(LocalTime.class, new JavaTimeSerializersV2.LocalTimeJacksonDeserializer());
+        addDeserializer(MonthDay.class, new JavaTimeSerializersV2.MonthDayJacksonDeserializer());
+        addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV2.OffsetDateTimeJacksonDeserializer());
+        addDeserializer(OffsetTime.class, new JavaTimeSerializersV2.OffsetTimeJacksonDeserializer());
+        addDeserializer(Period.class, new JavaTimeSerializersV2.PeriodJacksonDeserializer());
+        addDeserializer(Year.class, new JavaTimeSerializersV2.YearJacksonDeserializer());
+        addDeserializer(YearMonth.class, new JavaTimeSerializersV2.YearMonthJacksonDeserializer());
+        addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV2.ZonedDateTimeJacksonDeserializer());
+        addDeserializer(ZoneOffset.class, new JavaTimeSerializersV2.ZoneOffsetJacksonDeserializer());
+    }
+
+    public static Builder build() {
+        return new Builder();
+    }
+
+    @Override
+    public Map<Class, String> getTypeDefinitions() {
+        return TYPE_DEFINITIONS;
+    }
+
+    @Override
+    public String getTypeNamespace() {
+        return GraphSONTokens.GREMLINX_TYPE_NAMESPACE;
+    }
+
+    public static final class Builder implements GraphSONModuleBuilder {
+
+        private Builder() {
+        }
+
+        @Override
+        public GraphSONModule create(final boolean normalize, final TypeInfo typeInfo) {
+            return new GraphSONXModuleV2(normalize);
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java
deleted file mode 100644
index 0d4ba53..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Version 2.0 of GraphSON extensions.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONXModuleV2d0 extends GraphSONModule {
-
-    private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
-            new LinkedHashMap<Class, String>() {{
-                put(ByteBuffer.class, "ByteBuffer");
-                put(Short.class, "Int16");
-                put(BigInteger.class, "BigInteger");
-                put(BigDecimal.class, "BigDecimal");
-                put(Byte.class, "Byte");
-                put(Character.class, "Char");
-                put(InetAddress.class, "InetAddress");
-
-                // Time serializers/deserializers
-                put(Duration.class, "Duration");
-                put(Instant.class, "Instant");
-                put(LocalDate.class, "LocalDate");
-                put(LocalDateTime.class, "LocalDateTime");
-                put(LocalTime.class, "LocalTime");
-                put(MonthDay.class, "MonthDay");
-                put(OffsetDateTime.class, "OffsetDateTime");
-                put(OffsetTime.class, "OffsetTime");
-                put(Period.class, "Period");
-                put(Year.class, "Year");
-                put(YearMonth.class, "YearMonth");
-                put(ZonedDateTime.class, "ZonedDateTime");
-                put(ZoneOffset.class, "ZoneOffset");
-            }});
-
-    /**
-     * Constructs a new object.
-     */
-    protected GraphSONXModuleV2d0(final boolean normalize) {
-        super("graphsonx-2.0");
-
-        /////////////////////// SERIALIZERS ////////////////////////////
-
-        // java.time
-        addSerializer(Duration.class, new JavaTimeSerializersV2d0.DurationJacksonSerializer());
-        addSerializer(Instant.class, new JavaTimeSerializersV2d0.InstantJacksonSerializer());
-        addSerializer(LocalDate.class, new JavaTimeSerializersV2d0.LocalDateJacksonSerializer());
-        addSerializer(LocalDateTime.class, new JavaTimeSerializersV2d0.LocalDateTimeJacksonSerializer());
-        addSerializer(LocalTime.class, new JavaTimeSerializersV2d0.LocalTimeJacksonSerializer());
-        addSerializer(MonthDay.class, new JavaTimeSerializersV2d0.MonthDayJacksonSerializer());
-        addSerializer(OffsetDateTime.class, new JavaTimeSerializersV2d0.OffsetDateTimeJacksonSerializer());
-        addSerializer(OffsetTime.class, new JavaTimeSerializersV2d0.OffsetTimeJacksonSerializer());
-        addSerializer(Period.class, new JavaTimeSerializersV2d0.PeriodJacksonSerializer());
-        addSerializer(Year.class, new JavaTimeSerializersV2d0.YearJacksonSerializer());
-        addSerializer(YearMonth.class, new JavaTimeSerializersV2d0.YearMonthJacksonSerializer());
-        addSerializer(ZonedDateTime.class, new JavaTimeSerializersV2d0.ZonedDateTimeJacksonSerializer());
-        addSerializer(ZoneOffset.class, new JavaTimeSerializersV2d0.ZoneOffsetJacksonSerializer());
-
-        /////////////////////// DESERIALIZERS ////////////////////////////
-
-        // java.time
-        addDeserializer(Duration.class, new JavaTimeSerializersV2d0.DurationJacksonDeserializer());
-        addDeserializer(Instant.class, new JavaTimeSerializersV2d0.InstantJacksonDeserializer());
-        addDeserializer(LocalDate.class, new JavaTimeSerializersV2d0.LocalDateJacksonDeserializer());
-        addDeserializer(LocalDateTime.class, new JavaTimeSerializersV2d0.LocalDateTimeJacksonDeserializer());
-        addDeserializer(LocalTime.class, new JavaTimeSerializersV2d0.LocalTimeJacksonDeserializer());
-        addDeserializer(MonthDay.class, new JavaTimeSerializersV2d0.MonthDayJacksonDeserializer());
-        addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV2d0.OffsetDateTimeJacksonDeserializer());
-        addDeserializer(OffsetTime.class, new JavaTimeSerializersV2d0.OffsetTimeJacksonDeserializer());
-        addDeserializer(Period.class, new JavaTimeSerializersV2d0.PeriodJacksonDeserializer());
-        addDeserializer(Year.class, new JavaTimeSerializersV2d0.YearJacksonDeserializer());
-        addDeserializer(YearMonth.class, new JavaTimeSerializersV2d0.YearMonthJacksonDeserializer());
-        addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV2d0.ZonedDateTimeJacksonDeserializer());
-        addDeserializer(ZoneOffset.class, new JavaTimeSerializersV2d0.ZoneOffsetJacksonDeserializer());
-    }
-
-    public static Builder build() {
-        return new Builder();
-    }
-
-    @Override
-    public Map<Class, String> getTypeDefinitions() {
-        return TYPE_DEFINITIONS;
-    }
-
-    @Override
-    public String getTypeNamespace() {
-        return GraphSONTokens.GREMLINX_TYPE_NAMESPACE;
-    }
-
-    public static final class Builder implements GraphSONModuleBuilder {
-
-        private Builder() {
-        }
-
-        @Override
-        public GraphSONModule create(final boolean normalize) {
-            return new GraphSONXModuleV2d0(normalize);
-        }
-    }
-}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV3.java
new file mode 100644
index 0000000..05b6841
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV3.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Version 3.0 of GraphSON extensions.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONXModuleV3 extends GraphSONModule {
+
+    private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
+            new LinkedHashMap<Class, String>() {{
+                put(ByteBuffer.class, "ByteBuffer");
+                put(Short.class, "Int16");
+                put(BigInteger.class, "BigInteger");
+                put(BigDecimal.class, "BigDecimal");
+                put(Byte.class, "Byte");
+                put(Character.class, "Char");
+                put(InetAddress.class, "InetAddress");
+
+                // Time serializers/deserializers
+                put(Duration.class, "Duration");
+                put(Instant.class, "Instant");
+                put(LocalDate.class, "LocalDate");
+                put(LocalDateTime.class, "LocalDateTime");
+                put(LocalTime.class, "LocalTime");
+                put(MonthDay.class, "MonthDay");
+                put(OffsetDateTime.class, "OffsetDateTime");
+                put(OffsetTime.class, "OffsetTime");
+                put(Period.class, "Period");
+                put(Year.class, "Year");
+                put(YearMonth.class, "YearMonth");
+                put(ZonedDateTime.class, "ZonedDateTime");
+                put(ZoneOffset.class, "ZoneOffset");
+            }});
+
+    /**
+     * Constructs a new object.
+     */
+    protected GraphSONXModuleV3(final boolean normalize) {
+        super("graphsonx-3.0");
+
+        /////////////////////// SERIALIZERS ////////////////////////////
+
+        // java.time
+        addSerializer(Duration.class, new JavaTimeSerializersV3.DurationJacksonSerializer());
+        addSerializer(Instant.class, new JavaTimeSerializersV3.InstantJacksonSerializer());
+        addSerializer(LocalDate.class, new JavaTimeSerializersV3.LocalDateJacksonSerializer());
+        addSerializer(LocalDateTime.class, new JavaTimeSerializersV3.LocalDateTimeJacksonSerializer());
+        addSerializer(LocalTime.class, new JavaTimeSerializersV3.LocalTimeJacksonSerializer());
+        addSerializer(MonthDay.class, new JavaTimeSerializersV3.MonthDayJacksonSerializer());
+        addSerializer(OffsetDateTime.class, new JavaTimeSerializersV3.OffsetDateTimeJacksonSerializer());
+        addSerializer(OffsetTime.class, new JavaTimeSerializersV3.OffsetTimeJacksonSerializer());
+        addSerializer(Period.class, new JavaTimeSerializersV3.PeriodJacksonSerializer());
+        addSerializer(Year.class, new JavaTimeSerializersV3.YearJacksonSerializer());
+        addSerializer(YearMonth.class, new JavaTimeSerializersV3.YearMonthJacksonSerializer());
+        addSerializer(ZonedDateTime.class, new JavaTimeSerializersV3.ZonedDateTimeJacksonSerializer());
+        addSerializer(ZoneOffset.class, new JavaTimeSerializersV3.ZoneOffsetJacksonSerializer());
+
+        /////////////////////// DESERIALIZERS ////////////////////////////
+
+        // java.time
+        addDeserializer(Duration.class, new JavaTimeSerializersV3.DurationJacksonDeserializer());
+        addDeserializer(Instant.class, new JavaTimeSerializersV3.InstantJacksonDeserializer());
+        addDeserializer(LocalDate.class, new JavaTimeSerializersV3.LocalDateJacksonDeserializer());
+        addDeserializer(LocalDateTime.class, new JavaTimeSerializersV3.LocalDateTimeJacksonDeserializer());
+        addDeserializer(LocalTime.class, new JavaTimeSerializersV3.LocalTimeJacksonDeserializer());
+        addDeserializer(MonthDay.class, new JavaTimeSerializersV3.MonthDayJacksonDeserializer());
+        addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV3.OffsetDateTimeJacksonDeserializer());
+        addDeserializer(OffsetTime.class, new JavaTimeSerializersV3.OffsetTimeJacksonDeserializer());
+        addDeserializer(Period.class, new JavaTimeSerializersV3.PeriodJacksonDeserializer());
+        addDeserializer(Year.class, new JavaTimeSerializersV3.YearJacksonDeserializer());
+        addDeserializer(YearMonth.class, new JavaTimeSerializersV3.YearMonthJacksonDeserializer());
+        addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV3.ZonedDateTimeJacksonDeserializer());
+        addDeserializer(ZoneOffset.class, new JavaTimeSerializersV3.ZoneOffsetJacksonDeserializer());
+    }
+
+    public static GraphSONModuleBuilder build() {
+        return new Builder();
+    }
+
+    @Override
+    public Map<Class, String> getTypeDefinitions() {
+        return TYPE_DEFINITIONS;
+    }
+
+    @Override
+    public String getTypeNamespace() {
+        return GraphSONTokens.GREMLINX_TYPE_NAMESPACE;
+    }
+
+    public static final class Builder implements GraphSONModuleBuilder {
+
+        private Builder() {
+        }
+
+        @Override
+        public GraphSONModule create(final boolean normalize, final TypeInfo typeInfo) {
+            return new GraphSONXModuleV3(normalize);
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV3d0.java
deleted file mode 100644
index 38caa09..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV3d0.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Version 3.0 of GraphSON extensions.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONXModuleV3d0 extends GraphSONModule {
-
-    private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
-            new LinkedHashMap<Class, String>() {{
-                put(ByteBuffer.class, "ByteBuffer");
-                put(Short.class, "Int16");
-                put(BigInteger.class, "BigInteger");
-                put(BigDecimal.class, "BigDecimal");
-                put(Byte.class, "Byte");
-                put(Character.class, "Char");
-                put(InetAddress.class, "InetAddress");
-
-                // Time serializers/deserializers
-                put(Duration.class, "Duration");
-                put(Instant.class, "Instant");
-                put(LocalDate.class, "LocalDate");
-                put(LocalDateTime.class, "LocalDateTime");
-                put(LocalTime.class, "LocalTime");
-                put(MonthDay.class, "MonthDay");
-                put(OffsetDateTime.class, "OffsetDateTime");
-                put(OffsetTime.class, "OffsetTime");
-                put(Period.class, "Period");
-                put(Year.class, "Year");
-                put(YearMonth.class, "YearMonth");
-                put(ZonedDateTime.class, "ZonedDateTime");
-                put(ZoneOffset.class, "ZoneOffset");
-            }});
-
-    /**
-     * Constructs a new object.
-     */
-    protected GraphSONXModuleV3d0(final boolean normalize) {
-        super("graphsonx-3.0");
-
-        /////////////////////// SERIALIZERS ////////////////////////////
-
-        // java.time
-        addSerializer(Duration.class, new JavaTimeSerializersV3d0.DurationJacksonSerializer());
-        addSerializer(Instant.class, new JavaTimeSerializersV3d0.InstantJacksonSerializer());
-        addSerializer(LocalDate.class, new JavaTimeSerializersV3d0.LocalDateJacksonSerializer());
-        addSerializer(LocalDateTime.class, new JavaTimeSerializersV3d0.LocalDateTimeJacksonSerializer());
-        addSerializer(LocalTime.class, new JavaTimeSerializersV3d0.LocalTimeJacksonSerializer());
-        addSerializer(MonthDay.class, new JavaTimeSerializersV3d0.MonthDayJacksonSerializer());
-        addSerializer(OffsetDateTime.class, new JavaTimeSerializersV3d0.OffsetDateTimeJacksonSerializer());
-        addSerializer(OffsetTime.class, new JavaTimeSerializersV3d0.OffsetTimeJacksonSerializer());
-        addSerializer(Period.class, new JavaTimeSerializersV3d0.PeriodJacksonSerializer());
-        addSerializer(Year.class, new JavaTimeSerializersV3d0.YearJacksonSerializer());
-        addSerializer(YearMonth.class, new JavaTimeSerializersV3d0.YearMonthJacksonSerializer());
-        addSerializer(ZonedDateTime.class, new JavaTimeSerializersV3d0.ZonedDateTimeJacksonSerializer());
-        addSerializer(ZoneOffset.class, new JavaTimeSerializersV3d0.ZoneOffsetJacksonSerializer());
-
-        /////////////////////// DESERIALIZERS ////////////////////////////
-
-        // java.time
-        addDeserializer(Duration.class, new JavaTimeSerializersV3d0.DurationJacksonDeserializer());
-        addDeserializer(Instant.class, new JavaTimeSerializersV3d0.InstantJacksonDeserializer());
-        addDeserializer(LocalDate.class, new JavaTimeSerializersV3d0.LocalDateJacksonDeserializer());
-        addDeserializer(LocalDateTime.class, new JavaTimeSerializersV3d0.LocalDateTimeJacksonDeserializer());
-        addDeserializer(LocalTime.class, new JavaTimeSerializersV3d0.LocalTimeJacksonDeserializer());
-        addDeserializer(MonthDay.class, new JavaTimeSerializersV3d0.MonthDayJacksonDeserializer());
-        addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV3d0.OffsetDateTimeJacksonDeserializer());
-        addDeserializer(OffsetTime.class, new JavaTimeSerializersV3d0.OffsetTimeJacksonDeserializer());
-        addDeserializer(Period.class, new JavaTimeSerializersV3d0.PeriodJacksonDeserializer());
-        addDeserializer(Year.class, new JavaTimeSerializersV3d0.YearJacksonDeserializer());
-        addDeserializer(YearMonth.class, new JavaTimeSerializersV3d0.YearMonthJacksonDeserializer());
-        addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV3d0.ZonedDateTimeJacksonDeserializer());
-        addDeserializer(ZoneOffset.class, new JavaTimeSerializersV3d0.ZoneOffsetJacksonDeserializer());
-    }
-
-    public static Builder build() {
-        return new Builder();
-    }
-
-    @Override
-    public Map<Class, String> getTypeDefinitions() {
-        return TYPE_DEFINITIONS;
-    }
-
-    @Override
-    public String getTypeNamespace() {
-        return GraphSONTokens.GREMLINX_TYPE_NAMESPACE;
-    }
-
-    public static final class Builder implements GraphSONModuleBuilder {
-
-        private Builder() {
-        }
-
-        @Override
-        public GraphSONModule create(final boolean normalize) {
-            return new GraphSONXModuleV3d0(normalize);
-        }
-    }
-}
\ No newline at end of file
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1.java
new file mode 100644
index 0000000..1ae3231
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1.java
@@ -0,0 +1,326 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+/**
+ * GraphSON serializers for classes in {@code java.time.*}.
+ */
+final class JavaTimeSerializersV1 {
+
+    private JavaTimeSerializersV1() {}
+
+    /**
+     * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
+     */
+    static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
+
+        public AbstractJavaTimeSerializer(final Class<T> clazz) {
+            super(clazz);
+        }
+
+        @Override
+        public void serialize(final T value, final JsonGenerator gen,
+                              final SerializerProvider serializerProvider) throws IOException {
+            gen.writeString(value.toString());
+        }
+
+        @Override
+        public void serializeWithType(final T value, final JsonGenerator gen,
+                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+            typeSer.writeTypePrefixForObject(value, gen);
+            gen.writeStringField(GraphSONTokens.VALUE, value.toString());
+            typeSer.writeTypeSuffixForObject(value, gen);
+        }
+    }
+    /**
+     * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
+     */
+    abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
+        public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
+            super(clazz);
+        }
+
+        public abstract T parse(final String val);
+
+        @Override
+        public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
+            if (!jsonParser.getText().equals(GraphSONTokens.VALUE))
+                throw new IOException(String.format("Invalid format for %s - expecting '%s' with a text value in ISO-8061 format", _valueClass.getSimpleName(), GraphSONTokens.VALUE));
+
+            return parse(jsonParser.nextTextValue());
+        }
+    }
+
+    final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
+
+        public DurationJacksonSerializer() {
+            super(Duration.class);
+        }
+    }
+
+    final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
+        public DurationJacksonDeserializer() {
+            super(Duration.class);
+        }
+
+        @Override
+        public Duration parse(final String val) {
+            return Duration.parse(val);
+        }
+    }
+
+    final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
+
+        public InstantJacksonSerializer() {
+            super(Instant.class);
+        }
+    }
+
+    final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
+        public InstantJacksonDeserializer() {
+            super(Instant.class);
+        }
+
+        @Override
+        public Instant parse(final String val) {
+            return Instant.parse(val);
+        }
+    }
+
+    final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
+
+        public LocalDateJacksonSerializer() {
+            super(LocalDate.class);
+        }
+    }
+
+    final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
+        public LocalDateJacksonDeserializer() {
+            super(LocalDate.class);
+        }
+
+        @Override
+        public LocalDate parse(final String val) {
+            return LocalDate.parse(val);
+        }
+    }
+
+    final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
+
+        public LocalDateTimeJacksonSerializer() {
+            super(LocalDateTime.class);
+        }
+    }
+
+    final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
+        public LocalDateTimeJacksonDeserializer() {
+            super(LocalDateTime.class);
+        }
+
+        @Override
+        public LocalDateTime parse(final String val) {
+            return LocalDateTime.parse(val);
+        }
+    }
+
+    final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
+
+        public LocalTimeJacksonSerializer() {
+            super(LocalTime.class);
+        }
+    }
+
+    final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
+        public LocalTimeJacksonDeserializer() {
+            super(LocalTime.class);
+        }
+
+        @Override
+        public LocalTime parse(final String val) {
+            return LocalTime.parse(val);
+        }
+    }
+
+    final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
+
+        public MonthDayJacksonSerializer() {
+            super(MonthDay.class);
+        }
+    }
+
+    final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
+        public MonthDayJacksonDeserializer() {
+            super(MonthDay.class);
+        }
+
+        @Override
+        public MonthDay parse(final String val) {
+            return MonthDay.parse(val);
+        }
+    }
+
+    final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
+
+        public OffsetDateTimeJacksonSerializer() {
+            super(OffsetDateTime.class);
+        }
+    }
+
+    final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
+        public OffsetDateTimeJacksonDeserializer() {
+            super(OffsetDateTime.class);
+        }
+
+        @Override
+        public OffsetDateTime parse(final String val) {
+            return OffsetDateTime.parse(val);
+        }
+    }
+
+    final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
+
+        public OffsetTimeJacksonSerializer() {
+            super(OffsetTime.class);
+        }
+    }
+
+    final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
+        public OffsetTimeJacksonDeserializer() {
+            super(OffsetTime.class);
+        }
+
+        @Override
+        public OffsetTime parse(final String val) {
+            return OffsetTime.parse(val);
+        }
+    }
+
+    final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
+
+        public PeriodJacksonSerializer() {
+            super(Period.class);
+        }
+    }
+
+    final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
+        public PeriodJacksonDeserializer() {
+            super(Period.class);
+        }
+
+        @Override
+        public Period parse(final String val) {
+            return Period.parse(val);
+        }
+    }
+
+    final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
+
+        public YearJacksonSerializer() {
+            super(Year.class);
+        }
+    }
+
+    final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
+        public YearJacksonDeserializer() {
+            super(Year.class);
+        }
+
+        @Override
+        public Year parse(final String val) {
+            return Year.parse(val);
+        }
+    }
+
+    final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
+
+        public YearMonthJacksonSerializer() {
+            super(YearMonth.class);
+        }
+    }
+
+    final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
+        public YearMonthJacksonDeserializer() {
+            super(YearMonth.class);
+        }
+
+        @Override
+        public YearMonth parse(final String val) {
+            return YearMonth.parse(val);
+        }
+    }
+
+    final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
+
+        public ZonedDateTimeJacksonSerializer() {
+            super(ZonedDateTime.class);
+        }
+    }
+
+    final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
+        public ZonedDateTimeJacksonDeserializer() {
+            super(ZonedDateTime.class);
+        }
+
+        @Override
+        public ZonedDateTime parse(final String val) {
+            return ZonedDateTime.parse(val);
+        }
+    }
+
+    final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
+
+        public ZoneOffsetJacksonSerializer() {
+            super(ZoneOffset.class);
+        }
+    }
+
+    final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
+        public ZoneOffsetJacksonDeserializer() {
+            super(ZoneOffset.class);
+        }
+
+        @Override
+        public ZoneOffset parse(final String val) {
+            return ZoneOffset.of(val);
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
deleted file mode 100644
index 763c1d9..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
-/**
- * GraphSON serializers for classes in {@code java.time.*}.
- */
-final class JavaTimeSerializersV1d0 {
-
-    private JavaTimeSerializersV1d0() {}
-
-    /**
-     * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
-     */
-    static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
-
-        public AbstractJavaTimeSerializer(final Class<T> clazz) {
-            super(clazz);
-        }
-
-        @Override
-        public void serialize(final T value, final JsonGenerator gen,
-                              final SerializerProvider serializerProvider) throws IOException {
-            gen.writeString(value.toString());
-        }
-
-        @Override
-        public void serializeWithType(final T value, final JsonGenerator gen,
-                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
-            typeSer.writeTypePrefixForObject(value, gen);
-            gen.writeStringField(GraphSONTokens.VALUE, value.toString());
-            typeSer.writeTypeSuffixForObject(value, gen);
-        }
-    }
-    /**
-     * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
-     */
-    abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
-        public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
-            super(clazz);
-        }
-
-        public abstract T parse(final String val);
-
-        @Override
-        public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
-            if (!jsonParser.getText().equals(GraphSONTokens.VALUE))
-                throw new IOException(String.format("Invalid format for %s - expecting '%s' with a text value in ISO-8061 format", _valueClass.getSimpleName(), GraphSONTokens.VALUE));
-
-            return parse(jsonParser.nextTextValue());
-        }
-    }
-
-    final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
-
-        public DurationJacksonSerializer() {
-            super(Duration.class);
-        }
-    }
-
-    final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
-        public DurationJacksonDeserializer() {
-            super(Duration.class);
-        }
-
-        @Override
-        public Duration parse(final String val) {
-            return Duration.parse(val);
-        }
-    }
-
-    final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
-
-        public InstantJacksonSerializer() {
-            super(Instant.class);
-        }
-    }
-
-    final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
-        public InstantJacksonDeserializer() {
-            super(Instant.class);
-        }
-
-        @Override
-        public Instant parse(final String val) {
-            return Instant.parse(val);
-        }
-    }
-
-    final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
-
-        public LocalDateJacksonSerializer() {
-            super(LocalDate.class);
-        }
-    }
-
-    final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
-        public LocalDateJacksonDeserializer() {
-            super(LocalDate.class);
-        }
-
-        @Override
-        public LocalDate parse(final String val) {
-            return LocalDate.parse(val);
-        }
-    }
-
-    final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
-
-        public LocalDateTimeJacksonSerializer() {
-            super(LocalDateTime.class);
-        }
-    }
-
-    final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
-        public LocalDateTimeJacksonDeserializer() {
-            super(LocalDateTime.class);
-        }
-
-        @Override
-        public LocalDateTime parse(final String val) {
-            return LocalDateTime.parse(val);
-        }
-    }
-
-    final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
-
-        public LocalTimeJacksonSerializer() {
-            super(LocalTime.class);
-        }
-    }
-
-    final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
-        public LocalTimeJacksonDeserializer() {
-            super(LocalTime.class);
-        }
-
-        @Override
-        public LocalTime parse(final String val) {
-            return LocalTime.parse(val);
-        }
-    }
-
-    final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
-
-        public MonthDayJacksonSerializer() {
-            super(MonthDay.class);
-        }
-    }
-
-    final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
-        public MonthDayJacksonDeserializer() {
-            super(MonthDay.class);
-        }
-
-        @Override
-        public MonthDay parse(final String val) {
-            return MonthDay.parse(val);
-        }
-    }
-
-    final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
-
-        public OffsetDateTimeJacksonSerializer() {
-            super(OffsetDateTime.class);
-        }
-    }
-
-    final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
-        public OffsetDateTimeJacksonDeserializer() {
-            super(OffsetDateTime.class);
-        }
-
-        @Override
-        public OffsetDateTime parse(final String val) {
-            return OffsetDateTime.parse(val);
-        }
-    }
-
-    final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
-
-        public OffsetTimeJacksonSerializer() {
-            super(OffsetTime.class);
-        }
-    }
-
-    final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
-        public OffsetTimeJacksonDeserializer() {
-            super(OffsetTime.class);
-        }
-
-        @Override
-        public OffsetTime parse(final String val) {
-            return OffsetTime.parse(val);
-        }
-    }
-
-    final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
-
-        public PeriodJacksonSerializer() {
-            super(Period.class);
-        }
-    }
-
-    final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
-        public PeriodJacksonDeserializer() {
-            super(Period.class);
-        }
-
-        @Override
-        public Period parse(final String val) {
-            return Period.parse(val);
-        }
-    }
-
-    final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
-
-        public YearJacksonSerializer() {
-            super(Year.class);
-        }
-    }
-
-    final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
-        public YearJacksonDeserializer() {
-            super(Year.class);
-        }
-
-        @Override
-        public Year parse(final String val) {
-            return Year.parse(val);
-        }
-    }
-
-    final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
-
-        public YearMonthJacksonSerializer() {
-            super(YearMonth.class);
-        }
-    }
-
-    final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
-        public YearMonthJacksonDeserializer() {
-            super(YearMonth.class);
-        }
-
-        @Override
-        public YearMonth parse(final String val) {
-            return YearMonth.parse(val);
-        }
-    }
-
-    final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
-
-        public ZonedDateTimeJacksonSerializer() {
-            super(ZonedDateTime.class);
-        }
-    }
-
-    final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
-        public ZonedDateTimeJacksonDeserializer() {
-            super(ZonedDateTime.class);
-        }
-
-        @Override
-        public ZonedDateTime parse(final String val) {
-            return ZonedDateTime.parse(val);
-        }
-    }
-
-    final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
-
-        public ZoneOffsetJacksonSerializer() {
-            super(ZoneOffset.class);
-        }
-    }
-
-    final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
-        public ZoneOffsetJacksonDeserializer() {
-            super(ZoneOffset.class);
-        }
-
-        @Override
-        public ZoneOffset parse(final String val) {
-            return ZoneOffset.of(val);
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2.java
new file mode 100644
index 0000000..64d4f01
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2.java
@@ -0,0 +1,328 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+/**
+ * GraphSON serializers for classes in {@code java.time.*} for the version 2.0 of GraphSON.
+ */
+final class JavaTimeSerializersV2 {
+
+    private JavaTimeSerializersV2() {}
+
+    /**
+     * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
+     */
+    static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
+
+        public AbstractJavaTimeSerializer(final Class<T> clazz) {
+            super(clazz);
+        }
+
+        @Override
+        public void serialize(final T value, final JsonGenerator gen,
+                              final SerializerProvider serializerProvider) throws IOException {
+            gen.writeString(value.toString());
+        }
+
+        @Override
+        public void serializeWithType(final T value, final JsonGenerator gen,
+                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+            typeSer.writeTypePrefixForScalar(value, gen);
+            gen.writeString(value.toString());
+            typeSer.writeTypeSuffixForScalar(value, gen);
+        }
+    }
+    /**
+     * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
+     */
+    abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
+        public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
+            super(clazz);
+        }
+
+        public abstract T parse(final String val);
+
+        @Override
+        public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
+            return parse(jsonParser.getText());
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
+
+        public DurationJacksonSerializer() {
+            super(Duration.class);
+        }
+    }
+
+    final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
+        public DurationJacksonDeserializer() {
+            super(Duration.class);
+        }
+
+        @Override
+        public Duration parse(final String val) {
+            return Duration.parse(val);
+        }
+    }
+
+    final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
+
+        public InstantJacksonSerializer() {
+            super(Instant.class);
+        }
+    }
+
+    final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
+        public InstantJacksonDeserializer() {
+            super(Instant.class);
+        }
+
+        @Override
+        public Instant parse(final String val) {
+            return Instant.parse(val);
+        }
+    }
+
+    final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
+
+        public LocalDateJacksonSerializer() {
+            super(LocalDate.class);
+        }
+    }
+
+    final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
+        public LocalDateJacksonDeserializer() {
+            super(LocalDate.class);
+        }
+
+        @Override
+        public LocalDate parse(final String val) {
+            return LocalDate.parse(val);
+        }
+    }
+
+    final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
+
+        public LocalDateTimeJacksonSerializer() {
+            super(LocalDateTime.class);
+        }
+    }
+
+    final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
+        public LocalDateTimeJacksonDeserializer() {
+            super(LocalDateTime.class);
+        }
+
+        @Override
+        public LocalDateTime parse(final String val) {
+            return LocalDateTime.parse(val);
+        }
+    }
+
+    final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
+
+        public LocalTimeJacksonSerializer() {
+            super(LocalTime.class);
+        }
+    }
+
+    final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
+        public LocalTimeJacksonDeserializer() {
+            super(LocalTime.class);
+        }
+
+        @Override
+        public LocalTime parse(final String val) {
+            return LocalTime.parse(val);
+        }
+    }
+
+    final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
+
+        public MonthDayJacksonSerializer() {
+            super(MonthDay.class);
+        }
+    }
+
+    final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
+        public MonthDayJacksonDeserializer() {
+            super(MonthDay.class);
+        }
+
+        @Override
+        public MonthDay parse(final String val) {
+            return MonthDay.parse(val);
+        }
+    }
+
+    final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
+
+        public OffsetDateTimeJacksonSerializer() {
+            super(OffsetDateTime.class);
+        }
+    }
+
+    final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
+        public OffsetDateTimeJacksonDeserializer() {
+            super(OffsetDateTime.class);
+        }
+
+        @Override
+        public OffsetDateTime parse(final String val) {
+            return OffsetDateTime.parse(val);
+        }
+    }
+
+    final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
+
+        public OffsetTimeJacksonSerializer() {
+            super(OffsetTime.class);
+        }
+    }
+
+    final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
+        public OffsetTimeJacksonDeserializer() {
+            super(OffsetTime.class);
+        }
+
+        @Override
+        public OffsetTime parse(final String val) {
+            return OffsetTime.parse(val);
+        }
+    }
+
+    final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
+
+        public PeriodJacksonSerializer() {
+            super(Period.class);
+        }
+    }
+
+    final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
+        public PeriodJacksonDeserializer() {
+            super(Period.class);
+        }
+
+        @Override
+        public Period parse(final String val) {
+            return Period.parse(val);
+        }
+    }
+
+    final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
+
+        public YearJacksonSerializer() {
+            super(Year.class);
+        }
+    }
+
+    final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
+        public YearJacksonDeserializer() {
+            super(Year.class);
+        }
+
+        @Override
+        public Year parse(final String val) {
+            return Year.parse(val);
+        }
+    }
+
+    final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
+
+        public YearMonthJacksonSerializer() {
+            super(YearMonth.class);
+        }
+    }
+
+    final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
+        public YearMonthJacksonDeserializer() {
+            super(YearMonth.class);
+        }
+
+        @Override
+        public YearMonth parse(final String val) {
+            return YearMonth.parse(val);
+        }
+    }
+
+    final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
+
+        public ZonedDateTimeJacksonSerializer() {
+            super(ZonedDateTime.class);
+        }
+    }
+
+    final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
+        public ZonedDateTimeJacksonDeserializer() {
+            super(ZonedDateTime.class);
+        }
+
+        @Override
+        public ZonedDateTime parse(final String val) {
+            return ZonedDateTime.parse(val);
+        }
+    }
+
+    final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
+
+        public ZoneOffsetJacksonSerializer() {
+            super(ZoneOffset.class);
+        }
+    }
+
+    final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
+        public ZoneOffsetJacksonDeserializer() {
+            super(ZoneOffset.class);
+        }
+
+        @Override
+        public ZoneOffset parse(final String val) {
+            return ZoneOffset.of(val);
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
deleted file mode 100644
index 9401d51..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
-/**
- * GraphSON serializers for classes in {@code java.time.*} for the version 2.0 of GraphSON.
- */
-final class JavaTimeSerializersV2d0 {
-
-    private JavaTimeSerializersV2d0() {}
-
-    /**
-     * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
-     */
-    static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
-
-        public AbstractJavaTimeSerializer(final Class<T> clazz) {
-            super(clazz);
-        }
-
-        @Override
-        public void serialize(final T value, final JsonGenerator gen,
-                              final SerializerProvider serializerProvider) throws IOException {
-            gen.writeString(value.toString());
-        }
-
-        @Override
-        public void serializeWithType(final T value, final JsonGenerator gen,
-                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
-            typeSer.writeTypePrefixForScalar(value, gen);
-            gen.writeString(value.toString());
-            typeSer.writeTypeSuffixForScalar(value, gen);
-        }
-    }
-    /**
-     * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
-     */
-    abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
-        public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
-            super(clazz);
-        }
-
-        public abstract T parse(final String val);
-
-        @Override
-        public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
-            return parse(jsonParser.getText());
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
-
-        public DurationJacksonSerializer() {
-            super(Duration.class);
-        }
-    }
-
-    final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
-        public DurationJacksonDeserializer() {
-            super(Duration.class);
-        }
-
-        @Override
-        public Duration parse(final String val) {
-            return Duration.parse(val);
-        }
-    }
-
-    final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
-
-        public InstantJacksonSerializer() {
-            super(Instant.class);
-        }
-    }
-
-    final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
-        public InstantJacksonDeserializer() {
-            super(Instant.class);
-        }
-
-        @Override
-        public Instant parse(final String val) {
-            return Instant.parse(val);
-        }
-    }
-
-    final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
-
-        public LocalDateJacksonSerializer() {
-            super(LocalDate.class);
-        }
-    }
-
-    final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
-        public LocalDateJacksonDeserializer() {
-            super(LocalDate.class);
-        }
-
-        @Override
-        public LocalDate parse(final String val) {
-            return LocalDate.parse(val);
-        }
-    }
-
-    final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
-
-        public LocalDateTimeJacksonSerializer() {
-            super(LocalDateTime.class);
-        }
-    }
-
-    final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
-        public LocalDateTimeJacksonDeserializer() {
-            super(LocalDateTime.class);
-        }
-
-        @Override
-        public LocalDateTime parse(final String val) {
-            return LocalDateTime.parse(val);
-        }
-    }
-
-    final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
-
-        public LocalTimeJacksonSerializer() {
-            super(LocalTime.class);
-        }
-    }
-
-    final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
-        public LocalTimeJacksonDeserializer() {
-            super(LocalTime.class);
-        }
-
-        @Override
-        public LocalTime parse(final String val) {
-            return LocalTime.parse(val);
-        }
-    }
-
-    final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
-
-        public MonthDayJacksonSerializer() {
-            super(MonthDay.class);
-        }
-    }
-
-    final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
-        public MonthDayJacksonDeserializer() {
-            super(MonthDay.class);
-        }
-
-        @Override
-        public MonthDay parse(final String val) {
-            return MonthDay.parse(val);
-        }
-    }
-
-    final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
-
-        public OffsetDateTimeJacksonSerializer() {
-            super(OffsetDateTime.class);
-        }
-    }
-
-    final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
-        public OffsetDateTimeJacksonDeserializer() {
-            super(OffsetDateTime.class);
-        }
-
-        @Override
-        public OffsetDateTime parse(final String val) {
-            return OffsetDateTime.parse(val);
-        }
-    }
-
-    final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
-
-        public OffsetTimeJacksonSerializer() {
-            super(OffsetTime.class);
-        }
-    }
-
-    final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
-        public OffsetTimeJacksonDeserializer() {
-            super(OffsetTime.class);
-        }
-
-        @Override
-        public OffsetTime parse(final String val) {
-            return OffsetTime.parse(val);
-        }
-    }
-
-    final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
-
-        public PeriodJacksonSerializer() {
-            super(Period.class);
-        }
-    }
-
-    final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
-        public PeriodJacksonDeserializer() {
-            super(Period.class);
-        }
-
-        @Override
-        public Period parse(final String val) {
-            return Period.parse(val);
-        }
-    }
-
-    final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
-
-        public YearJacksonSerializer() {
-            super(Year.class);
-        }
-    }
-
-    final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
-        public YearJacksonDeserializer() {
-            super(Year.class);
-        }
-
-        @Override
-        public Year parse(final String val) {
-            return Year.parse(val);
-        }
-    }
-
-    final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
-
-        public YearMonthJacksonSerializer() {
-            super(YearMonth.class);
-        }
-    }
-
-    final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
-        public YearMonthJacksonDeserializer() {
-            super(YearMonth.class);
-        }
-
-        @Override
-        public YearMonth parse(final String val) {
-            return YearMonth.parse(val);
-        }
-    }
-
-    final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
-
-        public ZonedDateTimeJacksonSerializer() {
-            super(ZonedDateTime.class);
-        }
-    }
-
-    final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
-        public ZonedDateTimeJacksonDeserializer() {
-            super(ZonedDateTime.class);
-        }
-
-        @Override
-        public ZonedDateTime parse(final String val) {
-            return ZonedDateTime.parse(val);
-        }
-    }
-
-    final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
-
-        public ZoneOffsetJacksonSerializer() {
-            super(ZoneOffset.class);
-        }
-    }
-
-    final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
-        public ZoneOffsetJacksonDeserializer() {
-            super(ZoneOffset.class);
-        }
-
-        @Override
-        public ZoneOffset parse(final String val) {
-            return ZoneOffset.of(val);
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV3.java
new file mode 100644
index 0000000..06ddbeb
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV3.java
@@ -0,0 +1,328 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+/**
+ * GraphSON serializers for classes in {@code java.time.*} for the version 3.0 of GraphSON.
+ */
+final class JavaTimeSerializersV3 {
+
+    private JavaTimeSerializersV3() {}
+
+    /**
+     * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
+     */
+    static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
+
+        public AbstractJavaTimeSerializer(final Class<T> clazz) {
+            super(clazz);
+        }
+
+        @Override
+        public void serialize(final T value, final JsonGenerator gen,
+                              final SerializerProvider serializerProvider) throws IOException {
+            gen.writeString(value.toString());
+        }
+
+        @Override
+        public void serializeWithType(final T value, final JsonGenerator gen,
+                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+            typeSer.writeTypePrefixForScalar(value, gen);
+            gen.writeString(value.toString());
+            typeSer.writeTypeSuffixForScalar(value, gen);
+        }
+    }
+    /**
+     * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
+     */
+    abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
+        public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
+            super(clazz);
+        }
+
+        public abstract T parse(final String val);
+
+        @Override
+        public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
+            return parse(jsonParser.getText());
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
+
+        public DurationJacksonSerializer() {
+            super(Duration.class);
+        }
+    }
+
+    final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
+        public DurationJacksonDeserializer() {
+            super(Duration.class);
+        }
+
+        @Override
+        public Duration parse(final String val) {
+            return Duration.parse(val);
+        }
+    }
+
+    final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
+
+        public InstantJacksonSerializer() {
+            super(Instant.class);
+        }
+    }
+
+    final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
+        public InstantJacksonDeserializer() {
+            super(Instant.class);
+        }
+
+        @Override
+        public Instant parse(final String val) {
+            return Instant.parse(val);
+        }
+    }
+
+    final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
+
+        public LocalDateJacksonSerializer() {
+            super(LocalDate.class);
+        }
+    }
+
+    final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
+        public LocalDateJacksonDeserializer() {
+            super(LocalDate.class);
+        }
+
+        @Override
+        public LocalDate parse(final String val) {
+            return LocalDate.parse(val);
+        }
+    }
+
+    final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
+
+        public LocalDateTimeJacksonSerializer() {
+            super(LocalDateTime.class);
+        }
+    }
+
+    final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
+        public LocalDateTimeJacksonDeserializer() {
+            super(LocalDateTime.class);
+        }
+
+        @Override
+        public LocalDateTime parse(final String val) {
+            return LocalDateTime.parse(val);
+        }
+    }
+
+    final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
+
+        public LocalTimeJacksonSerializer() {
+            super(LocalTime.class);
+        }
+    }
+
+    final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
+        public LocalTimeJacksonDeserializer() {
+            super(LocalTime.class);
+        }
+
+        @Override
+        public LocalTime parse(final String val) {
+            return LocalTime.parse(val);
+        }
+    }
+
+    final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
+
+        public MonthDayJacksonSerializer() {
+            super(MonthDay.class);
+        }
+    }
+
+    final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
+        public MonthDayJacksonDeserializer() {
+            super(MonthDay.class);
+        }
+
+        @Override
+        public MonthDay parse(final String val) {
+            return MonthDay.parse(val);
+        }
+    }
+
+    final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
+
+        public OffsetDateTimeJacksonSerializer() {
+            super(OffsetDateTime.class);
+        }
+    }
+
+    final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
+        public OffsetDateTimeJacksonDeserializer() {
+            super(OffsetDateTime.class);
+        }
+
+        @Override
+        public OffsetDateTime parse(final String val) {
+            return OffsetDateTime.parse(val);
+        }
+    }
+
+    final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
+
+        public OffsetTimeJacksonSerializer() {
+            super(OffsetTime.class);
+        }
+    }
+
+    final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
+        public OffsetTimeJacksonDeserializer() {
+            super(OffsetTime.class);
+        }
+
+        @Override
+        public OffsetTime parse(final String val) {
+            return OffsetTime.parse(val);
+        }
+    }
+
+    final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
+
+        public PeriodJacksonSerializer() {
+            super(Period.class);
+        }
+    }
+
+    final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
+        public PeriodJacksonDeserializer() {
+            super(Period.class);
+        }
+
+        @Override
+        public Period parse(final String val) {
+            return Period.parse(val);
+        }
+    }
+
+    final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
+
+        public YearJacksonSerializer() {
+            super(Year.class);
+        }
+    }
+
+    final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
+        public YearJacksonDeserializer() {
+            super(Year.class);
+        }
+
+        @Override
+        public Year parse(final String val) {
+            return Year.parse(val);
+        }
+    }
+
+    final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
+
+        public YearMonthJacksonSerializer() {
+            super(YearMonth.class);
+        }
+    }
+
+    final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
+        public YearMonthJacksonDeserializer() {
+            super(YearMonth.class);
+        }
+
+        @Override
+        public YearMonth parse(final String val) {
+            return YearMonth.parse(val);
+        }
+    }
+
+    final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
+
+        public ZonedDateTimeJacksonSerializer() {
+            super(ZonedDateTime.class);
+        }
+    }
+
+    final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
+        public ZonedDateTimeJacksonDeserializer() {
+            super(ZonedDateTime.class);
+        }
+
+        @Override
+        public ZonedDateTime parse(final String val) {
+            return ZonedDateTime.parse(val);
+        }
+    }
+
+    final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
+
+        public ZoneOffsetJacksonSerializer() {
+            super(ZoneOffset.class);
+        }
+    }
+
+    final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
+        public ZoneOffsetJacksonDeserializer() {
+            super(ZoneOffset.class);
+        }
+
+        @Override
+        public ZoneOffset parse(final String val) {
+            return ZoneOffset.of(val);
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV3d0.java
deleted file mode 100644
index c1668e2..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV3d0.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
-/**
- * GraphSON serializers for classes in {@code java.time.*} for the version 3.0 of GraphSON.
- */
-final class JavaTimeSerializersV3d0 {
-
-    private JavaTimeSerializersV3d0() {}
-
-    /**
-     * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
-     */
-    static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
-
-        public AbstractJavaTimeSerializer(final Class<T> clazz) {
-            super(clazz);
-        }
-
-        @Override
-        public void serialize(final T value, final JsonGenerator gen,
-                              final SerializerProvider serializerProvider) throws IOException {
-            gen.writeString(value.toString());
-        }
-
-        @Override
-        public void serializeWithType(final T value, final JsonGenerator gen,
-                                      final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
-            typeSer.writeTypePrefixForScalar(value, gen);
-            gen.writeString(value.toString());
-            typeSer.writeTypeSuffixForScalar(value, gen);
-        }
-    }
-    /**
-     * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
-     */
-    abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
-        public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
-            super(clazz);
-        }
-
-        public abstract T parse(final String val);
-
-        @Override
-        public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
-            return parse(jsonParser.getText());
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
-
-        public DurationJacksonSerializer() {
-            super(Duration.class);
-        }
-    }
-
-    final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
-        public DurationJacksonDeserializer() {
-            super(Duration.class);
-        }
-
-        @Override
-        public Duration parse(final String val) {
-            return Duration.parse(val);
-        }
-    }
-
-    final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
-
-        public InstantJacksonSerializer() {
-            super(Instant.class);
-        }
-    }
-
-    final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
-        public InstantJacksonDeserializer() {
-            super(Instant.class);
-        }
-
-        @Override
-        public Instant parse(final String val) {
-            return Instant.parse(val);
-        }
-    }
-
-    final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
-
-        public LocalDateJacksonSerializer() {
-            super(LocalDate.class);
-        }
-    }
-
-    final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
-        public LocalDateJacksonDeserializer() {
-            super(LocalDate.class);
-        }
-
-        @Override
-        public LocalDate parse(final String val) {
-            return LocalDate.parse(val);
-        }
-    }
-
-    final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
-
-        public LocalDateTimeJacksonSerializer() {
-            super(LocalDateTime.class);
-        }
-    }
-
-    final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
-        public LocalDateTimeJacksonDeserializer() {
-            super(LocalDateTime.class);
-        }
-
-        @Override
-        public LocalDateTime parse(final String val) {
-            return LocalDateTime.parse(val);
-        }
-    }
-
-    final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
-
-        public LocalTimeJacksonSerializer() {
-            super(LocalTime.class);
-        }
-    }
-
-    final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
-        public LocalTimeJacksonDeserializer() {
-            super(LocalTime.class);
-        }
-
-        @Override
-        public LocalTime parse(final String val) {
-            return LocalTime.parse(val);
-        }
-    }
-
-    final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
-
-        public MonthDayJacksonSerializer() {
-            super(MonthDay.class);
-        }
-    }
-
-    final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
-        public MonthDayJacksonDeserializer() {
-            super(MonthDay.class);
-        }
-
-        @Override
-        public MonthDay parse(final String val) {
-            return MonthDay.parse(val);
-        }
-    }
-
-    final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
-
-        public OffsetDateTimeJacksonSerializer() {
-            super(OffsetDateTime.class);
-        }
-    }
-
-    final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
-        public OffsetDateTimeJacksonDeserializer() {
-            super(OffsetDateTime.class);
-        }
-
-        @Override
-        public OffsetDateTime parse(final String val) {
-            return OffsetDateTime.parse(val);
-        }
-    }
-
-    final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
-
-        public OffsetTimeJacksonSerializer() {
-            super(OffsetTime.class);
-        }
-    }
-
-    final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
-        public OffsetTimeJacksonDeserializer() {
-            super(OffsetTime.class);
-        }
-
-        @Override
-        public OffsetTime parse(final String val) {
-            return OffsetTime.parse(val);
-        }
-    }
-
-    final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
-
-        public PeriodJacksonSerializer() {
-            super(Period.class);
-        }
-    }
-
-    final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
-        public PeriodJacksonDeserializer() {
-            super(Period.class);
-        }
-
-        @Override
-        public Period parse(final String val) {
-            return Period.parse(val);
-        }
-    }
-
-    final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
-
-        public YearJacksonSerializer() {
-            super(Year.class);
-        }
-    }
-
-    final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
-        public YearJacksonDeserializer() {
-            super(Year.class);
-        }
-
-        @Override
-        public Year parse(final String val) {
-            return Year.parse(val);
-        }
-    }
-
-    final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
-
-        public YearMonthJacksonSerializer() {
-            super(YearMonth.class);
-        }
-    }
-
-    final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
-        public YearMonthJacksonDeserializer() {
-            super(YearMonth.class);
-        }
-
-        @Override
-        public YearMonth parse(final String val) {
-            return YearMonth.parse(val);
-        }
-    }
-
-    final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
-
-        public ZonedDateTimeJacksonSerializer() {
-            super(ZonedDateTime.class);
-        }
-    }
-
-    final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
-        public ZonedDateTimeJacksonDeserializer() {
-            super(ZonedDateTime.class);
-        }
-
-        @Override
-        public ZonedDateTime parse(final String val) {
-            return ZonedDateTime.parse(val);
-        }
-    }
-
-    final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
-
-        public ZoneOffsetJacksonSerializer() {
-            super(ZoneOffset.class);
-        }
-    }
-
-    final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
-        public ZoneOffsetJacksonDeserializer() {
-            super(ZoneOffset.class);
-        }
-
-        @Override
-        public ZoneOffset parse(final String val) {
-            return ZoneOffset.of(val);
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1.java
new file mode 100644
index 0000000..82d1b62
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializationFeature;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * GraphSON serializers for classes in {@code java.util.*}.
+ */
+final class JavaUtilSerializersV1 {
+
+    private JavaUtilSerializersV1() {}
+
+    final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
+
+        public MapEntryJacksonSerializer() {
+            super(Map.Entry.class);
+        }
+
+        @Override
+        public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            ser(entry, jsonGenerator, serializerProvider, null);
+        }
+
+        @Override
+        public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            ser(entry, jsonGenerator, serializerProvider, typeSerializer);
+        }
+
+        private static void ser(final Map.Entry entry, final JsonGenerator jsonGenerator,
+                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            jsonGenerator.writeStartObject();
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+
+            // this treatment of keys is consistent with the current GraphSONKeySerializer which extends the
+            // StdKeySerializer
+            final Object key = entry.getKey();
+            final Class cls = key.getClass();
+            String k;
+            if (cls == String.class)
+                k = (String) key;
+            else if (Element.class.isAssignableFrom(cls))
+                k = ((Element) key).id().toString();
+            else if(Date.class.isAssignableFrom(cls)) {
+                if (serializerProvider.isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS))
+                    k = String.valueOf(((Date) key).getTime());
+                else
+                    k = serializerProvider.getConfig().getDateFormat().format((Date) key);
+            } else if(cls == Class.class)
+                k = ((Class) key).getName();
+            else
+                k = key.toString();
+
+            serializerProvider.defaultSerializeField(k, entry.getValue(), jsonGenerator);
+            jsonGenerator.writeEndObject();
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1d0.java
deleted file mode 100644
index 15dd3b9..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1d0.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializationFeature;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * GraphSON serializers for classes in {@code java.util.*}.
- */
-final class JavaUtilSerializersV1d0 {
-
-    private JavaUtilSerializersV1d0() {}
-
-    final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
-
-        public MapEntryJacksonSerializer() {
-            super(Map.Entry.class);
-        }
-
-        @Override
-        public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            ser(entry, jsonGenerator, serializerProvider, null);
-        }
-
-        @Override
-        public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            ser(entry, jsonGenerator, serializerProvider, typeSerializer);
-        }
-
-        private static void ser(final Map.Entry entry, final JsonGenerator jsonGenerator,
-                                final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            jsonGenerator.writeStartObject();
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-
-            // this treatment of keys is consistent with the current GraphSONKeySerializer which extends the
-            // StdKeySerializer
-            final Object key = entry.getKey();
-            final Class cls = key.getClass();
-            String k;
-            if (cls == String.class)
-                k = (String) key;
-            else if (Element.class.isAssignableFrom(cls))
-                k = ((Element) key).id().toString();
-            else if(Date.class.isAssignableFrom(cls)) {
-                if (serializerProvider.isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS))
-                    k = String.valueOf(((Date) key).getTime());
-                else
-                    k = serializerProvider.getConfig().getDateFormat().format((Date) key);
-            } else if(cls == Class.class)
-                k = ((Class) key).getName();
-            else
-                k = key.toString();
-
-            serializerProvider.defaultSerializeField(k, entry.getValue(), jsonGenerator);
-            jsonGenerator.writeEndObject();
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2.java
new file mode 100644
index 0000000..8922528
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializationFeature;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * GraphSON serializers for classes in {@code java.util.*} for the version 2.0 of GraphSON.
+ */
+final class JavaUtilSerializersV2 {
+
+    private JavaUtilSerializersV2() {}
+
+    final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
+
+        public MapEntryJacksonSerializer() {
+            super(Map.Entry.class);
+        }
+
+        @Override
+        public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            ser(entry, jsonGenerator, serializerProvider);
+            jsonGenerator.writeEndObject();
+        }
+
+        @Override
+        public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            typeSerializer.writeTypePrefixForObject(entry, jsonGenerator);
+            ser(entry, jsonGenerator, serializerProvider);
+            typeSerializer.writeTypeSuffixForObject(entry, jsonGenerator);
+        }
+
+        private static void ser(final Map.Entry entry, final JsonGenerator jsonGenerator,
+                                final SerializerProvider serializerProvider) throws IOException {
+            // this treatment of keys is consistent with the current GraphSONKeySerializer which extends the
+            // StdKeySerializer
+            final Object key = entry.getKey();
+            final Class cls = key.getClass();
+            String k;
+            if (cls == String.class)
+                k = (String) key;
+            else if (Element.class.isAssignableFrom(cls))
+                k = ((Element) key).id().toString();
+            else if(Date.class.isAssignableFrom(cls)) {
+                if (serializerProvider.isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS))
+                    k = String.valueOf(((Date) key).getTime());
+                else
+                    k = serializerProvider.getConfig().getDateFormat().format((Date) key);
+            } else if(cls == Class.class)
+                k = ((Class) key).getName();
+            else
+                k = key.toString();
+
+            serializerProvider.defaultSerializeField(k, entry.getValue(), jsonGenerator);
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2d0.java
deleted file mode 100644
index 8d867c9..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2d0.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializationFeature;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.ByteBufferSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * GraphSON serializers for classes in {@code java.util.*} for the version 2.0 of GraphSON.
- */
-final class JavaUtilSerializersV2d0 {
-
-    private JavaUtilSerializersV2d0() {}
-
-    final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
-
-        public MapEntryJacksonSerializer() {
-            super(Map.Entry.class);
-        }
-
-        @Override
-        public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            ser(entry, jsonGenerator, serializerProvider);
-            jsonGenerator.writeEndObject();
-        }
-
-        @Override
-        public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            typeSerializer.writeTypePrefixForObject(entry, jsonGenerator);
-            ser(entry, jsonGenerator, serializerProvider);
-            typeSerializer.writeTypeSuffixForObject(entry, jsonGenerator);
-        }
-
-        private static void ser(final Map.Entry entry, final JsonGenerator jsonGenerator,
-                                final SerializerProvider serializerProvider) throws IOException {
-            // this treatment of keys is consistent with the current GraphSONKeySerializer which extends the
-            // StdKeySerializer
-            final Object key = entry.getKey();
-            final Class cls = key.getClass();
-            String k;
-            if (cls == String.class)
-                k = (String) key;
-            else if (Element.class.isAssignableFrom(cls))
-                k = ((Element) key).id().toString();
-            else if(Date.class.isAssignableFrom(cls)) {
-                if (serializerProvider.isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS))
-                    k = String.valueOf(((Date) key).getTime());
-                else
-                    k = serializerProvider.getConfig().getDateFormat().format((Date) key);
-            } else if(cls == Class.class)
-                k = ((Class) key).getName();
-            else
-                k = key.toString();
-
-            serializerProvider.defaultSerializeField(k, entry.getValue(), jsonGenerator);
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV3.java
new file mode 100644
index 0000000..47faf5a
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV3.java
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * GraphSON serializers for classes in {@code java.util.*} for the version 3.0 of GraphSON.
+ */
+final class JavaUtilSerializersV3 {
+
+    private JavaUtilSerializersV3() {}
+
+    ////////////////////////////// SERIALIZERS /////////////////////////////////
+
+    final static class MapJacksonSerializer extends StdSerializer<Map> {
+        public MapJacksonSerializer() {
+            super(Map.class);
+        }
+
+        @Override
+        public void serialize(final Map map, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            for(Map.Entry entry : (Set<Map.Entry>) map.entrySet()) {
+                jsonGenerator.writeObject(entry.getKey());
+                jsonGenerator.writeObject(entry.getValue());
+            }
+        }
+
+        @Override
+        public void serializeWithType(final Map map, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            typeSerializer.writeTypePrefixForObject(map, jsonGenerator);
+            serialize(map, jsonGenerator, serializerProvider);
+            typeSerializer.writeTypeSuffixForObject(map, jsonGenerator);
+        }
+    }
+
+    /**
+     * Coerces {@code Map.Entry} to a {@code Map} with a single entry in it.
+     */
+    final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
+
+        public MapEntryJacksonSerializer() {
+            super(Map.Entry.class);
+        }
+
+        @Override
+        public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            final Map<Object,Object> m = new HashMap<>();
+            if (entry != null) m.put(entry.getKey(), entry.getValue());
+            jsonGenerator.writeObject(m);
+        }
+
+        @Override
+        public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            serialize(entry, jsonGenerator, serializerProvider);
+        }
+    }
+
+    final static class SetJacksonSerializer extends StdSerializer<Set> {
+        public SetJacksonSerializer() {
+            super(Set.class);
+        }
+
+        @Override
+        public void serialize(final Set set, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            for(Object o : set) {
+                jsonGenerator.writeObject(o);
+            }
+        }
+
+        @Override
+        public void serializeWithType(final Set set, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            typeSerializer.writeTypePrefixForArray(set, jsonGenerator);
+            serialize(set, jsonGenerator, serializerProvider);
+            typeSerializer.writeTypeSuffixForArray(set, jsonGenerator);
+        }
+    }
+
+    final static class ListJacksonSerializer extends StdSerializer<List> {
+        public ListJacksonSerializer() {
+            super(List.class);
+        }
+
+        @Override
+        public void serialize(final List list, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            for(Object o : list) {
+                jsonGenerator.writeObject(o);
+            }
+        }
+
+        @Override
+        public void serializeWithType(final List list, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            typeSerializer.writeTypePrefixForArray(list, jsonGenerator);
+            serialize(list, jsonGenerator, serializerProvider);
+            typeSerializer.writeTypeSuffixForArray(list, jsonGenerator);
+        }
+    }
+
+    ////////////////////////////// DESERIALIZERS /////////////////////////////////
+
+
+    static class MapJacksonDeserializer extends StdDeserializer<Map> {
+
+        protected MapJacksonDeserializer() {
+            super(Map.class);
+        }
+
+        @Override
+        public Map deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Map<Object,Object> m = new LinkedHashMap<>();
+
+            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                final Object key = deserializationContext.readValue(jsonParser, Object.class);
+                jsonParser.nextToken();
+                final Object val = deserializationContext.readValue(jsonParser, Object.class);
+                m.put(key, val);
+            }
+
+            return m;
+        }
+    }
+
+    static class SetJacksonDeserializer extends StdDeserializer<Set> {
+
+        protected SetJacksonDeserializer() {
+            super(Set.class);
+        }
+
+        @Override
+        public Set deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Set<Object> s = new LinkedHashSet<>();
+
+            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                s.add(deserializationContext.readValue(jsonParser, Object.class));
+            }
+
+            return s;
+        }
+    }
+
+    static class ListJacksonDeserializer extends StdDeserializer<List> {
+
+        protected ListJacksonDeserializer() {
+            super(List.class);
+        }
+
+        @Override
+        public List deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final List<Object> s = new LinkedList<>();
+
+            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                s.add(deserializationContext.readValue(jsonParser, Object.class));
+            }
+
+            return s;
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV3d0.java
deleted file mode 100644
index f5c4da8..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV3d0.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * GraphSON serializers for classes in {@code java.util.*} for the version 3.0 of GraphSON.
- */
-final class JavaUtilSerializersV3d0 {
-
-    private JavaUtilSerializersV3d0() {}
-
-    ////////////////////////////// SERIALIZERS /////////////////////////////////
-
-    final static class MapJacksonSerializer extends StdSerializer<Map> {
-        public MapJacksonSerializer() {
-            super(Map.class);
-        }
-
-        @Override
-        public void serialize(final Map map, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            for(Map.Entry entry : (Set<Map.Entry>) map.entrySet()) {
-                jsonGenerator.writeObject(entry.getKey());
-                jsonGenerator.writeObject(entry.getValue());
-            }
-        }
-
-        @Override
-        public void serializeWithType(final Map map, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            typeSerializer.writeTypePrefixForObject(map, jsonGenerator);
-            serialize(map, jsonGenerator, serializerProvider);
-            typeSerializer.writeTypeSuffixForObject(map, jsonGenerator);
-        }
-    }
-
-    /**
-     * Coerces {@code Map.Entry} to a {@code Map} with a single entry in it.
-     */
-    final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
-
-        public MapEntryJacksonSerializer() {
-            super(Map.Entry.class);
-        }
-
-        @Override
-        public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            final Map<Object,Object> m = new HashMap<>();
-            if (entry != null) m.put(entry.getKey(), entry.getValue());
-            jsonGenerator.writeObject(m);
-        }
-
-        @Override
-        public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            serialize(entry, jsonGenerator, serializerProvider);
-        }
-    }
-
-    final static class SetJacksonSerializer extends StdSerializer<Set> {
-        public SetJacksonSerializer() {
-            super(Set.class);
-        }
-
-        @Override
-        public void serialize(final Set set, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            for(Object o : set) {
-                jsonGenerator.writeObject(o);
-            }
-        }
-
-        @Override
-        public void serializeWithType(final Set set, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            typeSerializer.writeTypePrefixForArray(set, jsonGenerator);
-            serialize(set, jsonGenerator, serializerProvider);
-            typeSerializer.writeTypeSuffixForArray(set, jsonGenerator);
-        }
-    }
-
-    final static class ListJacksonSerializer extends StdSerializer<List> {
-        public ListJacksonSerializer() {
-            super(List.class);
-        }
-
-        @Override
-        public void serialize(final List list, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            for(Object o : list) {
-                jsonGenerator.writeObject(o);
-            }
-        }
-
-        @Override
-        public void serializeWithType(final List list, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            typeSerializer.writeTypePrefixForArray(list, jsonGenerator);
-            serialize(list, jsonGenerator, serializerProvider);
-            typeSerializer.writeTypeSuffixForArray(list, jsonGenerator);
-        }
-    }
-
-    ////////////////////////////// DESERIALIZERS /////////////////////////////////
-
-
-    static class MapJacksonDeserializer extends StdDeserializer<Map> {
-
-        protected MapJacksonDeserializer() {
-            super(Map.class);
-        }
-
-        @Override
-        public Map deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Map<Object,Object> m = new LinkedHashMap<>();
-
-            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                final Object key = deserializationContext.readValue(jsonParser, Object.class);
-                jsonParser.nextToken();
-                final Object val = deserializationContext.readValue(jsonParser, Object.class);
-                m.put(key, val);
-            }
-
-            return m;
-        }
-    }
-
-    static class SetJacksonDeserializer extends StdDeserializer<Set> {
-
-        protected SetJacksonDeserializer() {
-            super(Set.class);
-        }
-
-        @Override
-        public Set deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Set<Object> s = new LinkedHashSet<>();
-
-            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                s.add(deserializationContext.readValue(jsonParser, Object.class));
-            }
-
-            return s;
-        }
-    }
-
-    static class ListJacksonDeserializer extends StdDeserializer<List> {
-
-        protected ListJacksonDeserializer() {
-            super(List.class);
-        }
-
-        @Override
-        public List deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final List<Object> s = new LinkedList<>();
-
-            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                s.add(deserializationContext.readValue(jsonParser, Object.class));
-            }
-
-            return s;
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2.java
new file mode 100644
index 0000000..45bca28
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2.java
@@ -0,0 +1,519 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.commons.configuration2.ConfigurationConverter;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+final class TraversalSerializersV2 {
+
+    private TraversalSerializersV2() {
+    }
+
+    /////////////////
+    // SERIALIZERS //
+    ////////////////
+
+    final static class TraversalJacksonSerializer extends StdSerializer<Traversal> {
+
+        public TraversalJacksonSerializer() {
+            super(Traversal.class);
+        }
+
+        @Override
+        public void serialize(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeObject(traversal.asAdmin().getBytecode());
+        }
+
+        @Override
+        public void serializeWithType(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+                throws IOException {
+            serialize(traversal, jsonGenerator, serializerProvider);
+        }
+
+    }
+
+    final static class BytecodeJacksonSerializer extends StdScalarSerializer<Bytecode> {
+
+        public BytecodeJacksonSerializer() {
+            super(Bytecode.class);
+        }
+
+        @Override
+        public void serialize(final Bytecode bytecode, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            if (bytecode.getSourceInstructions().iterator().hasNext()) {
+                jsonGenerator.writeArrayFieldStart(GraphSONTokens.SOURCE);
+                for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
+                    jsonGenerator.writeStartArray();
+                    jsonGenerator.writeString(instruction.getOperator());
+                    for (final Object argument : instruction.getArguments()) {
+                        jsonGenerator.writeObject(argument);
+                    }
+                    jsonGenerator.writeEndArray();
+                }
+                jsonGenerator.writeEndArray();
+            }
+            if (bytecode.getStepInstructions().iterator().hasNext()) {
+                jsonGenerator.writeArrayFieldStart(GraphSONTokens.STEP);
+                for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
+                    jsonGenerator.writeStartArray();
+                    jsonGenerator.writeString(instruction.getOperator());
+                    for (final Object argument : instruction.getArguments()) {
+                        jsonGenerator.writeObject(argument);
+                    }
+                    jsonGenerator.writeEndArray();
+                }
+                jsonGenerator.writeEndArray();
+            }
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    static class EnumJacksonSerializer extends StdScalarSerializer<Enum> {
+
+        public EnumJacksonSerializer() {
+            super(Enum.class);
+        }
+
+        @Override
+        public void serialize(final Enum enumInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeString(enumInstance.name());
+        }
+
+    }
+
+    final static class PJacksonSerializer extends StdScalarSerializer<P> {
+
+        public PJacksonSerializer() {
+            super(P.class);
+        }
+
+        @Override
+        public void serialize(final P p, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField(GraphSONTokens.PREDICATE, p.getPredicateName());
+            if (p instanceof ConnectiveP) {
+                jsonGenerator.writeArrayFieldStart(GraphSONTokens.VALUE);
+                for (final P<?> predicate : ((ConnectiveP<?>) p).getPredicates()) {
+                    jsonGenerator.writeObject(predicate);
+                }
+                jsonGenerator.writeEndArray();
+            } else {
+                if (p.getValue() instanceof Collection) {
+                    jsonGenerator.writeArrayFieldStart(GraphSONTokens.VALUE);
+                    for (final Object object : (Collection) p.getValue()) {
+                        jsonGenerator.writeObject(object);
+                    }
+                    jsonGenerator.writeEndArray();
+                } else
+                    jsonGenerator.writeObjectField(GraphSONTokens.VALUE, p.getValue());
+            }
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+
+    final static class LambdaJacksonSerializer extends StdScalarSerializer<Lambda> {
+
+        public LambdaJacksonSerializer() {
+            super(Lambda.class);
+        }
+
+        @Override
+        public void serialize(final Lambda lambda, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField(GraphSONTokens.SCRIPT, lambda.getLambdaScript());
+            jsonGenerator.writeStringField(GraphSONTokens.LANGUAGE, lambda.getLambdaLanguage());
+            jsonGenerator.writeNumberField(GraphSONTokens.ARGUMENTS, lambda.getLambdaArguments());
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+
+    final static class BindingJacksonSerializer extends StdScalarSerializer<Bytecode.Binding> {
+
+        public BindingJacksonSerializer() {
+            super(Bytecode.Binding.class);
+        }
+
+        @Override
+        public void serialize(final Bytecode.Binding binding, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField(GraphSONTokens.KEY, binding.variable());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, binding.value());
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+
+    final static class TraverserJacksonSerializer extends StdScalarSerializer<Traverser> {
+
+        public TraverserJacksonSerializer() {
+            super(Traverser.class);
+        }
+
+        @Override
+        public void serialize(final Traverser traverserInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeObjectField(GraphSONTokens.BULK, traverserInstance.bulk());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, traverserInstance.get());
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class TraversalStrategyJacksonSerializer extends StdScalarSerializer<TraversalStrategy> {
+
+        public TraversalStrategyJacksonSerializer() {
+            super(TraversalStrategy.class);
+        }
+
+        @Override
+        public void serialize(final TraversalStrategy traversalStrategy, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            for (final Map.Entry<Object, Object> entry : ConfigurationConverter.getMap(traversalStrategy.getConfiguration()).entrySet()) {
+                jsonGenerator.writeObjectField((String) entry.getKey(), entry.getValue());
+            }
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    ///////////////////
+    // DESERIALIZERS //
+    //////////////////
+
+    final static class BytecodeJacksonDeserializer extends StdDeserializer<Bytecode> {
+
+        public BytecodeJacksonDeserializer() {
+            super(Bytecode.class);
+        }
+
+        @Override
+        public Bytecode deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Bytecode bytecode = new Bytecode();
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                final String current = jsonParser.getCurrentName();
+                if (current.equals(GraphSONTokens.SOURCE) || current.equals(GraphSONTokens.STEP)) {
+                    jsonParser.nextToken();
+
+                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+
+                        // there should be a list now and the first item in the list is always string and is the step name
+                        // skip the start array
+                        jsonParser.nextToken();
+                        
+                        final String stepName = jsonParser.getText();
+
+                        // iterate through the rest of the list for arguments until it gets to the end
+                        final List<Object> arguments = new ArrayList<>();
+                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                            // we don't know the types here, so let the deserializer figure that business out
+                            arguments.add(deserializationContext.readValue(jsonParser, Object.class));
+                        }
+
+                        // if it's not a "source" then it must be a "step"
+                        if (current.equals(GraphSONTokens.SOURCE))
+                            bytecode.addSource(stepName, arguments.toArray());
+                        else
+                            bytecode.addStep(stepName, arguments.toArray());
+                    }
+                }
+            }
+            return bytecode;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class EnumJacksonDeserializer<A extends Enum> extends StdDeserializer<A> {
+
+        public EnumJacksonDeserializer(final Class<A> enumClass) {
+            super(enumClass);
+        }
+
+        @Override
+        public A deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Class<A> enumClass = (Class<A>) this._valueClass;
+            final String enumName = jsonParser.getText();
+            for (final Enum a : enumClass.getEnumConstants()) {
+                if (a.name().equals(enumName))
+                    return (A) a;
+            }
+            throw new IOException("Unknown enum type: " + enumClass);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class PJacksonDeserializer extends StdDeserializer<P> {
+
+        public PJacksonDeserializer() {
+            super(P.class);
+        }
+
+        @Override
+        public P deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String predicate = null;
+            Object value = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
+                    jsonParser.nextToken();
+                    predicate = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    value = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+
+            if (predicate.equals(GraphSONTokens.AND) || predicate.equals(GraphSONTokens.OR)) {
+                return predicate.equals(GraphSONTokens.AND) ? new AndP((List<P>) value) : new OrP((List<P>) value);
+            } else if (predicate.equals(GraphSONTokens.NOT) && value instanceof P) {
+                return P.not((P<?>) value);
+            } else {
+                try {
+                    if (value instanceof Collection) {
+                        if (predicate.equals("between"))
+                            return P.between(((List) value).get(0), ((List) value).get(1));
+                        else if (predicate.equals("inside"))
+                            return P.between(((List) value).get(0), ((List) value).get(1));
+                        else if (predicate.equals("outside"))
+                            return P.outside(((List) value).get(0), ((List) value).get(1));
+                        else if (predicate.equals("within"))
+                            return P.within((Collection) value);
+                        else if (predicate.equals("without"))
+                            return P.without((Collection) value);
+                        else
+                            return (P) P.class.getMethod(predicate, Collection.class).invoke(null, (Collection) value);
+                    } else {
+                        try {
+                            return (P) P.class.getMethod(predicate, Object.class).invoke(null, value);
+                        } catch (final NoSuchMethodException e) {
+                            return (P) P.class.getMethod(predicate, Object[].class).invoke(null, (Object) new Object[]{value});
+                        }
+                    }
+                } catch (final Exception e) {
+                    throw new IllegalStateException(e.getMessage(), e);
+                }
+            }
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class TextPJacksonDeserializer extends StdDeserializer<TextP> {
+
+        public TextPJacksonDeserializer() {
+            super(TextP.class);
+        }
+
+        @Override
+        public TextP deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String predicate = null;
+            String value = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
+                    jsonParser.nextToken();
+                    predicate = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    value = deserializationContext.readValue(jsonParser, String.class);
+                }
+            }
+
+            try {
+                return (TextP) TextP.class.getMethod(predicate, String.class).invoke(null, value);
+            } catch (final Exception e) {
+                throw new IllegalStateException(e.getMessage(), e);
+            }
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class LambdaJacksonDeserializer extends StdDeserializer<Lambda> {
+
+        public LambdaJacksonDeserializer() {
+            super(Lambda.class);
+        }
+
+        @Override
+        public Lambda deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String script = null;
+            String language = null;
+            int arguments = -1;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.SCRIPT)) {
+                    jsonParser.nextToken();
+                    script = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LANGUAGE)) {
+                    jsonParser.nextToken();
+                    language = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.ARGUMENTS)) {
+                    jsonParser.nextToken();
+                    arguments = jsonParser.getIntValue();
+                }
+            }
+
+            if (-1 == arguments || arguments > 2)
+                return new Lambda.UnknownArgLambda(script, language, arguments);
+            else if (0 == arguments)
+                return new Lambda.ZeroArgLambda<>(script, language);
+            else if (1 == arguments)
+                return new Lambda.OneArgLambda<>(script, language);
+            else
+                return new Lambda.TwoArgLambda<>(script, language);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class BindingJacksonDeserializer extends StdDeserializer<Bytecode.Binding> {
+
+        public BindingJacksonDeserializer() {
+            super(Bytecode.Binding.class);
+        }
+
+        @Override
+        public Bytecode.Binding deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String k = null;
+            Object v = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
+                    jsonParser.nextToken();
+                    k = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    v = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+            return new Bytecode.Binding<>(k, v);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class TraverserJacksonDeserializer extends StdDeserializer<Traverser> {
+
+        public TraverserJacksonDeserializer() {
+            super(Traverser.class);
+        }
+
+        @Override
+        public Traverser deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            long bulk = 1;
+            Object v = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.BULK)) {
+                    jsonParser.nextToken();
+                    bulk = deserializationContext.readValue(jsonParser, Long.class);
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    v = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+
+            return new DefaultRemoteTraverser<>(v, bulk);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class TraversalStrategyProxyJacksonDeserializer<T extends TraversalStrategy> extends AbstractObjectDeserializer<TraversalStrategyProxy> {
+
+        private final Class<T> clazz;
+
+        public TraversalStrategyProxyJacksonDeserializer(final Class<T> clazz) {
+            super(TraversalStrategyProxy.class);
+            this.clazz = clazz;
+        }
+
+        @Override
+        public TraversalStrategyProxy<T> createObject(final Map<String, Object> data) {
+            return new TraversalStrategyProxy<>(this.clazz, new MapConfiguration(data));
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
deleted file mode 100644
index 9c2ecab..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.commons.configuration2.ConfigurationConverter;
-import org.apache.commons.configuration2.MapConfiguration;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-final class TraversalSerializersV2d0 {
-
-    private TraversalSerializersV2d0() {
-    }
-
-    /////////////////
-    // SERIALIZERS //
-    ////////////////
-
-    final static class TraversalJacksonSerializer extends StdSerializer<Traversal> {
-
-        public TraversalJacksonSerializer() {
-            super(Traversal.class);
-        }
-
-        @Override
-        public void serialize(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeObject(traversal.asAdmin().getBytecode());
-        }
-
-        @Override
-        public void serializeWithType(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
-                throws IOException {
-            serialize(traversal, jsonGenerator, serializerProvider);
-        }
-
-    }
-
-    final static class BytecodeJacksonSerializer extends StdScalarSerializer<Bytecode> {
-
-        public BytecodeJacksonSerializer() {
-            super(Bytecode.class);
-        }
-
-        @Override
-        public void serialize(final Bytecode bytecode, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            if (bytecode.getSourceInstructions().iterator().hasNext()) {
-                jsonGenerator.writeArrayFieldStart(GraphSONTokens.SOURCE);
-                for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
-                    jsonGenerator.writeStartArray();
-                    jsonGenerator.writeString(instruction.getOperator());
-                    for (final Object argument : instruction.getArguments()) {
-                        jsonGenerator.writeObject(argument);
-                    }
-                    jsonGenerator.writeEndArray();
-                }
-                jsonGenerator.writeEndArray();
-            }
-            if (bytecode.getStepInstructions().iterator().hasNext()) {
-                jsonGenerator.writeArrayFieldStart(GraphSONTokens.STEP);
-                for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
-                    jsonGenerator.writeStartArray();
-                    jsonGenerator.writeString(instruction.getOperator());
-                    for (final Object argument : instruction.getArguments()) {
-                        jsonGenerator.writeObject(argument);
-                    }
-                    jsonGenerator.writeEndArray();
-                }
-                jsonGenerator.writeEndArray();
-            }
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    static class EnumJacksonSerializer extends StdScalarSerializer<Enum> {
-
-        public EnumJacksonSerializer() {
-            super(Enum.class);
-        }
-
-        @Override
-        public void serialize(final Enum enumInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeString(enumInstance.name());
-        }
-
-    }
-
-    final static class PJacksonSerializer extends StdScalarSerializer<P> {
-
-        public PJacksonSerializer() {
-            super(P.class);
-        }
-
-        @Override
-        public void serialize(final P p, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeStringField(GraphSONTokens.PREDICATE, p.getPredicateName());
-            if (p instanceof ConnectiveP) {
-                jsonGenerator.writeArrayFieldStart(GraphSONTokens.VALUE);
-                for (final P<?> predicate : ((ConnectiveP<?>) p).getPredicates()) {
-                    jsonGenerator.writeObject(predicate);
-                }
-                jsonGenerator.writeEndArray();
-            } else {
-                if (p.getValue() instanceof Collection) {
-                    jsonGenerator.writeArrayFieldStart(GraphSONTokens.VALUE);
-                    for (final Object object : (Collection) p.getValue()) {
-                        jsonGenerator.writeObject(object);
-                    }
-                    jsonGenerator.writeEndArray();
-                } else
-                    jsonGenerator.writeObjectField(GraphSONTokens.VALUE, p.getValue());
-            }
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-
-    final static class LambdaJacksonSerializer extends StdScalarSerializer<Lambda> {
-
-        public LambdaJacksonSerializer() {
-            super(Lambda.class);
-        }
-
-        @Override
-        public void serialize(final Lambda lambda, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeStringField(GraphSONTokens.SCRIPT, lambda.getLambdaScript());
-            jsonGenerator.writeStringField(GraphSONTokens.LANGUAGE, lambda.getLambdaLanguage());
-            jsonGenerator.writeNumberField(GraphSONTokens.ARGUMENTS, lambda.getLambdaArguments());
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-
-    final static class BindingJacksonSerializer extends StdScalarSerializer<Bytecode.Binding> {
-
-        public BindingJacksonSerializer() {
-            super(Bytecode.Binding.class);
-        }
-
-        @Override
-        public void serialize(final Bytecode.Binding binding, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeStringField(GraphSONTokens.KEY, binding.variable());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, binding.value());
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-
-    final static class TraverserJacksonSerializer extends StdScalarSerializer<Traverser> {
-
-        public TraverserJacksonSerializer() {
-            super(Traverser.class);
-        }
-
-        @Override
-        public void serialize(final Traverser traverserInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeObjectField(GraphSONTokens.BULK, traverserInstance.bulk());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, traverserInstance.get());
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class TraversalStrategyJacksonSerializer extends StdScalarSerializer<TraversalStrategy> {
-
-        public TraversalStrategyJacksonSerializer() {
-            super(TraversalStrategy.class);
-        }
-
-        @Override
-        public void serialize(final TraversalStrategy traversalStrategy, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            for (final Map.Entry<Object, Object> entry : ConfigurationConverter.getMap(traversalStrategy.getConfiguration()).entrySet()) {
-                jsonGenerator.writeObjectField((String) entry.getKey(), entry.getValue());
-            }
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    ///////////////////
-    // DESERIALIZERS //
-    //////////////////
-
-    final static class BytecodeJacksonDeserializer extends StdDeserializer<Bytecode> {
-
-        public BytecodeJacksonDeserializer() {
-            super(Bytecode.class);
-        }
-
-        @Override
-        public Bytecode deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Bytecode bytecode = new Bytecode();
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                final String current = jsonParser.getCurrentName();
-                if (current.equals(GraphSONTokens.SOURCE) || current.equals(GraphSONTokens.STEP)) {
-                    jsonParser.nextToken();
-
-                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-
-                        // there should be a list now and the first item in the list is always string and is the step name
-                        // skip the start array
-                        jsonParser.nextToken();
-                        
-                        final String stepName = jsonParser.getText();
-
-                        // iterate through the rest of the list for arguments until it gets to the end
-                        final List<Object> arguments = new ArrayList<>();
-                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                            // we don't know the types here, so let the deserializer figure that business out
-                            arguments.add(deserializationContext.readValue(jsonParser, Object.class));
-                        }
-
-                        // if it's not a "source" then it must be a "step"
-                        if (current.equals(GraphSONTokens.SOURCE))
-                            bytecode.addSource(stepName, arguments.toArray());
-                        else
-                            bytecode.addStep(stepName, arguments.toArray());
-                    }
-                }
-            }
-            return bytecode;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class EnumJacksonDeserializer<A extends Enum> extends StdDeserializer<A> {
-
-        public EnumJacksonDeserializer(final Class<A> enumClass) {
-            super(enumClass);
-        }
-
-        @Override
-        public A deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Class<A> enumClass = (Class<A>) this._valueClass;
-            final String enumName = jsonParser.getText();
-            for (final Enum a : enumClass.getEnumConstants()) {
-                if (a.name().equals(enumName))
-                    return (A) a;
-            }
-            throw new IOException("Unknown enum type: " + enumClass);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class PJacksonDeserializer extends StdDeserializer<P> {
-
-        public PJacksonDeserializer() {
-            super(P.class);
-        }
-
-        @Override
-        public P deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String predicate = null;
-            Object value = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
-                    jsonParser.nextToken();
-                    predicate = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    value = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-
-            if (predicate.equals(GraphSONTokens.AND) || predicate.equals(GraphSONTokens.OR)) {
-                return predicate.equals(GraphSONTokens.AND) ? new AndP((List<P>) value) : new OrP((List<P>) value);
-            } else if (predicate.equals(GraphSONTokens.NOT) && value instanceof P) {
-                return P.not((P<?>) value);
-            } else {
-                try {
-                    if (value instanceof Collection) {
-                        if (predicate.equals("between"))
-                            return P.between(((List) value).get(0), ((List) value).get(1));
-                        else if (predicate.equals("inside"))
-                            return P.between(((List) value).get(0), ((List) value).get(1));
-                        else if (predicate.equals("outside"))
-                            return P.outside(((List) value).get(0), ((List) value).get(1));
-                        else if (predicate.equals("within"))
-                            return P.within((Collection) value);
-                        else if (predicate.equals("without"))
-                            return P.without((Collection) value);
-                        else
-                            return (P) P.class.getMethod(predicate, Collection.class).invoke(null, (Collection) value);
-                    } else {
-                        try {
-                            return (P) P.class.getMethod(predicate, Object.class).invoke(null, value);
-                        } catch (final NoSuchMethodException e) {
-                            return (P) P.class.getMethod(predicate, Object[].class).invoke(null, (Object) new Object[]{value});
-                        }
-                    }
-                } catch (final Exception e) {
-                    throw new IllegalStateException(e.getMessage(), e);
-                }
-            }
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class TextPJacksonDeserializer extends StdDeserializer<TextP> {
-
-        public TextPJacksonDeserializer() {
-            super(TextP.class);
-        }
-
-        @Override
-        public TextP deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String predicate = null;
-            String value = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
-                    jsonParser.nextToken();
-                    predicate = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    value = deserializationContext.readValue(jsonParser, String.class);
-                }
-            }
-
-            try {
-                return (TextP) TextP.class.getMethod(predicate, String.class).invoke(null, value);
-            } catch (final Exception e) {
-                throw new IllegalStateException(e.getMessage(), e);
-            }
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class LambdaJacksonDeserializer extends StdDeserializer<Lambda> {
-
-        public LambdaJacksonDeserializer() {
-            super(Lambda.class);
-        }
-
-        @Override
-        public Lambda deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String script = null;
-            String language = null;
-            int arguments = -1;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.SCRIPT)) {
-                    jsonParser.nextToken();
-                    script = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LANGUAGE)) {
-                    jsonParser.nextToken();
-                    language = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.ARGUMENTS)) {
-                    jsonParser.nextToken();
-                    arguments = jsonParser.getIntValue();
-                }
-            }
-
-            if (-1 == arguments || arguments > 2)
-                return new Lambda.UnknownArgLambda(script, language, arguments);
-            else if (0 == arguments)
-                return new Lambda.ZeroArgLambda<>(script, language);
-            else if (1 == arguments)
-                return new Lambda.OneArgLambda<>(script, language);
-            else
-                return new Lambda.TwoArgLambda<>(script, language);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class BindingJacksonDeserializer extends StdDeserializer<Bytecode.Binding> {
-
-        public BindingJacksonDeserializer() {
-            super(Bytecode.Binding.class);
-        }
-
-        @Override
-        public Bytecode.Binding deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String k = null;
-            Object v = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
-                    jsonParser.nextToken();
-                    k = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    v = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-            return new Bytecode.Binding<>(k, v);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class TraverserJacksonDeserializer extends StdDeserializer<Traverser> {
-
-        public TraverserJacksonDeserializer() {
-            super(Traverser.class);
-        }
-
-        @Override
-        public Traverser deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            long bulk = 1;
-            Object v = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.BULK)) {
-                    jsonParser.nextToken();
-                    bulk = deserializationContext.readValue(jsonParser, Long.class);
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    v = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-
-            return new DefaultRemoteTraverser<>(v, bulk);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class TraversalStrategyProxyJacksonDeserializer<T extends TraversalStrategy> extends AbstractObjectDeserializer<TraversalStrategyProxy> {
-
-        private final Class<T> clazz;
-
-        public TraversalStrategyProxyJacksonDeserializer(final Class<T> clazz) {
-            super(TraversalStrategyProxy.class);
-            this.clazz = clazz;
-        }
-
-        @Override
-        public TraversalStrategyProxy<T> createObject(final Map<String, Object> data) {
-            return new TraversalStrategyProxy<>(this.clazz, new MapConfiguration(data));
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3.java
new file mode 100644
index 0000000..f42ba0d
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3.java
@@ -0,0 +1,612 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.commons.configuration2.ConfigurationConverter;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+final class TraversalSerializersV3 {
+
+    private TraversalSerializersV3() {
+    }
+
+    /////////////////
+    // SERIALIZERS //
+    ////////////////
+
+    final static class TraversalJacksonSerializer extends StdSerializer<Traversal> {
+
+        public TraversalJacksonSerializer() {
+            super(Traversal.class);
+        }
+
+        @Override
+        public void serialize(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeObject(traversal.asAdmin().getBytecode());
+        }
+
+        @Override
+        public void serializeWithType(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+                throws IOException {
+            serialize(traversal, jsonGenerator, serializerProvider);
+        }
+
+    }
+
+    final static class BytecodeJacksonSerializer extends StdScalarSerializer<Bytecode> {
+
+        public BytecodeJacksonSerializer() {
+            super(Bytecode.class);
+        }
+
+        @Override
+        public void serialize(final Bytecode bytecode, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            if (bytecode.getSourceInstructions().iterator().hasNext()) {
+                jsonGenerator.writeArrayFieldStart(GraphSONTokens.SOURCE);
+                for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
+                    jsonGenerator.writeStartArray();
+                    jsonGenerator.writeString(instruction.getOperator());
+                    for (final Object argument : instruction.getArguments()) {
+                        jsonGenerator.writeObject(argument);
+                    }
+                    jsonGenerator.writeEndArray();
+                }
+                jsonGenerator.writeEndArray();
+            }
+            if (bytecode.getStepInstructions().iterator().hasNext()) {
+                jsonGenerator.writeArrayFieldStart(GraphSONTokens.STEP);
+                for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
+                    jsonGenerator.writeStartArray();
+                    jsonGenerator.writeString(instruction.getOperator());
+                    for (final Object argument : instruction.getArguments()) {
+                        jsonGenerator.writeObject(argument);
+                    }
+                    jsonGenerator.writeEndArray();
+                }
+                jsonGenerator.writeEndArray();
+            }
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    static class EnumJacksonSerializer extends StdScalarSerializer<Enum> {
+
+        public EnumJacksonSerializer() {
+            super(Enum.class);
+        }
+
+        @Override
+        public void serialize(final Enum enumInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeString(enumInstance.name());
+        }
+
+    }
+
+    final static class PJacksonSerializer extends StdScalarSerializer<P> {
+
+        public PJacksonSerializer() {
+            super(P.class);
+        }
+
+        @Override
+        public void serialize(final P p, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField(GraphSONTokens.PREDICATE, p.getPredicateName());
+            if (p instanceof ConnectiveP) {
+                jsonGenerator.writeArrayFieldStart(GraphSONTokens.VALUE);
+                for (final P<?> predicate : ((ConnectiveP<?>) p).getPredicates()) {
+                    jsonGenerator.writeObject(predicate);
+                }
+                jsonGenerator.writeEndArray();
+            } else
+                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, p.getValue());
+
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+
+    final static class LambdaJacksonSerializer extends StdScalarSerializer<Lambda> {
+
+        public LambdaJacksonSerializer() {
+            super(Lambda.class);
+        }
+
+        @Override
+        public void serialize(final Lambda lambda, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField(GraphSONTokens.SCRIPT, lambda.getLambdaScript());
+            jsonGenerator.writeStringField(GraphSONTokens.LANGUAGE, lambda.getLambdaLanguage());
+            jsonGenerator.writeNumberField(GraphSONTokens.ARGUMENTS, lambda.getLambdaArguments());
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+
+    final static class BulkSetJacksonSerializer extends StdScalarSerializer<BulkSet> {
+
+        public BulkSetJacksonSerializer() {
+            super(BulkSet.class);
+        }
+
+        @Override
+        public void serialize(final BulkSet bulkSet, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartArray();
+            for (Map.Entry entry : (Set<Map.Entry>) bulkSet.asBulk().entrySet()) {
+                jsonGenerator.writeObject(entry.getKey());
+                jsonGenerator.writeObject(entry.getValue());
+            }
+            jsonGenerator.writeEndArray();
+        }
+    }
+
+    final static class BindingJacksonSerializer extends StdScalarSerializer<Bytecode.Binding> {
+
+        public BindingJacksonSerializer() {
+            super(Bytecode.Binding.class);
+        }
+
+        @Override
+        public void serialize(final Bytecode.Binding binding, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField(GraphSONTokens.KEY, binding.variable());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, binding.value());
+            jsonGenerator.writeEndObject();
+        }
+
+    }
+
+    final static class TraverserJacksonSerializer extends StdScalarSerializer<Traverser> {
+
+        public TraverserJacksonSerializer() {
+            super(Traverser.class);
+        }
+
+        @Override
+        public void serialize(final Traverser traverserInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeObjectField(GraphSONTokens.BULK, traverserInstance.bulk());
+            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, traverserInstance.get());
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    final static class TraversalStrategyJacksonSerializer extends StdScalarSerializer<TraversalStrategy> {
+
+        public TraversalStrategyJacksonSerializer() {
+            super(TraversalStrategy.class);
+        }
+
+        @Override
+        public void serialize(final TraversalStrategy traversalStrategy, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            for (final Map.Entry<Object, Object> entry : ConfigurationConverter.getMap(traversalStrategy.getConfiguration()).entrySet()) {
+                jsonGenerator.writeObjectField((String) entry.getKey(), entry.getValue());
+            }
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    ///////////////////
+    // DESERIALIZERS //
+    //////////////////
+
+    final static class BytecodeJacksonDeserializer extends StdDeserializer<Bytecode> {
+        private static final JavaType listJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, Object.class);
+        private static final JavaType listListJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, listJavaType);
+
+        public BytecodeJacksonDeserializer() {
+            super(Bytecode.class);
+        }
+
+        @Override
+        public Bytecode deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Bytecode bytecode = new Bytecode();
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                final String current = jsonParser.getCurrentName();
+                if (current.equals(GraphSONTokens.SOURCE) || current.equals(GraphSONTokens.STEP)) {
+                    jsonParser.nextToken();
+
+                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+
+                        // there should be a list now and the first item in the list is always string and is the step name
+                        // skip the start array
+                        jsonParser.nextToken();
+
+                        final String stepName = jsonParser.getText();
+
+                        // iterate through the rest of the list for arguments until it gets to the end
+                        final List<Object> arguments = new ArrayList<>();
+                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                            // we don't know the types here, so let the deserializer figure that business out
+                            arguments.add(deserializationContext.readValue(jsonParser, Object.class));
+                        }
+
+                        // if it's not a "source" then it must be a "step"
+                        if (current.equals(GraphSONTokens.SOURCE))
+                            bytecode.addSource(stepName, arguments.toArray());
+                        else
+                            bytecode.addStep(stepName, arguments.toArray());
+                    }
+                }
+            }
+            return bytecode;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class EnumJacksonDeserializer<A extends Enum> extends StdDeserializer<A> {
+
+        public EnumJacksonDeserializer(final Class<A> enumClass) {
+            super(enumClass);
+        }
+
+        @Override
+        public A deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Class<A> enumClass = (Class<A>) this._valueClass;
+            final String enumName = jsonParser.getText();
+            for (final Enum a : enumClass.getEnumConstants()) {
+                if (a.name().equals(enumName))
+                    return (A) a;
+            }
+            throw new IOException("Unknown enum type: " + enumClass);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class PJacksonDeserializer extends AbstractReflectJacksonDeserializer<P> {
+
+        public PJacksonDeserializer() {
+            super(P.class);
+        }
+
+        @Override
+        public P deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String predicate = null;
+            Object value = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
+                    jsonParser.nextToken();
+                    predicate = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    value = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+
+            if (predicate.equals(GraphSONTokens.AND) || predicate.equals(GraphSONTokens.OR)) {
+                return predicate.equals(GraphSONTokens.AND) ? new AndP((List<P>) value) : new OrP((List<P>) value);
+            } else if (predicate.equals(GraphSONTokens.NOT) && value instanceof P) {
+                return P.not((P<?>) value);
+            } else {
+                try {
+                    if (value instanceof Collection) {
+                        if (predicate.equals("between"))
+                            return P.between(((List) value).get(0), ((List) value).get(1));
+                        else if (predicate.equals("inside"))
+                            return P.between(((List) value).get(0), ((List) value).get(1));
+                        else if (predicate.equals("outside"))
+                            return P.outside(((List) value).get(0), ((List) value).get(1));
+                        else if (predicate.equals("within"))
+                            return P.within((Collection) value);
+                        else if (predicate.equals("without"))
+                            return P.without((Collection) value);
+                        else
+                            return (P) tryFindMethod(P.class, predicate, Collection.class).invoke(null, (Collection) value);
+                    } else {
+                        try {
+                            return (P) tryFindMethod(P.class, predicate, Object.class).invoke(null, value);
+                        } catch (final NoSuchMethodException e) {
+                            return (P) tryFindMethod(P.class, predicate, Object[].class).invoke(null, (Object) new Object[]{value});
+                        }
+                    }
+                } catch (final Exception e) {
+                    throw new IllegalStateException(e.getMessage(), e);
+                }
+            }
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    /**
+     * Deserializers that make reflection calls can use this class as a base and thus cache reflected methods to avoid
+     * future lookups.
+     */
+    static abstract class AbstractReflectJacksonDeserializer<T> extends StdDeserializer<T> {
+        private final Map<CacheKey, Method> CACHE = new ConcurrentHashMap<>();
+
+        public AbstractReflectJacksonDeserializer(final Class<? extends T> clazz) {
+            super(clazz);
+        }
+
+        protected Method tryFindMethod(final Class<?> base, final String methodName, final Class<?> parameterType) throws Exception {
+            return CACHE.computeIfAbsent(new CacheKey(methodName, parameterType),
+                    cacheKey -> {
+                        try {
+                            return base.getMethod(methodName, parameterType);
+                        } catch (Exception e) {
+                            throw new IllegalStateException(e.getMessage(), e);
+                        }
+                    });
+        }
+
+        private static class CacheKey {
+            private final String predicate;
+            private final Class<?> parameterType;
+
+            public CacheKey(final String predicate, final Class<?> parameterType) {
+                this.predicate = Objects.requireNonNull(predicate);
+                this.parameterType = Objects.requireNonNull(parameterType);
+            }
+
+            @Override
+            public boolean equals(final Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                final CacheKey cacheKey = (CacheKey) o;
+                return predicate.equals(cacheKey.predicate) &&
+                        parameterType.equals(cacheKey.parameterType);
+            }
+
+            @Override
+            public int hashCode() {
+                return Objects.hash(predicate, parameterType);
+            }
+        }
+    }
+
+    final static class TextPJacksonDeserializer extends AbstractReflectJacksonDeserializer<TextP> {
+
+        public TextPJacksonDeserializer() {
+            super(TextP.class);
+        }
+
+        @Override
+        public TextP deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String predicate = null;
+            String value = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
+                    jsonParser.nextToken();
+                    predicate = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    value = deserializationContext.readValue(jsonParser, String.class);
+                }
+            }
+
+            try {
+                return (TextP) tryFindMethod(TextP.class, predicate, String.class).invoke(null, value);
+            } catch (final Exception e) {
+                throw new IllegalStateException(e.getMessage(), e);
+            }
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class LambdaJacksonDeserializer extends StdDeserializer<Lambda> {
+
+        public LambdaJacksonDeserializer() {
+            super(Lambda.class);
+        }
+
+        @Override
+        public Lambda deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String script = null;
+            String language = null;
+            int arguments = -1;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.SCRIPT)) {
+                    jsonParser.nextToken();
+                    script = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LANGUAGE)) {
+                    jsonParser.nextToken();
+                    language = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.ARGUMENTS)) {
+                    jsonParser.nextToken();
+                    arguments = jsonParser.getIntValue();
+                }
+            }
+
+            if (-1 == arguments || arguments > 2)
+                return new Lambda.UnknownArgLambda(script, language, arguments);
+            else if (0 == arguments)
+                return new Lambda.ZeroArgLambda<>(script, language);
+            else if (1 == arguments)
+                return new Lambda.OneArgLambda<>(script, language);
+            else
+                return new Lambda.TwoArgLambda<>(script, language);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class BulkSetJacksonDeserializer extends StdDeserializer<BulkSet> {
+        public BulkSetJacksonDeserializer() {
+            super(BulkSet.class);
+        }
+
+        @Override
+        public BulkSet deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+
+            final BulkSet<Object> bulkSet = new BulkSet<>();
+
+            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                final Object key = deserializationContext.readValue(jsonParser, Object.class);
+                jsonParser.nextToken();
+                final Long val = deserializationContext.readValue(jsonParser, Long.class);
+                bulkSet.add(key, val);
+            }
+
+            return bulkSet;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class BindingJacksonDeserializer extends StdDeserializer<Bytecode.Binding> {
+
+        public BindingJacksonDeserializer() {
+            super(Bytecode.Binding.class);
+        }
+
+        @Override
+        public Bytecode.Binding deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            String k = null;
+            Object v = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
+                    jsonParser.nextToken();
+                    k = jsonParser.getText();
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    v = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+            return new Bytecode.Binding<>(k, v);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    static class TraverserJacksonDeserializer extends StdDeserializer<Traverser> {
+
+        public TraverserJacksonDeserializer() {
+            super(Traverser.class);
+        }
+
+        @Override
+        public Traverser deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            long bulk = 1;
+            Object v = null;
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals(GraphSONTokens.BULK)) {
+                    jsonParser.nextToken();
+                    bulk = deserializationContext.readValue(jsonParser, Long.class);
+                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
+                    jsonParser.nextToken();
+                    v = deserializationContext.readValue(jsonParser, Object.class);
+                }
+            }
+
+            return new DefaultRemoteTraverser<>(v, bulk);
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+
+    final static class TraversalStrategyProxyJacksonDeserializer<T extends TraversalStrategy> extends AbstractObjectDeserializer<TraversalStrategyProxy> {
+
+        private final Class<T> clazz;
+
+        public TraversalStrategyProxyJacksonDeserializer(final Class<T> clazz) {
+            super(TraversalStrategyProxy.class);
+            this.clazz = clazz;
+        }
+
+        @Override
+        public TraversalStrategyProxy<T> createObject(final Map<String, Object> data) {
+            return new TraversalStrategyProxy<>(this.clazz, new MapConfiguration(data));
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
deleted file mode 100644
index 8ebb413..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.commons.configuration2.ConfigurationConverter;
-import org.apache.commons.configuration2.MapConfiguration;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-final class TraversalSerializersV3d0 {
-
-    private TraversalSerializersV3d0() {
-    }
-
-    /////////////////
-    // SERIALIZERS //
-    ////////////////
-
-    final static class TraversalJacksonSerializer extends StdSerializer<Traversal> {
-
-        public TraversalJacksonSerializer() {
-            super(Traversal.class);
-        }
-
-        @Override
-        public void serialize(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeObject(traversal.asAdmin().getBytecode());
-        }
-
-        @Override
-        public void serializeWithType(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
-                throws IOException {
-            serialize(traversal, jsonGenerator, serializerProvider);
-        }
-
-    }
-
-    final static class BytecodeJacksonSerializer extends StdScalarSerializer<Bytecode> {
-
-        public BytecodeJacksonSerializer() {
-            super(Bytecode.class);
-        }
-
-        @Override
-        public void serialize(final Bytecode bytecode, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            if (bytecode.getSourceInstructions().iterator().hasNext()) {
-                jsonGenerator.writeArrayFieldStart(GraphSONTokens.SOURCE);
-                for (final Bytecode.Instruction instruction : bytecode.getSourceInstructions()) {
-                    jsonGenerator.writeStartArray();
-                    jsonGenerator.writeString(instruction.getOperator());
-                    for (final Object argument : instruction.getArguments()) {
-                        jsonGenerator.writeObject(argument);
-                    }
-                    jsonGenerator.writeEndArray();
-                }
-                jsonGenerator.writeEndArray();
-            }
-            if (bytecode.getStepInstructions().iterator().hasNext()) {
-                jsonGenerator.writeArrayFieldStart(GraphSONTokens.STEP);
-                for (final Bytecode.Instruction instruction : bytecode.getStepInstructions()) {
-                    jsonGenerator.writeStartArray();
-                    jsonGenerator.writeString(instruction.getOperator());
-                    for (final Object argument : instruction.getArguments()) {
-                        jsonGenerator.writeObject(argument);
-                    }
-                    jsonGenerator.writeEndArray();
-                }
-                jsonGenerator.writeEndArray();
-            }
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    static class EnumJacksonSerializer extends StdScalarSerializer<Enum> {
-
-        public EnumJacksonSerializer() {
-            super(Enum.class);
-        }
-
-        @Override
-        public void serialize(final Enum enumInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeString(enumInstance.name());
-        }
-
-    }
-
-    final static class PJacksonSerializer extends StdScalarSerializer<P> {
-
-        public PJacksonSerializer() {
-            super(P.class);
-        }
-
-        @Override
-        public void serialize(final P p, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeStringField(GraphSONTokens.PREDICATE, p.getPredicateName());
-            if (p instanceof ConnectiveP) {
-                jsonGenerator.writeArrayFieldStart(GraphSONTokens.VALUE);
-                for (final P<?> predicate : ((ConnectiveP<?>) p).getPredicates()) {
-                    jsonGenerator.writeObject(predicate);
-                }
-                jsonGenerator.writeEndArray();
-            } else
-                jsonGenerator.writeObjectField(GraphSONTokens.VALUE, p.getValue());
-
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-
-    final static class LambdaJacksonSerializer extends StdScalarSerializer<Lambda> {
-
-        public LambdaJacksonSerializer() {
-            super(Lambda.class);
-        }
-
-        @Override
-        public void serialize(final Lambda lambda, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeStringField(GraphSONTokens.SCRIPT, lambda.getLambdaScript());
-            jsonGenerator.writeStringField(GraphSONTokens.LANGUAGE, lambda.getLambdaLanguage());
-            jsonGenerator.writeNumberField(GraphSONTokens.ARGUMENTS, lambda.getLambdaArguments());
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-
-    final static class BulkSetJacksonSerializer extends StdScalarSerializer<BulkSet> {
-
-        public BulkSetJacksonSerializer() {
-            super(BulkSet.class);
-        }
-
-        @Override
-        public void serialize(final BulkSet bulkSet, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartArray();
-            for (Map.Entry entry : (Set<Map.Entry>) bulkSet.asBulk().entrySet()) {
-                jsonGenerator.writeObject(entry.getKey());
-                jsonGenerator.writeObject(entry.getValue());
-            }
-            jsonGenerator.writeEndArray();
-        }
-    }
-
-    final static class BindingJacksonSerializer extends StdScalarSerializer<Bytecode.Binding> {
-
-        public BindingJacksonSerializer() {
-            super(Bytecode.Binding.class);
-        }
-
-        @Override
-        public void serialize(final Bytecode.Binding binding, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeStringField(GraphSONTokens.KEY, binding.variable());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, binding.value());
-            jsonGenerator.writeEndObject();
-        }
-
-    }
-
-    final static class TraverserJacksonSerializer extends StdScalarSerializer<Traverser> {
-
-        public TraverserJacksonSerializer() {
-            super(Traverser.class);
-        }
-
-        @Override
-        public void serialize(final Traverser traverserInstance, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeObjectField(GraphSONTokens.BULK, traverserInstance.bulk());
-            jsonGenerator.writeObjectField(GraphSONTokens.VALUE, traverserInstance.get());
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    final static class TraversalStrategyJacksonSerializer extends StdScalarSerializer<TraversalStrategy> {
-
-        public TraversalStrategyJacksonSerializer() {
-            super(TraversalStrategy.class);
-        }
-
-        @Override
-        public void serialize(final TraversalStrategy traversalStrategy, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            for (final Map.Entry<Object, Object> entry : ConfigurationConverter.getMap(traversalStrategy.getConfiguration()).entrySet()) {
-                jsonGenerator.writeObjectField((String) entry.getKey(), entry.getValue());
-            }
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    ///////////////////
-    // DESERIALIZERS //
-    //////////////////
-
-    final static class BytecodeJacksonDeserializer extends StdDeserializer<Bytecode> {
-        private static final JavaType listJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, Object.class);
-        private static final JavaType listListJavaType = TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, listJavaType);
-
-        public BytecodeJacksonDeserializer() {
-            super(Bytecode.class);
-        }
-
-        @Override
-        public Bytecode deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Bytecode bytecode = new Bytecode();
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                final String current = jsonParser.getCurrentName();
-                if (current.equals(GraphSONTokens.SOURCE) || current.equals(GraphSONTokens.STEP)) {
-                    jsonParser.nextToken();
-
-                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-
-                        // there should be a list now and the first item in the list is always string and is the step name
-                        // skip the start array
-                        jsonParser.nextToken();
-
-                        final String stepName = jsonParser.getText();
-
-                        // iterate through the rest of the list for arguments until it gets to the end
-                        final List<Object> arguments = new ArrayList<>();
-                        while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                            // we don't know the types here, so let the deserializer figure that business out
-                            arguments.add(deserializationContext.readValue(jsonParser, Object.class));
-                        }
-
-                        // if it's not a "source" then it must be a "step"
-                        if (current.equals(GraphSONTokens.SOURCE))
-                            bytecode.addSource(stepName, arguments.toArray());
-                        else
-                            bytecode.addStep(stepName, arguments.toArray());
-                    }
-                }
-            }
-            return bytecode;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class EnumJacksonDeserializer<A extends Enum> extends StdDeserializer<A> {
-
-        public EnumJacksonDeserializer(final Class<A> enumClass) {
-            super(enumClass);
-        }
-
-        @Override
-        public A deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Class<A> enumClass = (Class<A>) this._valueClass;
-            final String enumName = jsonParser.getText();
-            for (final Enum a : enumClass.getEnumConstants()) {
-                if (a.name().equals(enumName))
-                    return (A) a;
-            }
-            throw new IOException("Unknown enum type: " + enumClass);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class PJacksonDeserializer extends AbstractReflectJacksonDeserializer<P> {
-
-        public PJacksonDeserializer() {
-            super(P.class);
-        }
-
-        @Override
-        public P deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String predicate = null;
-            Object value = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
-                    jsonParser.nextToken();
-                    predicate = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    value = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-
-            if (predicate.equals(GraphSONTokens.AND) || predicate.equals(GraphSONTokens.OR)) {
-                return predicate.equals(GraphSONTokens.AND) ? new AndP((List<P>) value) : new OrP((List<P>) value);
-            } else if (predicate.equals(GraphSONTokens.NOT) && value instanceof P) {
-                return P.not((P<?>) value);
-            } else {
-                try {
-                    if (value instanceof Collection) {
-                        if (predicate.equals("between"))
-                            return P.between(((List) value).get(0), ((List) value).get(1));
-                        else if (predicate.equals("inside"))
-                            return P.between(((List) value).get(0), ((List) value).get(1));
-                        else if (predicate.equals("outside"))
-                            return P.outside(((List) value).get(0), ((List) value).get(1));
-                        else if (predicate.equals("within"))
-                            return P.within((Collection) value);
-                        else if (predicate.equals("without"))
-                            return P.without((Collection) value);
-                        else
-                            return (P) tryFindMethod(P.class, predicate, Collection.class).invoke(null, (Collection) value);
-                    } else {
-                        try {
-                            return (P) tryFindMethod(P.class, predicate, Object.class).invoke(null, value);
-                        } catch (final NoSuchMethodException e) {
-                            return (P) tryFindMethod(P.class, predicate, Object[].class).invoke(null, (Object) new Object[]{value});
-                        }
-                    }
-                } catch (final Exception e) {
-                    throw new IllegalStateException(e.getMessage(), e);
-                }
-            }
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    /**
-     * Deserializers that make reflection calls can use this class as a base and thus cache reflected methods to avoid
-     * future lookups.
-     */
-    static abstract class AbstractReflectJacksonDeserializer<T> extends StdDeserializer<T> {
-        private final Map<CacheKey, Method> CACHE = new ConcurrentHashMap<>();
-
-        public AbstractReflectJacksonDeserializer(final Class<? extends T> clazz) {
-            super(clazz);
-        }
-
-        protected Method tryFindMethod(final Class<?> base, final String methodName, final Class<?> parameterType) throws Exception {
-            return CACHE.computeIfAbsent(new CacheKey(methodName, parameterType),
-                    cacheKey -> {
-                        try {
-                            return base.getMethod(methodName, parameterType);
-                        } catch (Exception e) {
-                            throw new IllegalStateException(e.getMessage(), e);
-                        }
-                    });
-        }
-
-        private static class CacheKey {
-            private final String predicate;
-            private final Class<?> parameterType;
-
-            public CacheKey(final String predicate, final Class<?> parameterType) {
-                this.predicate = Objects.requireNonNull(predicate);
-                this.parameterType = Objects.requireNonNull(parameterType);
-            }
-
-            @Override
-            public boolean equals(final Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                final CacheKey cacheKey = (CacheKey) o;
-                return predicate.equals(cacheKey.predicate) &&
-                        parameterType.equals(cacheKey.parameterType);
-            }
-
-            @Override
-            public int hashCode() {
-                return Objects.hash(predicate, parameterType);
-            }
-        }
-    }
-
-    final static class TextPJacksonDeserializer extends AbstractReflectJacksonDeserializer<TextP> {
-
-        public TextPJacksonDeserializer() {
-            super(TextP.class);
-        }
-
-        @Override
-        public TextP deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String predicate = null;
-            String value = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.PREDICATE)) {
-                    jsonParser.nextToken();
-                    predicate = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    value = deserializationContext.readValue(jsonParser, String.class);
-                }
-            }
-
-            try {
-                return (TextP) tryFindMethod(TextP.class, predicate, String.class).invoke(null, value);
-            } catch (final Exception e) {
-                throw new IllegalStateException(e.getMessage(), e);
-            }
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class LambdaJacksonDeserializer extends StdDeserializer<Lambda> {
-
-        public LambdaJacksonDeserializer() {
-            super(Lambda.class);
-        }
-
-        @Override
-        public Lambda deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String script = null;
-            String language = null;
-            int arguments = -1;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.SCRIPT)) {
-                    jsonParser.nextToken();
-                    script = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.LANGUAGE)) {
-                    jsonParser.nextToken();
-                    language = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.ARGUMENTS)) {
-                    jsonParser.nextToken();
-                    arguments = jsonParser.getIntValue();
-                }
-            }
-
-            if (-1 == arguments || arguments > 2)
-                return new Lambda.UnknownArgLambda(script, language, arguments);
-            else if (0 == arguments)
-                return new Lambda.ZeroArgLambda<>(script, language);
-            else if (1 == arguments)
-                return new Lambda.OneArgLambda<>(script, language);
-            else
-                return new Lambda.TwoArgLambda<>(script, language);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class BulkSetJacksonDeserializer extends StdDeserializer<BulkSet> {
-        public BulkSetJacksonDeserializer() {
-            super(BulkSet.class);
-        }
-
-        @Override
-        public BulkSet deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-
-            final BulkSet<Object> bulkSet = new BulkSet<>();
-
-            while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                final Object key = deserializationContext.readValue(jsonParser, Object.class);
-                jsonParser.nextToken();
-                final Long val = deserializationContext.readValue(jsonParser, Long.class);
-                bulkSet.add(key, val);
-            }
-
-            return bulkSet;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class BindingJacksonDeserializer extends StdDeserializer<Bytecode.Binding> {
-
-        public BindingJacksonDeserializer() {
-            super(Bytecode.Binding.class);
-        }
-
-        @Override
-        public Bytecode.Binding deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            String k = null;
-            Object v = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.KEY)) {
-                    jsonParser.nextToken();
-                    k = jsonParser.getText();
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    v = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-            return new Bytecode.Binding<>(k, v);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    static class TraverserJacksonDeserializer extends StdDeserializer<Traverser> {
-
-        public TraverserJacksonDeserializer() {
-            super(Traverser.class);
-        }
-
-        @Override
-        public Traverser deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            long bulk = 1;
-            Object v = null;
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals(GraphSONTokens.BULK)) {
-                    jsonParser.nextToken();
-                    bulk = deserializationContext.readValue(jsonParser, Long.class);
-                } else if (jsonParser.getCurrentName().equals(GraphSONTokens.VALUE)) {
-                    jsonParser.nextToken();
-                    v = deserializationContext.readValue(jsonParser, Object.class);
-                }
-            }
-
-            return new DefaultRemoteTraverser<>(v, bulk);
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-
-    final static class TraversalStrategyProxyJacksonDeserializer<T extends TraversalStrategy> extends AbstractObjectDeserializer<TraversalStrategyProxy> {
-
-        private final Class<T> clazz;
-
-        public TraversalStrategyProxyJacksonDeserializer(final Class<T> clazz) {
-            super(TraversalStrategyProxy.class);
-            this.clazz = clazz;
-        }
-
-        @Override
-        public TraversalStrategyProxy<T> createObject(final Map<String, Object> data) {
-            return new TraversalStrategyProxy<>(this.clazz, new MapConfiguration(data));
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1.java
new file mode 100644
index 0000000..7acd276
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.gryo;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferencePath;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+
+/**
+ * {@link AbstractGryoClassResolver} for Gryo 1.0.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GryoClassResolverV1 extends AbstractGryoClassResolver {
+
+    @Override
+    public Class coerceType(final Class clazz) {
+        // force all instances of Vertex, Edge, VertexProperty, etc. to their respective interface
+        final Class type;
+        if (!ReferenceVertex.class.isAssignableFrom(clazz) && !DetachedVertex.class.isAssignableFrom(clazz) && Vertex.class.isAssignableFrom(clazz))
+            type = Vertex.class;
+        else if (!ReferenceEdge.class.isAssignableFrom(clazz) && !DetachedEdge.class.isAssignableFrom(clazz) && Edge.class.isAssignableFrom(clazz))
+            type = Edge.class;
+        else if (!ReferenceVertexProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && VertexProperty.class.isAssignableFrom(clazz))
+            type = VertexProperty.class;
+        else if (!ReferenceProperty.class.isAssignableFrom(clazz) && !DetachedProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && !ReferenceVertexProperty.class.isAssignableFrom(clazz) && Property.class.isAssignableFrom(clazz))
+            type = Property.class;
+        else if (!ReferencePath.class.isAssignableFrom(clazz) && !DetachedPath.class.isAssignableFrom(clazz) && Path.class.isAssignableFrom(clazz))
+            type = Path.class;
+        else if (Lambda.class.isAssignableFrom(clazz))
+            type = Lambda.class;
+        else if (ByteBuffer.class.isAssignableFrom(clazz))
+            type = ByteBuffer.class;
+        else if (Class.class.isAssignableFrom(clazz))
+            type = Class.class;
+        else if (InetAddress.class.isAssignableFrom(clazz))
+            type = InetAddress.class;
+        else if (ConnectiveP.class.isAssignableFrom(clazz))
+            type = P.class;
+        else
+            type = clazz;
+
+        return type;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java
deleted file mode 100644
index 82531b0..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV1d0.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferencePath;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-
-/**
- * {@link AbstractGryoClassResolver} for Gryo 1.0.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GryoClassResolverV1d0 extends AbstractGryoClassResolver {
-
-    @Override
-    public Class coerceType(final Class clazz) {
-        // force all instances of Vertex, Edge, VertexProperty, etc. to their respective interface
-        final Class type;
-        if (!ReferenceVertex.class.isAssignableFrom(clazz) && !DetachedVertex.class.isAssignableFrom(clazz) && Vertex.class.isAssignableFrom(clazz))
-            type = Vertex.class;
-        else if (!ReferenceEdge.class.isAssignableFrom(clazz) && !DetachedEdge.class.isAssignableFrom(clazz) && Edge.class.isAssignableFrom(clazz))
-            type = Edge.class;
-        else if (!ReferenceVertexProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && VertexProperty.class.isAssignableFrom(clazz))
-            type = VertexProperty.class;
-        else if (!ReferenceProperty.class.isAssignableFrom(clazz) && !DetachedProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && !ReferenceVertexProperty.class.isAssignableFrom(clazz) && Property.class.isAssignableFrom(clazz))
-            type = Property.class;
-        else if (!ReferencePath.class.isAssignableFrom(clazz) && !DetachedPath.class.isAssignableFrom(clazz) && Path.class.isAssignableFrom(clazz))
-            type = Path.class;
-        else if (Lambda.class.isAssignableFrom(clazz))
-            type = Lambda.class;
-        else if (ByteBuffer.class.isAssignableFrom(clazz))
-            type = ByteBuffer.class;
-        else if (Class.class.isAssignableFrom(clazz))
-            type = Class.class;
-        else if (InetAddress.class.isAssignableFrom(clazz))
-            type = InetAddress.class;
-        else if (ConnectiveP.class.isAssignableFrom(clazz))
-            type = P.class;
-        else
-            type = clazz;
-
-        return type;
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV3.java
new file mode 100644
index 0000000..2066f8d
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV3.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.gryo;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferencePath;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+
+/**
+ * {@link AbstractGryoClassResolver} for Gryo 3.0.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GryoClassResolverV3 extends AbstractGryoClassResolver {
+
+    @Override
+    public Class coerceType(final Class clazz) {
+        // force all instances of Vertex, Edge, VertexProperty, etc. to their respective interface
+        final Class type;
+        if (!ReferenceVertex.class.isAssignableFrom(clazz) && !DetachedVertex.class.isAssignableFrom(clazz) && Vertex.class.isAssignableFrom(clazz))
+            type = Vertex.class;
+        else if (!ReferenceEdge.class.isAssignableFrom(clazz) && !DetachedEdge.class.isAssignableFrom(clazz) && Edge.class.isAssignableFrom(clazz))
+            type = Edge.class;
+        else if (!ReferenceVertexProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && VertexProperty.class.isAssignableFrom(clazz))
+            type = VertexProperty.class;
+        else if (!ReferenceProperty.class.isAssignableFrom(clazz) && !DetachedProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && !ReferenceVertexProperty.class.isAssignableFrom(clazz) && Property.class.isAssignableFrom(clazz))
+            type = Property.class;
+        else if (!ReferencePath.class.isAssignableFrom(clazz) && !DetachedPath.class.isAssignableFrom(clazz) && Path.class.isAssignableFrom(clazz))
+            type = Path.class;
+        else if (Lambda.class.isAssignableFrom(clazz))
+            type = Lambda.class;
+        else if (ByteBuffer.class.isAssignableFrom(clazz))
+            type = ByteBuffer.class;
+        else if (Class.class.isAssignableFrom(clazz))
+            type = Class.class;
+        else if (InetAddress.class.isAssignableFrom(clazz))
+            type = InetAddress.class;
+        else if (ConnectiveP.class.isAssignableFrom(clazz))
+            type = P.class;
+        else if (Metrics.class.isAssignableFrom(clazz))
+            type = Metrics.class;
+        else if (TraversalMetrics.class.isAssignableFrom(clazz))
+            type = TraversalMetrics.class;
+        else
+            type = clazz;
+
+        return type;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV3d0.java
deleted file mode 100644
index 99a7c4a..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolverV3d0.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferencePath;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-
-/**
- * {@link AbstractGryoClassResolver} for Gryo 3.0.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GryoClassResolverV3d0 extends AbstractGryoClassResolver {
-
-    @Override
-    public Class coerceType(final Class clazz) {
-        // force all instances of Vertex, Edge, VertexProperty, etc. to their respective interface
-        final Class type;
-        if (!ReferenceVertex.class.isAssignableFrom(clazz) && !DetachedVertex.class.isAssignableFrom(clazz) && Vertex.class.isAssignableFrom(clazz))
-            type = Vertex.class;
-        else if (!ReferenceEdge.class.isAssignableFrom(clazz) && !DetachedEdge.class.isAssignableFrom(clazz) && Edge.class.isAssignableFrom(clazz))
-            type = Edge.class;
-        else if (!ReferenceVertexProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && VertexProperty.class.isAssignableFrom(clazz))
-            type = VertexProperty.class;
-        else if (!ReferenceProperty.class.isAssignableFrom(clazz) && !DetachedProperty.class.isAssignableFrom(clazz) && !DetachedVertexProperty.class.isAssignableFrom(clazz) && !ReferenceVertexProperty.class.isAssignableFrom(clazz) && Property.class.isAssignableFrom(clazz))
-            type = Property.class;
-        else if (!ReferencePath.class.isAssignableFrom(clazz) && !DetachedPath.class.isAssignableFrom(clazz) && Path.class.isAssignableFrom(clazz))
-            type = Path.class;
-        else if (Lambda.class.isAssignableFrom(clazz))
-            type = Lambda.class;
-        else if (ByteBuffer.class.isAssignableFrom(clazz))
-            type = ByteBuffer.class;
-        else if (Class.class.isAssignableFrom(clazz))
-            type = Class.class;
-        else if (InetAddress.class.isAssignableFrom(clazz))
-            type = InetAddress.class;
-        else if (ConnectiveP.class.isAssignableFrom(clazz))
-            type = P.class;
-        else if (Metrics.class.isAssignableFrom(clazz))
-            type = Metrics.class;
-        else if (TraversalMetrics.class.isAssignableFrom(clazz))
-            type = TraversalMetrics.class;
-        else
-            type = clazz;
-
-        return type;
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1.java
new file mode 100644
index 0000000..3e7a4c0
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1.java
@@ -0,0 +1,314 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.gryo;
+
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Text;
+import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.BiPredicate;
+
+/**
+ * This class holds serializers for graph-based objects such as vertices, edges, properties, and paths. These objects
+ * are "detached" using {@link DetachedFactory} before serialization. These serializers present a generalized way to
+ * serialize the implementations of core interfaces. These are serializers for Gryo 1.0.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public final class GryoSerializersV1 {
+
+    /**
+     * Serializes any {@link Edge} implementation encountered to a {@link DetachedEdge}.
+     */
+    public final static class EdgeSerializer implements SerializerShim<Edge> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Edge edge) {
+            kryo.writeClassAndObject(output, DetachedFactory.detach(edge, true));
+        }
+
+        @Override
+        public <I extends InputShim> Edge read(final KryoShim<I, ?> kryo, final I input, final Class<Edge> edgeClass) {
+            final Object o = kryo.readClassAndObject(input);
+            return (Edge) o;
+        }
+    }
+
+    /**
+     * Serializes any {@link Vertex} implementation encountered to an {@link DetachedVertex}.
+     */
+    public final static class VertexSerializer implements SerializerShim<Vertex> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Vertex vertex) {
+            kryo.writeClassAndObject(output, DetachedFactory.detach(vertex, true));
+        }
+
+        @Override
+        public <I extends InputShim> Vertex read(final KryoShim<I, ?> kryo, final I input, final Class<Vertex> vertexClass) {
+            return (Vertex) kryo.readClassAndObject(input);
+        }
+    }
+
+    /**
+     * Serializes any {@link Property} implementation encountered to an {@link DetachedProperty}.
+     */
+    public final static class PropertySerializer implements SerializerShim<Property> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Property property) {
+            kryo.writeClassAndObject(output, property instanceof VertexProperty ? DetachedFactory.detach((VertexProperty) property, true) : DetachedFactory.detach(property));
+        }
+
+        @Override
+        public <I extends InputShim> Property read(final KryoShim<I, ?> kryo, final I input, final Class<Property> propertyClass) {
+            return (Property) kryo.readClassAndObject(input);
+        }
+    }
+
+    /**
+     * Serializes any {@link VertexProperty} implementation encountered to an {@link DetachedVertexProperty}.
+     */
+    public final static class VertexPropertySerializer implements SerializerShim<VertexProperty> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final VertexProperty vertexProperty) {
+            kryo.writeClassAndObject(output, DetachedFactory.detach(vertexProperty, true));
+        }
+
+        @Override
+        public <I extends InputShim> VertexProperty read(final KryoShim<I, ?> kryo, final I input, final Class<VertexProperty> vertexPropertyClass) {
+            return (VertexProperty) kryo.readClassAndObject(input);
+        }
+    }
+
+    /**
+     * Serializes any {@link Path} implementation encountered to an {@link DetachedPath}.
+     */
+    public final static class PathSerializer implements SerializerShim<Path> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Path path) {
+            kryo.writeClassAndObject(output, DetachedFactory.detach(path, false));
+        }
+
+        @Override
+        public <I extends InputShim> Path read(final KryoShim<I, ?> kryo, final I input, final Class<Path> pathClass) {
+            return (Path) kryo.readClassAndObject(input);
+        }
+    }
+
+    public final static class BytecodeSerializer implements SerializerShim<Bytecode> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode bytecode) {
+            writeInstructions(kryo, output, bytecode.getSourceInstructions());
+            writeInstructions(kryo, output, bytecode.getStepInstructions());
+        }
+
+        @Override
+        public <I extends InputShim> Bytecode read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode> clazz) {
+            final Bytecode bytecode = new Bytecode();
+            final int sourceInstructionCount = input.readInt();
+            for (int ix = 0; ix < sourceInstructionCount; ix++) {
+                final String operator = input.readString();
+                final Object[] args = operator.equals(TraversalSource.Symbols.withoutStrategies) ?
+                        kryo.readObject(input, Class[].class) :
+                        kryo.readObject(input, Object[].class);
+                bytecode.addSource(operator, args);
+            }
+
+            final int stepInstructionCount = input.readInt();
+            for (int ix = 0; ix < stepInstructionCount; ix++) {
+                final String operator = input.readString();
+                final Object[] args = kryo.readObject(input, Object[].class);
+                bytecode.addStep(operator, args);
+            }
+
+            return bytecode;
+        }
+
+        private static <O extends OutputShim> void writeInstructions(final KryoShim<?, O> kryo, final O output,
+                                                                     final List<Bytecode.Instruction> instructions) {
+            output.writeInt(instructions.size());
+            for (Bytecode.Instruction inst : instructions) {
+                output.writeString(inst.getOperator());
+                kryo.writeObject(output, inst.getArguments());
+            }
+        }
+    }
+
+    public final static class PSerializer implements SerializerShim<P> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final P p) {
+            output.writeString(p instanceof ConnectiveP ?
+                    (p instanceof AndP ? "and" : "or") :
+                    p.getBiPredicate().toString());
+            if (p instanceof ConnectiveP || p.getValue() instanceof Collection) {
+                output.writeByte((byte) 0);
+                final Collection<?> coll = p instanceof ConnectiveP ?
+                        ((ConnectiveP<?>) p).getPredicates() : (Collection) p.getValue();
+                output.writeInt(coll.size());
+                coll.forEach(v -> kryo.writeClassAndObject(output, v));
+            } else {
+                output.writeByte((byte) 1);
+                kryo.writeClassAndObject(output, p.getValue());
+            }
+        }
+
+        @Override
+        public <I extends InputShim> P read(final KryoShim<I, ?> kryo, final I input, final Class<P> clazz) {
+            final String predicate = input.readString();
+            final boolean isCollection = input.readByte() == (byte) 0;
+            final Object value;
+            if (isCollection) {
+                value = new ArrayList<>();
+                final int size = input.readInt();
+                for (int ix = 0; ix < size; ix++) {
+                    ((List) value).add(kryo.readClassAndObject(input));
+                }
+            } else {
+                value = kryo.readClassAndObject(input);
+            }
+
+            try {
+                if (predicate.equals("and") || predicate.equals("or"))
+                    return predicate.equals("and") ? new AndP((List<P>) value) : new OrP((List<P>) value);
+                else if (value instanceof Collection) {
+                    if (predicate.equals("between"))
+                        return P.between(((List) value).get(0), ((List) value).get(1));
+                    else if (predicate.equals("inside"))
+                        return P.inside(((List) value).get(0), ((List) value).get(1));
+                    else if (predicate.equals("outside"))
+                        return P.outside(((List) value).get(0), ((List) value).get(1));
+                    else if (predicate.equals("within"))
+                        return P.within((Collection) value);
+                    else if (predicate.equals("without"))
+                        return P.without((Collection) value);
+                    else
+                        return (P) P.class.getMethod(predicate, Collection.class).invoke(null, (Collection) value);
+                } else
+                    return (P) P.class.getMethod(predicate, Object.class).invoke(null, value);
+            } catch (final Exception e) {
+                throw new IllegalStateException(e.getMessage(), e);
+            }
+        }
+    }
+
+    public final static class TextPSerializer implements SerializerShim<TextP> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final TextP p) {
+            final BiPredicate<?,?> tp = p.getBiPredicate();
+            if (tp instanceof Text) {
+                output.writeString(((Text) tp).name());
+            } else if (tp instanceof Text.RegexPredicate) {
+                output.writeString(((Text.RegexPredicate) tp).isNegate() ? "notRegex" : "regex");
+            } else {
+                output.writeString(tp.toString());
+            }
+            kryo.writeObject(output, p.getValue());
+        }
+
+        @Override
+        public <I extends InputShim> TextP read(final KryoShim<I, ?> kryo, final I input, final Class<TextP> clazz) {
+            final String predicate = input.readString();
+            final String value = kryo.readObject(input, String.class);
+
+            try {
+                return (TextP) TextP.class.getMethod(predicate, String.class).invoke(null, value);
+            } catch (final Exception e) {
+                throw new IllegalStateException(e.getMessage(), e);
+            }
+        }
+    }
+
+    public final static class LambdaSerializer implements SerializerShim<Lambda> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Lambda lambda) {
+            output.writeString(lambda.getLambdaScript());
+            output.writeString(lambda.getLambdaLanguage());
+            output.writeInt(lambda.getLambdaArguments());
+        }
+
+        @Override
+        public <I extends InputShim> Lambda read(final KryoShim<I, ?> kryo, final I input, final Class<Lambda> clazz) {
+            final String script = input.readString();
+            final String language = input.readString();
+            final int arguments = input.readInt();
+            //
+            if (-1 == arguments || arguments > 2)
+                return new Lambda.UnknownArgLambda(script, language, arguments);
+            else if (0 == arguments)
+                return new Lambda.ZeroArgLambda<>(script, language);
+            else if (1 == arguments)
+                return new Lambda.OneArgLambda<>(script, language);
+            else
+                return new Lambda.TwoArgLambda<>(script, language);
+        }
+    }
+
+    public final static class BindingSerializer implements SerializerShim<Bytecode.Binding> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode.Binding binding) {
+            output.writeString(binding.variable());
+            kryo.writeClassAndObject(output, binding.value());
+        }
+
+        @Override
+        public <I extends InputShim> Bytecode.Binding read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode.Binding> clazz) {
+            final String var = input.readString();
+            final Object val = kryo.readClassAndObject(input);
+            return new Bytecode.Binding(var, val);
+        }
+    }
+
+    public final static class DefaultRemoteTraverserSerializer implements SerializerShim<DefaultRemoteTraverser> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final DefaultRemoteTraverser remoteTraverser) {
+            kryo.writeClassAndObject(output, remoteTraverser.get());
+            output.writeLong(remoteTraverser.bulk());
+        }
+
+        @Override
+        public <I extends InputShim> DefaultRemoteTraverser read(final KryoShim<I, ?> kryo, final I input, final Class<DefaultRemoteTraverser> remoteTraverserClass) {
+            final Object o = kryo.readClassAndObject(input);
+            return new DefaultRemoteTraverser<>(o, input.readLong());
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java
deleted file mode 100644
index f88a4ff..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV1d0.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Text;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.BiPredicate;
-
-/**
- * This class holds serializers for graph-based objects such as vertices, edges, properties, and paths. These objects
- * are "detached" using {@link DetachedFactory} before serialization. These serializers present a generalized way to
- * serialize the implementations of core interfaces. These are serializers for Gryo 1.0.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class GryoSerializersV1d0 {
-
-    /**
-     * Serializes any {@link Edge} implementation encountered to a {@link DetachedEdge}.
-     */
-    public final static class EdgeSerializer implements SerializerShim<Edge> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Edge edge) {
-            kryo.writeClassAndObject(output, DetachedFactory.detach(edge, true));
-        }
-
-        @Override
-        public <I extends InputShim> Edge read(final KryoShim<I, ?> kryo, final I input, final Class<Edge> edgeClass) {
-            final Object o = kryo.readClassAndObject(input);
-            return (Edge) o;
-        }
-    }
-
-    /**
-     * Serializes any {@link Vertex} implementation encountered to an {@link DetachedVertex}.
-     */
-    public final static class VertexSerializer implements SerializerShim<Vertex> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Vertex vertex) {
-            kryo.writeClassAndObject(output, DetachedFactory.detach(vertex, true));
-        }
-
-        @Override
-        public <I extends InputShim> Vertex read(final KryoShim<I, ?> kryo, final I input, final Class<Vertex> vertexClass) {
-            return (Vertex) kryo.readClassAndObject(input);
-        }
-    }
-
-    /**
-     * Serializes any {@link Property} implementation encountered to an {@link DetachedProperty}.
-     */
-    public final static class PropertySerializer implements SerializerShim<Property> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Property property) {
-            kryo.writeClassAndObject(output, property instanceof VertexProperty ? DetachedFactory.detach((VertexProperty) property, true) : DetachedFactory.detach(property));
-        }
-
-        @Override
-        public <I extends InputShim> Property read(final KryoShim<I, ?> kryo, final I input, final Class<Property> propertyClass) {
-            return (Property) kryo.readClassAndObject(input);
-        }
-    }
-
-    /**
-     * Serializes any {@link VertexProperty} implementation encountered to an {@link DetachedVertexProperty}.
-     */
-    public final static class VertexPropertySerializer implements SerializerShim<VertexProperty> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final VertexProperty vertexProperty) {
-            kryo.writeClassAndObject(output, DetachedFactory.detach(vertexProperty, true));
-        }
-
-        @Override
-        public <I extends InputShim> VertexProperty read(final KryoShim<I, ?> kryo, final I input, final Class<VertexProperty> vertexPropertyClass) {
-            return (VertexProperty) kryo.readClassAndObject(input);
-        }
-    }
-
-    /**
-     * Serializes any {@link Path} implementation encountered to an {@link DetachedPath}.
-     */
-    public final static class PathSerializer implements SerializerShim<Path> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Path path) {
-            kryo.writeClassAndObject(output, DetachedFactory.detach(path, false));
-        }
-
-        @Override
-        public <I extends InputShim> Path read(final KryoShim<I, ?> kryo, final I input, final Class<Path> pathClass) {
-            return (Path) kryo.readClassAndObject(input);
-        }
-    }
-
-    public final static class BytecodeSerializer implements SerializerShim<Bytecode> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode bytecode) {
-            writeInstructions(kryo, output, bytecode.getSourceInstructions());
-            writeInstructions(kryo, output, bytecode.getStepInstructions());
-        }
-
-        @Override
-        public <I extends InputShim> Bytecode read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode> clazz) {
-            final Bytecode bytecode = new Bytecode();
-            final int sourceInstructionCount = input.readInt();
-            for (int ix = 0; ix < sourceInstructionCount; ix++) {
-                final String operator = input.readString();
-                final Object[] args = operator.equals(TraversalSource.Symbols.withoutStrategies) ?
-                        kryo.readObject(input, Class[].class) :
-                        kryo.readObject(input, Object[].class);
-                bytecode.addSource(operator, args);
-            }
-
-            final int stepInstructionCount = input.readInt();
-            for (int ix = 0; ix < stepInstructionCount; ix++) {
-                final String operator = input.readString();
-                final Object[] args = kryo.readObject(input, Object[].class);
-                bytecode.addStep(operator, args);
-            }
-
-            return bytecode;
-        }
-
-        private static <O extends OutputShim> void writeInstructions(final KryoShim<?, O> kryo, final O output,
-                                                                     final List<Bytecode.Instruction> instructions) {
-            output.writeInt(instructions.size());
-            for (Bytecode.Instruction inst : instructions) {
-                output.writeString(inst.getOperator());
-                kryo.writeObject(output, inst.getArguments());
-            }
-        }
-    }
-
-    public final static class PSerializer implements SerializerShim<P> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final P p) {
-            output.writeString(p instanceof ConnectiveP ?
-                    (p instanceof AndP ? "and" : "or") :
-                    p.getBiPredicate().toString());
-            if (p instanceof ConnectiveP || p.getValue() instanceof Collection) {
-                output.writeByte((byte) 0);
-                final Collection<?> coll = p instanceof ConnectiveP ?
-                        ((ConnectiveP<?>) p).getPredicates() : (Collection) p.getValue();
-                output.writeInt(coll.size());
-                coll.forEach(v -> kryo.writeClassAndObject(output, v));
-            } else {
-                output.writeByte((byte) 1);
-                kryo.writeClassAndObject(output, p.getValue());
-            }
-        }
-
-        @Override
-        public <I extends InputShim> P read(final KryoShim<I, ?> kryo, final I input, final Class<P> clazz) {
-            final String predicate = input.readString();
-            final boolean isCollection = input.readByte() == (byte) 0;
-            final Object value;
-            if (isCollection) {
-                value = new ArrayList<>();
-                final int size = input.readInt();
-                for (int ix = 0; ix < size; ix++) {
-                    ((List) value).add(kryo.readClassAndObject(input));
-                }
-            } else {
-                value = kryo.readClassAndObject(input);
-            }
-
-            try {
-                if (predicate.equals("and") || predicate.equals("or"))
-                    return predicate.equals("and") ? new AndP((List<P>) value) : new OrP((List<P>) value);
-                else if (value instanceof Collection) {
-                    if (predicate.equals("between"))
-                        return P.between(((List) value).get(0), ((List) value).get(1));
-                    else if (predicate.equals("inside"))
-                        return P.inside(((List) value).get(0), ((List) value).get(1));
-                    else if (predicate.equals("outside"))
-                        return P.outside(((List) value).get(0), ((List) value).get(1));
-                    else if (predicate.equals("within"))
-                        return P.within((Collection) value);
-                    else if (predicate.equals("without"))
-                        return P.without((Collection) value);
-                    else
-                        return (P) P.class.getMethod(predicate, Collection.class).invoke(null, (Collection) value);
-                } else
-                    return (P) P.class.getMethod(predicate, Object.class).invoke(null, value);
-            } catch (final Exception e) {
-                throw new IllegalStateException(e.getMessage(), e);
-            }
-        }
-    }
-
-    public final static class TextPSerializer implements SerializerShim<TextP> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final TextP p) {
-            final BiPredicate<?,?> tp = p.getBiPredicate();
-            if (tp instanceof Text) {
-                output.writeString(((Text) tp).name());
-            } else if (tp instanceof Text.RegexPredicate) {
-                output.writeString(((Text.RegexPredicate) tp).isNegate() ? "notRegex" : "regex");
-            } else {
-                output.writeString(tp.toString());
-            }
-            kryo.writeObject(output, p.getValue());
-        }
-
-        @Override
-        public <I extends InputShim> TextP read(final KryoShim<I, ?> kryo, final I input, final Class<TextP> clazz) {
-            final String predicate = input.readString();
-            final String value = kryo.readObject(input, String.class);
-
-            try {
-                return (TextP) TextP.class.getMethod(predicate, String.class).invoke(null, value);
-            } catch (final Exception e) {
-                throw new IllegalStateException(e.getMessage(), e);
-            }
-        }
-    }
-
-    public final static class LambdaSerializer implements SerializerShim<Lambda> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Lambda lambda) {
-            output.writeString(lambda.getLambdaScript());
-            output.writeString(lambda.getLambdaLanguage());
-            output.writeInt(lambda.getLambdaArguments());
-        }
-
-        @Override
-        public <I extends InputShim> Lambda read(final KryoShim<I, ?> kryo, final I input, final Class<Lambda> clazz) {
-            final String script = input.readString();
-            final String language = input.readString();
-            final int arguments = input.readInt();
-            //
-            if (-1 == arguments || arguments > 2)
-                return new Lambda.UnknownArgLambda(script, language, arguments);
-            else if (0 == arguments)
-                return new Lambda.ZeroArgLambda<>(script, language);
-            else if (1 == arguments)
-                return new Lambda.OneArgLambda<>(script, language);
-            else
-                return new Lambda.TwoArgLambda<>(script, language);
-        }
-    }
-
-    public final static class BindingSerializer implements SerializerShim<Bytecode.Binding> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode.Binding binding) {
-            output.writeString(binding.variable());
-            kryo.writeClassAndObject(output, binding.value());
-        }
-
-        @Override
-        public <I extends InputShim> Bytecode.Binding read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode.Binding> clazz) {
-            final String var = input.readString();
-            final Object val = kryo.readClassAndObject(input);
-            return new Bytecode.Binding(var, val);
-        }
-    }
-
-    public final static class DefaultRemoteTraverserSerializer implements SerializerShim<DefaultRemoteTraverser> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final DefaultRemoteTraverser remoteTraverser) {
-            kryo.writeClassAndObject(output, remoteTraverser.get());
-            output.writeLong(remoteTraverser.bulk());
-        }
-
-        @Override
-        public <I extends InputShim> DefaultRemoteTraverser read(final KryoShim<I, ?> kryo, final I input, final Class<DefaultRemoteTraverser> remoteTraverserClass) {
-            final Object o = kryo.readClassAndObject(input);
-            return new DefaultRemoteTraverser<>(o, input.readLong());
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3.java
new file mode 100644
index 0000000..9a846a3
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3.java
@@ -0,0 +1,507 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.gryo;
+
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Text;
+import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiPredicate;
+
+/**
+ * This class holds serializers for graph-based objects such as vertices, edges, properties, and paths. These objects
+ * are "detached" using {@link DetachedFactory} before serialization. These serializers present a generalized way to
+ * serialize the implementations of core interfaces. These serializers are versioned and not compatible with Gryo 1.0.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public final class GryoSerializersV3 {
+
+    /**
+     * Serializes any {@link Edge} implementation encountered to a {@link DetachedEdge}.
+     */
+    public final static class EdgeSerializer implements SerializerShim<Edge> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Edge edge) {
+            kryo.writeClassAndObject(output, edge.id());
+            output.writeString(edge.label());
+            kryo.writeClassAndObject(output, edge.inVertex().id());
+
+            // temporary try/catch perhaps? need this to get SparkSingleIterationStrategyTest to work. Trying to grab
+            // the label of the adjacent vertex ends in error if there's a StarEdge in the ComputerGraph$ComputerEdge.
+            // apparently this is how we handle things in DetachedElement. i'll write here in the comments what was
+            // written there:
+            //
+            // ghetto
+            try {
+                output.writeString(edge.inVertex().label());
+            } catch (Exception ex) {
+                output.writeString(Vertex.DEFAULT_LABEL);
+            }
+
+            kryo.writeClassAndObject(output, edge.outVertex().id());
+
+            // same nonsense as above for a default label
+            try {
+                output.writeString(edge.outVertex().label());
+            } catch (Exception ex) {
+                output.writeString(Vertex.DEFAULT_LABEL);
+            }
+
+            writeElementProperties(kryo, output, edge);
+        }
+
+        @Override
+        public <I extends InputShim> Edge read(final KryoShim<I, ?> kryo, final I input, final Class<Edge> edgeClass) {
+            final DetachedEdge.Builder builder = DetachedEdge.build();
+            builder.setId(kryo.readClassAndObject(input));
+            builder.setLabel(input.readString());
+
+            final DetachedVertex.Builder inV = DetachedVertex.build();
+            inV.setId(kryo.readClassAndObject(input));
+            inV.setLabel(input.readString());
+            builder.setInV(inV.create());
+
+            final DetachedVertex.Builder outV = DetachedVertex.build();
+            outV.setId(kryo.readClassAndObject(input));
+            outV.setLabel(input.readString());
+            builder.setOutV(outV.create());
+
+            while(input.readBoolean()) {
+                builder.addProperty(new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input)));
+            }
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Serializes any {@link Vertex} implementation encountered to an {@link DetachedVertex}.
+     */
+    public final static class VertexSerializer implements SerializerShim<Vertex> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Vertex vertex) {
+            kryo.writeClassAndObject(output, vertex.id());
+            output.writeString(vertex.label());
+
+            final Iterator<? extends VertexProperty> properties = vertex.properties();
+            output.writeBoolean(properties.hasNext());
+            while (properties.hasNext()) {
+                final VertexProperty vp = properties.next();
+                kryo.writeClassAndObject(output, vp.id());
+                output.writeString(vp.label());
+                kryo.writeClassAndObject(output, vp.value());
+
+                if (vp instanceof DetachedVertexProperty || (vertex.graph().features().vertex().supportsMetaProperties())) {
+                    writeElementProperties(kryo, output, vp);
+                } else {
+                    output.writeBoolean(false);
+                }
+
+                output.writeBoolean(properties.hasNext());
+            }
+        }
+
+        @Override
+        public <I extends InputShim> Vertex read(final KryoShim<I, ?> kryo, final I input, final Class<Vertex> vertexClass) {
+            final DetachedVertex.Builder builder = DetachedVertex.build();
+            builder.setId(kryo.readClassAndObject(input));
+            builder.setLabel(input.readString());
+
+            while(input.readBoolean()) {
+                final DetachedVertexProperty.Builder vpBuilder = DetachedVertexProperty.build();
+                vpBuilder.setId(kryo.readClassAndObject(input));
+                vpBuilder.setLabel(input.readString());
+                vpBuilder.setValue(kryo.readClassAndObject(input));
+
+                while(input.readBoolean()) {
+                    vpBuilder.addProperty(new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input)));
+                }
+
+                builder.addProperty(vpBuilder.create());
+            }
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Serializes any {@link Property} implementation encountered to an {@link DetachedProperty}.
+     */
+    public final static class PropertySerializer implements SerializerShim<Property> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Property property) {
+            output.writeString(property.key());
+            kryo.writeClassAndObject(output, property.value());
+            kryo.writeClassAndObject(output, property.element().id());
+            output.writeString(property.element().label());
+        }
+
+        @Override
+        public <I extends InputShim> Property read(final KryoShim<I, ?> kryo, final I input, final Class<Property> propertyClass) {
+            return new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input),
+                    DetachedVertex.build().setId(kryo.readClassAndObject(input)).setLabel(input.readString()).create());
+        }
+    }
+
+    /**
+     * Serializes any {@link VertexProperty} implementation encountered to an {@link DetachedVertexProperty}.
+     */
+    public final static class VertexPropertySerializer implements SerializerShim<VertexProperty> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final VertexProperty vertexProperty) {
+            kryo.writeClassAndObject(output, vertexProperty.id());
+            output.writeString(vertexProperty.label());
+            kryo.writeClassAndObject(output, vertexProperty.value());
+            kryo.writeClassAndObject(output, vertexProperty.element().id());
+            output.writeString(vertexProperty.element().label());
+
+            if (vertexProperty instanceof DetachedVertexProperty || (vertexProperty.graph().features().vertex().supportsMetaProperties())) {
+                writeElementProperties(kryo, output, vertexProperty);
+            } else {
+                output.writeBoolean(false);
+            }
+        }
+
+        @Override
+        public <I extends InputShim> VertexProperty read(final KryoShim<I, ?> kryo, final I input, final Class<VertexProperty> vertexPropertyClass) {
+           final DetachedVertexProperty.Builder vpBuilder = DetachedVertexProperty.build();
+            vpBuilder.setId(kryo.readClassAndObject(input));
+            vpBuilder.setLabel(input.readString());
+            vpBuilder.setValue(kryo.readClassAndObject(input));
+
+            final DetachedVertex.Builder host = DetachedVertex.build();
+            host.setId(kryo.readClassAndObject(input));
+            host.setLabel(input.readString());
+            vpBuilder.setV(host.create());
+
+            while(input.readBoolean()) {
+                vpBuilder.addProperty(new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input)));
+            }
+
+            return vpBuilder.create();
+        }
+    }
+
+    /**
+     * Serializes any {@link Path} implementation encountered to an {@link DetachedPath}.
+     */
+    public final static class PathSerializer implements SerializerShim<Path> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Path path) {
+            kryo.writeClassAndObject(output, DetachedFactory.detach(path, false));
+        }
+
+        @Override
+        public <I extends InputShim> Path read(final KryoShim<I, ?> kryo, final I input, final Class<Path> pathClass) {
+            return (Path) kryo.readClassAndObject(input);
+        }
+    }
+
+    public final static class BytecodeSerializer implements SerializerShim<Bytecode> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode bytecode) {
+            writeInstructions(kryo, output, bytecode.getSourceInstructions());
+            writeInstructions(kryo, output, bytecode.getStepInstructions());
+        }
+
+        @Override
+        public <I extends InputShim> Bytecode read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode> clazz) {
+            final Bytecode bytecode = new Bytecode();
+            final int sourceInstructionCount = input.readInt();
+            for (int ix = 0; ix < sourceInstructionCount; ix++) {
+                final String operator = input.readString();
+                final Object[] args = operator.equals(TraversalSource.Symbols.withoutStrategies) ?
+                        kryo.readObject(input, Class[].class) :
+                        kryo.readObject(input, Object[].class);
+                bytecode.addSource(operator, args);
+            }
+
+            final int stepInstructionCount = input.readInt();
+            for (int ix = 0; ix < stepInstructionCount; ix++) {
+                final String operator = input.readString();
+                final Object[] args = kryo.readObject(input, Object[].class);
+                bytecode.addStep(operator, args);
+            }
+
+            return bytecode;
+        }
+
+        private static <O extends OutputShim> void writeInstructions(final KryoShim<?, O> kryo, final O output,
+                                                                     final List<Bytecode.Instruction> instructions) {
+            output.writeInt(instructions.size());
+            for (Bytecode.Instruction inst : instructions) {
+                output.writeString(inst.getOperator());
+                kryo.writeObject(output, inst.getArguments());
+            }
+        }
+    }
+
+    public final static class PSerializer implements SerializerShim<P> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final P p) {
+            output.writeString(p instanceof ConnectiveP ?
+                    (p instanceof AndP ? "and" : "or") :
+                    p.getBiPredicate().toString());
+            if (p instanceof ConnectiveP || p.getValue() instanceof Collection) {
+                output.writeByte((byte) 0);
+                final Collection<?> coll = p instanceof ConnectiveP ?
+                        ((ConnectiveP<?>) p).getPredicates() : (Collection) p.getValue();
+                output.writeInt(coll.size());
+                coll.forEach(v -> kryo.writeClassAndObject(output, v));
+            } else {
+                output.writeByte((byte) 1);
+                kryo.writeClassAndObject(output, p.getValue());
+            }
+        }
+
+        @Override
+        public <I extends InputShim> P read(final KryoShim<I, ?> kryo, final I input, final Class<P> clazz) {
+            final String predicate = input.readString();
+            final boolean isCollection = input.readByte() == (byte) 0;
+            final Object value;
+            if (isCollection) {
+                value = new ArrayList<>();
+                final int size = input.readInt();
+                for (int ix = 0; ix < size; ix++) {
+                    ((List) value).add(kryo.readClassAndObject(input));
+                }
+            } else {
+                value = kryo.readClassAndObject(input);
+            }
+
+            try {
+                if (predicate.equals("and") || predicate.equals("or"))
+                    return predicate.equals("and") ? new AndP((List<P>) value) : new OrP((List<P>) value);
+                else if (value instanceof Collection) {
+                    if (predicate.equals("between"))
+                        return P.between(((List) value).get(0), ((List) value).get(1));
+                    else if (predicate.equals("inside"))
+                        return P.inside(((List) value).get(0), ((List) value).get(1));
+                    else if (predicate.equals("outside"))
+                        return P.outside(((List) value).get(0), ((List) value).get(1));
+                    else if (predicate.equals("within"))
+                        return P.within((Collection) value);
+                    else if (predicate.equals("without"))
+                        return P.without((Collection) value);
+                    else
+                        return (P) P.class.getMethod(predicate, Collection.class).invoke(null, (Collection) value);
+                } else
+                    return (P) P.class.getMethod(predicate, Object.class).invoke(null, value);
+            } catch (final Exception e) {
+                throw new IllegalStateException(e.getMessage(), e);
+            }
+        }
+    }
+
+    public final static class TextPSerializer implements SerializerShim<TextP> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final TextP p) {
+            final BiPredicate<?,?> tp = p.getBiPredicate();
+            if (tp instanceof Text) {
+                output.writeString(((Text) tp).name());
+            } else if (tp instanceof Text.RegexPredicate) {
+                output.writeString(((Text.RegexPredicate) tp).isNegate() ? "notRegex" : "regex");
+            } else {
+                output.writeString(tp.toString());
+            }
+            kryo.writeObject(output, p.getValue());
+        }
+
+        @Override
+        public <I extends InputShim> TextP read(final KryoShim<I, ?> kryo, final I input, final Class<TextP> clazz) {
+            final String predicate = input.readString();
+            final String value = kryo.readObject(input, String.class);
+
+            try {
+                return (TextP) TextP.class.getMethod(predicate, String.class).invoke(null, value);
+            } catch (final Exception e) {
+                throw new IllegalStateException(e.getMessage(), e);
+            }
+        }
+    }
+
+    public final static class LambdaSerializer implements SerializerShim<Lambda> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Lambda lambda) {
+            output.writeString(lambda.getLambdaScript());
+            output.writeString(lambda.getLambdaLanguage());
+            output.writeInt(lambda.getLambdaArguments());
+        }
+
+        @Override
+        public <I extends InputShim> Lambda read(final KryoShim<I, ?> kryo, final I input, final Class<Lambda> clazz) {
+            final String script = input.readString();
+            final String language = input.readString();
+            final int arguments = input.readInt();
+            //
+            if (-1 == arguments || arguments > 2)
+                return new Lambda.UnknownArgLambda(script, language, arguments);
+            else if (0 == arguments)
+                return new Lambda.ZeroArgLambda<>(script, language);
+            else if (1 == arguments)
+                return new Lambda.OneArgLambda<>(script, language);
+            else
+                return new Lambda.TwoArgLambda<>(script, language);
+        }
+    }
+
+    public final static class BindingSerializer implements SerializerShim<Bytecode.Binding> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode.Binding binding) {
+            output.writeString(binding.variable());
+            kryo.writeClassAndObject(output, binding.value());
+        }
+
+        @Override
+        public <I extends InputShim> Bytecode.Binding read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode.Binding> clazz) {
+            final String var = input.readString();
+            final Object val = kryo.readClassAndObject(input);
+            return new Bytecode.Binding(var, val);
+        }
+    }
+
+    public final static class DefaultRemoteTraverserSerializer implements SerializerShim<DefaultRemoteTraverser> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final DefaultRemoteTraverser remoteTraverser) {
+            kryo.writeClassAndObject(output, remoteTraverser.get());
+            output.writeLong(remoteTraverser.bulk());
+        }
+
+        @Override
+        public <I extends InputShim> DefaultRemoteTraverser read(final KryoShim<I, ?> kryo, final I input, final Class<DefaultRemoteTraverser> remoteTraverserClass) {
+            final Object o = kryo.readClassAndObject(input);
+            return new DefaultRemoteTraverser<>(o, input.readLong());
+        }
+    }
+
+    public final static class TraversalMetricsSerializer implements SerializerShim<TraversalMetrics> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final TraversalMetrics object) {
+            output.writeDouble(object.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+            final Collection<? extends Metrics> metrics = object.getMetrics();
+            output.writeInt(metrics.size());
+            metrics.forEach(m -> kryo.writeObject(output, m));
+        }
+
+        @Override
+        public <I extends InputShim> TraversalMetrics read(final KryoShim<I, ?> kryo, final I input, final Class<TraversalMetrics> clazz) {
+            final double duration = input.readDouble();
+            final int size = input.readInt();
+
+            final List<MutableMetrics> orderedMetrics = new ArrayList<>();
+            for (int ix = 0; ix < size; ix++) {
+                orderedMetrics.add(kryo.readObject(input, MutableMetrics.class));
+            }
+
+            return new DefaultTraversalMetrics(Math.round(duration * 1000000), orderedMetrics);
+        }
+    }
+
+    public final static class MetricsSerializer implements SerializerShim<Metrics> {
+        @Override
+        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Metrics object) {
+            output.writeString(object.getId());
+            output.writeString(object.getName());
+            output.writeDouble(object.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+            kryo.writeObject(output, object.getCounts());
+
+            // annotations is a synchronized LinkedHashMap - get rid of the "synch" for serialization as gryo
+            // doesn't know how to deserialize that well and LinkedHashMap should work with 3.3.x and previous
+            final Map<String, Object> annotations = new LinkedHashMap<>();
+            object.getAnnotations().forEach(annotations::put);
+            kryo.writeObject(output, annotations);
+
+            // kryo might have a problem with LinkedHashMap value collections. can't recreate it independently but
+            // it gets fixed with standard collections for some reason.
+            final List<Metrics> nested = new ArrayList<>(object.getNested());
+            kryo.writeObject(output, nested);
+        }
+
+        @Override
+        public <I extends InputShim> Metrics read(final KryoShim<I, ?> kryo, final I input, final Class<Metrics> clazz) {
+            final MutableMetrics m = new MutableMetrics(input.readString(), input.readString());
+
+            m.setDuration(Math.round(input.readDouble() * 1000000), TimeUnit.NANOSECONDS);
+
+            final Map<String,Long> counts = (Map<String,Long>) kryo.readObject(input, HashMap.class);
+            for (Map.Entry<String, Long> count : counts.entrySet()) {
+                m.setCount(count.getKey(), count.getValue());
+            }
+
+            final Map<String,Object> annotations = (Map<String,Object>) kryo.readObject(input, HashMap.class);
+            for (Map.Entry<String, Object> count : annotations.entrySet()) {
+                m.setAnnotation(count.getKey(), count.getValue());
+            }
+
+            final List<MutableMetrics> nesteds = (List<MutableMetrics>) kryo.readObject(input, ArrayList.class);
+            for (MutableMetrics nested : nesteds) {
+                m.addNested(nested);
+            }
+            return m;
+        }
+    }
+
+    private static void writeElementProperties(final KryoShim kryo, final OutputShim output, final Element element) {
+        final Iterator<? extends Property> properties = element.properties();
+        output.writeBoolean(properties.hasNext());
+        while (properties.hasNext()) {
+            final Property p = properties.next();
+            output.writeString(p.key());
+            kryo.writeClassAndObject(output, p.value());
+            output.writeBoolean(properties.hasNext());
+        }
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
deleted file mode 100644
index a2b996e..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.gryo;
-
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Text;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiPredicate;
-
-/**
- * This class holds serializers for graph-based objects such as vertices, edges, properties, and paths. These objects
- * are "detached" using {@link DetachedFactory} before serialization. These serializers present a generalized way to
- * serialize the implementations of core interfaces. These serializers are versioned and not compatible with Gryo 1.0.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class GryoSerializersV3d0 {
-
-    /**
-     * Serializes any {@link Edge} implementation encountered to a {@link DetachedEdge}.
-     */
-    public final static class EdgeSerializer implements SerializerShim<Edge> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Edge edge) {
-            kryo.writeClassAndObject(output, edge.id());
-            output.writeString(edge.label());
-            kryo.writeClassAndObject(output, edge.inVertex().id());
-
-            // temporary try/catch perhaps? need this to get SparkSingleIterationStrategyTest to work. Trying to grab
-            // the label of the adjacent vertex ends in error if there's a StarEdge in the ComputerGraph$ComputerEdge.
-            // apparently this is how we handle things in DetachedElement. i'll write here in the comments what was
-            // written there:
-            //
-            // ghetto
-            try {
-                output.writeString(edge.inVertex().label());
-            } catch (Exception ex) {
-                output.writeString(Vertex.DEFAULT_LABEL);
-            }
-
-            kryo.writeClassAndObject(output, edge.outVertex().id());
-
-            // same nonsense as above for a default label
-            try {
-                output.writeString(edge.outVertex().label());
-            } catch (Exception ex) {
-                output.writeString(Vertex.DEFAULT_LABEL);
-            }
-
-            writeElementProperties(kryo, output, edge);
-        }
-
-        @Override
-        public <I extends InputShim> Edge read(final KryoShim<I, ?> kryo, final I input, final Class<Edge> edgeClass) {
-            final DetachedEdge.Builder builder = DetachedEdge.build();
-            builder.setId(kryo.readClassAndObject(input));
-            builder.setLabel(input.readString());
-
-            final DetachedVertex.Builder inV = DetachedVertex.build();
-            inV.setId(kryo.readClassAndObject(input));
-            inV.setLabel(input.readString());
-            builder.setInV(inV.create());
-
-            final DetachedVertex.Builder outV = DetachedVertex.build();
-            outV.setId(kryo.readClassAndObject(input));
-            outV.setLabel(input.readString());
-            builder.setOutV(outV.create());
-
-            while(input.readBoolean()) {
-                builder.addProperty(new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input)));
-            }
-
-            return builder.create();
-        }
-    }
-
-    /**
-     * Serializes any {@link Vertex} implementation encountered to an {@link DetachedVertex}.
-     */
-    public final static class VertexSerializer implements SerializerShim<Vertex> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Vertex vertex) {
-            kryo.writeClassAndObject(output, vertex.id());
-            output.writeString(vertex.label());
-
-            final Iterator<? extends VertexProperty> properties = vertex.properties();
-            output.writeBoolean(properties.hasNext());
-            while (properties.hasNext()) {
-                final VertexProperty vp = properties.next();
-                kryo.writeClassAndObject(output, vp.id());
-                output.writeString(vp.label());
-                kryo.writeClassAndObject(output, vp.value());
-
-                if (vp instanceof DetachedVertexProperty || (vertex.graph().features().vertex().supportsMetaProperties())) {
-                    writeElementProperties(kryo, output, vp);
-                } else {
-                    output.writeBoolean(false);
-                }
-
-                output.writeBoolean(properties.hasNext());
-            }
-        }
-
-        @Override
-        public <I extends InputShim> Vertex read(final KryoShim<I, ?> kryo, final I input, final Class<Vertex> vertexClass) {
-            final DetachedVertex.Builder builder = DetachedVertex.build();
-            builder.setId(kryo.readClassAndObject(input));
-            builder.setLabel(input.readString());
-
-            while(input.readBoolean()) {
-                final DetachedVertexProperty.Builder vpBuilder = DetachedVertexProperty.build();
-                vpBuilder.setId(kryo.readClassAndObject(input));
-                vpBuilder.setLabel(input.readString());
-                vpBuilder.setValue(kryo.readClassAndObject(input));
-
-                while(input.readBoolean()) {
-                    vpBuilder.addProperty(new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input)));
-                }
-
-                builder.addProperty(vpBuilder.create());
-            }
-
-            return builder.create();
-        }
-    }
-
-    /**
-     * Serializes any {@link Property} implementation encountered to an {@link DetachedProperty}.
-     */
-    public final static class PropertySerializer implements SerializerShim<Property> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Property property) {
-            output.writeString(property.key());
-            kryo.writeClassAndObject(output, property.value());
-            kryo.writeClassAndObject(output, property.element().id());
-            output.writeString(property.element().label());
-        }
-
-        @Override
-        public <I extends InputShim> Property read(final KryoShim<I, ?> kryo, final I input, final Class<Property> propertyClass) {
-            return new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input),
-                    DetachedVertex.build().setId(kryo.readClassAndObject(input)).setLabel(input.readString()).create());
-        }
-    }
-
-    /**
-     * Serializes any {@link VertexProperty} implementation encountered to an {@link DetachedVertexProperty}.
-     */
-    public final static class VertexPropertySerializer implements SerializerShim<VertexProperty> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final VertexProperty vertexProperty) {
-            kryo.writeClassAndObject(output, vertexProperty.id());
-            output.writeString(vertexProperty.label());
-            kryo.writeClassAndObject(output, vertexProperty.value());
-            kryo.writeClassAndObject(output, vertexProperty.element().id());
-            output.writeString(vertexProperty.element().label());
-
-            if (vertexProperty instanceof DetachedVertexProperty || (vertexProperty.graph().features().vertex().supportsMetaProperties())) {
-                writeElementProperties(kryo, output, vertexProperty);
-            } else {
-                output.writeBoolean(false);
-            }
-        }
-
-        @Override
-        public <I extends InputShim> VertexProperty read(final KryoShim<I, ?> kryo, final I input, final Class<VertexProperty> vertexPropertyClass) {
-           final DetachedVertexProperty.Builder vpBuilder = DetachedVertexProperty.build();
-            vpBuilder.setId(kryo.readClassAndObject(input));
-            vpBuilder.setLabel(input.readString());
-            vpBuilder.setValue(kryo.readClassAndObject(input));
-
-            final DetachedVertex.Builder host = DetachedVertex.build();
-            host.setId(kryo.readClassAndObject(input));
-            host.setLabel(input.readString());
-            vpBuilder.setV(host.create());
-
-            while(input.readBoolean()) {
-                vpBuilder.addProperty(new DetachedProperty<>(input.readString(), kryo.readClassAndObject(input)));
-            }
-
-            return vpBuilder.create();
-        }
-    }
-
-    /**
-     * Serializes any {@link Path} implementation encountered to an {@link DetachedPath}.
-     */
-    public final static class PathSerializer implements SerializerShim<Path> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Path path) {
-            kryo.writeClassAndObject(output, DetachedFactory.detach(path, false));
-        }
-
-        @Override
-        public <I extends InputShim> Path read(final KryoShim<I, ?> kryo, final I input, final Class<Path> pathClass) {
-            return (Path) kryo.readClassAndObject(input);
-        }
-    }
-
-    public final static class BytecodeSerializer implements SerializerShim<Bytecode> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode bytecode) {
-            writeInstructions(kryo, output, bytecode.getSourceInstructions());
-            writeInstructions(kryo, output, bytecode.getStepInstructions());
-        }
-
-        @Override
-        public <I extends InputShim> Bytecode read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode> clazz) {
-            final Bytecode bytecode = new Bytecode();
-            final int sourceInstructionCount = input.readInt();
-            for (int ix = 0; ix < sourceInstructionCount; ix++) {
-                final String operator = input.readString();
-                final Object[] args = operator.equals(TraversalSource.Symbols.withoutStrategies) ?
-                        kryo.readObject(input, Class[].class) :
-                        kryo.readObject(input, Object[].class);
-                bytecode.addSource(operator, args);
-            }
-
-            final int stepInstructionCount = input.readInt();
-            for (int ix = 0; ix < stepInstructionCount; ix++) {
-                final String operator = input.readString();
-                final Object[] args = kryo.readObject(input, Object[].class);
-                bytecode.addStep(operator, args);
-            }
-
-            return bytecode;
-        }
-
-        private static <O extends OutputShim> void writeInstructions(final KryoShim<?, O> kryo, final O output,
-                                                                     final List<Bytecode.Instruction> instructions) {
-            output.writeInt(instructions.size());
-            for (Bytecode.Instruction inst : instructions) {
-                output.writeString(inst.getOperator());
-                kryo.writeObject(output, inst.getArguments());
-            }
-        }
-    }
-
-    public final static class PSerializer implements SerializerShim<P> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final P p) {
-            output.writeString(p instanceof ConnectiveP ?
-                    (p instanceof AndP ? "and" : "or") :
-                    p.getBiPredicate().toString());
-            if (p instanceof ConnectiveP || p.getValue() instanceof Collection) {
-                output.writeByte((byte) 0);
-                final Collection<?> coll = p instanceof ConnectiveP ?
-                        ((ConnectiveP<?>) p).getPredicates() : (Collection) p.getValue();
-                output.writeInt(coll.size());
-                coll.forEach(v -> kryo.writeClassAndObject(output, v));
-            } else {
-                output.writeByte((byte) 1);
-                kryo.writeClassAndObject(output, p.getValue());
-            }
-        }
-
-        @Override
-        public <I extends InputShim> P read(final KryoShim<I, ?> kryo, final I input, final Class<P> clazz) {
-            final String predicate = input.readString();
-            final boolean isCollection = input.readByte() == (byte) 0;
-            final Object value;
-            if (isCollection) {
-                value = new ArrayList<>();
-                final int size = input.readInt();
-                for (int ix = 0; ix < size; ix++) {
-                    ((List) value).add(kryo.readClassAndObject(input));
-                }
-            } else {
-                value = kryo.readClassAndObject(input);
-            }
-
-            try {
-                if (predicate.equals("and") || predicate.equals("or"))
-                    return predicate.equals("and") ? new AndP((List<P>) value) : new OrP((List<P>) value);
-                else if (value instanceof Collection) {
-                    if (predicate.equals("between"))
-                        return P.between(((List) value).get(0), ((List) value).get(1));
-                    else if (predicate.equals("inside"))
-                        return P.inside(((List) value).get(0), ((List) value).get(1));
-                    else if (predicate.equals("outside"))
-                        return P.outside(((List) value).get(0), ((List) value).get(1));
-                    else if (predicate.equals("within"))
-                        return P.within((Collection) value);
-                    else if (predicate.equals("without"))
-                        return P.without((Collection) value);
-                    else
-                        return (P) P.class.getMethod(predicate, Collection.class).invoke(null, (Collection) value);
-                } else
-                    return (P) P.class.getMethod(predicate, Object.class).invoke(null, value);
-            } catch (final Exception e) {
-                throw new IllegalStateException(e.getMessage(), e);
-            }
-        }
-    }
-
-    public final static class TextPSerializer implements SerializerShim<TextP> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final TextP p) {
-            final BiPredicate<?,?> tp = p.getBiPredicate();
-            if (tp instanceof Text) {
-                output.writeString(((Text) tp).name());
-            } else if (tp instanceof Text.RegexPredicate) {
-                output.writeString(((Text.RegexPredicate) tp).isNegate() ? "notRegex" : "regex");
-            } else {
-                output.writeString(tp.toString());
-            }
-            kryo.writeObject(output, p.getValue());
-        }
-
-        @Override
-        public <I extends InputShim> TextP read(final KryoShim<I, ?> kryo, final I input, final Class<TextP> clazz) {
-            final String predicate = input.readString();
-            final String value = kryo.readObject(input, String.class);
-
-            try {
-                return (TextP) TextP.class.getMethod(predicate, String.class).invoke(null, value);
-            } catch (final Exception e) {
-                throw new IllegalStateException(e.getMessage(), e);
-            }
-        }
-    }
-
-    public final static class LambdaSerializer implements SerializerShim<Lambda> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Lambda lambda) {
-            output.writeString(lambda.getLambdaScript());
-            output.writeString(lambda.getLambdaLanguage());
-            output.writeInt(lambda.getLambdaArguments());
-        }
-
-        @Override
-        public <I extends InputShim> Lambda read(final KryoShim<I, ?> kryo, final I input, final Class<Lambda> clazz) {
-            final String script = input.readString();
-            final String language = input.readString();
-            final int arguments = input.readInt();
-            //
-            if (-1 == arguments || arguments > 2)
-                return new Lambda.UnknownArgLambda(script, language, arguments);
-            else if (0 == arguments)
-                return new Lambda.ZeroArgLambda<>(script, language);
-            else if (1 == arguments)
-                return new Lambda.OneArgLambda<>(script, language);
-            else
-                return new Lambda.TwoArgLambda<>(script, language);
-        }
-    }
-
-    public final static class BindingSerializer implements SerializerShim<Bytecode.Binding> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Bytecode.Binding binding) {
-            output.writeString(binding.variable());
-            kryo.writeClassAndObject(output, binding.value());
-        }
-
-        @Override
-        public <I extends InputShim> Bytecode.Binding read(final KryoShim<I, ?> kryo, final I input, final Class<Bytecode.Binding> clazz) {
-            final String var = input.readString();
-            final Object val = kryo.readClassAndObject(input);
-            return new Bytecode.Binding(var, val);
-        }
-    }
-
-    public final static class DefaultRemoteTraverserSerializer implements SerializerShim<DefaultRemoteTraverser> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final DefaultRemoteTraverser remoteTraverser) {
-            kryo.writeClassAndObject(output, remoteTraverser.get());
-            output.writeLong(remoteTraverser.bulk());
-        }
-
-        @Override
-        public <I extends InputShim> DefaultRemoteTraverser read(final KryoShim<I, ?> kryo, final I input, final Class<DefaultRemoteTraverser> remoteTraverserClass) {
-            final Object o = kryo.readClassAndObject(input);
-            return new DefaultRemoteTraverser<>(o, input.readLong());
-        }
-    }
-
-    public final static class TraversalMetricsSerializer implements SerializerShim<TraversalMetrics> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final TraversalMetrics object) {
-            output.writeDouble(object.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-            final Collection<? extends Metrics> metrics = object.getMetrics();
-            output.writeInt(metrics.size());
-            metrics.forEach(m -> kryo.writeObject(output, m));
-        }
-
-        @Override
-        public <I extends InputShim> TraversalMetrics read(final KryoShim<I, ?> kryo, final I input, final Class<TraversalMetrics> clazz) {
-            final double duration = input.readDouble();
-            final int size = input.readInt();
-
-            final List<MutableMetrics> orderedMetrics = new ArrayList<>();
-            for (int ix = 0; ix < size; ix++) {
-                orderedMetrics.add(kryo.readObject(input, MutableMetrics.class));
-            }
-
-            return new DefaultTraversalMetrics(Math.round(duration * 1000000), orderedMetrics);
-        }
-    }
-
-    public final static class MetricsSerializer implements SerializerShim<Metrics> {
-        @Override
-        public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Metrics object) {
-            output.writeString(object.getId());
-            output.writeString(object.getName());
-            output.writeDouble(object.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-            kryo.writeObject(output, object.getCounts());
-
-            // annotations is a synchronized LinkedHashMap - get rid of the "synch" for serialization as gryo
-            // doesn't know how to deserialize that well and LinkedHashMap should work with 3.3.x and previous
-            final Map<String, Object> annotations = new LinkedHashMap<>();
-            object.getAnnotations().forEach(annotations::put);
-            kryo.writeObject(output, annotations);
-
-            // kryo might have a problem with LinkedHashMap value collections. can't recreate it independently but
-            // it gets fixed with standard collections for some reason.
-            final List<Metrics> nested = new ArrayList<>(object.getNested());
-            kryo.writeObject(output, nested);
-        }
-
-        @Override
-        public <I extends InputShim> Metrics read(final KryoShim<I, ?> kryo, final I input, final Class<Metrics> clazz) {
-            final MutableMetrics m = new MutableMetrics(input.readString(), input.readString());
-
-            m.setDuration(Math.round(input.readDouble() * 1000000), TimeUnit.NANOSECONDS);
-
-            final Map<String,Long> counts = (Map<String,Long>) kryo.readObject(input, HashMap.class);
-            for (Map.Entry<String, Long> count : counts.entrySet()) {
-                m.setCount(count.getKey(), count.getValue());
-            }
-
-            final Map<String,Object> annotations = (Map<String,Object>) kryo.readObject(input, HashMap.class);
-            for (Map.Entry<String, Object> count : annotations.entrySet()) {
-                m.setAnnotation(count.getKey(), count.getValue());
-            }
-
-            final List<MutableMetrics> nesteds = (List<MutableMetrics>) kryo.readObject(input, ArrayList.class);
-            for (MutableMetrics nested : nesteds) {
-                m.addNested(nested);
-            }
-            return m;
-        }
-    }
-
-    private static void writeElementProperties(final KryoShim kryo, final OutputShim output, final Element element) {
-        final Iterator<? extends Property> properties = element.properties();
-        output.writeBoolean(properties.hasNext());
-        while (properties.hasNext()) {
-            final Property p = properties.next();
-            output.writeString(p.key());
-            kryo.writeClassAndObject(output, p.value());
-            output.writeBoolean(properties.hasNext());
-        }
-    }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 3004251..4ee9f99 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -26,6 +26,7 @@
 import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Contains;
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
 import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 import org.apache.tinkerpop.gremlin.process.traversal.Order;
@@ -178,8 +179,8 @@
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public enum GryoVersion {
-    V1_0("1.0", initV1d0Registrations(), GryoClassResolverV1d0::new),
-    V3_0("3.0", initV3d0Registrations(), GryoClassResolverV3d0::new);
+    V1_0("1.0", initV1Registrations(), GryoClassResolverV1::new),
+    V3_0("3.0", initV3Registrations(), GryoClassResolverV3::new);
 
     private final String versionNumber;
     private final List<TypeRegistration<?>> registrations;
@@ -230,7 +231,7 @@
         return versionNumber;
     }
 
-    public static List<TypeRegistration<?>> initV3d0Registrations() {
+    public static List<TypeRegistration<?>> initV3Registrations() {
         return new ArrayList<TypeRegistration<?>>() {{
             add(GryoTypeReg.of(byte[].class, 25));
             add(GryoTypeReg.of(char[].class, 26));
@@ -302,11 +303,11 @@
 
             add(GryoTypeReg.of(StarGraph.class, 86, new StarGraphSerializer(Direction.BOTH, new GraphFilter())));
 
-            add(GryoTypeReg.of(Edge.class, 65, new GryoSerializersV3d0.EdgeSerializer()));
-            add(GryoTypeReg.of(Vertex.class, 66, new GryoSerializersV3d0.VertexSerializer()));
-            add(GryoTypeReg.of(Property.class, 67, new GryoSerializersV3d0.PropertySerializer()));
-            add(GryoTypeReg.of(VertexProperty.class, 68, new GryoSerializersV3d0.VertexPropertySerializer()));
-            add(GryoTypeReg.of(Path.class, 59, new GryoSerializersV3d0.PathSerializer()));
+            add(GryoTypeReg.of(Edge.class, 65, new GryoSerializersV3.EdgeSerializer()));
+            add(GryoTypeReg.of(Vertex.class, 66, new GryoSerializersV3.VertexSerializer()));
+            add(GryoTypeReg.of(Property.class, 67, new GryoSerializersV3.PropertySerializer()));
+            add(GryoTypeReg.of(VertexProperty.class, 68, new GryoSerializersV3.VertexPropertySerializer()));
+            add(GryoTypeReg.of(Path.class, 59, new GryoSerializersV3.PathSerializer()));
             // skip 55
             add(GryoTypeReg.of(B_O_Traverser.class, 75));
             add(GryoTypeReg.of(O_Traverser.class, 76));
@@ -318,14 +319,14 @@
             add(GryoTypeReg.of(LP_O_OB_P_S_SE_SL_Traverser.class, 91));
 
             add(GryoTypeReg.of(ProjectedTraverser.class, 168));
-            add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializersV3d0.DefaultRemoteTraverserSerializer()));
+            add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializersV3.DefaultRemoteTraverserSerializer()));
 
-            add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializersV3d0.BytecodeSerializer()));
-            add(GryoTypeReg.of(P.class, 124, new GryoSerializersV3d0.PSerializer()));
-            add(GryoTypeReg.of(TextP.class, 186, new GryoSerializersV3d0.TextPSerializer()));
+            add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializersV3.BytecodeSerializer()));
+            add(GryoTypeReg.of(P.class, 124, new GryoSerializersV3.PSerializer()));
+            add(GryoTypeReg.of(TextP.class, 186, new GryoSerializersV3.TextPSerializer()));
             add(GryoTypeReg.of(Text.RegexPredicate.class, 197));                                       // ***LAST ID***
-            add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializersV3d0.LambdaSerializer()));
-            add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializersV3d0.BindingSerializer()));
+            add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializersV3.LambdaSerializer()));
+            add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializersV3.BindingSerializer()));
             add(GryoTypeReg.of(Order.class, 127));
             add(GryoTypeReg.of(Scope.class, 128));
             add(GryoTypeReg.of(VertexProperty.Cardinality.class, 131));
@@ -333,6 +334,7 @@
             add(GryoTypeReg.of(Pop.class, 133));
             add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
             add(GryoTypeReg.of(Pick.class, 137));
+            add(GryoTypeReg.of(DT.class, 198));
             add(GryoTypeReg.of(Merge.class, 196));
             add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
             add(GryoTypeReg.of(MultiComparator.class, 165));
@@ -373,8 +375,8 @@
             add(GryoTypeReg.of(Tree.class, 61));
             add(GryoTypeReg.of(HashSet.class, 62));
             add(GryoTypeReg.of(BulkSet.class, 64));
-            add(GryoTypeReg.of(Metrics.class, 69, new GryoSerializersV3d0.MetricsSerializer()));
-            add(GryoTypeReg.of(TraversalMetrics.class, 70, new GryoSerializersV3d0.TraversalMetricsSerializer()));
+            add(GryoTypeReg.of(Metrics.class, 69, new GryoSerializersV3.MetricsSerializer()));
+            add(GryoTypeReg.of(TraversalMetrics.class, 70, new GryoSerializersV3.TraversalMetricsSerializer()));
             add(GryoTypeReg.of(MapMemory.class, 73));
             add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
             add(GryoTypeReg.of(AtomicLong.class, 79));
@@ -423,17 +425,17 @@
             // placeholder serializers for classes that don't live here in core. this will allow them to be used if
             // present  or ignored if the class isn't available. either way the registration numbers are held as
             // placeholders so that the format stays stable
-            tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.RequestMessage",
-                    "org.apache.tinkerpop.gremlin.driver.ser.RequestMessageGryoSerializer", 167);
-            tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
-                    "org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
+            tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.util.message.RequestMessage",
+                    "org.apache.tinkerpop.gremlin.util.ser.RequestMessageGryoSerializer", 167);
+            tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.util.message.ResponseMessage",
+                    "org.apache.tinkerpop.gremlin.util.ser.ResponseMessageGryoSerializer", 169);
 
             tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
                     null, 184);
         }};
     }
 
-    public static List<TypeRegistration<?>> initV1d0Registrations() {
+    public static List<TypeRegistration<?>> initV1Registrations() {
         return new ArrayList<TypeRegistration<?>>() {{
             add(GryoTypeReg.of(byte[].class, 25));
             add(GryoTypeReg.of(char[].class, 26));
@@ -505,11 +507,11 @@
 
             add(GryoTypeReg.of(StarGraph.class, 86, new StarGraphSerializer(Direction.BOTH, new GraphFilter())));
 
-            add(GryoTypeReg.of(Edge.class, 65, new GryoSerializersV1d0.EdgeSerializer()));
-            add(GryoTypeReg.of(Vertex.class, 66, new GryoSerializersV1d0.VertexSerializer()));
-            add(GryoTypeReg.of(Property.class, 67, new GryoSerializersV1d0.PropertySerializer()));
-            add(GryoTypeReg.of(VertexProperty.class, 68, new GryoSerializersV1d0.VertexPropertySerializer()));
-            add(GryoTypeReg.of(Path.class, 59, new GryoSerializersV1d0.PathSerializer()));
+            add(GryoTypeReg.of(Edge.class, 65, new GryoSerializersV1.EdgeSerializer()));
+            add(GryoTypeReg.of(Vertex.class, 66, new GryoSerializersV1.VertexSerializer()));
+            add(GryoTypeReg.of(Property.class, 67, new GryoSerializersV1.PropertySerializer()));
+            add(GryoTypeReg.of(VertexProperty.class, 68, new GryoSerializersV1.VertexPropertySerializer()));
+            add(GryoTypeReg.of(Path.class, 59, new GryoSerializersV1.PathSerializer()));
             // skip 55
             add(GryoTypeReg.of(B_O_Traverser.class, 75));
             add(GryoTypeReg.of(O_Traverser.class, 76));
@@ -520,14 +522,14 @@
             add(GryoTypeReg.of(LP_O_OB_S_SE_SL_Traverser.class, 90));
             add(GryoTypeReg.of(LP_O_OB_P_S_SE_SL_Traverser.class, 91));
             add(GryoTypeReg.of(ProjectedTraverser.class, 164));
-            add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializersV1d0.DefaultRemoteTraverserSerializer()));
+            add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializersV1.DefaultRemoteTraverserSerializer()));
 
-            add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializersV1d0.BytecodeSerializer()));
-            add(GryoTypeReg.of(P.class, 124, new GryoSerializersV1d0.PSerializer()));
-            add(GryoTypeReg.of(TextP.class, 186, new GryoSerializersV1d0.TextPSerializer()));
-            add(GryoTypeReg.of(Text.RegexPredicate.class, 197));             // ***LAST ID***
-            add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializersV1d0.LambdaSerializer()));
-            add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializersV1d0.BindingSerializer()));
+            add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializersV1.BytecodeSerializer()));
+            add(GryoTypeReg.of(P.class, 124, new GryoSerializersV1.PSerializer()));
+            add(GryoTypeReg.of(TextP.class, 186, new GryoSerializersV1.TextPSerializer()));
+            add(GryoTypeReg.of(Text.RegexPredicate.class, 197));
+            add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializersV1.LambdaSerializer()));
+            add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializersV1.BindingSerializer()));
             add(GryoTypeReg.of(Order.class, 127));
             add(GryoTypeReg.of(Scope.class, 128));
             add(GryoTypeReg.of(VertexProperty.Cardinality.class, 131));
@@ -535,6 +537,7 @@
             add(GryoTypeReg.of(Pop.class, 133));
             add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
             add(GryoTypeReg.of(Pick.class, 137));
+            add(GryoTypeReg.of(DT.class, 198));     // ***LAST ID***
             add(GryoTypeReg.of(Merge.class, 196));
             add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
             add(GryoTypeReg.of(MultiComparator.class, 165));
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/service/Service.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/service/Service.java
index d211da9..0062f67 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/service/Service.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/service/Service.java
@@ -27,11 +27,10 @@
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
 
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
 
 /**
  * Service call with I input type and R return type. Services can return {@link Traverser}s or raw values (which will be
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/Attachable.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/Attachable.java
index 3cd76f2..bebd8f8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/Attachable.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/Attachable.java
@@ -27,8 +27,14 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -43,6 +49,8 @@
  */
 public interface Attachable<V> {
 
+    Logger logger = LoggerFactory.getLogger(Attachable.class);
+
     /**
      * Get the raw object trying to be attached.
      *
@@ -189,8 +197,10 @@
             final Iterator<Edge> edgeIterator = hostVertex.edges(Direction.OUT, attachableEdge.get().label());
             while (edgeIterator.hasNext()) {
                 final Edge edge = edgeIterator.next();
-                if (ElementHelper.areEqual(edge, baseEdge))
+                if (ElementHelper.areEqual(edge, baseEdge)) {
+                    CloseableIterator.closeIterator(edgeIterator);
                     return Optional.of(edge);
+                }
             }
             return Optional.empty();
         }
@@ -263,8 +273,10 @@
                     final Edge edge = edgeIterator.next();
                     if (ElementHelper.areEqual(edge, propertyElement)) {
                         final Property property = edge.property(baseProperty.key());
-                        if (ElementHelper.areEqual(baseProperty, property))
+                        if (ElementHelper.areEqual(baseProperty, property)) {
+                            CloseableIterator.closeIterator(edgeIterator);
                             return Optional.of(property);
+                        }
                     }
                 }
                 return Optional.empty();
@@ -274,6 +286,7 @@
                     final VertexProperty vertexProperty = vertexPropertyIterator.next();
                     if (ElementHelper.areEqual(vertexProperty, baseProperty.element())) {
                         final Property property = vertexProperty.property(baseProperty.key());
+                        CloseableIterator.closeIterator(vertexPropertyIterator);
                         if (property.isPresent() && property.value().equals(baseProperty.value()))
                             return Optional.of(property);
                         else
@@ -291,12 +304,21 @@
             final Vertex vertex = hostGraph.features().vertex().willAllowId(baseVertex.id()) ?
                     hostGraph.addVertex(T.id, baseVertex.id(), T.label, baseVertex.label()) :
                     hostGraph.addVertex(T.label, baseVertex.label());
-            baseVertex.properties().forEachRemaining(vp -> {
-                final VertexProperty vertexProperty = hostGraph.features().vertex().properties().willAllowId(vp.id()) ?
-                        vertex.property(hostGraph.features().vertex().getCardinality(vp.key()), vp.key(), vp.value(), T.id, vp.id()) :
-                        vertex.property(hostGraph.features().vertex().getCardinality(vp.key()), vp.key(), vp.value());
-                vp.properties().forEachRemaining(p -> vertexProperty.property(p.key(), p.value()));
-            });
+            final Map<String, List<VertexProperty<Object>>> propertyMap = new HashMap<>();
+            baseVertex.properties().forEachRemaining(vp -> propertyMap.computeIfAbsent(vp.key(), k -> new ArrayList<>()).add(vp));
+            for (Map.Entry<String, List<VertexProperty<Object>>> entry : propertyMap.entrySet()) {
+                final VertexProperty.Cardinality cardinality = hostGraph.features().vertex().getCardinality(entry.getKey());
+                if (VertexProperty.Cardinality.single == cardinality && entry.getValue().size() > 1) {
+                    logger.warn("{} has SINGLE cardinality but with more than one value: {}. Only last value will be retained.",
+                        entry.getKey(), entry.getValue());
+                }
+                for (VertexProperty<Object> vp : entry.getValue()) {
+                    final VertexProperty<Object> vertexProperty = hostGraph.features().vertex().properties().willAllowId(vp.id()) ?
+                        vertex.property(cardinality, vp.key(), vp.value(), T.id, vp.id()) :
+                        vertex.property(cardinality, vp.key(), vp.value());
+                    vp.properties().forEachRemaining(p -> vertexProperty.property(p.key(), p.value()));
+                }
+            }
             return vertex;
         }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java
index 60f3d0b..06a0984 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java
@@ -25,12 +25,12 @@
 import java.util.Iterator;
 
 /**
- * An extension of {@code Iterator} that implements {@code Closeable} which allows a {@link Graph} implementation
+ * An extension of {@code Iterator} that implements {@code AutoCloseable} which allows a {@link Graph} implementation
  * that hold open resources to provide the user the option to release those resources.
  *
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
-public interface CloseableIterator<T> extends Iterator<T>, Closeable {
+public interface CloseableIterator<T> extends Iterator<T>, AutoCloseable {
 
     /**
      * Wraps an existing {@code Iterator} in a {@code CloseableIterator}. If the {@code Iterator} is already of that
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
index 0bf6160..a5e3765 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/ElementHelper.java
@@ -339,8 +339,11 @@
     public static <V> Optional<VertexProperty<V>> stageVertexProperty(final Vertex vertex,
                                                                       final VertexProperty.Cardinality cardinality,
                                                                       final String key, final V value, final Object... keyValues) {
-        if (cardinality.equals(VertexProperty.Cardinality.single))
-            vertex.properties(key).forEachRemaining(VertexProperty::remove);
+        if (cardinality.equals(VertexProperty.Cardinality.single)) {
+            final Iterator<VertexProperty<Object>> properties = vertex.properties(key);
+            if (null != properties)
+                properties.forEachRemaining(VertexProperty::remove);
+        }
         else if (cardinality.equals(VertexProperty.Cardinality.set)) {
             final Iterator<VertexProperty<V>> itty = vertex.properties(key);
             while (itty.hasNext()) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
index 25e846d..1014e0e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
@@ -25,11 +25,12 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.javatuples.Pair;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -89,6 +90,24 @@
         }
     }
 
+    public DetachedEdge(final Object id, final String label,
+                        final List<Property> properties,
+                        final Object outVId, final String outVLabel,
+                        final Object inVId, final String inVLabel) {
+        super(id, label);
+        this.outVertex = new DetachedVertex(outVId, outVLabel, Collections.emptyMap());
+        this.inVertex = new DetachedVertex(inVId, inVLabel, Collections.emptyMap());
+        if (properties != null && !properties.isEmpty()) {
+            this.properties = new HashMap<>();
+            properties.iterator().forEachRemaining(property -> {
+                if (!this.properties.containsKey(property.key())) {
+                    this.properties.put(property.key(), new ArrayList());
+                }
+                this.properties.get(property.key()).add(property);
+            });
+        }
+    }
+
     @Override
     public String toString() {
         return StringFactory.edgeString(this);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
index 25bdbae..f331d8d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
@@ -86,6 +86,19 @@
         }
     }
 
+    public DetachedVertex(final Object id, final String label, final List<VertexProperty> properties) {
+        super(id, label);
+        if (properties != null && !properties.isEmpty()) {
+            this.properties = new HashMap<>();
+            properties.iterator().forEachRemaining(property -> {
+                if (!this.properties.containsKey(property.key())) {
+                    this.properties.put(property.key(), new ArrayList());
+                }
+                this.properties.get(property.key()).add(property);
+            });
+        }
+    }
+
     @Override
     public <V> VertexProperty<V> property(final String key, final V value) {
         throw Element.Exceptions.propertyAdditionNotSupported();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java
index d9b917c..1b70c1c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java
@@ -25,6 +25,7 @@
 import org.apache.tinkerpop.gremlin.structure.util.Host;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -67,7 +68,8 @@
 
         if (null != properties && !properties.isEmpty()) {
             this.properties = new HashMap<>();
-            properties.entrySet().iterator().forEachRemaining(entry -> this.properties.put(entry.getKey(), Collections.singletonList(new DetachedProperty<>(entry.getKey(), entry.getValue(), this))));
+            properties.entrySet().iterator().forEachRemaining(entry -> this.properties.put(entry.getKey(),
+                    Collections.singletonList(new DetachedProperty<>(entry.getKey(), entry.getValue(), this))));
         }
     }
 
@@ -81,7 +83,8 @@
 
         if (null != properties && !properties.isEmpty()) {
             this.properties = new HashMap<>();
-            properties.entrySet().iterator().forEachRemaining(entry -> this.properties.put(entry.getKey(), Collections.singletonList(new DetachedProperty<>(entry.getKey(), entry.getValue(), this))));
+            properties.entrySet().iterator().forEachRemaining(entry -> this.properties.put(entry.getKey(),
+                    Collections.singletonList(new DetachedProperty<>(entry.getKey(), entry.getValue(), this))));
         }
     }
 
@@ -129,7 +132,11 @@
     @Override
     void internalAddProperty(final Property p) {
         if (null == properties) properties = new HashMap<>();
-        this.properties.put(p.key(), Collections.singletonList(p));
+
+        if(!this.properties.containsKey(p.key())) {
+            this.properties.put(p.key(), new ArrayList());
+        }
+        this.properties.get(p.key()).add(p);
     }
 
     public void internalSetVertex(final DetachedVertex vertex) {
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java
index cf89346..7da0dce 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java
@@ -36,7 +36,7 @@
 
     /**
      * A helper function for reading vertex edges from a serialized {@link StarGraph} (i.e. a {@code Map}) generated by
-     * {@link StarGraphGraphSONSerializerV1d0}.
+     * {@link StarGraphGraphSONSerializerV1}.
      */
     public static void readStarGraphEdges(final Function<Attachable<Edge>, Edge> edgeMaker,
                                           final StarGraph starGraph,
@@ -65,7 +65,7 @@
 
     /**
      * A helper function for reading a serialized {@link StarGraph} from a {@code Map} generated by
-     * {@link StarGraphGraphSONSerializerV1d0}.
+     * {@link StarGraphGraphSONSerializerV1}.
      */
     public static StarGraph readStarGraphVertex(final Map<String, Object> vertexData) throws IOException {
         final StarGraph starGraph = StarGraph.open();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1.java
new file mode 100644
index 0000000..74639ff
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1.java
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class StarGraphGraphSONSerializerV1 extends StdSerializer<DirectionalStarGraph> {
+    private final boolean normalize;
+    public StarGraphGraphSONSerializerV1(final boolean normalize) {
+        super(DirectionalStarGraph.class);
+        this.normalize = normalize;
+    }
+
+    @Override
+    public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+                          final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+        ser(starGraph, jsonGenerator, serializerProvider, null);
+    }
+
+    @Override
+    public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+                                  final SerializerProvider serializerProvider,
+                                  final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+        ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
+    }
+
+    private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+                     final SerializerProvider serializerProvider,
+                     final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+        jsonGenerator.writeStartObject();
+        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+        GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
+        jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
+        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
+        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
+        if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
+            jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
+            for (final String k : keys) {
+                final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
+                jsonGenerator.writeArrayFieldStart(k);
+                if (typeSerializer != null) {
+                    jsonGenerator.writeString(ArrayList.class.getName());
+                    jsonGenerator.writeStartArray();
+                }
+
+                final List<VertexProperty> vertexProperties = normalize ? sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
+                for (final VertexProperty property : vertexProperties) {
+                    jsonGenerator.writeStartObject();
+                    if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+                    GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+                    GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+
+                    final Iterator<Property> metaProperties = normalize ?
+                            IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+                    if (metaProperties.hasNext()) {
+                        jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+                        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+                        while (metaProperties.hasNext()) {
+                            final Property<Object> meta = metaProperties.next();
+                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+                        }
+                        jsonGenerator.writeEndObject();
+                    }
+                    jsonGenerator.writeEndObject();
+                }
+                jsonGenerator.writeEndArray();
+                if (typeSerializer != null) jsonGenerator.writeEndArray();
+            }
+            jsonGenerator.writeEndObject();
+        }
+        // For some reason, this wasn't closed.
+        jsonGenerator.writeEndObject();
+    }
+
+    private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+                            final SerializerProvider serializerProvider,
+                            final TypeSerializer typeSerializer,
+                            final Direction direction)  throws IOException, JsonProcessingException {
+        // only write edges if there are some AND if the user requested them to be serialized AND if they match
+        // the direction being serialized by the format
+        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+        final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
+        final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
+        final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
+                && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
+        if (writeEdges) {
+            jsonGenerator.writeObjectFieldStart(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
+            for (final String k : keys) {
+                final List<Edge> edges = starEdges.get(k);
+                jsonGenerator.writeArrayFieldStart(k);
+                if (typeSerializer != null) {
+                    jsonGenerator.writeString(ArrayList.class.getName());
+                    jsonGenerator.writeStartArray();
+                }
+
+                final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
+                for (final Edge edge : edgesToWrite) {
+                    jsonGenerator.writeStartObject();
+                    if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+                    GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+                    GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
+                            direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
+                            jsonGenerator, serializerProvider, typeSerializer);
+
+                    final Iterator<Property<Object>> edgeProperties = normalize ?
+                            IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+                    if (edgeProperties.hasNext()) {
+                        jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+                        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+                        while (edgeProperties.hasNext()) {
+                            final Property<Object> meta = edgeProperties.next();
+                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+                        }
+                        jsonGenerator.writeEndObject();
+                    }
+                    jsonGenerator.writeEndObject();
+                }
+                jsonGenerator.writeEndArray();
+                if (typeSerializer != null) jsonGenerator.writeEndArray();
+            }
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
+        Collections.sort(listToSort, comparator);
+        return listToSort;
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
deleted file mode 100644
index 01cb6d6..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.star;
-
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class StarGraphGraphSONSerializerV1d0 extends StdSerializer<DirectionalStarGraph> {
-    private final boolean normalize;
-    public StarGraphGraphSONSerializerV1d0(final boolean normalize) {
-        super(DirectionalStarGraph.class);
-        this.normalize = normalize;
-    }
-
-    @Override
-    public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
-                          final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-        ser(starGraph, jsonGenerator, serializerProvider, null);
-    }
-
-    @Override
-    public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
-                                  final SerializerProvider serializerProvider,
-                                  final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-        ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
-    }
-
-    private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
-                     final SerializerProvider serializerProvider,
-                     final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
-        jsonGenerator.writeStartObject();
-        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-        GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
-        jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
-        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
-        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
-        if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
-            jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
-            for (final String k : keys) {
-                final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
-                jsonGenerator.writeArrayFieldStart(k);
-                if (typeSerializer != null) {
-                    jsonGenerator.writeString(ArrayList.class.getName());
-                    jsonGenerator.writeStartArray();
-                }
-
-                final List<VertexProperty> vertexProperties = normalize ? sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
-                for (final VertexProperty property : vertexProperties) {
-                    jsonGenerator.writeStartObject();
-                    if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-                    GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
-                    GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
-
-                    final Iterator<Property> metaProperties = normalize ?
-                            IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
-                    if (metaProperties.hasNext()) {
-                        jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
-                        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-                        while (metaProperties.hasNext()) {
-                            final Property<Object> meta = metaProperties.next();
-                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
-                        }
-                        jsonGenerator.writeEndObject();
-                    }
-                    jsonGenerator.writeEndObject();
-                }
-                jsonGenerator.writeEndArray();
-                if (typeSerializer != null) jsonGenerator.writeEndArray();
-            }
-            jsonGenerator.writeEndObject();
-        }
-        // For some reason, this wasn't closed.
-        jsonGenerator.writeEndObject();
-    }
-
-    private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
-                            final SerializerProvider serializerProvider,
-                            final TypeSerializer typeSerializer,
-                            final Direction direction)  throws IOException, JsonProcessingException {
-        // only write edges if there are some AND if the user requested them to be serialized AND if they match
-        // the direction being serialized by the format
-        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
-        final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
-        final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
-        final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
-                && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
-        if (writeEdges) {
-            jsonGenerator.writeObjectFieldStart(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
-            for (final String k : keys) {
-                final List<Edge> edges = starEdges.get(k);
-                jsonGenerator.writeArrayFieldStart(k);
-                if (typeSerializer != null) {
-                    jsonGenerator.writeString(ArrayList.class.getName());
-                    jsonGenerator.writeStartArray();
-                }
-
-                final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
-                for (final Edge edge : edgesToWrite) {
-                    jsonGenerator.writeStartObject();
-                    if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-                    GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
-                    GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
-                            direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
-                            jsonGenerator, serializerProvider, typeSerializer);
-
-                    final Iterator<Property<Object>> edgeProperties = normalize ?
-                            IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
-                    if (edgeProperties.hasNext()) {
-                        jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
-                        if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-                        while (edgeProperties.hasNext()) {
-                            final Property<Object> meta = edgeProperties.next();
-                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
-                        }
-                        jsonGenerator.writeEndObject();
-                    }
-                    jsonGenerator.writeEndObject();
-                }
-                jsonGenerator.writeEndArray();
-                if (typeSerializer != null) jsonGenerator.writeEndArray();
-            }
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
-        Collections.sort(listToSort, comparator);
-        return listToSort;
-    }
-
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2.java
new file mode 100644
index 0000000..e9eb63c
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class StarGraphGraphSONSerializerV2 extends StdSerializer<DirectionalStarGraph> {
+    private final boolean normalize;
+    public StarGraphGraphSONSerializerV2(final boolean normalize) {
+        super(DirectionalStarGraph.class);
+        this.normalize = normalize;
+    }
+
+    @Override
+    public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+                          final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+        ser(starGraph, jsonGenerator, serializerProvider, null);
+    }
+
+    @Override
+    public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+                                  final SerializerProvider serializerProvider,
+                                  final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+        ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
+    }
+
+    private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+                     final SerializerProvider serializerProvider,
+                     final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+        GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+        GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
+        jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
+        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
+        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
+        if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
+            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+            GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+            final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
+            for (final String k : keys) {
+                final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
+                jsonGenerator.writeFieldName(k);
+                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+                final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
+                for (final VertexProperty property : vertexProperties) {
+                    GraphSONUtil.writeStartObject(property, jsonGenerator, typeSerializer);
+                    GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+                    GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+
+                    final Iterator<Property> metaProperties = normalize ?
+                            IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+                    if (metaProperties.hasNext()) {
+                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+                        GraphSONUtil.writeStartObject(metaProperties, jsonGenerator, typeSerializer);
+
+                        while (metaProperties.hasNext()) {
+                            final Property<Object> meta = metaProperties.next();
+                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+                        }
+                        GraphSONUtil.writeEndObject(metaProperties, jsonGenerator, typeSerializer);
+                    }
+                    GraphSONUtil.writeEndObject(property, jsonGenerator, typeSerializer);
+                }
+                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+            }
+            GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+        }
+        GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+    }
+
+    private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+                            final SerializerProvider serializerProvider,
+                            final TypeSerializer typeSerializer,
+                            final Direction direction)  throws IOException, JsonProcessingException {
+        // only write edges if there are some AND if the user requested them to be serialized AND if they match
+        // the direction being serialized by the format
+        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+        final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
+        final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
+        final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
+                && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
+        if (writeEdges) {
+            jsonGenerator.writeFieldName(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
+            GraphSONUtil.writeStartObject(directionalStarGraph, jsonGenerator, typeSerializer);
+            final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
+            for (final String k : keys) {
+                final List<Edge> edges = starEdges.get(k);
+                jsonGenerator.writeFieldName(k);
+                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+                final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
+                for (final Edge edge : edgesToWrite) {
+                    GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+                    GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+                    GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
+                            direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
+                            jsonGenerator, serializerProvider, typeSerializer);
+
+                    final Iterator<Property<Object>> edgeProperties = normalize ?
+                            IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+                    if (edgeProperties.hasNext()) {
+                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+                        GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+                        while (edgeProperties.hasNext()) {
+                            final Property<Object> meta = edgeProperties.next();
+                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+                        }
+                        GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+                    }
+                    GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+                }
+                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+            }
+            GraphSONUtil.writeEndObject(directionalStarGraph, jsonGenerator, typeSerializer);
+        }
+    }
+
+    private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
+        Collections.sort(listToSort, comparator);
+        return listToSort;
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
deleted file mode 100644
index 04d65c5..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.star;
-
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class StarGraphGraphSONSerializerV2d0 extends StdSerializer<DirectionalStarGraph> {
-    private final boolean normalize;
-    public StarGraphGraphSONSerializerV2d0(final boolean normalize) {
-        super(DirectionalStarGraph.class);
-        this.normalize = normalize;
-    }
-
-    @Override
-    public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
-                          final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-        ser(starGraph, jsonGenerator, serializerProvider, null);
-    }
-
-    @Override
-    public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
-                                  final SerializerProvider serializerProvider,
-                                  final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-        ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
-    }
-
-    private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
-                     final SerializerProvider serializerProvider,
-                     final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
-        GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
-        GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
-        jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
-        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
-        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
-        if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
-            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-            GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
-            final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
-            for (final String k : keys) {
-                final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
-                jsonGenerator.writeFieldName(k);
-                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
-
-                final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
-                for (final VertexProperty property : vertexProperties) {
-                    GraphSONUtil.writeStartObject(property, jsonGenerator, typeSerializer);
-                    GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
-                    GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
-
-                    final Iterator<Property> metaProperties = normalize ?
-                            IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
-                    if (metaProperties.hasNext()) {
-                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-                        GraphSONUtil.writeStartObject(metaProperties, jsonGenerator, typeSerializer);
-
-                        while (metaProperties.hasNext()) {
-                            final Property<Object> meta = metaProperties.next();
-                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
-                        }
-                        GraphSONUtil.writeEndObject(metaProperties, jsonGenerator, typeSerializer);
-                    }
-                    GraphSONUtil.writeEndObject(property, jsonGenerator, typeSerializer);
-                }
-                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
-            }
-            GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
-        }
-        GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
-    }
-
-    private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
-                            final SerializerProvider serializerProvider,
-                            final TypeSerializer typeSerializer,
-                            final Direction direction)  throws IOException, JsonProcessingException {
-        // only write edges if there are some AND if the user requested them to be serialized AND if they match
-        // the direction being serialized by the format
-        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
-        final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
-        final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
-        final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
-                && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
-        if (writeEdges) {
-            jsonGenerator.writeFieldName(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
-            GraphSONUtil.writeStartObject(directionalStarGraph, jsonGenerator, typeSerializer);
-            final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
-            for (final String k : keys) {
-                final List<Edge> edges = starEdges.get(k);
-                jsonGenerator.writeFieldName(k);
-                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
-
-                final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
-                for (final Edge edge : edgesToWrite) {
-                    GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
-                    GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
-                    GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
-                            direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
-                            jsonGenerator, serializerProvider, typeSerializer);
-
-                    final Iterator<Property<Object>> edgeProperties = normalize ?
-                            IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
-                    if (edgeProperties.hasNext()) {
-                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-                        GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
-                        while (edgeProperties.hasNext()) {
-                            final Property<Object> meta = edgeProperties.next();
-                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
-                        }
-                        GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
-                    }
-                    GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
-                }
-                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
-            }
-            GraphSONUtil.writeEndObject(directionalStarGraph, jsonGenerator, typeSerializer);
-        }
-    }
-
-    private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
-        Collections.sort(listToSort, comparator);
-        return listToSort;
-    }
-
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV3.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV3.java
new file mode 100644
index 0000000..68b1808
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV3.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class StarGraphGraphSONSerializerV3 extends StdSerializer<DirectionalStarGraph> {
+    private final boolean normalize;
+    public StarGraphGraphSONSerializerV3(final boolean normalize) {
+        super(DirectionalStarGraph.class);
+        this.normalize = normalize;
+    }
+
+    @Override
+    public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+                          final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+        ser(starGraph, jsonGenerator, serializerProvider, null);
+    }
+
+    @Override
+    public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+                                  final SerializerProvider serializerProvider,
+                                  final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+        ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
+    }
+
+    private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+                     final SerializerProvider serializerProvider,
+                     final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+        GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+        GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
+        jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
+        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
+        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
+        if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
+            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+            GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+            final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
+            for (final String k : keys) {
+                final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
+                jsonGenerator.writeFieldName(k);
+                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+                final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
+                for (final VertexProperty property : vertexProperties) {
+                    GraphSONUtil.writeStartObject(property, jsonGenerator, typeSerializer);
+                    GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+                    GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+
+                    final Iterator<Property> metaProperties = normalize ?
+                            IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+                    if (metaProperties.hasNext()) {
+                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+                        GraphSONUtil.writeStartObject(metaProperties, jsonGenerator, typeSerializer);
+
+                        while (metaProperties.hasNext()) {
+                            final Property<Object> meta = metaProperties.next();
+                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+                        }
+                        GraphSONUtil.writeEndObject(metaProperties, jsonGenerator, typeSerializer);
+                    }
+                    GraphSONUtil.writeEndObject(property, jsonGenerator, typeSerializer);
+                }
+                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+            }
+            GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+        }
+        GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+    }
+
+    private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+                            final SerializerProvider serializerProvider,
+                            final TypeSerializer typeSerializer,
+                            final Direction direction)  throws IOException, JsonProcessingException {
+        // only write edges if there are some AND if the user requested them to be serialized AND if they match
+        // the direction being serialized by the format
+        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+        final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
+        final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
+        final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
+                && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
+        if (writeEdges) {
+            jsonGenerator.writeFieldName(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
+            GraphSONUtil.writeStartObject(directionalStarGraph, jsonGenerator, typeSerializer);
+            final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
+            for (final String k : keys) {
+                final List<Edge> edges = starEdges.get(k);
+                jsonGenerator.writeFieldName(k);
+                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+                final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
+                for (final Edge edge : edgesToWrite) {
+                    GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+                    GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+                    GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
+                            direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
+                            jsonGenerator, serializerProvider, typeSerializer);
+
+                    final Iterator<Property<Object>> edgeProperties = normalize ?
+                            IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+                    if (edgeProperties.hasNext()) {
+                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+                        GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+                        while (edgeProperties.hasNext()) {
+                            final Property<Object> meta = edgeProperties.next();
+                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+                        }
+                        GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+                    }
+                    GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+                }
+                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+            }
+            GraphSONUtil.writeEndObject(directionalStarGraph, jsonGenerator, typeSerializer);
+        }
+    }
+
+    private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
+        Collections.sort(listToSort, comparator);
+        return listToSort;
+    }
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV3d0.java
deleted file mode 100644
index 9a9682c..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV3d0.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.star;
-
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class StarGraphGraphSONSerializerV3d0 extends StdSerializer<DirectionalStarGraph> {
-    private final boolean normalize;
-    public StarGraphGraphSONSerializerV3d0(final boolean normalize) {
-        super(DirectionalStarGraph.class);
-        this.normalize = normalize;
-    }
-
-    @Override
-    public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
-                          final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-        ser(starGraph, jsonGenerator, serializerProvider, null);
-    }
-
-    @Override
-    public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
-                                  final SerializerProvider serializerProvider,
-                                  final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-        ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
-    }
-
-    private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
-                     final SerializerProvider serializerProvider,
-                     final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
-        GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
-        GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
-        jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
-        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
-        if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
-        if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
-            jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-            GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
-            final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
-            for (final String k : keys) {
-                final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
-                jsonGenerator.writeFieldName(k);
-                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
-
-                final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
-                for (final VertexProperty property : vertexProperties) {
-                    GraphSONUtil.writeStartObject(property, jsonGenerator, typeSerializer);
-                    GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
-                    GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
-
-                    final Iterator<Property> metaProperties = normalize ?
-                            IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
-                    if (metaProperties.hasNext()) {
-                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-                        GraphSONUtil.writeStartObject(metaProperties, jsonGenerator, typeSerializer);
-
-                        while (metaProperties.hasNext()) {
-                            final Property<Object> meta = metaProperties.next();
-                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
-                        }
-                        GraphSONUtil.writeEndObject(metaProperties, jsonGenerator, typeSerializer);
-                    }
-                    GraphSONUtil.writeEndObject(property, jsonGenerator, typeSerializer);
-                }
-                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
-            }
-            GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
-        }
-        GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
-    }
-
-    private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
-                            final SerializerProvider serializerProvider,
-                            final TypeSerializer typeSerializer,
-                            final Direction direction)  throws IOException, JsonProcessingException {
-        // only write edges if there are some AND if the user requested them to be serialized AND if they match
-        // the direction being serialized by the format
-        final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
-        final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
-        final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
-        final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
-                && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
-        if (writeEdges) {
-            jsonGenerator.writeFieldName(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
-            GraphSONUtil.writeStartObject(directionalStarGraph, jsonGenerator, typeSerializer);
-            final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
-            for (final String k : keys) {
-                final List<Edge> edges = starEdges.get(k);
-                jsonGenerator.writeFieldName(k);
-                GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
-
-                final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
-                for (final Edge edge : edgesToWrite) {
-                    GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
-                    GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
-                    GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
-                            direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
-                            jsonGenerator, serializerProvider, typeSerializer);
-
-                    final Iterator<Property<Object>> edgeProperties = normalize ?
-                            IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
-                    if (edgeProperties.hasNext()) {
-                        jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-                        GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
-                        while (edgeProperties.hasNext()) {
-                            final Property<Object> meta = edgeProperties.next();
-                            GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
-                        }
-                        GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
-                    }
-                    GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
-                }
-                GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
-            }
-            GraphSONUtil.writeEndObject(directionalStarGraph, jsonGenerator, typeSerializer);
-        }
-    }
-
-    private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
-        Collections.sort(listToSort, comparator);
-        return listToSort;
-    }
-
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
new file mode 100644
index 0000000..1242d16
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+public final class CollectionUtil {
+    private CollectionUtil() {
+    }
+
+    public static <E> List<E> asList(final E... elements) {
+        return new ArrayList<>(Arrays.asList(elements));
+    }
+
+    public static <E> LinkedHashSet<E> asSet(final E... elements) {
+        return asSet(Arrays.asList(elements));
+    }
+
+    public static <E> LinkedHashSet<E> asSet(final Collection<E> elements) {
+        return new LinkedHashSet<>(elements);
+    }
+
+    public static <K,V> LinkedHashMap<K,V> asMap(final Object... elements) {
+        final LinkedHashMap<K,V> map = new LinkedHashMap<>();
+        for (int i = 0; i < elements.length; i+=2) {
+            final K k = (K) elements[i];
+            final V v = (V) (i+1 < elements.length ? elements[i+1] : null);
+            map.put(k, v);
+        }
+        return map;
+    }
+
+    public static <K,V> ConcurrentHashMap<K,V> clone(final ConcurrentHashMap<K,V> map) {
+        final ConcurrentHashMap<K, V> result = new ConcurrentHashMap<>(map.size());
+
+        for (Map.Entry<K, V> entry : map.entrySet()) {
+            V clonedValue;
+            if (entry.getValue() instanceof Set) {
+                clonedValue = (V) ConcurrentHashMap.newKeySet();
+                ((Set) clonedValue).addAll((Set) entry.getValue());
+            } else if (entry.getValue() instanceof ArrayList) {
+                clonedValue = (V)((ArrayList) entry.getValue()).clone();
+            } else {
+                clonedValue = entry.getValue();
+            }
+
+            result.put(entry.getKey(), clonedValue);
+        }
+
+        return result;
+    }
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/DatetimeHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/DatetimeHelper.java
index 39b9ae6..3133411 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/DatetimeHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/DatetimeHelper.java
@@ -34,7 +34,6 @@
 import static java.time.ZoneOffset.UTC;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
-import static java.time.format.DateTimeFormatter.ISO_TIME;
 
 /**
  * Utility class for parsing and formatting dates/times.
@@ -128,4 +127,11 @@
     public static Date datetime(final String d) {
         return parse(d);
     }
+
+    /**
+     * A proxy allows for syntax similar to Gremlin grammar of {@code datetime()}.
+     */
+    public static Date datetime() {
+        return new Date();
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
index fabfbb3..369ad32 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
@@ -24,7 +24,7 @@
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public final class Gremlin {
-    private final static String gremlinVersion = "3.6.8-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+    private final static String gremlinVersion = "3.7.3-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
     private Gremlin() {
     }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/GremlinValueComparator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/GremlinValueComparator.java
index ea2566f..f99c191 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/GremlinValueComparator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/GremlinValueComparator.java
@@ -125,6 +125,11 @@
          */
         @Override
         public boolean equals(final Object f, final Object s) {
+            // numbers and collections with different hashcode can be equal
+            if (f != null && s != null && f.hashCode() != s.hashCode()
+                    && !(f instanceof Number) && !(f instanceof Collection) && !(f instanceof Map))
+                return false;
+
             // shortcut a long, drawn out element by element comparison
             if (containersOfDifferentSize(f, s))
                 return false;
@@ -138,9 +143,9 @@
                 return false;
 
             try {
-              // comparable(f, s) assures that type(f) == type(s)
-              final Type type = Type.type(f);
-              return comparator(type).compare(f, s) == 0;
+                // comparable(f, s) assures that type(f) == type(s)
+                final Type type = Type.type(f);
+                return comparator(type).compare(f, s) == 0;
             } catch (GremlinTypeErrorException ex) {
                 /**
                  * By routing through the compare(f, s) path we expose ourselves to type errors, which should be
@@ -151,7 +156,7 @@
                  *
                  * Can also happen for elements nested inside of collections.
                  */
-               return false;
+                return false;
             }
         }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/MultiMap.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/MultiMap.java
new file mode 100644
index 0000000..4cc2d17
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/MultiMap.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A number of static methods to interact with a multi map, i.e. a map that maps keys to sets of values.
+ *
+ * @author Matthias Broecheler (me@matthiasb.com)
+ */
+public final class MultiMap {
+
+    private MultiMap() {}
+
+    public static <K, V> boolean putAll(final Map<K, Set<V>> map, final K key, final Collection<V> values) {
+        return getMapSet(map, key).addAll(values);
+    }
+
+    public static <K, V> boolean put(final Map<K, Set<V>> map, final K key, final V value) {
+        return getMapSet(map, key).add(value);
+    }
+
+    public static <K, V> boolean containsEntry(final Map<K, Set<V>> map, final K key, final V value) {
+        final Set<V> set = map.get(key);
+        return set != null && set.contains(value);
+    }
+
+    public static <K, V> Set<V> get(final Map<K, Set<V>> map, final K key) {
+        final Set<V> set = getMapSet(map, key);
+        return set == null ? Collections.emptySet() : set;
+    }
+
+    private static <K, V> Set<V> getMapSet(final Map<K, Set<V>> map, final K key) {
+        Set<V> set = map.get(key);
+        if (set == null) {
+            set = new LinkedHashSet<>();
+            map.put(key, set);
+        }
+        return set;
+    }
+
+
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingBiFunction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingBiFunction.java
new file mode 100644
index 0000000..30bcf02
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ThrowingBiFunction.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.function;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@FunctionalInterface
+public interface ThrowingBiFunction<T, U, R> {
+    R apply(final T t, final U u) throws Exception;
+}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
index d7f4b48..eb4073d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
@@ -470,6 +470,10 @@
         return list(asIterator(o));
     }
 
+    public static Set asSet(final Object o) {
+        return set(asIterator(o));
+    }
+
     /**
      * Construct a {@link Stream} from an {@link Iterator}.
      */
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/CollectionFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/CollectionFactory.java
deleted file mode 100644
index 9e25631..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/CollectionFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.tools;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-public class CollectionFactory {
-
-    public static <E> List<E> asList(final E... elements) {
-        return new ArrayList<>(Arrays.asList(elements));
-    }
-
-    public static <E> LinkedHashSet<E> asSet(final E... elements) {
-        return asSet(Arrays.asList(elements));
-    }
-
-    public static <E> LinkedHashSet<E> asSet(final Collection<E> elements) {
-        return new LinkedHashSet<>(elements);
-    }
-
-    public static <K,V> LinkedHashMap<K,V> asMap(final Object... elements) {
-        final LinkedHashMap<K,V> map = new LinkedHashMap<>();
-        for (int i = 0; i < elements.length; i+=2) {
-            final K k = (K) elements[i];
-            final V v = (V) (i+1 < elements.length ? elements[i+1] : null);
-            map.put(k, v);
-        }
-        return map;
-    }
-
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/MultiMap.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/MultiMap.java
deleted file mode 100644
index 0a5bf7b..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/MultiMap.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.tools;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A number of static methods to interact with a multi map, i.e. a map that maps keys to sets of values.
- *
- * @author Matthias Broecheler (me@matthiasb.com)
- */
-public final class MultiMap {
-
-    private MultiMap() {}
-
-    public static <K, V> boolean putAll(final Map<K, Set<V>> map, final K key, final Collection<V> values) {
-        return getMapSet(map, key).addAll(values);
-    }
-
-    public static <K, V> boolean put(final Map<K, Set<V>> map, final K key, final V value) {
-        return getMapSet(map, key).add(value);
-    }
-
-    public static <K, V> boolean containsEntry(final Map<K, Set<V>> map, final K key, final V value) {
-        final Set<V> set = map.get(key);
-        return set != null && set.contains(value);
-    }
-
-    public static <K, V> Set<V> get(final Map<K, Set<V>> map, final K key) {
-        final Set<V> set = getMapSet(map, key);
-        return set == null ? Collections.emptySet() : set;
-    }
-
-    private static <K, V> Set<V> getMapSet(final Map<K, Set<V>> map, final K key) {
-        Set<V> set = map.get(key);
-        if (set == null) {
-            set = new LinkedHashSet<>();
-            map.put(key, set);
-        }
-        return set;
-    }
-
-
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java
index aa4d714..d442f52 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinLangScriptEngineTest.java
@@ -25,6 +25,10 @@
 
 import javax.script.Bindings;
 import javax.script.ScriptException;
+import javax.script.SimpleBindings;
+
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
@@ -47,6 +51,19 @@
     }
 
     @Test
+    public void shouldEvalGremlinScriptWithParameters() throws ScriptException {
+        final Bindings b = new SimpleBindings();
+        b.put("g", g);
+        b.put("x", 100);
+        b.put("y", 1000);
+        b.put("z", 10000);
+
+        final Object result = scriptEngine.eval("g.V(x, y, z)", b);
+        assertThat(result, instanceOf(Traversal.Admin.class));
+        assertEquals(g.V(100, 1000, 10000).asAdmin().getBytecode(), ((Traversal.Admin) result).getBytecode());
+    }
+
+    @Test
     public void shouldEvalGremlinBytecode() throws ScriptException {
         final Object result = scriptEngine.eval(g.V().asAdmin().getBytecode(), "g");
         assertThat(result, instanceOf(Traversal.Admin.class));
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptCheckerTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptCheckerTest.java
index 620ea0e..9287528 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptCheckerTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/GremlinScriptCheckerTest.java
@@ -35,6 +35,7 @@
         final GremlinScriptChecker.Result r = GremlinScriptChecker.parse("g.with(true).V().out('knows')");
         assertEquals(Optional.empty(), r.getTimeout());
         assertEquals(Optional.empty(), r.getRequestId());
+        assertEquals(Optional.empty(), r.getMaterializeProperties());
     }
 
     @Test
@@ -43,6 +44,7 @@
         assertSame(EMPTY_RESULT, r);
         assertEquals(Optional.empty(), r.getTimeout());
         assertEquals(Optional.empty(), r.getRequestId());
+        assertEquals(Optional.empty(), r.getMaterializeProperties());
     }
 
     @Test
@@ -156,7 +158,7 @@
     public void shouldIdentifyRequestIdAsTokenKeyWithoutClassName() {
         assertEquals("db024fca-ed15-4375-95de-4c6106aef895", GremlinScriptChecker.parse("g.with(REQUEST_ID, \"db024fca-ed15-4375-95de-4c6106aef895\").with(true).V().out('knows')").
                 getRequestId().get());
-        assertEquals("db024fca-ed15-4375-95de-4c6106aef895", GremlinScriptChecker.parse("g.with(REQUEST_ID, \"db024fca-ed15-4375-95de-4c6106aef895\").with(true).V().out('knows')").
+        assertEquals("db024fca-ed15-4375-95de-4c6106aef895", GremlinScriptChecker.parse("g.with(REQUEST_ID, 'db024fca-ed15-4375-95de-4c6106aef895').with(true).V().out('knows')").
                 getRequestId().get());
     }
 
@@ -193,11 +195,56 @@
     }
 
     @Test
+    public void shouldIdentifyMaterializePropertiesSingleQuoted() {
+        assertEquals("all", GremlinScriptChecker.parse("g.with('materializeProperties', 'all').with(true).V().out('knows')").
+                getMaterializeProperties().get());
+        assertEquals("all", GremlinScriptChecker.parse("g.with(\"materializeProperties\", 'all').with(true).V().out('knows')").
+                getMaterializeProperties().get());
+    }
+
+    @Test
+    public void shouldIdentifyMaterializePropertiesDoubleQuoted() {
+        assertEquals("all", GremlinScriptChecker.parse("g.with('materializeProperties', \"all\").with(true).V().out('knows')").
+                getMaterializeProperties().get());
+        assertEquals("all", GremlinScriptChecker.parse("g.with(\"materializeProperties\", \"all\").with(true).V().out('knows')").
+                getMaterializeProperties().get());
+    }
+
+    @Test
+    public void shouldIdentifyMaterializePropertiesWithEmbeddedQuote() {
+        assertEquals("te's\"t", GremlinScriptChecker.parse("g.with('materializeProperties', \"te's\"t\").with(true).V().out('knows')").
+                getMaterializeProperties().get());
+    }
+
+    @Test
+    public void shouldIdentifyMaterializePropertiesAsTokenKeyWithoutClassName() {
+        assertEquals("all", GremlinScriptChecker.parse("g.with(ARGS_MATERIALIZE_PROPERTIES, 'all').with(true).V().out('knows')").
+                getMaterializeProperties().get());
+        assertEquals("all", GremlinScriptChecker.parse("g.with(ARGS_MATERIALIZE_PROPERTIES, \"all\").with(true).V().out('knows')").
+                getMaterializeProperties().get());
+    }
+
+    @Test
+    public void shouldIdentifyMaterializePropertiesAsTokenKey() {
+        assertEquals("all", GremlinScriptChecker.parse("g.with(Tokens.ARGS_MATERIALIZE_PROPERTIES, 'all').with(true).V().out('knows')").
+                getMaterializeProperties().get());
+        assertEquals("all", GremlinScriptChecker.parse("g.with(Tokens.ARGS_MATERIALIZE_PROPERTIES, \"all\").with(true).V().out('knows')").
+                getMaterializeProperties().get());
+    }
+
+    @Test
+    public void shouldIdentifyMultipleMaterializeProperties() {
+        assertEquals("all", GremlinScriptChecker.parse("g.with('materializeProperties', \"hello\").with(\"materializeProperties\", 'world').with('materializeProperties', 'all').with(true).V().out('knows')").
+                getMaterializeProperties().get());
+    }
+
+    @Test
     public void shouldFindAllResults() {
         final GremlinScriptChecker.Result r = GremlinScriptChecker.parse(
-                "g.with('evaluationTimeout', 1000).with(true).with(REQUEST_ID, \"db024fca-ed15-4375-95de-4c6106aef895\").V().out('knows')");
+                "g.with('evaluationTimeout', 1000).with(true).with(REQUEST_ID, \"db024fca-ed15-4375-95de-4c6106aef895\").with(\"materializeProperties\", 'all').V().out('knows')");
         assertEquals(1000, r.getTimeout().get().longValue());
         assertEquals("db024fca-ed15-4375-95de-4c6106aef895", r.getRequestId().get());
+        assertEquals("all", r.getMaterializeProperties().get());
     }
 
     @Test
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ScriptEngineCacheTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ScriptEngineCacheTest.java
index 9e6d0dc..8900cd3 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ScriptEngineCacheTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/jsr223/ScriptEngineCacheTest.java
@@ -18,7 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.jsr223;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assume.assumeThat;
 
 import org.apache.tinkerpop.gremlin.AssertHelper;
 import org.junit.Test;
@@ -35,6 +37,9 @@
 
     @Test
     public void shouldGetEngineFromCache() {
+        String javaVersion = System.getProperty("java.version");
+        int majorVersion = Integer.parseInt(javaVersion.substring(0, javaVersion.indexOf('.')));
+        assumeThat("Requires lower than JDK 14.", majorVersion < 14, is(true));
         assertSame(ScriptEngineCache.get("nashorn"), ScriptEngineCache.get("nashorn"));
     }
 
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitorTest.java
new file mode 100644
index 0000000..43f3305
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitorTest.java
@@ -0,0 +1,286 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.language.grammar;
+
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
+import org.apache.tinkerpop.gremlin.process.traversal.IO;
+import org.apache.tinkerpop.gremlin.process.traversal.Merge;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+@RunWith(Parameterized.class)
+public class ArgumentVisitorTest {
+    @Parameterized.Parameter(value = 0)
+    public Class<?> clazz;
+
+    @Parameterized.Parameter(value = 1)
+    public String script;
+
+    @Parameterized.Parameter(value = 2)
+    public Object expected;
+
+    @Parameterized.Parameter(value = 3)
+    public GremlinAntlrToJava antlrToLanguage;
+
+    private static final GraphTraversalSource g = EmptyGraph.instance().traversal();
+
+    private static final Date now = new Date();
+
+    private static final Map<String, Object> nullMap = new HashMap<String, Object>() {{
+        put("x", null);
+    }};
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Iterable<Object[]> generateTestParameters() {
+        return Arrays.asList(new Object[][]{
+                {Boolean.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Boolean.class, "true", true, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", true)))},
+                {Boolean.class, "false", false, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", true)))},
+                {Boolean.class, "x", true, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", true)))},
+                {Integer.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Integer.class, "0", 0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100)))},
+                {Integer.class, "0i", 0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100)))},
+                {Integer.class, "0L", 0L, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100)))},
+                {Integer.class, "x", 0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0)))},
+                {Integer.class, "x", 0L, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0L)))},
+                {Float.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Float.class, "0.0d", 0.0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 1000.0)))},
+                {Float.class, "0d", 0.0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 1000.0)))},
+                {Float.class, "0F", 0.0F, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 1000.0F)))},
+                {Float.class, "x", 0.0, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0.0)))},
+                {Float.class, "x", 0.0F, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 0.0F)))},
+                {String.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {String.class, "'test'", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {String.class, "x", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "test")))},
+                {String.class, "x", "graphson", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", IO.graphson)))},
+                {StringNullable.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {StringNullable.class, "null", null, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {StringNullable.class, "x", null, createAntlr(new VariableResolver.DefaultVariableResolver(nullMap))},
+                {Object.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Object.class, "'test'", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Object.class, "x", "test", createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "test")))},
+                {Object.class, "x", now, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", now)))},
+                {Object.class, "[1,2,3]", Arrays.asList(1, 2, 3), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", now)))},
+                {Object.class, "x", P.eq(100), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", P.eq(100))))},
+                {Direction.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Direction.class, "Direction.OUT", Direction.OUT, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Direction.class, "OUT", Direction.OUT, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Direction.class, "x", Direction.OUT, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Direction.OUT)))},
+                {Direction.class, "x", Direction.from, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Direction.from)))},
+                {Vertex.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Vertex.class, "new Vertex(1i,'person')", new ReferenceVertex(1, "person"), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Direction.from)))},
+                {Vertex.class, "x", new ReferenceVertex(1, "person"), createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", new ReferenceVertex(1, "person"))))},
+                {Order.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Order.class, "Order.desc", Order.desc, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Order.class, "x", Order.desc, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Order.desc)))},
+                {Scope.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Scope.class, "Scope.local", Scope.local, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Scope.class, "local", Scope.local, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Scope.class, "x", Scope.local, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Scope.local)))},
+                {T.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {T.class, "T.label", T.label, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {T.class, "label", T.label, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {T.class, "x", T.label, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", T.label)))},
+                {VertexProperty.Cardinality.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {VertexProperty.Cardinality.class, "Cardinality.list", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {VertexProperty.Cardinality.class, "list", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {VertexProperty.Cardinality.class, "x", VertexProperty.Cardinality.list, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", VertexProperty.Cardinality.list)))},
+                {DT.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {DT.class, "DT.hour", DT.hour, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {DT.class, "hour", DT.hour, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {DT.class, "x", DT.hour, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", DT.hour)))},
+                {Merge.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Merge.class, "Merge.onMatch", Merge.onMatch, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Merge.class, "onMatch", Merge.onMatch, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Merge.class, "x", Merge.onMatch, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Merge.onMatch)))},
+                {Pop.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Pop.class, "Pop.last", Pop.last, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Pop.class, "last", Pop.last, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Pop.class, "x", Pop.last, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Pop.last)))},
+                {Operator.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Operator.class, "Operator.sum", Operator.sum, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Operator.class, "sum", Operator.sum, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Operator.class, "x", Operator.sum, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Operator.sum)))},
+                {Column.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {Column.class, "Column.keys", Column.keys, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Column.class, "keys", Column.keys, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {Column.class, "x", Column.keys, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", Column.keys)))},
+                {SackFunctions.Barrier.class, "x", new VariableResolverException("x"), createAntlr(VariableResolver.NoVariableResolver.instance())},
+                {SackFunctions.Barrier.class, "Barrier.normSack", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {SackFunctions.Barrier.class, "Barrier.normSack", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", "nope")))},
+                {SackFunctions.Barrier.class, "x", SackFunctions.Barrier.normSack, createAntlr(new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", SackFunctions.Barrier.normSack)))},
+        });
+    }
+
+    @Test
+    public void shouldParse() {
+        final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
+        final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
+        if (clazz.equals(Boolean.class)) {
+            assertParsing(() -> {
+                final GremlinParser.BooleanArgumentContext ctx = parser.booleanArgument();
+                return antlrToLanguage.argumentVisitor.parseBoolean(ctx);
+            });
+        } else if (clazz.equals(Integer.class)) {
+            assertParsing(() -> {
+                final GremlinParser.IntegerArgumentContext ctx = parser.integerArgument();
+                return antlrToLanguage.argumentVisitor.parseNumber(ctx);
+            });
+        } else if (clazz.equals(Float.class)) {
+            assertParsing(() -> {
+                final GremlinParser.FloatArgumentContext ctx = parser.floatArgument();
+                return antlrToLanguage.argumentVisitor.parseNumber(ctx);
+            });
+        } else if (clazz.equals(String.class)) {
+            assertParsing(() -> {
+                final GremlinParser.StringArgumentContext ctx = parser.stringArgument();
+                return antlrToLanguage.argumentVisitor.parseString(ctx);
+            });
+        } else if (clazz.equals(StringNullable.class)) {
+            assertParsing(() -> {
+                final GremlinParser.StringNullableArgumentContext ctx = parser.stringNullableArgument();
+                return antlrToLanguage.argumentVisitor.parseString(ctx);
+            });
+        } else if (clazz.equals(Object.class)) {
+            assertParsing(() -> {
+                final GremlinParser.GenericLiteralArgumentContext ctx = parser.genericLiteralArgument();
+                return antlrToLanguage.argumentVisitor.parseObject(ctx);
+            });
+        } else if (clazz.equals(List.class)) {
+            assertParsing(() -> {
+                final GremlinParser.GenericLiteralListArgumentContext ctx = parser.genericLiteralListArgument();
+                return antlrToLanguage.argumentVisitor.parseObjectVarargs(ctx);
+            });
+        } else if (clazz.equals(Direction.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalDirectionArgumentContext ctx = parser.traversalDirectionArgument();
+                return antlrToLanguage.argumentVisitor.parseDirection(ctx);
+            });
+        } else if (clazz.equals(Vertex.class)) {
+            assertParsing(() -> {
+                final GremlinParser.StructureVertexArgumentContext ctx = parser.structureVertexArgument();
+                return antlrToLanguage.argumentVisitor.parseVertex(ctx);
+            });
+        } else if (clazz.equals(Order.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalOrderArgumentContext ctx = parser.traversalOrderArgument();
+                return antlrToLanguage.argumentVisitor.parseOrder(ctx);
+            });
+        } else if (clazz.equals(Scope.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalScopeArgumentContext ctx = parser.traversalScopeArgument();
+                return antlrToLanguage.argumentVisitor.parseScope(ctx);
+            });
+        } else if (clazz.equals(T.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalTokenArgumentContext ctx = parser.traversalTokenArgument();
+                return antlrToLanguage.argumentVisitor.parseT(ctx);
+            });
+        } else if (clazz.equals(VertexProperty.Cardinality.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalCardinalityArgumentContext ctx = parser.traversalCardinalityArgument();
+                return antlrToLanguage.argumentVisitor.parseCardinality(ctx);
+            });
+        } else if (clazz.equals(DT.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalDTArgumentContext ctx = parser.traversalDTArgument();
+                return antlrToLanguage.argumentVisitor.parseDT(ctx);
+            });
+        } else if (clazz.equals(Merge.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalMergeArgumentContext ctx = parser.traversalMergeArgument();
+                return antlrToLanguage.argumentVisitor.parseMerge(ctx);
+            });
+        } else if (clazz.equals(Pop.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalPopArgumentContext ctx = parser.traversalPopArgument();
+                return antlrToLanguage.argumentVisitor.parsePop(ctx);
+            });
+        } else if (clazz.equals(Operator.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalBiFunctionArgumentContext ctx = parser.traversalBiFunctionArgument();
+                return antlrToLanguage.argumentVisitor.visitTraversalBiFunctionArgument(ctx);
+            });
+        } else if (clazz.equals(Column.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalColumnArgumentContext ctx = parser.traversalColumnArgument();
+                return antlrToLanguage.argumentVisitor.parseColumn(ctx);
+            });
+        } else if (clazz.equals(SackFunctions.Barrier.class)) {
+            assertParsing(() -> {
+                final GremlinParser.TraversalSackMethodArgumentContext ctx = parser.traversalSackMethodArgument();
+                return antlrToLanguage.argumentVisitor.visitTraversalSackMethodArgument(ctx);
+            });
+        } else {
+            fail("Missing an assertion type");
+        }
+    }
+
+    private void assertParsing(final Supplier<Object> visit) {
+        try {
+            final Object o = visit.get();
+            if (expected instanceof VariableResolverException)
+                fail(String.format("Should have failed with %s", VariableResolverException.class.getSimpleName()));
+            else
+                assertEquals(expected, o);
+        } catch (Exception ex) {
+            assertThat(ex, instanceOf(VariableResolverException.class));
+        }
+    }
+
+    private static GremlinAntlrToJava createAntlr(final VariableResolver resolver) {
+        return new GremlinAntlrToJava("g", EmptyGraph.instance(), __::start, g, resolver);
+    }
+
+    private static class StringNullable { }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ComplexTraversalMethodVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ComplexTraversalMethodVisitorTest.java
index 32ba811..9bf9a68 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ComplexTraversalMethodVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/ComplexTraversalMethodVisitorTest.java
@@ -71,7 +71,7 @@
         }
 
         @Test
-        public void testNestedGraphTraversal() {
+        public void shouldParseNestedGraphTraversal() {
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.QueryContext ctx = parser.query();
@@ -104,7 +104,7 @@
         }
 
         @Test
-        public void testChainedGraphTraversal() {
+        public void shouldParseChainedGraphTraversal() {
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.QueryContext ctx = parser.query();
@@ -137,7 +137,7 @@
         }
 
         @Test
-        public void testTerminatedGraphTraversal() {
+        public void shouldParseTerminatedGraphTraversal() {
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.QueryContext ctx = parser.query();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java
index 1350b03..96d0ede 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GeneralLiteralVisitorTest.java
@@ -20,6 +20,7 @@
 
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
@@ -54,7 +55,7 @@
         final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(query));
         final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
         final GremlinParser.GenericLiteralRangeContext ctx = parser.genericLiteralRange();
-        return GenericLiteralVisitor.instance().visitGenericLiteralRange(ctx);
+        return new GenericLiteralVisitor(new GremlinAntlrToJava()).visitGenericLiteralRange(ctx);
     }
 
     @RunWith(Parameterized.class)
@@ -237,12 +238,12 @@
         public void shouldParse() {
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
-            final GremlinParser.StringBasedLiteralContext ctx = parser.stringBasedLiteral();
+            final GremlinParser.StringLiteralContext ctx = parser.stringLiteral();
             if (expected.equals("Empty")) {
                 // handle special case for Empty string
-                assertEquals("", GenericLiteralVisitor.instance().visitStringBasedLiteral(ctx));
+                assertEquals("", new GenericLiteralVisitor(new GremlinAntlrToJava()).visitStringLiteral(ctx));
             } else {
-                assertEquals(expected, GenericLiteralVisitor.instance().visitStringBasedLiteral(ctx));
+                assertEquals(expected, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitStringLiteral(ctx));
             }
         }
     }
@@ -281,8 +282,8 @@
             final String stringLiteral = quoteCharacter + inputChars + quoteCharacter;
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(stringLiteral));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
-            final GremlinParser.StringBasedLiteralContext ctx = parser.stringBasedLiteral();
-            assertEquals(expectedOutputChars, GenericLiteralVisitor.instance().visitStringBasedLiteral(ctx));
+            final GremlinParser.StringLiteralContext ctx = parser.stringLiteral();
+            assertEquals(expectedOutputChars, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitStringLiteral(ctx));
         }
     }
 
@@ -349,7 +350,7 @@
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.IntegerLiteralContext ctx = parser.integerLiteral();
 
-            final Object actualValue = GenericLiteralVisitor.instance().visitIntegerLiteral(ctx);
+            final Object actualValue = new GenericLiteralVisitor(new GremlinAntlrToJava()).visitIntegerLiteral(ctx);
             assertEquals(expected, actualValue);
         }
     }
@@ -386,7 +387,7 @@
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.IntegerLiteralContext ctx = parser.integerLiteral();
 
-            assertEquals(new BigInteger(expected, radix), GenericLiteralVisitor.instance().visitIntegerLiteral(ctx));
+            assertEquals(new BigInteger(expected, radix), new GenericLiteralVisitor(new GremlinAntlrToJava()).visitIntegerLiteral(ctx));
         }
     }
 
@@ -437,7 +438,7 @@
             final Constructor<?> ctor = clazz.getConstructor(String.class);
             final Object expectedValue = ctor.newInstance(expected);
 
-            assertEquals(expectedValue, GenericLiteralVisitor.instance().visitFloatLiteral(ctx));
+            assertEquals(expectedValue, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitFloatLiteral(ctx));
         }
     }
 
@@ -475,11 +476,23 @@
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.DateLiteralContext ctx = parser.dateLiteral();
 
-            final Date dt = (Date) GenericLiteralVisitor.instance().visitDateLiteral(ctx);
+            final Date dt = (Date) new GenericLiteralVisitor(new GremlinAntlrToJava()).visitDateLiteral(ctx);
             assertEquals(expected, dt);
         }
     }
 
+    public static class ValidCurrentDateLiteralTest {
+        @Test
+        public void shouldParseCurrentDate() {
+            final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString("datetime()"));
+            final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
+            final GremlinParser.DateLiteralContext ctx = parser.dateLiteral();
+
+            final Date dt = (Date) new GenericLiteralVisitor(new GremlinAntlrToJava()).visitDateLiteral(ctx);
+            assertTrue(new Date().getTime() - dt.getTime() < 1000);
+        }
+    }
+
     @RunWith(Parameterized.class)
     public static class ValidBooleanLiteralTest {
         @Parameterized.Parameter(value = 0)
@@ -502,7 +515,7 @@
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.BooleanLiteralContext ctx = parser.booleanLiteral();
 
-            assertEquals(expected, GenericLiteralVisitor.instance().visitBooleanLiteral(ctx));
+            assertEquals(expected, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitBooleanLiteral(ctx));
         }
     }
 
@@ -543,7 +556,7 @@
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.GenericLiteralContext ctx = parser.genericLiteral();
-            final Object genericLiteral = GenericLiteralVisitor.instance().visitGenericLiteral(ctx);
+            final Object genericLiteral = new GenericLiteralVisitor(new GremlinAntlrToJava()).visitGenericLiteral(ctx);
 
             // verify type is Map
             assertThat(genericLiteral, instanceOf(Map.class));
@@ -557,11 +570,11 @@
     public static class ValidListLiteralTest {
 
         @Test
-        public void testGenericLiteralCollection() {
+        public void shouldParseGenericLiteralCollection() {
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString("['world', 165, [12L, 0xA, 14.5, \"hello\"]]"));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.GenericLiteralContext ctx = parser.genericLiteral();
-            final Object genericLiteral = GenericLiteralVisitor.instance().visitGenericLiteral(ctx);
+            final Object genericLiteral = new GenericLiteralVisitor(new GremlinAntlrToJava()).visitGenericLiteral(ctx);
 
             // verify type is Object[]
             assertThat(genericLiteral, instanceOf(List.class));
@@ -600,11 +613,11 @@
          * Generic literal collection test
          */
         @Test
-        public void testEmptyGenericLiteralCollection() {
+        public void shouldParseEmptyGenericLiteralCollection() {
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString("[]"));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.GenericLiteralContext ctx = parser.genericLiteral();
-            final Object genericLiteral = GenericLiteralVisitor.instance().visitGenericLiteral(ctx);
+            final Object genericLiteral = new GenericLiteralVisitor(new GremlinAntlrToJava()).visitGenericLiteral(ctx);
 
             // verify type is Object[]
             assertThat(genericLiteral, instanceOf(List.class));
@@ -618,59 +631,97 @@
     public static class NullNaNInfTest {
 
         @Test
-        public void testNull() {
+        public void shouldParseNull() {
             final String script = "null";
 
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.NullLiteralContext ctx = parser.nullLiteral();
-            assertEquals(null, GenericLiteralVisitor.instance().visitNullLiteral(ctx));
+            assertEquals(null, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitNullLiteral(ctx));
         }
 
         @Test
-        public void testNaN() {
+        public void shouldParseNaN() {
             final String script = "NaN";
 
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.NanLiteralContext ctx = parser.nanLiteral();
 
-            final Object o = GenericLiteralVisitor.instance().visitNanLiteral(ctx);
+            final Object o = new GenericLiteralVisitor(new GremlinAntlrToJava()).visitNanLiteral(ctx);
             assertTrue(o instanceof Double);
             assertTrue(Double.isNaN((double) o));
         }
 
         @Test
-        public void testInf() {
+        public void shouldParseInf() {
             final String script = "Infinity";
 
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.InfLiteralContext ctx = parser.infLiteral();
 
-            assertEquals(Double.POSITIVE_INFINITY, GenericLiteralVisitor.instance().visitInfLiteral(ctx));
+            assertEquals(Double.POSITIVE_INFINITY, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitInfLiteral(ctx));
         }
 
         @Test
-        public void testPosInf() {
+        public void shouldParsePosInf() {
             final String script = "+Infinity";
 
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.InfLiteralContext ctx = parser.infLiteral();
 
-            assertEquals(Double.POSITIVE_INFINITY, GenericLiteralVisitor.instance().visitInfLiteral(ctx));
+            assertEquals(Double.POSITIVE_INFINITY, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitInfLiteral(ctx));
         }
 
         @Test
-        public void testNegInf() {
+        public void shouldParseNegInf() {
             final String script = "-Infinity";
 
             final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
             final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
             final GremlinParser.InfLiteralContext ctx = parser.infLiteral();
 
-            assertEquals(Double.NEGATIVE_INFINITY, GenericLiteralVisitor.instance().visitInfLiteral(ctx));
+            assertEquals(Double.NEGATIVE_INFINITY, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitInfLiteral(ctx));
+        }
+    }
+
+    @RunWith(Parameterized.class)
+    public static class CardinalityTest {
+        @Parameterized.Parameter(value = 0)
+        public String script;
+
+        @Parameterized.Parameter(value = 1)
+        public Object expected;
+
+        @Parameterized.Parameters()
+        public static Iterable<Object[]> generateTestParameters() {
+            return Arrays.asList(new Object[][]{
+                    {"single(\"test\")", VertexProperty.Cardinality.single("test")},
+                    {"list(\"test\")", VertexProperty.Cardinality.list("test")},
+                    {"set(\"test\")", VertexProperty.Cardinality.set("test")},
+                    {"Cardinality.single(\"test\")", VertexProperty.Cardinality.single("test")},
+                    {"Cardinality.list(\"test\")", VertexProperty.Cardinality.list("test")},
+                    {"Cardinality.set(\"test\")", VertexProperty.Cardinality.set("test")},
+                    {"single(1l)", VertexProperty.Cardinality.single(1L)},
+                    {"list(1l)", VertexProperty.Cardinality.list(1L)},
+                    {"set(1l)", VertexProperty.Cardinality.set(1L)},
+                    {"Cardinality.single", VertexProperty.Cardinality.single},
+                    {"Cardinality.list", VertexProperty.Cardinality.list},
+                    {"Cardinality.set", VertexProperty.Cardinality.set},
+                    {"single", VertexProperty.Cardinality.single},
+                    {"list", VertexProperty.Cardinality.list},
+                    {"set", VertexProperty.Cardinality.set},
+            });
+        }
+
+        @Test
+        public void shouldParse() {
+            final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
+            final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
+            final GremlinParser.TraversalCardinalityContext ctx = parser.traversalCardinality();
+            assertEquals(expected, new GenericLiteralVisitor(new GremlinAntlrToJava()).visitTraversalCardinality(ctx));
         }
     }
 }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java
index b9d600d..9b67393 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinQueryParserTest.java
@@ -18,15 +18,96 @@
  */
 package org.apache.tinkerpop.gremlin.language.grammar;
 
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
 public class GremlinQueryParserTest {
+    private static final GraphTraversalSource g = EmptyGraph.instance().traversal();
 
     @Test
     public void shouldParseEmpty() {
         assertEquals("", GremlinQueryParser.parse("\"\""));
         assertEquals("", GremlinQueryParser.parse("''"));
     }
+
+    @Test
+    public void shouldParseVariables() {
+        final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
+                EmptyGraph.instance(), __::start, g,
+                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("z", 50)));
+        final GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V().has('name',gt(z))", gremlinAntlrToJava);
+
+        assertEquals(g.V().has("name", P.gt(50)).asAdmin().getBytecode(),
+                t.asAdmin().getBytecode());
+    }
+
+    @Test
+    public void shouldParseVariablesInVarargs() {
+        final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
+                EmptyGraph.instance(), __::start, g,
+                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100,
+                                                                                 "y", 200,
+                                                                                 "z", 50)));
+
+        GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V().has('name',gt(z))", gremlinAntlrToJava);
+        assertEquals(g.V().has("name", P.gt(50)).asAdmin().getBytecode(),
+                t.asAdmin().getBytecode());
+
+        t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V(x).has('name',gt(z))", gremlinAntlrToJava);
+        assertEquals(g.V(100).has("name", P.gt(50)).asAdmin().getBytecode(),
+                t.asAdmin().getBytecode());
+
+        t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V(x, y, 300).has('name',gt(z))", gremlinAntlrToJava);
+        assertEquals(g.V(100, 200, 300).has("name", P.gt(50)).asAdmin().getBytecode(),
+                t.asAdmin().getBytecode());
+    }
+
+    @Test(expected = GremlinParserException.class)
+    public void shouldNotParseVariablesInList() {
+        final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
+                EmptyGraph.instance(), __::start, g,
+                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100,
+                        "y", 200,
+                        "z", 50)));
+        GremlinQueryParser.parse("g.V([x, y, 300]).has('name',gt(z))", gremlinAntlrToJava);
+    }
+
+    @Test(expected = GremlinParserException.class)
+    public void shouldNotParseVariablesWhichAreTraversalBased() {
+        final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
+                EmptyGraph.instance(), __::start, g,
+                new VariableResolver.DefaultVariableResolver(ElementHelper.asMap("x", 100,
+                        "y", 200,
+                        "z", __.out())));
+        GremlinQueryParser.parse("g.V([x, y, 300]).where(z)", gremlinAntlrToJava);
+    }
+
+    @Test
+    public void shouldParseVariableWithNoOp() {
+        final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
+                EmptyGraph.instance(), __::start, g,
+                VariableResolver.NullVariableResolver.instance());
+        final GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V().has('name',gt(z))", gremlinAntlrToJava);
+
+        assertEquals(g.V().has("name", P.gt(null)).asAdmin().getBytecode(),
+                t.asAdmin().getBytecode());
+    }
+
+    @Test
+    public void shouldParseMultiVariablesWithNoOp() {
+        final GremlinAntlrToJava gremlinAntlrToJava = new GremlinAntlrToJava("g",
+                EmptyGraph.instance(), __::start, g,
+                VariableResolver.NullVariableResolver.instance());
+        final GraphTraversal<?, ?> t = (GraphTraversal<?, ?>) GremlinQueryParser.parse("g.V(a,b,c).has('name',gt(z))", gremlinAntlrToJava);
+
+        assertEquals(g.V(null, null, null).has("name", P.gt(null)).asAdmin().getBytecode(),
+                t.asAdmin().getBytecode());
+    }
 }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParserTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParserTest.java
index 52f0a25..0f181d6 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParserTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalEnumParserTest.java
@@ -65,7 +65,7 @@
         }
 
         @Test
-        public void testAllEnumTypes() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+        public void shouldParseAllEnumTypes() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
             final Class<? extends Enum> enumType = (Class<? extends Enum>) (Class.forName(className));
             for (Enum enumConstant : enumType.getEnumConstants()) {
                 final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(enumConstant.name()));
@@ -98,7 +98,7 @@
         }
 
         @Test
-        public void testAllQualifiedEnumTypes() throws
+        public void shouldParseAllQualifiedEnumTypes() throws
         ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
             Class<? extends Enum> enumType = (Class<? extends Enum>) (Class.forName(className));
             for (Enum enumConstant : enumType.getEnumConstants()) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java
index be1af46..51244cd 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitorTest.java
@@ -39,9 +39,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.function.Function;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
@@ -75,633 +74,714 @@
     }
 
     @Test
-    public void testChainedTraversal() throws Exception {
+    public void shouldParseChainedTraversal() throws Exception {
         // a random chain traversal.
         compare(g.V().addE("person"), eval("g.V().addE('person')"));
     }
 
     @Test
-    public void testTraversalMethod_addE_String() throws Exception {
+    public void shouldParseTraversalMethod_addE_String() throws Exception {
         // same with chained traversal but uses double quotes
         compare(g.V().addE("person"), eval("g.V().addE(\"person\")"));
     }
 
     @Test
-    public void testTraversalMethod_addE_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_addE_Traversal() throws Exception {
         // same with chained traversal but uses double quotes
         compare(g.V().addE(V().hasLabel("person").label()), eval("g.V().addE(V().hasLabel(\"person\").label())"));
     }
 
     @Test
-    public void testTraversalMethod_addV_Empty() throws Exception {
+    public void shouldParseTraversalMethod_addV_Empty() throws Exception {
         compare(g.V().addV(), eval("g.V().addV()"));
     }
 
     @Test
-    public void testTraversalMethod_addV_String() throws Exception {
+    public void shouldParseTraversalMethod_addV_String() throws Exception {
         compare(g.V().addV("test"), eval("g.V().addV(\"test\")"));
     }
 
     @Test
-    public void testTraversalMethod_addV_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_addV_Traversal() throws Exception {
         compare(g.addV(V().hasLabel("person").label()), eval("g.addV(V().hasLabel(\"person\").label())"));
     }
 
     @Test
-    public void testTraversalMethod_aggregate() throws Exception {
+    public void shouldParseTraversalMethod_aggregate() throws Exception {
         compare(g.V().aggregate("test"), eval("g.V().aggregate('test')"));
     }
 
     @Test
-    public void testTraversalMethod_aggregate_Scope() throws Exception {
+    public void shouldParseTraversalMethod_aggregate_Scope() throws Exception {
         compare(g.V().aggregate(global, "test"), eval("g.V().aggregate(global, 'test')"));
         compare(g.V().aggregate(Scope.local, "test"), eval("g.V().aggregate(Scope.local, 'test')"));
     }
 
     @Test
-    public void testTraversalMethod_and() throws Exception {
+    public void shouldParseTraversalMethod_all_P() throws Exception {
+        compare(g.V().id().fold().all(gt(1)), eval("g.V().id().fold().all(gt(1))"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_and() throws Exception {
         compare(g.V().and(outE("knows")), eval("g.V().and(outE('knows'))"));
     }
 
     @Test
-    public void testTraversalMethod_as() throws Exception {
+    public void shouldParseTraversalMethod_any_P() throws Exception {
+        compare(g.V().id().fold().any(gt(1)), eval("g.V().id().fold().any(gt(1))"));
+    }
+    @Test
+    public void shouldParseTraversalMethod_as() throws Exception {
         compare(g.V().as("test"), eval("g.V().as('test')"));
     }
 
     @Test
-    public void testTraversalMethod_barrier_Consumer() throws Exception {
+    public void shouldParseTraversalMethod_barrier_Consumer() throws Exception {
         compare(g.V().barrier(normSack), eval("g.V().barrier(normSack)"));
     }
 
     @Test
-    public void testTraversalMethod_barrier_Empty() throws Exception {
+    public void shouldParseTraversalMethod_barrier_Empty() throws Exception {
         compare(g.V().barrier(), eval("g.V().barrier()"));
     }
 
     @Test
-    public void testTraversalMethod_barrier_int() throws Exception {
+    public void shouldParseTraversalMethod_barrier_int() throws Exception {
         compare(g.V().barrier(4), eval("g.V().barrier(4)"));
     }
 
     @Test
-    public void testTraversalMethod_both_Empty() throws Exception {
+    public void shouldParseTraversalMethod_both_Empty() throws Exception {
         compare(g.V().both(), eval("g.V().both()"));
     }
 
     @Test
-    public void testTraversalMethod_both_SingleString() throws Exception {
+    public void shouldParseTraversalMethod_both_SingleString() throws Exception {
         compare(g.V().both("test"), eval("g.V().both('test')"));
     }
 
     @Test
-    public void testTraversalMethod_both_MultiString() throws Exception {
+    public void shouldParseTraversalMethod_both_MultiString() throws Exception {
         compare(g.V().both(new String[]{"a", "b"}), eval("g.V().both('a', 'b')"));
     }
 
     @Test
-    public void testTraversalMethod_bothE() throws Exception {
+    public void shouldParseTraversalMethod_bothE() throws Exception {
         compare(g.V().bothE("test"), eval("g.V().bothE('test')"));
     }
 
     @Test
-    public void testTraversalMethod_bothV() throws Exception {
+    public void shouldParseTraversalMethod_bothV() throws Exception {
         compare(g.V().bothV(), eval("g.V().bothV()"));
     }
 
     @Test
-    public void testTraversalMethod_branch_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_branch_Traversal() throws Exception {
         compare(g.V().branch(values("name")), eval("g.V().branch(values('name'))"));
     }
 
     @Test
-    public void testTraversalMethod_by_Comparator() throws Exception {
+    public void shouldParseTraversalMethod_by_Comparator() throws Exception {
         compare(g.V().order().by(Order.asc), eval("g.V().order().by(asc)"));
     }
 
     @Test
-    public void testTraversalMethod_by_Empty() throws Exception {
+    public void shouldParseTraversalMethod_by_Empty() throws Exception {
         compare(g.V().cyclicPath().by(), eval("g.V().cyclicPath().by()"));
     }
 
     @Test
-    public void testTraversalMethod_by_Function() throws Exception {
+    public void shouldParseTraversalMethod_by_Function() throws Exception {
         compare(g.V().order().by(T.id), eval("g.V().order().by(id)"));
     }
 
     @Test
-    public void testTraversalMethod_by_Function_Comparator() throws Exception {
+    public void shouldParseTraversalMethod_by_Function_Comparator() throws Exception {
         compare(g.V().order().by(Column.keys, Order.asc), eval("g.V().order().by(keys, asc)"));
     }
 
     @Test
-    public void testTraversalMethod_by_Order() throws Exception {
+    public void shouldParseTraversalMethod_by_Order() throws Exception {
         compare(g.V().order().by(Order.shuffle), eval("g.V().order().by(shuffle)"));
     }
 
     @Test
-    public void testTraversalMethod_by_String() throws Exception {
+    public void shouldParseTraversalMethod_by_String() throws Exception {
         compare(g.V().order().by("name"), eval("g.V().order().by('name')"));
     }
 
     @Test
-    public void testTraversalMethod_by_String_Comparator() throws Exception {
+    public void shouldParseTraversalMethod_by_String_Comparator() throws Exception {
         compare(g.V().order().by("name", Order.asc), eval("g.V().order().by('name', asc)"));
     }
 
     @Test
-    public void testTraversalMethod_by_T() throws Exception {
+    public void shouldParseTraversalMethod_by_T() throws Exception {
         compare(g.V().order().by(T.id), eval("g.V().order().by(id)"));
     }
 
     @Test
-    public void testTraversalMethod_by_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_by_Traversal() throws Exception {
         compare(g.V().group().by(bothE().count()), eval("g.V().group().by(bothE().count())"));
     }
 
     @Test
-    public void testTraversalMethod_by_Traversal_Comparator() throws Exception {
+    public void shouldParseTraversalMethod_by_Traversal_Comparator() throws Exception {
         compare(g.V().order().by(bothE().count(), Order.asc), eval("g.V().order().by(bothE().count(), asc)"));
     }
 
     @Test
-    public void testTraversalMethod_cap() throws Exception {
+    public void shouldParseTraversalMethod_cap() throws Exception {
         compare(g.V().cap("test"), eval("g.V().cap('test')"));
     }
 
     @Test
-    public void testTraversalMethod_choose_Function() throws Exception {
+    public void shouldParseTraversalMethod_choose_Function() throws Exception {
         compare(g.V().choose((Function) label), eval("g.V().choose(label)"));
     }
 
     @Test
-    public void testTraversalMethod_choose_Predicate_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_choose_Predicate_Traversal() throws Exception {
         compare(g.V().choose(is(12), values("age")), eval("g.V().choose(is(12), values(\"age\"))"));
     }
 
     @Test
-    public void testTraversalMethod_choose_Predicate_Traversal_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_choose_Predicate_Traversal_Traversal() throws Exception {
         compare(g.V().choose(is(12), values("age"), values("count")),
                 eval("g.V().choose(is(12), values(\"age\"), values(\"count\"))"));
     }
 
     @Test
-    public void testTraversalMethod_choose_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_choose_Traversal() throws Exception {
         compare(g.V().choose(values("age")), eval("g.V().choose(values('age'))"));
     }
 
     @Test
-    public void testTraversalMethod_choose_Traversal_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_choose_Traversal_Traversal() throws Exception {
         compare(g.V().choose(values("age"), bothE()), eval("g.V().choose(values('age'), bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_choose_Traversal_Traversal_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_choose_Traversal_Traversal_Traversal() throws Exception {
         compare(g.V().choose(values("age"), bothE(), bothE()), eval("g.V().choose(values('age'), bothE(), bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_coalesce() throws Exception {
+    public void shouldParseTraversalMethod_coalesce() throws Exception {
         compare(g.V().coalesce(outE("knows")), eval("g.V().coalesce(outE('knows'))"));
     }
 
     @Test
-    public void testTraversalMethod_coin() throws Exception {
+    public void shouldParseTraversalMethod_coin() throws Exception {
         compare(g.V().coin(2.5), eval("g.V().coin(2.5)"));
     }
 
     @Test
-    public void testTraversalMethod_constant() throws Exception {
+    public void shouldParseTraversalMethod_combine_Object() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(2);
+        compare(g.V().values("name").fold().combine(list),
+                eval("g.V().values(\"name\").fold().combine([1,2])"));
+        compare(g.V().values("name").fold().combine(V().fold()),
+                eval("g.V().values(\"name\").fold().combine(__.V().fold())"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_constant() throws Exception {
         compare(g.V().constant("yigit"), eval("g.V().constant('yigit')"));
     }
 
     @Test
-    public void testTraversalMethod_count_Empty() throws Exception {
+    public void shouldParseTraversalMethod_count_Empty() throws Exception {
         compare(g.V().count(), eval("g.V().count()"));
     }
 
     @Test
-    public void testTraversalMethod_count_Scope() throws Exception {
+    public void shouldParseTraversalMethod_count_Scope() throws Exception {
         compare(g.V().count(global), eval("g.V().count(global)"));
     }
 
     @Test
-    public void testTraversalMethod_cyclicPath() throws Exception {
+    public void shouldParseTraversalMethod_cyclicPath() throws Exception {
         compare(g.V().cyclicPath(), eval("g.V().cyclicPath()"));
     }
 
     @Test
-    public void testTraversalMethod_dedup_Scope_String() throws Exception {
+    public void shouldParseTraversalMethod_dedup_Scope_String() throws Exception {
         compare(g.V().dedup(Scope.local, "age"), eval("g.V().dedup(local, 'age')"));
     }
 
     @Test
-    public void testTraversalMethod_dedup_String() throws Exception {
+    public void shouldParseTraversalMethod_dedup_String() throws Exception {
         compare(g.V().dedup(), eval("g.V().dedup()"));
     }
 
     @Test
-    public void testTraversalMethod_drop() throws Exception {
+    public void shouldParseTraversalMethod_difference_Object() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(2);
+        compare(g.V().values("name").fold().difference(list),
+                eval("g.V().values(\"name\").fold().difference([1,2])"));
+        compare(g.V().values("name").fold().difference(V().fold()),
+                eval("g.V().values(\"name\").fold().difference(__.V().fold())"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_disjunct_Object() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(2);
+        compare(g.V().values("name").fold().disjunct(list),
+                eval("g.V().values(\"name\").fold().disjunct([1,2])"));
+        compare(g.V().values("name").fold().disjunct(V().fold()),
+                eval("g.V().values(\"name\").fold().disjunct(__.V().fold())"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_drop() throws Exception {
         compare(g.V().drop(), eval("g.V().drop()"));
     }
 
     @Test
-    public void testTraversalMethod_emit_Empty() throws Exception {
+    public void shouldParseTraversalMethod_emit_Empty() throws Exception {
         compare(g.V().emit(), eval("g.V().emit()"));
     }
 
     @Test
-    public void testTraversalMethod_emit_Predicate() throws Exception {
+    public void shouldParseTraversalMethod_emit_Predicate() throws Exception {
         compare(g.V().repeat(out()).emit(is("asd")), eval("g.V().repeat(out()).emit(is(\"asd\"))"));
     }
 
     @Test
-    public void testTraversalMethod_emit_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_emit_Traversal() throws Exception {
         compare(g.V().emit(has("name")), eval("g.V().emit(has('name'))"));
     }
 
     @Test
-    public void testTraversalMethod_filter_Predicate() throws Exception {
+    public void shouldParseTraversalMethod_filter_Predicate() throws Exception {
         compare(g.V().repeat(out()).filter(is("2")), eval("g.V().repeat(out()).filter(is(\"2\"))"));
     }
 
     @Test
-    public void testTraversalMethod_filter_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_filter_Traversal() throws Exception {
         compare(g.V().filter(has("name")), eval("g.V().filter(has('name'))"));
     }
 
     @Test
-    public void testTraversalMethod_flatMap_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_flatMap_Traversal() throws Exception {
         compare(g.V().flatMap(has("name")), eval("g.V().flatMap(has('name'))"));
     }
 
     @Test
-    public void testTraversalMethod_fold_Empty() throws Exception {
+    public void shouldParseTraversalMethod_fold_Empty() throws Exception {
         compare(g.V().fold(), eval("g.V().fold()"));
     }
 
     @Test
-    public void testTraversalMethod_fold_Object_BiFunction() throws Exception {
+    public void shouldParseTraversalMethod_fold_Object_BiFunction() throws Exception {
         compare(g.V().values("age").fold(0, Operator.max), eval("g.V().values('age').fold(0, max)"));
     }
 
     @Test
-    public void testTraversalMethod_from_String() throws Exception {
+    public void shouldParseTraversalMethod_from_String() throws Exception {
         compare(g.V().cyclicPath().from("name"), eval("g.V().cyclicPath().from('name')"));
     }
 
     @Test
-    public void testTraversalMethod_from_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_from_Traversal() throws Exception {
         compare(g.V().addE("as").from(V()), eval("g.V().addE('as').from(V())"));
     }
 
     @Test
-    public void testTraversalMethod_group_Empty() throws Exception {
+    public void shouldParseTraversalMethod_group_Empty() throws Exception {
         compare(g.V().group(), eval("g.V().group()"));
     }
 
     @Test
-    public void testTraversalMethod_group_String() throws Exception {
+    public void shouldParseTraversalMethod_group_String() throws Exception {
         compare(g.V().group("age"), eval("g.V().group('age')"));
     }
 
     @Test
-    public void testTraversalMethod_groupCount_Empty() throws Exception {
+    public void shouldParseTraversalMethod_groupCount_Empty() throws Exception {
         compare(g.V().groupCount(), eval("g.V().groupCount()"));
     }
 
     @Test
-    public void testTraversalMethod_groupCount_String() throws Exception {
+    public void shouldParseTraversalMethod_groupCount_String() throws Exception {
         compare(g.V().groupCount("age"), eval("g.V().groupCount('age')"));
     }
 
     @Test
-    public void testTraversalMethod_has_String() throws Exception {
+    public void shouldParseTraversalMethod_has_String() throws Exception {
         compare(g.V().has("age"), eval("g.V().has('age')"));
     }
 
     @Test
-    public void testTraversalMethod_has_String_Object() throws Exception {
+    public void shouldParseTraversalMethod_has_String_Object() throws Exception {
         compare(g.V().has("age", 132), eval("g.V().has('age', 132)"));
     }
 
     @Test
-    public void testTraversalMethod_has_String_P() throws Exception {
+    public void shouldParseTraversalMethod_has_String_P() throws Exception {
         compare(g.V().has("a", eq("b")), eval("g.V().has(\"a\", eq(\"b\"))"));
     }
 
     @Test
-    public void testTraversalMethod_has_String_String_Object() throws Exception {
+    public void shouldParseTraversalMethod_has_String_String_Object() throws Exception {
         compare(g.V().has("a", "b", 3), eval("g.V().has(\"a\", \"b\", 3)"));
     }
 
     @Test
-    public void testTraversalMethod_has_String_String_P() throws Exception {
+    public void shouldParseTraversalMethod_has_String_String_P() throws Exception {
         compare(g.V().has("a", "b", eq("c")), eval("g.V().has(\"a\", \"b\", eq(\"c\"))"));
     }
 
     @Test
-    public void testTraversalMethod_has_String_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_has_String_Traversal() throws Exception {
         compare(g.V().has("age", bothE()), eval("g.V().has('age', bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_has_T_Object() throws Exception {
+    public void shouldParseTraversalMethod_has_T_Object() throws Exception {
         compare(g.V().has(T.id, 6), eval("g.V().has(id, 6)"));
     }
 
     @Test
-    public void testTraversalMethod_has_T_P() throws Exception {
+    public void shouldParseTraversalMethod_has_T_P() throws Exception {
         compare(g.V().has(T.id, eq("asd")), eval("g.V().has(id, eq('asd'))"));
     }
 
     @Test
-    public void testTraversalMethod_has_T_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_has_T_Traversal() throws Exception {
         compare(g.V().has(T.id, bothE()), eval("g.V().has(id, bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_hasId_Object_Object() throws Exception {
+    public void shouldParseTraversalMethod_hasId_Object_Object() throws Exception {
         compare(g.V().hasId(3, 4), eval("g.V().hasId(3, 4)"));
     }
 
     @Test
-    public void testTraversalMethod_hasId_P() throws Exception {
+    public void shouldParseTraversalMethod_hasId_P() throws Exception {
         compare(g.V().hasId(gt(4)), eval("g.V().hasId(gt(4))"));
     }
 
     @Test
-    public void testTraversalMethod_hasKey_P() throws Exception {
+    public void shouldParseTraversalMethod_hasKey_P() throws Exception {
         compare(g.V().hasKey(eq("asd")), eval("g.V().hasKey(eq(\"asd\"))"));
     }
 
     @Test
-    public void testTraversalMethod_hasKey_String_String() throws Exception {
+    public void shouldParseTraversalMethod_hasKey_String_String() throws Exception {
         compare(g.V().hasKey("age"), eval("g.V().hasKey('age')"));
         compare(g.V().hasKey("age", "3"), eval("g.V().hasKey('age', '3')"));
     }
 
     @Test
-    public void testTraversalMethod_hasLabel_P() throws Exception {
+    public void shouldParseTraversalMethod_hasLabel_P() throws Exception {
         compare(g.V().hasLabel(eq("asd")), eval("g.V().hasLabel(eq(\"asd\"))"));
     }
 
     @Test
-    public void testTraversalMethod_hasLabel_String_String() throws Exception {
+    public void shouldParseTraversalMethod_hasLabel_String_String() throws Exception {
         compare(g.V().hasLabel("age"), eval("g.V().hasLabel('age')"));
         compare(g.V().hasLabel("age", "3"), eval("g.V().hasLabel('age', '3')"));
     }
 
     @Test
-    public void testTraversalMethod_hasNot() throws Exception {
+    public void shouldParseTraversalMethod_hasNot() throws Exception {
         compare(g.V().hasNot("know"), eval("g.V().hasNot('know')"));
     }
 
     @Test
-    public void testTraversalMethod_hasValue_Object_Object() throws Exception {
+    public void shouldParseTraversalMethod_hasValue_Object_Object() throws Exception {
         compare(g.V().hasValue(3, 4), eval("g.V().hasValue(3, 4)"));
     }
 
     @Test
-    public void testTraversalMethod_hasValue_P() throws Exception {
+    public void shouldParseTraversalMethod_hasValue_P() throws Exception {
         compare(g.V().hasValue(eq(2)), eval("g.V().hasValue(eq(2))"));
     }
 
     @Test
-    public void testTraversalMethod_id() throws Exception {
+    public void shouldParseTraversalMethod_id() throws Exception {
         compare(g.V().id(), eval("g.V().id()"));
     }
 
     @Test
-    public void testTraversalMethod_identity() throws Exception {
+    public void shouldParseTraversalMethod_identity() throws Exception {
         compare(g.V().identity(), eval("g.V().identity()"));
     }
 
     @Test
-    public void testTraversalMethod_in() throws Exception {
+    public void shouldParseTraversalMethod_in() throws Exception {
         compare(g.V().in("created"), eval("g.V().in('created')"));
     }
 
     @Test
-    public void testTraversalMethod_index() throws Exception {
+    public void shouldParseTraversalMethod_index() throws Exception {
         compare(g.V().hasLabel("software").index(), eval("g.V().hasLabel('software').index()"));
     }
 
     @Test
-    public void testTraversalMethod_inE() throws Exception {
+    public void shouldParseTraversalMethod_inE() throws Exception {
         compare(g.V().inE("created"), eval("g.V().inE('created')"));
     }
 
     @Test
-    public void testTraversalMethod_inV() throws Exception {
+    public void shouldParseTraversalMethod_inV() throws Exception {
         compare(g.V().inV(), eval("g.V().inV()"));
     }
 
     @Test
-    public void testTraversalMethod_inject() throws Exception {
+    public void shouldParseTraversalMethod_inject() throws Exception {
         compare(g.V(4).out().values("name").inject("daniel"),
                 eval("g.V(4).out().values(\"name\").inject(\"daniel\")"));
     }
 
     @Test
-    public void testTraversalMethod_is_Object() throws Exception {
+    public void shouldParseTraversalMethod_intersect_Object() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(2);
+        compare(g.V().values("name").fold().intersect(list),
+                eval("g.V().values(\"name\").fold().intersect([1,2])"));
+        compare(g.V().values("name").fold().intersect(V().fold()),
+                eval("g.V().values(\"name\").fold().intersect(__.V().fold())"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_is_Object() throws Exception {
         compare(g.V().is(4), eval("g.V().is(4)"));
     }
 
     @Test
-    public void testTraversalMethod_is_P() throws Exception {
+    public void shouldParseTraversalMethod_is_P() throws Exception {
         compare(g.V().is(gt(4)), eval("g.V().is(gt(4))"));
     }
 
     @Test
-    public void testTraversalMethod_iterate() throws Exception {
+    public void shouldParseTraversalMethod_iterate() throws Exception {
         compare(g.V().iterate(), eval("g.V().iterate()"));
     }
 
     @Test
-    public void testTraversalMethod_key() throws Exception {
+    public void shouldParseTraversalMethod_conjoin_Object() throws Exception {
+        compare(g.V().values("name").fold().conjoin(";"),
+                eval("g.V().values(\"name\").fold().conjoin(\";\")"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_key() throws Exception {
         compare(g.V().key(), eval("g.V().key()"));
     }
 
     @Test
-    public void testTraversalMethod_label() throws Exception {
+    public void shouldParseTraversalMethod_label() throws Exception {
         compare(g.V().label(), eval("g.V().label()"));
     }
 
     @Test
-    public void testTraversalMethod_limit_Scope_long() throws Exception {
+    public void shouldParseTraversalMethod_limit_Scope_long() throws Exception {
         compare(g.V().limit(global, 3), eval("g.V().limit(global, 3)"));
     }
 
     @Test
-    public void testTraversalMethod_limit_long() throws Exception {
+    public void shouldParseTraversalMethod_limit_long() throws Exception {
         compare(g.V().limit(2), eval("g.V().limit(2)"));
     }
 
     @Test
-    public void testTraversalMethod_local() throws Exception {
+    public void shouldParseTraversalMethod_local() throws Exception {
         compare(g.V().local(bothE()), eval("g.V().local(bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_loops() throws Exception {
+    public void shouldParseTraversalMethod_loops() throws Exception {
         compare(g.V().loops(), eval("g.V().loops()"));
     }
 
     @Test
-    public void testTraversalMethod_map_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_map_Traversal() throws Exception {
         compare(g.V().map(bothE()), eval("g.V().map(bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_match() throws Exception {
+    public void shouldParseTraversalMethod_match() throws Exception {
         compare(g.V().match(as("a"), as("b")), eval("g.V().match(as(\"a\"), as(\"b\"))"));
     }
 
     @Test
-    public void testTraversalMethod_max_Empty() throws Exception {
+    public void shouldParseTraversalMethod_max_Empty() throws Exception {
         compare(g.V().max(), eval("g.V().max()"));
     }
 
     @Test
-    public void testTraversalMethod_max_Scope() throws Exception {
+    public void shouldParseTraversalMethod_max_Scope() throws Exception {
         compare(g.V().max(Scope.local), eval("g.V().max(local)"));
     }
 
     @Test
-    public void testTraversalMethod_math() throws Exception {
+    public void shouldParseTraversalMethod_math() throws Exception {
         compare(g.V().count().math("_ + 10"), eval("g.V().count().math('_ + 10')"));
     }
 
     @Test
-    public void testTraversalMethod_mean_Empty() throws Exception {
+    public void shouldParseTraversalMethod_mean_Empty() throws Exception {
         compare(g.V().mean(), eval("g.V().mean()"));
     }
 
     @Test
-    public void testTraversalMethod_mean_Scope() throws Exception {
+    public void shouldParseTraversalMethod_mean_Scope() throws Exception {
         compare(g.V().mean(global), eval("g.V().mean(global)"));
     }
 
     @Test
-    public void testTraversalMethod_min_Empty() throws Exception {
+    public void shouldParseTraversalMethod_merge_Object() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(2);
+        compare(g.V().values("name").fold().merge(list),
+                eval("g.V().values(\"name\").fold().merge([1,2])"));
+        compare(g.V().values("name").fold().merge(V().fold()),
+                eval("g.V().values(\"name\").fold().merge(__.V().fold())"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_min_Empty() throws Exception {
         compare(g.V().min(), eval("g.V().min()"));
     }
 
     @Test
-    public void testTraversalMethod_min_Scope() throws Exception {
+    public void shouldParseTraversalMethod_min_Scope() throws Exception {
         compare(g.V().min(Scope.local), eval("g.V().min(local)"));
     }
 
     @Test
-    public void testTraversalMethod_not() throws Exception {
+    public void shouldParseTraversalMethod_not() throws Exception {
         compare(g.V().not(both()), eval("g.V().not(both())"));
     }
 
     @Test
-    public void testTraversalMethod_option_Object_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_option_Object_Traversal() throws Exception {
         compare(g.V().branch(values("name")).option(2, bothE()),
                 eval("g.V().branch(values(\"name\")).option(2, bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_option_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_option_Traversal() throws Exception {
         compare(g.V().branch(values("name")).option(both()), eval("g.V().branch(values(\"name\")).option(both())"));
     }
 
     @Test
-    public void testTraversalMethod_optional() throws Exception {
+    public void shouldParseTraversalMethod_optional() throws Exception {
         compare(g.V().optional(min()), eval("g.V().optional(min())"));
     }
 
     @Test
-    public void testTraversalMethod_or() throws Exception {
+    public void shouldParseTraversalMethod_or() throws Exception {
         compare(g.V().or(as("a"), as("b")), eval("g.V().or(as(\"a\"), as(\"b\"))"));
     }
 
     @Test
-    public void testTraversalMethod_order_Empty() throws Exception {
+    public void shouldParseTraversalMethod_order_Empty() throws Exception {
         compare(g.V().order(), eval("g.V().order()"));
     }
 
     @Test
-    public void testTraversalMethod_order_Scope() throws Exception {
+    public void shouldParseTraversalMethod_order_Scope() throws Exception {
         compare(g.V().order(global), eval("g.V().order(global)"));
     }
 
     @Test
-    public void testTraversalMethod_otherV() throws Exception {
+    public void shouldParseTraversalMethod_otherV() throws Exception {
         compare(g.V().otherV(), eval("g.V().otherV()"));
     }
 
     @Test
-    public void testTraversalMethod_out() throws Exception {
+    public void shouldParseTraversalMethod_out() throws Exception {
         compare(g.V().out("a", "b"), eval("g.V().out(\"a\", \"b\")"));
     }
 
     @Test
-    public void testTraversalMethod_outE() throws Exception {
+    public void shouldParseTraversalMethod_outE() throws Exception {
         compare(g.V().outE("a", "b"), eval("g.V().outE(\"a\", \"b\")"));
     }
 
     @Test
-    public void testTraversalMethod_outV() throws Exception {
+    public void shouldParseTraversalMethod_outV() throws Exception {
         compare(g.V().outV(), eval("g.V().outV()"));
     }
 
     @Test
-    public void testTraversalMethod_pageRank_Empty() throws Exception {
+    public void shouldParseTraversalMethod_pageRank_Empty() throws Exception {
         compare(g.V().pageRank(), eval("g.V().pageRank()"));
     }
 
     @Test
-    public void testTraversalMethod_pageRank_double() throws Exception {
+    public void shouldParseTraversalMethod_pageRank_double() throws Exception {
         compare(g.V().pageRank(2.6), eval("g.V().pageRank(2.6)"));
     }
 
     @Test
-    public void testTraversalMethod_path() throws Exception {
+    public void shouldParseTraversalMethod_path() throws Exception {
         compare(g.V().path(), eval("g.V().path()"));
     }
 
     @Test
-    public void testTraversalMethod_peerPressure() throws Exception {
+    public void shouldParseTraversalMethod_peerPressure() throws Exception {
         compare(g.V().peerPressure(), eval("g.V().peerPressure()"));
     }
 
     @Test
-    public void testTraversalMethod_profile_Empty() throws Exception {
+    public void shouldParseTraversalMethod_product_Object() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(2);
+        compare(g.V().values("name").fold().product(list),
+                eval("g.V().values(\"name\").fold().product([1,2])"));
+        compare(g.V().values("name").fold().product(V().fold()),
+                eval("g.V().values(\"name\").fold().product(__.V().fold())"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_profile_Empty() throws Exception {
         compare(g.V().profile(), eval("g.V().profile()"));
     }
 
     @Test
-    public void testTraversalMethod_profile_String() throws Exception {
+    public void shouldParseTraversalMethod_profile_String() throws Exception {
         compare(g.V().profile("neptune"), eval("g.V().profile('neptune')"));
     }
 
     @Test
-    public void testTraversalMethod_project() throws Exception {
+    public void shouldParseTraversalMethod_project() throws Exception {
         compare(g.V().project("neptune"), eval("g.V().project('neptune')"));
         compare(g.V().project("neptune", "uranus"), eval("g.V().project('neptune', 'uranus')"));
     }
 
     @Test
-    public void testTraversalMethod_properties() throws Exception {
+    public void shouldParseTraversalMethod_properties() throws Exception {
         compare(g.V().properties("venus", "mars"), eval("g.V().properties('venus', 'mars')"));
     }
 
     @Test
-    public void testTraversalMethod_property_Cardinality_Object_Object_Object() throws Exception {
+    public void shouldParseTraversalMethod_property_Cardinality_Object_Object_Object() throws Exception {
         compare(g.V().property(VertexProperty.Cardinality.list,1,2,"key", 4),
                 eval("g.V().property(list, 1,2,'key',4)"));
     }
 
     @Test
-    public void testTraversalMethod_property_Object_Object_Object() throws Exception {
+    public void shouldParseTraversalMethod_property_Object_Object_Object() throws Exception {
         compare(g.V().property(1,2,"key", 4), eval("g.V().property(1,2,'key',4)"));
     }
 
     @Test
-    public void testTraversalMethod_property_Object() throws Exception {
+    public void shouldParseTraversalMethod_property_Object() throws Exception {
         final LinkedHashMap<Object, Object> map = new LinkedHashMap<>();
         map.put("key", "foo");
         map.put("key1", "bar");
@@ -717,7 +797,7 @@
     }
 
     @Test
-    public void testTraversalMethod_property_Cardinality_Object() throws Exception {
+    public void shouldParseTraversalMethod_property_Cardinality_Object() throws Exception {
         final LinkedHashMap<Object, Object> map = new LinkedHashMap<>();
         map.put("key", "foo");
         map.put("key1", "bar");
@@ -725,27 +805,27 @@
     }
 
     @Test
-    public void testTraversalMethod_propertyMap() throws Exception {
+    public void shouldParseTraversalMethod_propertyMap() throws Exception {
         compare(g.V().propertyMap("venus", "mars"), eval("g.V().propertyMap('venus', 'mars')"));
     }
 
     @Test
-    public void testTraversalMethod_range_Scope_long_long() throws Exception {
+    public void shouldParseTraversalMethod_range_Scope_long_long() throws Exception {
         compare(g.V().range(global, 3,5), eval("g.V().range(global, 3,5)"));
     }
 
     @Test
-    public void testTraversalMethod_range_long_long() throws Exception {
+    public void shouldParseTraversalMethod_range_long_long() throws Exception {
         compare(g.V().range(3,5), eval("g.V().range(3,5)"));
     }
 
     @Test
-    public void testTraversalMethod_repeat() throws Exception {
+    public void shouldParseTraversalMethod_repeat() throws Exception {
         compare(g.V().repeat(both()), eval("g.V().repeat(both())"));
     }
 
     @Test
-    public void testTraversalMethod_sack_BiFunction() throws Exception {
+    public void shouldParseTraversalMethod_sack_BiFunction() throws Exception {
         compare(g.V().sack(), eval("g.V().sack()"));
         compare(g.V().sack(Operator.addAll), eval("g.V().sack(addAll)"));
         compare(g.V().sack(Operator.and), eval("g.V().sack(and)"));
@@ -761,223 +841,223 @@
     }
 
     @Test
-    public void testTraversalMethod_sack_Empty() throws Exception {
+    public void shouldParseTraversalMethod_sack_Empty() throws Exception {
         compare(g.V().sack(), eval("g.V().sack()"));
     }
 
     @Test
-    public void testTraversalMethod_sample_Scope_int() throws Exception {
+    public void shouldParseTraversalMethod_sample_Scope_int() throws Exception {
         compare(g.V().sample(global, 2), eval("g.V().sample(global, 2)"));
     }
 
     @Test
-    public void testTraversalMethod_sample_int() throws Exception {
+    public void shouldParseTraversalMethod_sample_int() throws Exception {
         compare(g.V().sample(4), eval("g.V().sample(4)"));
     }
 
     @Test
-    public void testTraversalMethod_select_Column() throws Exception {
+    public void shouldParseTraversalMethod_select_Column() throws Exception {
         compare(g.V().select(Column.keys), eval("g.V().select(keys)"));
     }
 
     @Test
-    public void testTraversalMethod_select_Pop_String() throws Exception {
+    public void shouldParseTraversalMethod_select_Pop_String() throws Exception {
         compare(g.V().select(Pop.first, "asd"), eval("g.V().select(first, 'asd')"));
     }
 
     @Test
-    public void testTraversalMethod_select_Pop_String_String_String() throws Exception {
+    public void shouldParseTraversalMethod_select_Pop_String_String_String() throws Exception {
         compare(g.V().select(Pop.all, "a", "b", "c", "d"), eval("g.V().select(all, \"a\", \"b\", \"c\", \"d\")"));
     }
 
     @Test
-    public void testTraversalMethod_select_Pop_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_select_Pop_Traversal() throws Exception {
         compare(g.V().select(Pop.all, out().properties("a")), eval("g.V().select(all, out().properties(\"a\"))"));
     }
 
     @Test
-    public void testTraversalMethod_select_String() throws Exception {
+    public void shouldParseTraversalMethod_select_String() throws Exception {
         compare(g.V().select("yigit"), eval("g.V().select(\"yigit\")"));
     }
 
     @Test
-    public void testTraversalMethod_select_String_String_String() throws Exception {
+    public void shouldParseTraversalMethod_select_String_String_String() throws Exception {
         compare(g.V().select("a", "b", "c", "d"), eval("g.V().select(\"a\", \"b\", \"c\", \"d\")"));
     }
 
     @Test
-    public void testTraversalMethod_select_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_select_Traversal() throws Exception {
         compare(g.V().select(out().properties("a")), eval("g.V().select(out().properties(\"a\"))"));
     }
 
     @Test
-    public void testTraversalMethod_sideEffect() throws Exception {
+    public void shouldParseTraversalMethod_sideEffect() throws Exception {
         compare(g.V().sideEffect(bothE()), eval("g.V().sideEffect(bothE())"));
     }
 
     @Test
-    public void testTraversalMethod_simplePath() throws Exception {
+    public void shouldParseTraversalMethod_simplePath() throws Exception {
         compare(g.V().simplePath(), eval("g.V().simplePath()"));
     }
 
     @Test
-    public void testTraversalMethod_skip_Scope_long() throws Exception {
+    public void shouldParseTraversalMethod_skip_Scope_long() throws Exception {
         compare(g.V().skip(global, 8), eval("g.V().skip(global, 8)"));
     }
 
     @Test
-    public void testTraversalMethod_skip_long() throws Exception {
+    public void shouldParseTraversalMethod_skip_long() throws Exception {
         compare(g.V().skip(8), eval("g.V().skip(8)"));
     }
 
     @Test
-    public void testTraversalMethod_store() throws Exception {
+    public void shouldParseTraversalMethod_store() throws Exception {
         compare(g.V().store("asd"), eval("g.V().store(\"asd\")"));
     }
 
     @Test
-    public void testTraversalMethod_subgraph() throws Exception {
+    public void shouldParseTraversalMethod_subgraph() throws Exception {
         compare(g.V().subgraph("asd"), eval("g.V().subgraph('asd')"));
     }
 
     @Test
-    public void testTraversalMethod_sum_Empty() throws Exception {
+    public void shouldParseTraversalMethod_sum_Empty() throws Exception {
         compare(g.V().sum(), eval("g.V().sum()"));
     }
 
     @Test
-    public void testTraversalMethod_sum_Scope() throws Exception {
+    public void shouldParseTraversalMethod_sum_Scope() throws Exception {
         compare(g.V().sum(Scope.local), eval("g.V().sum(local)"));
     }
 
     @Test
-    public void testTraversalMethod_tail_Empty() throws Exception {
+    public void shouldParseTraversalMethod_tail_Empty() throws Exception {
         compare(g.V().tail(), eval("g.V().tail()"));
     }
 
     @Test
-    public void testTraversalMethod_tail_Scope() throws Exception {
+    public void shouldParseTraversalMethod_tail_Scope() throws Exception {
         compare(g.V().tail(Scope.local), eval("g.V().tail(local)"));
     }
 
     @Test
-    public void testTraversalMethod_tail_Scope_long() throws Exception {
+    public void shouldParseTraversalMethod_tail_Scope_long() throws Exception {
         compare(g.V().tail(Scope.local, 3), eval("g.V().tail(local, 3)"));
     }
 
     @Test
-    public void testTraversalMethod_tail_long() throws Exception {
+    public void shouldParseTraversalMethod_tail_long() throws Exception {
         compare(g.V().tail(4), eval("g.V().tail(4)"));
     }
 
     @Test
-    public void testTraversalMethod_timeLimit() throws Exception {
+    public void shouldParseTraversalMethod_timeLimit() throws Exception {
         compare(g.V().timeLimit(5), eval("g.V().timeLimit(5)"));
     }
 
     @Test
-    public void testTraversalMethod_times() throws Exception {
+    public void shouldParseTraversalMethod_times() throws Exception {
         compare(g.V().times(6), eval("g.V().times(6)"));
     }
 
     @Test
-    public void testTraversalMethod_to_Direction_String() throws Exception {
+    public void shouldParseTraversalMethod_to_Direction_String() throws Exception {
         compare(g.V().to(Direction.IN, "asd"), eval("g.V().to(IN, 'asd')"));
     }
 
     @Test
-    public void testTraversalMethod_to_String() throws Exception {
+    public void shouldParseTraversalMethod_to_String() throws Exception {
         compare(g.V().path().to("home"), eval("g.V().path().to(\"home\")"));
     }
 
     @Test
-    public void testTraversalMethod_to_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_to_Traversal() throws Exception {
         compare(g.V().addE("as").to(V()), eval("g.V().addE('as').to(V())"));
     }
 
     @Test
-    public void testTraversalMethod_toE() throws Exception {
+    public void shouldParseTraversalMethod_toE() throws Exception {
         compare(g.V().toE(Direction.IN, "asd"), eval("g.V().toE(IN, 'asd')"));
     }
 
     @Test
-    public void testTraversalMethod_toV() throws Exception {
+    public void shouldParseTraversalMethod_toV() throws Exception {
         compare(g.V().toV(Direction.IN), eval("g.V().toV(IN)"));
     }
 
     @Test
-    public void testTraversalMethod_tree_Empty() throws Exception {
+    public void shouldParseTraversalMethod_tree_Empty() throws Exception {
         compare(g.V().tree(), eval("g.V().tree()"));
     }
 
     @Test
-    public void testTraversalMethod_tree_String() throws Exception {
+    public void shouldParseTraversalMethod_tree_String() throws Exception {
         compare(g.V().tree("hello"), eval("g.V().tree(\"hello\")"));
     }
 
     @Test
-    public void testTraversalMethod_unfold() throws Exception {
+    public void shouldParseTraversalMethod_unfold() throws Exception {
         compare(g.V().unfold(), eval("g.V().unfold()"));
     }
 
     @Test
-    public void testTraversalMethod_union() throws Exception {
+    public void shouldParseTraversalMethod_union() throws Exception {
         compare(g.V().union(in(), out()), eval("g.V().union(in(), out())"));
     }
 
     @Test
-    public void testTraversalMethod_until_Predicate() throws Exception {
+    public void shouldParseTraversalMethod_until_Predicate() throws Exception {
         compare(g.V().until(is("123")), eval("g.V().until(is(\"123\"))"));
     }
 
     @Test
-    public void testTraversalMethod_until_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_until_Traversal() throws Exception {
         compare(g.V().until(has("ripple")), eval("g.V().until(has(\"ripple\"))"));
     }
 
     @Test
-    public void testTraversalMethod_value() throws Exception {
+    public void shouldParseTraversalMethod_value() throws Exception {
         compare(g.V().value(), eval("g.V().value()"));
     }
 
     @Test
-    public void testTraversalMethod_valueMap_String() throws Exception {
+    public void shouldParseTraversalMethod_valueMap_String() throws Exception {
         compare(g.V().valueMap("yigit"), eval("g.V().valueMap(\"yigit\")"));
     }
 
     @Test
-    public void testTraversalMethod_valueMap_boolean_String1() throws Exception {
+    public void shouldParseTraversalMethod_valueMap_boolean_String1() throws Exception {
         compare(g.V().valueMap(true), eval("g.V().valueMap(true)"));
     }
 
     @Test
-    public void testTraversalMethod_valueMap_boolean_String2() throws Exception {
+    public void shouldParseTraversalMethod_valueMap_boolean_String2() throws Exception {
         compare(g.V().valueMap(true, "that"), eval("g.V().valueMap(true, \"that\")"));
     }
 
     @Test
-    public void testTraversalMethod_valueMap_withOption() throws Exception {
+    public void shouldParseTraversalMethod_valueMap_withOption() throws Exception {
         compare(g.V().valueMap().with(WithOptions.tokens, WithOptions.labels),
                 eval("g.V().valueMap().with(WithOptions.tokens, WithOptions.labels)"));
     }
 
     @Test
-    public void testTraversalMethod_values() throws Exception {
+    public void shouldParseTraversalMethod_values() throws Exception {
         compare(g.V().values("earth", "mars"), eval("g.V().values(\"earth\", \"mars\")"));
     }
 
     @Test
-    public void testTraversalMethod_where_P() throws Exception {
+    public void shouldParseTraversalMethod_where_P() throws Exception {
         compare(g.V().where(eq("123")), eval("g.V().where(eq(\"123\"))"));
     }
 
     @Test
-    public void testTraversalMethod_where_String_P() throws Exception {
+    public void shouldParseTraversalMethod_where_String_P() throws Exception {
         compare(g.V().where("age", eq("123")), eval("g.V().where('age', eq(\"123\"))"));
     }
 
     @Test
-    public void testTraversalMethod_where_Traversal() throws Exception {
+    public void shouldParseTraversalMethod_where_Traversal() throws Exception {
         compare(g.V().where(both()), eval("g.V().where(both())"));
     }
 
@@ -1040,73 +1120,73 @@
     }
 
     @Test
-    public void testTraversalMethod_peerPressure_withPropertyName() throws Exception {
+    public void shouldParseTraversalMethod_peerPressure_withPropertyName() throws Exception {
         compare(g.V().peerPressure().with(PeerPressure.propertyName, "cluster"),
                 eval("g.V().peerPressure().with(PeerPressure.propertyName, 'cluster')"));
     }
 
     @Test
-    public void testTraversalMethod_peerPressure_withEdges() throws Exception {
+    public void shouldParseTraversalMethod_peerPressure_withEdges() throws Exception {
         compare(g.V().peerPressure().with(PeerPressure.edges, outE("knows")),
                 eval("g.V().peerPressure().with(PeerPressure.edges, __.outE('knows'))"));
     }
 
     @Test
-    public void testTraversalMethod_peerPressure_withTimes() throws Exception {
+    public void shouldParseTraversalMethod_peerPressure_withTimes() throws Exception {
         compare(g.V().peerPressure().with(PeerPressure.times, 2),
                 eval("g.V().peerPressure().with(PeerPressure.times, 2)"));
     }
 
     @Test
-    public void testTraversalMethod_pageRank_withOutEdges() throws Exception {
+    public void shouldParseTraversalMethod_pageRank_withOutEdges() throws Exception {
         compare(g.V().pageRank(2.6).with(PageRank.edges, outE("knows")),
                 eval("g.V().pageRank(2.6).with(PageRank.edges, __.outE('knows'))"));
     }
 
     @Test
-    public void testTraversalMethod_pageRank_withTimes() throws Exception {
+    public void shouldParseTraversalMethod_pageRank_withTimes() throws Exception {
         compare(g.V().pageRank(2.6).with(PageRank.times, 2),
                 eval("g.V().pageRank(2.6).with(PageRank.times, 2)"));
     }
 
     @Test
-    public void testTraversalMethod_pageRank_withPropertyName() throws Exception {
+    public void shouldParseTraversalMethod_pageRank_withPropertyName() throws Exception {
         compare(g.V().pageRank(2.6).with(PageRank.propertyName, "blah"),
                 eval("g.V().pageRank(2.6).with(PageRank.propertyName, 'blah')"));
     }
 
     @Test
-    public void testTraversalMethod_shortestPath_withEdges() throws Exception {
+    public void shouldParseTraversalMethod_shortestPath_withEdges() throws Exception {
         compare(g.V().shortestPath().with(ShortestPath.edges, outE("knows")),
                 eval("g.V().shortestPath().with(ShortestPath.edges, __.outE('knows'))"));
     }
 
     @Test
-    public void testTraversalMethod_shortestPath_withIncludeEdges() throws Exception {
+    public void shouldParseTraversalMethod_shortestPath_withIncludeEdges() throws Exception {
         compare(g.V().shortestPath().with(ShortestPath.includeEdges, true),
                 eval("g.V().shortestPath().with(ShortestPath.includeEdges, true)"));
     }
 
     @Test
-    public void testTraversalMethod_shortestPath_withDistance() throws Exception {
+    public void shouldParseTraversalMethod_shortestPath_withDistance() throws Exception {
         compare(g.V().shortestPath().with(ShortestPath.distance, "asd"),
                 eval("g.V().shortestPath().with(ShortestPath.distance, 'asd')"));
     }
 
     @Test
-    public void testTraversalMethod_shortestPath_withMaxDistance() throws Exception {
+    public void shouldParseTraversalMethod_shortestPath_withMaxDistance() throws Exception {
         compare(g.V().shortestPath().with(ShortestPath.maxDistance, 2),
                 eval("g.V().shortestPath().with(ShortestPath.maxDistance, 2)"));
     }
 
     @Test
-    public void testTraversalMethod_shortestPath_withTarget() throws Exception {
+    public void shouldParseTraversalMethod_shortestPath_withTarget() throws Exception {
         compare(g.V().shortestPath().with(ShortestPath.target, has("name", "peter")),
                 eval("g.V().shortestPath().with(ShortestPath.target, __.has('name','peter'))"));
     }
 
     @Test
-    public void testTraversalMethod_shortestPath_withEdgesWithTarget() throws Exception {
+    public void shouldParseTraversalMethod_shortestPath_withEdgesWithTarget() throws Exception {
         compare(g.V().shortestPath().with(ShortestPath.edges, Direction.IN).with(ShortestPath.target, has("name", "josh")),
                 eval("g.V().shortestPath().\n" +
                         "                 with(ShortestPath.edges, IN).\n" +
@@ -1114,14 +1194,108 @@
     }
 
     @Test
-    public void testTraversalMethod_with() throws Exception {
+    public void shouldParseTraversalMethod_with() throws Exception {
         compare(g.V().with("blah"),
                 eval("g.V().with('blah')"));
     }
 
     @Test
-    public void testTraversalMethod_with_multipleArgs() throws Exception {
+    public void shouldParseTraversalMethod_with_multipleArgs() throws Exception {
         compare(g.V().with("blah", "bleh"),
                 eval("g.V().with('blah', 'bleh')"));
     }
+
+    @Test
+    public void shouldParseTraversalMethod_midTraversal_E() throws Exception {
+        compare(g.inject(1).E(), eval("g.inject(1).E()"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_midTraversal_E_multipleArgs() throws Exception {
+        compare(g.inject(1).E(2,null), eval("g.inject(1).E(2,null)"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_midTraversal_E_spawning() throws Exception {
+        compare(g.V().coalesce(E(),addE("person")), eval("g.V().coalesce(__.E(),__.addE('person'))"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_midTraversal_E_multipleArgs_spawning() throws Exception {
+        compare(g.V().coalesce(E(1,2),addE("person")),
+                eval("g.V().coalesce(__.E(1,2),__.addE('person'))"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_concat_Empty() throws Exception {
+        compare(g.V().concat(), eval("g.V().concat()"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_concat_multipleStringArgs() throws Exception {
+        compare(g.V().concat("hello", "world"), eval("g.V().concat('hello', 'world')"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_concat_traversal() throws Exception {
+        compare(g.V().concat(constant("hello")),
+                eval("g.V().concat(__.constant('hello'))"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_concat_multipleTraversalArgs() throws Exception {
+        compare(g.V().concat(constant("hello"), constant("world")),
+                eval("g.V().concat(__.constant('hello'), __.constant('world'))"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_concat_ArgsWithNulls() throws Exception {
+        compare(g.V().concat(null, "hello"),
+                eval("g.V().concat(null, 'hello')"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_asString_Empty() throws Exception {
+        compare(g.V().asString(), eval("g.V().asString()"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_format_String() throws Exception {
+        compare(g.V().format("Hello %{name}"), eval("g.V().format(\"Hello %{name}\")"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_toLower_Empty() throws Exception {
+        compare(g.V().toLower(), eval("g.V().toLower()"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_toUpper_Empty() throws Exception {
+        compare(g.V().toUpper(), eval("g.V().toUpper()"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_length_Empty() throws Exception {
+        compare(g.V().length(), eval("g.V().length()"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_replace_string_string() throws Exception {
+        compare(g.V().replace("a", "b"), eval("g.V().replace('a', 'b')"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_split_string() throws Exception {
+        compare(g.V().split("a"), eval("g.V().split('a')"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_substring_long() throws Exception {
+        compare(g.V().substring(1), eval("g.V().substring(1)"));
+    }
+
+    @Test
+    public void shouldParseTraversalMethod_substring_long_long() throws Exception {
+        compare(g.V().substring(1, 3), eval("g.V().substring(1, 3)"));
+    }
 }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitorTest.java
index e784d5c..cb7b49a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitorTest.java
@@ -99,11 +99,11 @@
     }
 
     @Test
-    public void testPredicate() {
+    public void shouldParsePredicate() {
         final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
         final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
         final GremlinParser.TraversalPredicateContext ctx = parser.traversalPredicate();
-        final P predicate = TraversalPredicateVisitor.instance().visitTraversalPredicate(ctx);
+        final P predicate = new TraversalPredicateVisitor(new GremlinAntlrToJava()).visitTraversalPredicate(ctx);
 
         Assert.assertEquals(expected, predicate);
     }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java
index 6272c41..a6bc04f 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalRootVisitorTest.java
@@ -41,7 +41,7 @@
     }
 
     @Test
-    public void testTraversalMethod_none()  {
+    public void shouldParseTraversalMethod_none()  {
         compare(g.V().none(), eval("g.V().none()"));
         compare(g.V().union(__.identity().none()), eval("g.V().union(__.identity().none())"));
     }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java
index 145fd9f..6c555c6 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSelfMethodVisitorTest.java
@@ -73,7 +73,7 @@
     }
 
     @Test
-    public void testTraversalSourceSelfMethod() {
+    public void shouldParseTraversalSourceSelfMethod() {
         final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
         final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
         final GremlinParser.TraversalSourceSelfMethodContext ctx = parser.traversalSourceSelfMethod();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnVisitorTest.java
index 33204e1..88475a7 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalSourceSpawnVisitorTest.java
@@ -46,11 +46,25 @@
     }
 
     @Test
-    public void testTraversalSourceSpawnMethod_inject() {
-        // a random spawn of inject method.
-        compare(g.inject(1,2,3,4), eval("g.inject(1,2,3,4)"));
-        compare(g.inject(1,2,3,new HashMap<>()), eval("g.inject(1,2,3,[:])"));
+    public void shouldParseTraversalSourceSpawnMethod_inject() {
+        compare(g.inject(1), eval("g.inject(1)"));
+        compare(g.inject(1, 2, 3, 4), eval("g.inject(1,2,3,4)"));
+        compare(g.inject(1, 2, 3, new HashMap<>()), eval("g.inject(1,2,3,[:])"));
+    }
+
+    @Test
+    public void shouldParseTraversalSourceSpawnMethod_V() {
+        compare(g.V().out().values("name").inject("daniel"), eval("g.V().out().values('name').inject('daniel')"));
         compare(g.V(4).out().values("name").inject("daniel"), eval("g.V(4).out().values('name').inject('daniel')"));
+        compare(g.V(4, 5).out().values("name").inject("daniel"), eval("g.V(4, 5).out().values('name').inject('daniel')"));
+    }
+
+    @Test
+    public void shouldParseTraversalSourceSpawnMethod_E() {
+        compare(g.E().values("name").inject("daniel"), eval("g.E().values('name').inject('daniel')"));
+        compare(g.E(4).values("name").inject("daniel"), eval("g.E(4).values('name').inject('daniel')"));
+        compare(g.E(4, 5).values("name").inject("daniel"), eval("g.E(4, 5).values('name').inject('daniel')"));
+
     }
 
     private Object eval(final String query) {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitorTest.java
index df3ed2f..445c6ff 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalStrategyVisitorTest.java
@@ -79,11 +79,11 @@
     }
 
     @Test
-    public void testTraversalStrategy() {
+    public void shouldParseTraversalStrategy() {
         final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(script));
         final GremlinParser parser = new GremlinParser(new CommonTokenStream(lexer));
         final GremlinParser.TraversalStrategyContext ctx = parser.traversalStrategy();
-        final TraversalStrategy strategy = new TraversalStrategyVisitor((DefaultGremlinBaseVisitor) antlrToLanguage.tvisitor).visitTraversalStrategy(ctx);
+        final TraversalStrategy strategy = new TraversalStrategyVisitor(antlrToLanguage).visitTraversalStrategy(ctx);
 
         assertEquals(expected, strategy);
         assertEquals(ConfigurationConverter.getMap(expected.getConfiguration()),
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CardinalityTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CardinalityTest.java
new file mode 100644
index 0000000..b5c578e
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CardinalityTest.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class CardinalityTest {
+
+    @Test
+    public void shouldCreateSingle() {
+        final CardinalityValueTraversal t = VertexProperty.Cardinality.single("test");
+        assertEquals("test", t.getValue());
+        assertEquals(VertexProperty.Cardinality.single, t.getCardinality());
+    }
+
+    @Test
+    public void shouldCreateSet() {
+        final CardinalityValueTraversal t = VertexProperty.Cardinality.set("test");
+        assertEquals("test", t.getValue());
+        assertEquals(VertexProperty.Cardinality.set, t.getCardinality());
+    }
+
+    @Test
+    public void shouldCreateList() {
+        final CardinalityValueTraversal t = VertexProperty.Cardinality.list("test");
+        assertEquals("test", t.getValue());
+        assertEquals(VertexProperty.Cardinality.list, t.getCardinality());
+    }
+
+    @Test
+    public void shouldBeEqual() {
+        assertEquals(VertexProperty.Cardinality.single("test"), VertexProperty.Cardinality.single("test"));
+        assertEquals(VertexProperty.Cardinality.single(1), VertexProperty.Cardinality.single(1));
+        assertEquals(VertexProperty.Cardinality.single(null), VertexProperty.Cardinality.single(null));
+    }
+
+    @Test
+    public void shouldNotBeEqual() {
+        assertNotEquals(VertexProperty.Cardinality.single(100), VertexProperty.Cardinality.single("testing"));
+        assertNotEquals(VertexProperty.Cardinality.single("test"), VertexProperty.Cardinality.single("testing"));
+        assertNotEquals(VertexProperty.Cardinality.single(100), VertexProperty.Cardinality.single(1));
+        assertNotEquals(VertexProperty.Cardinality.single("null"), VertexProperty.Cardinality.single(null));
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CompareTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CompareTest.java
index f7a15e3..a98d6a9 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CompareTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CompareTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.tinkerpop.gremlin.process.traversal;
 
-import org.apache.tinkerpop.gremlin.util.tools.CollectionFactory;
 import org.javatuples.Pair;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32,10 +31,10 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asList;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asSet;
 import static org.junit.Assert.assertEquals;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asList;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asSet;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
index 99275d6..9d17501 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
@@ -36,10 +36,10 @@
 import java.util.List;
 import java.util.Locale;
 
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asSet;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asList;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
 import static org.apache.tinkerpop.gremlin.util.GremlinValueComparator.Type;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asList;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asSet;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
index b7c352e..494e4c9 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
@@ -169,14 +169,10 @@
         }
 
         @Override
-        public void addStarts(final Iterator starts) {
-
-        }
+        public void addStarts(final Iterator starts) { }
 
         @Override
-        public void addStart(final Traverser.Admin start) {
-
-        }
+        public void addStart(final Traverser.Admin start) { }
 
         @Override
         public boolean hasStarts() {
@@ -184,9 +180,7 @@
         }
 
         @Override
-        public void setPreviousStep(final Step step) {
-
-        }
+        public void setPreviousStep(final Step step) { }
 
         @Override
         public Step getPreviousStep() {
@@ -194,9 +188,7 @@
         }
 
         @Override
-        public void setNextStep(final Step step) {
-
-        }
+        public void setNextStep(final Step step) { }
 
         @Override
         public Step getNextStep() {
@@ -209,14 +201,10 @@
         }
 
         @Override
-        public void setTraversal(final Traversal.Admin traversal) {
-
-        }
+        public void setTraversal(final Traversal.Admin traversal) { }
 
         @Override
-        public void reset() {
-
-        }
+        public void reset() { }
 
         @Override
         public Step clone() {
@@ -229,19 +217,16 @@
         }
 
         @Override
-        public void addLabel(final String label) {
-
-        }
+        public void addLabel(final String label) { }
 
         @Override
-        public void removeLabel(final String label) {
-
-        }
+        public void removeLabel(final String label) { }
 
         @Override
-        public void setId(final String id) {
+        public void clearLabels() { }
 
-        }
+        @Override
+        public void setId(final String id) { }
 
         @Override
         public String getId() {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
index 496ddd4..3094cbc 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
@@ -27,7 +27,7 @@
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.tools.CollectionFactory;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -96,12 +96,12 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailMergeEForBadInput() {
-        g.mergeE(CollectionFactory.asMap(T.value, "nope"));
+        g.mergeE(CollectionUtil.asMap(T.value, "nope"));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailMergeVForBadInput() {
-        g.mergeV(CollectionFactory.asMap(T.value, "nope"));
+        g.mergeV(CollectionUtil.asMap(T.value, "nope"));
     }
 
     /**
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java
index 422ae12..28936ea 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalTest.java
@@ -25,7 +25,7 @@
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.util.tools.CollectionFactory;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -76,12 +76,12 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailMergeEWithBadInput() {
-        g.inject(0).mergeE(CollectionFactory.asMap(T.value, 100));
+        g.inject(0).mergeE(CollectionUtil.asMap(T.value, 100));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailMergeVWithBadInput() {
-        g.inject(0).mergeV(CollectionFactory.asMap(T.value, 100));
+        g.inject(0).mergeV(CollectionUtil.asMap(T.value, 100));
     }
 
     @Test
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AllStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AllStepTest.java
new file mode 100644
index 0000000..1bd979f
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AllStepTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+public class AllStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() { return Collections.singletonList(__.all(P.gt(0))); }
+
+    @Test
+    public void testReturnTypes() {
+        assertTrue(__.__(new int[]{}).all(P.gt(7)).hasNext());
+        assertArrayEquals(new int[] {7, 10}, __.__(new int[] {5, 8, 10}, new int[] {7, 10}).all(P.gte(7)).next());
+        assertArrayEquals(new long[] {7L, 10L}, __.__(new long[] {5L, 8L, 10L}, new long[] {7L, 10L}).all(P.gte(7)).next());
+        assertArrayEquals(new Long[] {7L, 10L}, __.__(1).constant(new Long[] {7L, 10L}).all(P.gte(7)).next());
+        assertArrayEquals(new double[] {7.1, 10.5}, __.__(new double[] {5.5, 8.0, 10.1}, new double[] {7.1, 10.5}).all(P.gte(7.0)).next(), 0.01);
+    }
+
+    @Test
+    public void testNullParameter() {
+        final Throwable thrown = assertThrows(IllegalArgumentException.class, () -> __.__(new int[]{1}).all(null).hasNext());
+        assertEquals("Input predicate to all step can't be null.", thrown.getMessage());
+    }
+
+    @Test
+    public void testSetTraverser() {
+        final Set<Integer> numbers = new HashSet<>();
+        numbers.add(10);
+        numbers.add(11);
+
+        assertTrue(__.__(numbers).all(P.gt(7)).hasNext());
+    }
+
+    @Test
+    public void testListIteratorTraverser() {
+        final List<Integer> numbers = new ArrayList<>();
+        numbers.add(10);
+        numbers.add(11);
+
+        assertTrue(__.__(numbers.iterator()).all(P.gte(10)).hasNext());
+    }
+
+    @Test
+    public void testCornerCases() {
+        final List validOne = new ArrayList() {{ add(20); }};
+        final List validTwo = new ArrayList() {{ add(21); add(25);}};
+        final List validThree = new ArrayList() {{ add(51); add(57); add(71); }};
+        final List containsNull = new ArrayList() {{ add(50); add(null); add(60); }};
+        final List empty = new ArrayList();
+        final List incorrectType = new ArrayList() {{ add(100); add("25"); }};
+        final List valueTooSmall = new ArrayList() {{ add(101); add(1); add(10);}};
+
+        assertEquals(4L, __.__(validOne, null, containsNull, empty, incorrectType, valueTooSmall, validTwo, validThree)
+                        .all(P.gt(3)).count().next().longValue());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AnyStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AnyStepTest.java
new file mode 100644
index 0000000..58f7b0e
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AnyStepTest.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+public class AnyStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() { return Collections.singletonList(__.any(P.gt(0))); }
+
+    @Test
+    public void testReturnTypes() {
+        assertFalse(__.__(new int[] {}).any(P.gt(7)).hasNext());
+        assertArrayEquals(new int[] {7, 10}, __.__(new int[] {3, 5, 6}, new int[] {7, 10}).any(P.gte(7)).next());
+        assertArrayEquals(new long[] {7L, 10L}, __.__(new long[] {3L, 5L, 6L}, new long[] {7L, 10L}).any(P.gte(7)).next());
+        assertArrayEquals(new Long[] {7L, 10L}, __.__(1).constant(new Long[] {7L, 10L}).any(P.gte(7)).next());
+        assertArrayEquals(new double[] {7.7, 10.1}, __.__(new double[] {3.3, 5.791739562, 6.1082}, new double[] {7.7, 10.1}).any(P.gte(7)).next(), 0.01);
+        assertArrayEquals(new Object[] {2, "hello", 10L}, __.__(new Object[] {3.6, "other"}, new Object[] {2, "hello", 10L}).any(P.gte(7)).next());
+    }
+
+    @Test
+    public void testNullParameter() {
+        final Throwable thrown = assertThrows(IllegalArgumentException.class, () -> __.__(new int[]{1}).any(null).hasNext());
+        assertEquals("Input predicate to any step can't be null.", thrown.getMessage());
+    }
+
+    @Test
+    public void testSetTraverser() {
+        final Set<Integer> numbers = new HashSet<>();
+        numbers.add(10);
+        numbers.add(11);
+
+        assertTrue(__.__(numbers).any(P.eq(10)).hasNext());
+    }
+
+    @Test
+    public void testListIteratorTraverser() {
+        final List<Integer> numbers = new ArrayList<>();
+        numbers.add(10);
+        numbers.add(11);
+
+        assertTrue(__.__(numbers.iterator()).any(P.eq(11)).hasNext());
+    }
+
+    @Test
+    public void testCornerCases() {
+        final List validOne = new ArrayList() {{ add(20); }};
+        final List validTwo = new ArrayList() {{ add(21); add(25);}};
+        final List validThree = new ArrayList() {{ add(51); add(57); add(71); }};
+        final List validFour = new ArrayList() {{ add(1); add(2); add(10); }};
+        final List invalidOne = new ArrayList() {{ add(0); add(1); }};
+        final List containsNull = new ArrayList() {{ add(50); add(null); add(60); }};
+        final List empty = new ArrayList();
+        final List incorrectType = new ArrayList() {{ add(100); add("25"); }};
+        final List valueTooSmall = new ArrayList() {{ add(101); add(1); add(10);}};
+
+        assertEquals(7L, __.__(validOne, null, containsNull, empty, incorrectType, validFour, invalidOne, valueTooSmall, validTwo, validThree)
+                        .any(P.gt(3)).count().next().longValue());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsDateStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsDateStepTest.java
new file mode 100644
index 0000000..4d6e7b6
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsDateStepTest.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.time.Instant;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import static java.time.ZoneOffset.UTC;
+import static org.junit.Assert.assertEquals;
+
+public class AsDateStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.asDate());
+    }
+
+    @Test
+    public void shouldParseDate() {
+
+        final Instant testInstant = ZonedDateTime.of(2023, 8, 2, 0, 0, 0, 0, UTC).toInstant();
+        final Date testDate = new Date(testInstant.getEpochSecond() * 1000);
+
+        assertEquals(new Date(1), __.__(1).asDate().next());
+        assertEquals(new Date(2), __.__(2.0).asDate().next());
+        assertEquals(new Date(3), __.__(3L).asDate().next());
+        assertEquals(testDate, __.__(testDate.getTime()).asDate().next());
+
+        assertEquals(testDate, __.__("2023-08-02T00:00:00Z").asDate().next());
+        assertEquals(testDate, __.__(testDate).asDate().next());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionWhenInvalidStringInput() {
+        __.__("This String is not an ISO 8601 Date").asDate().next();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionWhenArrayInput() {
+        __.__(Arrays.asList(1, 2)).asDate().next();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionWhenUUIDInput() {
+        __.__(UUID.randomUUID()).asDate().next();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionWhenNullInput() {
+        __.__(null).asDate().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringGlobalStepTest.java
new file mode 100644
index 0000000..aa9097b
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringGlobalStepTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class AsStringGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.asString());
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("1", __.__(1).asString().next());
+        assertEquals("[]", __.__(Collections.emptyList()).asString().next());
+        assertEquals("[1, 2]", __.__(Arrays.asList(1, 2)).asString().next());
+        assertEquals("1", __.__(Arrays.asList(1, 2)).unfold().asString().next());
+        assertArrayEquals(new String[]{"1", "2"}, __.inject(Arrays.asList(1, 2)).unfold().asString().toList().toArray());
+
+        assertEquals(null, __.__(null).asString().next());
+
+        assertEquals("[1, 2]test", __.__(Arrays.asList(1, 2)).asString().concat("test").next());
+        assertEquals("1test", __.__(Arrays.asList(1, 2)).unfold().asString().concat("test").next());
+        assertArrayEquals(new String[]{"1test", "2test"},
+                __.__(Arrays.asList(1, 2)).unfold().asString().concat("test").toList().toArray());
+        assertArrayEquals(new String[]{"1test", "2test"},
+                __.__(Arrays.asList(1, 2)).unfold().asString().concat("test").fold().next().toArray());
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringLocalStepTest.java
new file mode 100644
index 0000000..21dd03c
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsStringLocalStepTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class AsStringLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.asString(Scope.local));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("1", __.__(1).asString(Scope.local).next());
+        assertArrayEquals(new String[]{"1", "2"}, __.inject(1, 2).asString(Scope.local).toList().toArray());
+        assertArrayEquals(new String[]{}, ((List<?>) __.__(Collections.emptyList()).asString(Scope.local).next()).toArray());
+        assertArrayEquals(new String[]{"1", "2", null}, ((List<?>) __.__(Arrays.asList(1, 2, null)).asString(Scope.local).next()).toArray());
+
+        assertArrayEquals(new String[]{"1test", "2test"},
+                __.__(Arrays.asList(1, 2)).asString(Scope.local).unfold().concat("test").toList().toArray());
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStepTest.java
new file mode 100644
index 0000000..15c5d5c
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStepTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class CombineStepTest extends StepTest {
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+            __.combine(Collections.emptyList()),
+            __.combine(Collections.emptySet()),
+            __.combine(__.V().fold()));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Collections.emptyList(), __.__(Collections.emptyList()).combine(Collections.emptyList()).next());
+        assertEquals(Arrays.asList(1, 2, 3), __.__(Collections.emptyList()).combine(Arrays.asList(1, 2, 3)).next());
+        assertEquals(Arrays.asList(1, 2, 3), __.__(Arrays.asList(1, 2, 3)).combine(Collections.emptyList()).next());
+
+        assertEquals(Arrays.asList(5L, 8L, 10L, 7L, 10L), __.__(new long[] {5L, 8L, 10L}).combine(new long[] {7L, 10L}).next());
+        assertEquals(Arrays.asList(5L, 8L, 10L, 7L, 10L), __.__(new long[] {5L, 8L, 10L}).combine(__.constant(new long[] {7L, 10L})).next());
+
+        assertEquals(Arrays.asList(7L, 8L, 11L), __.__(1).constant(new Long[] {7L}).combine(new Long[] {8L, 11L}).next());
+        assertEquals(Arrays.asList(7L, 8L, 11L), __.__(1).constant(new Long[] {7L}).combine(__.constant(new Long[] {8L, 11L})).next());
+
+        assertEquals(Arrays.asList(5.5, 8.0, 10.1, 7.1, 10.5), __.__(new double[] {5.5, 8.0, 10.1}).combine(new double[] {7.1, 10.5}).next());
+        assertEquals(Arrays.asList(5.5, 8.0, 10.1, 7.1, 10.5), __.__(new double[] {5.5, 8.0, 10.1}).combine(__.constant(new double[] {7.1, 10.5})).next());
+
+        final Set<Integer> ten = new HashSet<>();
+        ten.add(10);
+        final Set<Integer> eleven = new HashSet<>();
+        eleven.add(11);
+        assertEquals(Arrays.asList(10, 11), __.__(ten).combine(eleven).next());
+        assertEquals(Arrays.asList(10, 11), __.__(ten).combine(__.constant(eleven)).next());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStepTest.java
new file mode 100644
index 0000000..476a696
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStepTest.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ConcatStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.concat("test"));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("a", __.__("a").concat().next());
+        assertEquals("abc", __.__("a").concat("b", "c").next());
+        assertEquals("aa", __.__("a").concat(__.inject("b", "c")).next());
+        assertEquals("aa", __.__("a").concat(__.inject(Arrays.asList("b", "c")).unfold()).next());
+        assertEquals("", __.__("").concat("").next());
+
+        assertArrayEquals(new String[]{"a", "b", "c"},
+                __.__("a", "b", "c").concat().toList().toArray());
+        assertArrayEquals(new String[]{"ade", "bde", "cde"},
+                __.__("a", "b", "c").concat("d", "e").toList().toArray());
+        assertArrayEquals(new String[]{"aa", "bb", "cc"},
+                __.__("a", "b", "c").concat(__.inject("d", "e")).toList().toArray());
+
+        assertArrayEquals(new String[]{"Mr.a", "Mr.b", "Mr.c", "Mr.d"},
+                __.__("a", "b", "c", "d").as("letters").constant("Mr.").concat(__.select("letters")).toList().toArray());
+        assertArrayEquals(new String[]{"Hello Mr.a", "Hello Mr.b", "Hello Mr.c", "Hello Mr.d"},
+                __.__("a", "b", "c", "d").as("letters").
+                        constant("Hello ").concat(__.constant("Mr."), __.select("letters")).toList().toArray());
+
+        assertNull(__.inject(null).concat(null).next());
+        assertNull(__.inject(null).concat(__.constant(null)).next());
+        assertArrayEquals(new String[]{"hi"},
+                __.__(null).concat(null, null, __.constant("hi")).toList().toArray());
+
+        String nullStr = null;
+        assertNull(__.inject(null).concat(nullStr).next());
+        assertArrayEquals(new String[]{"a", "b", null},
+                __.__("a", "b", null).concat(nullStr).toList().toArray());
+        assertArrayEquals(new String[]{"acd", "bcd", "cd"},
+                __.__("a", "b", null).concat("c", "d", nullStr).toList().toArray());
+
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList("a", "b", "c")).concat("d").next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStepTest.java
new file mode 100644
index 0000000..a84c691
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStepTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class ConjoinStepTest extends StepTest {
+    @Override
+    protected List<Traversal> getTraversals() { return Collections.singletonList(__.conjoin("a")); }
+
+    @Test
+    public void testReturnTypes() {
+        try {
+            __.__(Collections.emptyList()).conjoin(null).next();
+            fail();
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("Input delimiter to conjoin step can't be null"));
+        }
+
+        assertEquals("", __.__(Collections.emptyList()).conjoin("a").next());
+        assertEquals("5AA8AA10", __.__(new long[] {5L, 8L, 10L}).conjoin("AA").next());
+        assertEquals("715", __.__(1).constant(new Long[] {7L, 15L}).conjoin("").next());
+        assertEquals("5.5,8.0,10.1", __.__(new double[] {5.5, 8.0, 10.1}).conjoin(",").next());
+        assertNull(__.__(Arrays.asList(null, null)).conjoin(",").next());
+
+        final Set<Integer> set = new HashSet<>();
+        set.add(10); set.add(11); set.add(12);
+        assertEquals("10.11.12", __.__(set).conjoin(".").next());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateAddStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateAddStepTest.java
new file mode 100644
index 0000000..f7bb2ef
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateAddStepTest.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.DT;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class DateAddStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.dateAdd(DT.hour, 5));
+    }
+
+    @Test
+    public void shouldAddHours() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.add(Calendar.HOUR_OF_DAY, 2);
+        final Date expected = cal.getTime();
+
+        assertEquals(expected, __.__(now).dateAdd(DT.hour, 2).next());
+    }
+
+    @Test
+    public void shouldAddNegativeHours() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.add(Calendar.HOUR_OF_DAY, -3);
+        final Date expected = cal.getTime();
+
+        assertEquals(expected, __.__(now).dateAdd(DT.hour, -3).next());
+    }
+
+    @Test
+    public void shouldAddMinutes() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.add(Calendar.MINUTE, 5);
+        final Date expected = cal.getTime();
+
+        assertEquals(expected, __.__(now).dateAdd(DT.minute, 5).next());
+    }
+
+    @Test
+    public void shouldAddSeconds() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.add(Calendar.SECOND, 15);
+        final Date expected = cal.getTime();
+
+        assertEquals(expected, __.__(now).dateAdd(DT.second, 15).next());
+    }
+
+    @Test
+    public void shouldAddDays() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.add(Calendar.DAY_OF_MONTH, 50);
+        final Date expected = cal.getTime();
+
+        assertEquals(expected, __.__(now).dateAdd(DT.day, 50).next());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateDiffStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateDiffStepTest.java
new file mode 100644
index 0000000..0cffa60
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DateDiffStepTest.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import static java.time.ZoneOffset.UTC;
+import static org.junit.Assert.assertEquals;
+
+public class DateDiffStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.dateDiff(new Date(1690934420000L)));
+    }
+
+    @Test
+    public void shouldHandlePositiveValues() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.setTimeZone(TimeZone.getTimeZone(UTC));
+        cal.add(Calendar.DAY_OF_MONTH, 7);
+        final Date other = cal.getTime();
+
+        assertEquals(604800L, (long) __.__(other).dateDiff(now).next());
+    }
+
+    @Test
+    public void shouldHandleNegativeValues() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.setTimeZone(TimeZone.getTimeZone(UTC));
+        cal.add(Calendar.DAY_OF_MONTH, 7);
+        final Date other = cal.getTime();
+
+        assertEquals(-604800L, (long) __.__(now).dateDiff(other).next());
+    }
+
+    @Test
+    public void shouldHandleTraversalParam() {
+        final Date now = new Date();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+        cal.setTimeZone(TimeZone.getTimeZone(UTC));
+        cal.add(Calendar.DAY_OF_MONTH, 7);
+        final Date other = cal.getTime();
+
+        assertEquals(-604800L, (long) __.__(now).dateDiff(__.constant(other)).next());
+    }
+
+    @Test
+    public void shouldHandleNullTraversalParam() {
+        final Date now = new Date();
+
+        assertEquals(now.getTime() / 1000, (long) __.__(now).dateDiff(__.constant(null)).next());
+    }
+
+    @Test
+    public void shouldHandleNullDate() {
+        final Date now = new Date();
+
+        assertEquals(now.getTime() / 1000, (long) __.__(now).dateDiff((Date) null).next());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWhenInputIsNotDate() {
+        __.__("2023-08-23T00:00:00Z").dateDiff(new Date()).next();
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStepTest.java
new file mode 100644
index 0000000..8d8d9b3
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStepTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class DifferenceStepTest extends StepTest {
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+                __.difference(Collections.emptyList()),
+                __.difference(Collections.emptySet()),
+                __.difference(__.V().fold()));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Collections.emptySet(), __.__(Collections.emptyList()).difference(Collections.emptyList()).next());
+        assertEquals(Collections.emptySet(), __.__(Collections.emptyList()).difference(Arrays.asList(1, 2, 3)).next());
+        assertEquals(new HashSet(Arrays.asList(1, 2, 3)), __.__(Arrays.asList(1, 2, 3)).difference(Collections.emptyList()).next());
+
+        assertEquals(new HashSet(Arrays.asList(5L)), __.__(new long[] {5L, 8L, 10L}).difference(new long[] {7L, 8L, 10L}).next());
+        assertEquals(new HashSet(Arrays.asList(5L)), __.__(new long[] {5L, 8L, 10L}).difference(__.constant(new long[] {7L, 8L, 10L})).next());
+
+        assertEquals(new HashSet(Arrays.asList(12L)), __.__(1).constant(new Long[] {12L, 7L}).difference(new Long[] {7L, 8L, 11L}).next());
+        assertEquals(new HashSet(Arrays.asList(12L)), __.__(1).constant(new Long[] {7L, 12L}).difference(__.constant(new Long[] {7L, 8L, 11L})).next());
+
+        assertEquals(Collections.emptySet(), __.__(new double[] {5.5, 8.0, 10.1}).difference(new double[] {5.5, 8.0, 10.1, 10.5}).next());
+        assertEquals(new HashSet(Arrays.asList(5.5, 10.1)), __.__(new double[] {5.5, 8.0, 10.1}).difference(__.constant(new double[] {8.0, 10.5})).next());
+
+        final Set<Integer> setA = new HashSet<>();
+        setA.add(10); setA.add(11); setA.add(12);
+        final Set<Integer> setB = new HashSet<>();
+        setB.add(10); setB.add(11); setB.add(15);
+        assertEquals(new HashSet(Arrays.asList(12)), __.__(setA).difference(setB).next());
+        assertEquals(new HashSet(Arrays.asList(12)), __.__(setA).difference(__.constant(setB)).next());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStepTest.java
new file mode 100644
index 0000000..6543c7b
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStepTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class DisjunctStepTest extends StepTest {
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+                __.disjunct(Collections.emptyList()),
+                __.disjunct(Collections.emptySet()),
+                __.disjunct(__.V().fold()));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Collections.emptySet(), __.__(Collections.emptyList()).disjunct(Collections.emptyList()).next());
+        assertEquals(new HashSet(Arrays.asList(1, 2, 3)), __.__(Collections.emptyList()).disjunct(Arrays.asList(1, 2, 3)).next());
+        assertEquals(new HashSet(Arrays.asList(1, 2, 3)), __.__(Arrays.asList(1, 2, 3)).disjunct(Collections.emptyList()).next());
+
+        assertEquals(new HashSet(Arrays.asList(5L, 7L)), __.__(new long[] {5L, 8L, 10L}).disjunct(new long[] {7L, 8L, 10L}).next());
+        assertEquals(new HashSet(Arrays.asList(5L, 7L)), __.__(new long[] {5L, 8L, 10L}).disjunct(__.constant(new long[] {7L, 8L, 10L})).next());
+
+        assertEquals(new HashSet(Arrays.asList(8L, 11L)), __.__(1).constant(new Long[] {7L}).disjunct(new Long[] {7L, 8L, 11L}).next());
+        assertEquals(new HashSet(Arrays.asList(8L, 11L)), __.__(1).constant(new Long[] {7L}).disjunct(__.constant(new Long[] {7L, 8L, 11L})).next());
+
+        assertEquals(new HashSet(Arrays.asList(5.5, 10.1, 10.5)), __.__(new double[] {5.5, 8.0, 10.1}).disjunct(new double[] {8.0, 10.5}).next());
+        assertEquals(new HashSet(Arrays.asList(5.5, 10.1, 10.5)), __.__(new double[] {5.5, 8.0, 10.1}).disjunct(__.constant(new double[] {8.0, 10.5})).next());
+
+        final Set<Integer> setA = new HashSet<>();
+        setA.add(10); setA.add(11); setA.add(12);
+        final Set<Integer> setB = new HashSet<>();
+        setB.add(10); setB.add(11); setB.add(15);
+        assertEquals(new HashSet(Arrays.asList(12, 15)), __.__(setA).disjunct(setB).next());
+        assertEquals(new HashSet(Arrays.asList(12, 15)), __.__(setA).disjunct(__.constant(setB)).next());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FormatStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FormatStepTest.java
new file mode 100644
index 0000000..cf66458
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FormatStepTest.java
@@ -0,0 +1,183 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
+import static org.junit.Assert.assertEquals;
+
+public class FormatStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(
+                __.format("hello")
+        );
+    }
+
+    private List<String> getVariables(final String format) {
+        final FormatStep formatStep = new FormatStep(__.inject("test").asAdmin(), format);
+        return new ArrayList<>(formatStep.getScopeKeys());
+    }
+
+    @Test
+    public void shouldGetVariablesFromTemplate() {
+        assertEquals(Collections.emptyList(), getVariables(""));
+        assertEquals(Collections.emptyList(), getVariables("Hello world"));
+        assertEquals(Collections.emptyList(), getVariables("Hello %{world"));
+        assertEquals(Collections.emptyList(), getVariables("Hello {world}"));
+        assertEquals(Collections.emptyList(), getVariables("Hello % {world}"));
+        assertEquals(Collections.emptyList(), getVariables("Hello %% {world}"));
+        assertEquals(Collections.emptyList(), getVariables("Hello %%{world}"));
+        assertEquals(Collections.emptyList(), getVariables("Hello%%{world}"));
+        assertEquals(Collections.emptyList(), getVariables("Hello %{_}"));
+        assertEquals(Collections.emptyList(), getVariables("%%{world}"));
+        assertEquals(Collections.singletonList(""), getVariables("Hello %{}"));
+        assertEquals(Collections.singletonList(" "), getVariables("Hello %{ }"));
+        assertEquals(Collections.singletonList("world"), getVariables("Hello %{world}"));
+        assertEquals(Collections.singletonList("world"), getVariables("%%{Hello} %{world} %{_}"));
+        assertEquals(Arrays.asList("Hello", "world"), getVariables("%{Hello} %{world}"));
+        assertEquals(Arrays.asList("Hello", "hello", "world"), getVariables("%{Hello}%{hello}%{world}"));
+        assertEquals(Arrays.asList("Hello", "world"), getVariables("%{Hello} %{Hello} %{world}"));
+        assertEquals(Arrays.asList("Hello", "hello", "world"), getVariables("%{Hello} %{hello} %{world}"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionWhenFormatStringIsNull() {
+        new FormatStep(__.inject("test").asAdmin(), null);
+    }
+
+    @Test
+    public void shouldWorkWithoutVariables() {
+        assertEquals("Hello world", __.__("test").format("Hello world").next());
+    }
+
+    @Test
+    public void shouldWorkWithVertexInput() {
+        final Vertex vertex1 = new DetachedVertex(10L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("Stephen").create()));
+
+        assertEquals("Hello Stephen", __.__(vertex1).format("Hello %{name}").next());
+    }
+
+    @Test
+    public void shouldWorkWithEmptyTemplate() {
+        final Vertex vertex1 = new DetachedVertex(10L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("Stephen").create()));
+
+        assertEquals("", __.__(vertex1).format("").next());
+    }
+
+    @Test
+    public void shouldWorkWithMultipleVertexInput() {
+        final Vertex vertex1 = new DetachedVertex(10L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("Stephen").create()));
+
+        final Vertex vertex2 = new DetachedVertex(11L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(2).setLabel("name").setValue("Marko").create()));
+
+        assertEquals(Arrays.asList("Hello Stephen", "Hello Marko"),
+                __.__(vertex1, vertex2).format("Hello %{name}").toList());
+    }
+
+    @Test
+    public void shouldWorkWithModulator() {
+        final Vertex vertex1 = new DetachedVertex(10L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("Stephen").create()));
+
+        final Vertex vertex2 = new DetachedVertex(11L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(2).setLabel("name").setValue("Marko").create()));
+
+        assertEquals(Arrays.asList("Hello Stephen", "Hello Marko"),
+                __.__(vertex1, vertex2).format("%{_} %{_}").by(__.constant("Hello")).by(__.values("name")).toList());
+    }
+
+    @Test
+    public void shouldNotTryToApplyModulatorTraversalToAllVars() {
+        final Vertex vertex1 = new DetachedVertex(10L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("Stephen").create()));
+
+        assertEquals(Collections.emptyList(),
+                __.__(vertex1).format("%{name} %{missing}").by(__.label()).toList());
+    }
+
+    @Test
+    public void shouldHandleMissingModulatorValue() {
+        final Vertex vertex1 = new DetachedVertex(10L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("Stephen").create()));
+
+        final Vertex vertex2 = new DetachedVertex(11L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(2).setLabel("name").setValue("Marko").create()));
+
+        assertEquals(Arrays.asList("Hello Stephen Hello", "Hello Marko Hello"),
+                __.__(vertex1, vertex2).format("%{_} %{_} %{_}").
+                        by(__.constant("Hello")).by(__.values("name")).toList());
+    }
+
+    @Test
+    public void shouldWorkWithMap() {
+        assertEquals("Hello 2", __.__(asMap("name", 2)).format("Hello %{name}").next());
+        assertEquals("Hello Stephen", __.__(asMap("name", "Stephen")).format("Hello %{name}").next());
+    }
+
+    @Test
+    public void shouldWorkWithScopeVariables() {
+         assertEquals("Hello Stephen", __.__("Stephen").as("name").format("Hello %{name}").next());
+    }
+
+    @Test
+    public void shouldHandleSameVariableTwice() {
+        assertEquals("Hello, Hello Stephen",
+                __.__("Hello").as("action").format("%{action}, %{action} Stephen").next());
+    }
+
+    @Test
+    public void shouldWorkWithMixedInput() {
+        final Vertex vertex = new DetachedVertex(10L, "test", Arrays.asList(
+                DetachedVertexProperty.build().setId(1).setLabel("p1").setValue("val1").create(),
+                DetachedVertexProperty.build().setId(2).setLabel("p2").setValue("val2").create()));
+
+        assertEquals("val1 val2 valA valB",
+                __.inject("valA").as("varA").
+                        constant("valB").as("varB").
+                        constant(vertex).format("%{p1} %{p2} %{varA} %{varB}").next());
+    }
+
+    @Test
+    public void shouldPrioritizeVertexPropertiesOverScopeVariables() {
+        final Vertex vertex = new DetachedVertex(10L, "person", Collections.singletonList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("Stephen").create()));
+
+        assertEquals("Hello Stephen",
+                __.__("Marko").as("name").
+                        constant(vertex).format("Hello %{name}").next());
+    }
+}
\ No newline at end of file
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStepTest.java
new file mode 100644
index 0000000..82610d5
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStepTest.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class IntersectStepTest extends StepTest {
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+                __.intersect(Collections.emptyList()),
+                __.intersect(Collections.emptySet()),
+                __.intersect(__.V().fold()));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Collections.emptySet(), __.__(Collections.emptyList()).intersect(Collections.emptyList()).next());
+        assertEquals(Collections.emptySet(), __.__(Collections.emptyList()).intersect(Arrays.asList(1, 2, 3)).next());
+        assertEquals(Collections.emptySet(), __.__(Arrays.asList(1, 2, 3)).intersect(Collections.emptyList()).next());
+
+        assertEquals(new HashSet(Arrays.asList(8L, 10L)), __.__(new long[] {5L, 8L, 10L}).intersect(new long[] {7L, 8L, 10L}).next());
+        assertEquals(Collections.emptySet(), __.__(new long[] {5L, 8L}).intersect(__.constant(new long[] {7L, 9L, 10L})).next());
+
+        assertEquals(new HashSet(Arrays.asList(7L)), __.__(1).constant(new Long[] {7L}).intersect(new Long[] {7L, 8L, 11L}).next());
+        assertEquals(new HashSet(Arrays.asList(7L)), __.__(1).constant(new Long[] {7L}).intersect(__.constant(new Long[] {7L, 8L, 11L})).next());
+
+        assertEquals(new HashSet(Arrays.asList(8.0, 10.1)), __.__(new double[] {5.5, 8.0, 10.1}).intersect(new double[] {8.0, 10.1, 10.5}).next());
+        assertEquals(new HashSet(Arrays.asList(8.0)), __.__(new double[] {5.5, 8.0, 10.1}).intersect(__.constant(new double[] {8.0, 10.5})).next());
+
+        final Set<Integer> setA = new HashSet<>();
+        setA.add(10); setA.add(11); setA.add(12);
+        final Set<Integer> setB = new HashSet<>();
+        setB.add(10); setB.add(11); setB.add(15);
+        assertEquals(new HashSet(Arrays.asList(10, 11)), __.__(setA).intersect(setB).next());
+        assertEquals(new HashSet(Arrays.asList(10, 11)), __.__(setA).intersect(__.constant(setB)).next());
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimGlobalStepTest.java
new file mode 100644
index 0000000..37f149d
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimGlobalStepTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class LTrimGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.lTrim());
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("test   ", __.__("test   ").lTrim().next());
+        assertArrayEquals(new String[]{"hello world ", "test  ", null, "", ""},
+                __.inject(" hello world ", "  test  ", null, "", " ").lTrim().toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList(" a ", " b ", " c" )).lTrim().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimLocalStepTest.java
new file mode 100644
index 0000000..af9a68b
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LTrimLocalStepTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class LTrimLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.lTrim(Scope.local));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("test   ", __.__("test   ").lTrim().next());
+        assertArrayEquals(new String[]{"hello world ", "test  ", null, "", ""},
+                __.inject(" hello world ", "  test  ", null, "", " ").lTrim().toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList(" a ", " b ", " c" )).lTrim().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthGlobalStepTest.java
new file mode 100644
index 0000000..656b4ce
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthGlobalStepTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class LengthGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.length());
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Integer.valueOf(4), __.__("test").length().next());
+        assertArrayEquals(new Integer[]{5, 4, null, 0}, __.inject("hello", "test", null, "").length().toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList("a", "b", "c")).length().next();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingNonStringNonListValues() {
+        __.__(1).length().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthLocalStepTest.java
new file mode 100644
index 0000000..40199ee
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LengthLocalStepTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class LengthLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.length(Scope.local));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Integer.valueOf(4), __.__("test").length(Scope.local).next());
+        assertArrayEquals(new Integer[]{5, 4, null, 0}, __.inject("hello", "test", null, "").length().toList().toArray());
+        assertArrayEquals(new Integer[]{1, 2, 3}, ((List<?>) __.__(Arrays.asList("a", "bb", "ccc")).length(Scope.local).next()).toArray());
+        assertArrayEquals(new Integer[]{5, 4, null, 0}, ((List<?>) __.__(Arrays.asList("hello", "test", null, "")).length(Scope.local).next()).toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingNonStringList() {
+        __.__(Arrays.asList(1, 2, 3)).length(Scope.local).next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStepTest.java
index f248d7d..904ce83 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStepTest.java
@@ -29,7 +29,7 @@
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
 import org.apache.tinkerpop.gremlin.util.function.TraverserSetSupplier;
-import org.apache.tinkerpop.gremlin.util.tools.CollectionFactory;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -44,7 +44,7 @@
 
     @Test
     public void shouldValidateWithTokens() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, 101,
                 Direction.OUT, new ReferenceVertex(100),
                 T.label, "knows",
@@ -54,7 +54,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithTokensBecauseOfBOTH() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, 101,
                 Direction.BOTH, new ReferenceVertex(100),
                 T.label, "knows",
@@ -64,7 +64,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithTokensBecauseOfValue() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, 101,
                 Direction.OUT, new ReferenceVertex(100),
                 T.value, "knows",
@@ -74,7 +74,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithTokensBecauseOfBadLabel() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, 101,
                 Direction.OUT, new ReferenceVertex(100),
                 T.label, 100000,
@@ -84,7 +84,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithTokensBecauseOfWeirdKey() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, 101,
                 Direction.OUT, new ReferenceVertex(100),
                 new ReferenceVertex("weird"), 100000,
@@ -94,13 +94,13 @@
 
     @Test
     public void shouldValidateWithoutTokens() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v");
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v");
         MergeEdgeStep.validateMapInput(m, true);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithoutTokens() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, 101,
                 Direction.BOTH, new ReferenceVertex(100),
                 T.label, "knows",
@@ -110,7 +110,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithoutTokensBecauseOfWeirdKey() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 new ReferenceVertex("weird"), 100000);
         MergeEdgeStep.validateMapInput(m, true);
     }
@@ -124,15 +124,15 @@
         final Traverser.Admin traverser = mock(Traverser.Admin.class);
         when(traverser.split()).thenReturn(mock(Traverser.Admin.class));
         final Traversal.Admin onCreateTraversal = mock(Traversal.Admin.class);
-        when(onCreateTraversal.next()).thenReturn(Collections.unmodifiableMap(CollectionFactory.asMap("key1", "value1")));
+        when(onCreateTraversal.next()).thenReturn(Collections.unmodifiableMap(CollectionUtil.asMap("key1", "value1")));
         when(onCreateTraversal.getSideEffects()).thenReturn(mock(TraversalSideEffects.class));
 
         final MergeEdgeStep step = new MergeEdgeStep<>(traversal, true);
         step.addChildOption(Merge.onCreate, onCreateTraversal);
 
-        final Map mergeMap = CollectionFactory.asMap("key2", "value2");
+        final Map mergeMap = CollectionUtil.asMap("key2", "value2");
         final Map onCreateMap = step.onCreateMap(traverser, new LinkedHashMap<>(), mergeMap);
 
-        assertEquals(CollectionFactory.asMap("key1", "value1", "key2", "value2"), onCreateMap);
+        assertEquals(CollectionUtil.asMap("key1", "value1", "key2", "value2"), onCreateMap);
     }
 }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStepTest.java
index fac6688..ca2feae 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStepTest.java
@@ -28,7 +28,7 @@
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
 import org.apache.tinkerpop.gremlin.util.function.TraverserSetSupplier;
-import org.apache.tinkerpop.gremlin.util.tools.CollectionFactory;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -42,7 +42,7 @@
 
     @Test
     public void shouldValidateWithTokens() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 T.label, "person",
                 T.id, 10000);
         MergeVertexStep.validateMapInput(m, false);
@@ -50,7 +50,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithTokensBecauseOfValue() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 T.value, "nope",
                 T.label, "person",
                 T.id, 10000);
@@ -59,7 +59,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithTokensBecauseOfWeirdKey() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, "weird",
                 T.id, 10000);
         MergeVertexStep.validateMapInput(m, false);
@@ -67,13 +67,13 @@
 
     @Test
     public void shouldValidateWithoutTokens() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v");
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v");
         MergeVertexStep.validateMapInput(m, true);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithoutTokens() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, 101,
                 Direction.BOTH, new ReferenceVertex(100),
                 T.label, "knows",
@@ -83,7 +83,7 @@
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithoutTokensBecauseOfWeirdKey() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 new ReferenceVertex("weird"), 100000);
         MergeVertexStep.validateMapInput(m, true);
     }
@@ -97,70 +97,70 @@
         final Traverser.Admin traverser = mock(Traverser.Admin.class);
         when(traverser.split()).thenReturn(mock(Traverser.Admin.class));
         final Traversal.Admin onCreateTraversal = mock(Traversal.Admin.class);
-        when(onCreateTraversal.next()).thenReturn(Collections.unmodifiableMap(CollectionFactory.asMap("key1", "value1")));
+        when(onCreateTraversal.next()).thenReturn(Collections.unmodifiableMap(CollectionUtil.asMap("key1", "value1")));
         when(onCreateTraversal.getSideEffects()).thenReturn(mock(TraversalSideEffects.class));
 
         final MergeVertexStep step = new MergeVertexStep(traversal, true);
         step.addChildOption(Merge.onCreate, onCreateTraversal);
 
-        final Map mergeMap = CollectionFactory.asMap("key2", "value2");
+        final Map mergeMap = CollectionUtil.asMap("key2", "value2");
         final Map onCreateMap = step.onCreateMap(traverser, mergeMap);
 
-        assertEquals(CollectionFactory.asMap("key1", "value1", "key2", "value2"), onCreateMap);
+        assertEquals(CollectionUtil.asMap("key1", "value1", "key2", "value2"), onCreateMap);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithNullKey() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 null, "person");
         MergeVertexStep.validateMapInput(m, true);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithNullLabelValue() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 T.label, null);
         MergeVertexStep.validateMapInput(m, false);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithObjectAsLabelValue() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 T.label, new Object());
         MergeVertexStep.validateMapInput(m, false);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithNullIdValue() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 T.id, null);
         MergeVertexStep.validateMapInput(m, false);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithNullDirectionValue() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 Direction.IN, null);
         MergeVertexStep.validateMapInput(m, false);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithHiddenIdKey() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 "~id", 10000);
         MergeVertexStep.validateMapInput(m, false);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithHiddenLabelKey() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 "~label", "person");
         MergeVertexStep.validateMapInput(m, false);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldFailToValidateWithHiddenLabelValue() {
-        final Map<Object,Object> m = CollectionFactory.asMap("k", "v",
+        final Map<Object,Object> m = CollectionUtil.asMap("k", "v",
                 T.label, "~person");
         MergeVertexStep.validateMapInput(m, false);
     }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStepTest.java
new file mode 100644
index 0000000..371e21c
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStepTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class ProductStepTest extends StepTest {
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+                __.product(Collections.emptyList()),
+                __.product(Collections.emptySet()),
+                __.product(__.V().fold()));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Collections.emptyList(), __.__(Collections.emptyList()).product(Collections.emptyList()).next());
+        assertEquals(Collections.emptyList(), __.__(Collections.emptyList()).product(Arrays.asList(1, 2, 3)).next());
+        assertEquals(Collections.emptyList(), __.__(Arrays.asList(1, 2, 3)).product(Collections.emptyList()).next());
+
+        assertEquals(Arrays.asList(Arrays.asList(1,1), Arrays.asList(1,2), Arrays.asList(1,3)), __.__(Arrays.asList(1)).product(Arrays.asList(1, 2, 3)).next());
+        assertEquals(Arrays.asList(Arrays.asList(1,1), Arrays.asList(2,1), Arrays.asList(3,1)), __.__(Arrays.asList(1, 2, 3)).product(Arrays.asList(1)).next());
+
+        assertEquals(Arrays.asList(Arrays.asList(5L,7L), Arrays.asList(5L,10L), Arrays.asList(8L,7L), Arrays.asList(8L,10L)),
+                    __.__(new long[] {5L, 8L}).product(new long[] {7L, 10L}).next());
+        assertEquals(Arrays.asList(Arrays.asList(5L,7L), Arrays.asList(5L,10L), Arrays.asList(8L,7L), Arrays.asList(8L,10L)),
+                    __.__(new long[] {5L, 8L}).product(__.constant(new long[] {7L, 10L})).next());
+
+        assertEquals(Arrays.asList(Arrays.asList(7L,8L), Arrays.asList(7L,11L), Arrays.asList(3L,8L), Arrays.asList(3L,11L)),
+                    __.__(1).constant(new Long[] {7L, 3L}).product(new Long[] {8L, 11L}).next());
+        assertEquals(Arrays.asList(Arrays.asList(7L,8L), Arrays.asList(7L,11L), Arrays.asList(1L,8L), Arrays.asList(1L,11L)),
+                    __.__(1).constant(new Long[] {7L, 1L}).product(__.constant(new Long[] {8L, 11L})).next());
+
+        assertEquals(Arrays.asList(Arrays.asList(5.5,5.5), Arrays.asList(5.5,10.5), Arrays.asList(8.0,5.5), Arrays.asList(8.0,10.5)),
+                    __.__(new double[] {5.5, 8.0}).product(new double[] {5.5, 10.5}).next());
+        assertEquals(Arrays.asList(Arrays.asList(5.5,5.5), Arrays.asList(5.5,10.5), Arrays.asList(8.0,5.5), Arrays.asList(8.0,10.5)),
+                    __.__(new double[] {5.5, 8.0}).product(__.constant(new double[] {5.5, 10.5})).next());
+
+        final Set<Integer> ten = new HashSet<>();
+        ten.add(10);
+        final Set<Integer> eleven = new HashSet<>();
+        eleven.add(11);
+        assertEquals(Arrays.asList(Arrays.asList(10, 11)), __.__(ten).product(eleven).next());
+        assertEquals(Arrays.asList(Arrays.asList(10, 11)), __.__(ten).product(__.constant(eleven)).next());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimGlobalStepTest.java
new file mode 100644
index 0000000..4c7b4fe
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimGlobalStepTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class RTrimGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.rTrim());
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("   test", __.__("   test   ").rTrim().next());
+        assertArrayEquals(new String[]{" hello world", "  test", null, "", ""},
+                __.inject(" hello world ", "  test  ", null, "", " ").rTrim().toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList(" a ", " b ", " c" )).rTrim().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimLocalStepTest.java
new file mode 100644
index 0000000..e1b3c24
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RTrimLocalStepTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class RTrimLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.rTrim(Scope.local));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("   test", __.__("   test   ").rTrim(Scope.local).next());
+        assertArrayEquals(new String[]{" hello world", "  test", null, "", ""},
+                __.inject(" hello world ", "  test  ", null, "", " ").rTrim(Scope.local).toList().toArray());
+
+        assertArrayEquals(new String[]{" a", "  b", "   c", null},
+                ((List<?>)__.inject(Arrays.asList(" a ", "  b  ", "   c ", null)).rTrim(Scope.local).next()).toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList(1, 2, 3)).rTrim(Scope.local).next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceGlobalStepTest.java
new file mode 100644
index 0000000..1b1216f
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceGlobalStepTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+import org.mockito.internal.util.StringUtil;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class ReplaceGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.replace("a", "b"));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("halo", __.__("hello").replace("el", "a").next());
+        assertEquals("world", __.__("world").replace("el", "a").next());
+
+        assertEquals("hello", __.__("hello").replace(null, "a").next());
+        assertEquals("hello", __.__("hello").replace("el", null).next());
+        assertEquals("hello", __.__("hello").replace(null, null).next());
+
+        assertArrayEquals(new String[]{"hell0", "w0rld", null, ""},
+                __.__("hello", "world", null, "").replace("o", "0").toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() { __.__(Arrays.asList("a", "b", "c")).replace("a", "b").next(); }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceLocalStepTest.java
new file mode 100644
index 0000000..2b5c7d8
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReplaceLocalStepTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+public class ReplaceLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.replace(Scope.local, "a", "b"));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("halo", __.__("hello").replace(Scope.local, "el", "a").next());
+
+        assertEquals("hello", __.__("hello").replace(Scope.local, null, "a").next());
+        assertEquals("hello", __.__("hello").replace(Scope.local, "el", null).next());
+        assertEquals("hello", __.__("hello").replace(Scope.local, null, null).next());
+
+        assertArrayEquals(new String[]{"hell0", "w0rld", null, ""},
+                ((List<?>) __.__(Arrays.asList("hello", "world", null, "")).replace(Scope.local, "o", "0").next()).toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() { __.__(Arrays.asList(1, 2, 3)).replace(Scope.local, "a", "b").next(); }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseStepTest.java
new file mode 100644
index 0000000..f9cd341
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseStepTest.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class ReverseStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {return Collections.singletonList(__.reverse());}
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Collections.emptyList(), __.__(Collections.emptyList()).reverse().next());
+        assertEquals("tset", __.__("test").reverse().next());
+        assertArrayEquals(new String[]{"dlrow olleh", "tset", "321.on", null, ""},
+                __.inject("hello world", "test", "no.123", null, "").reverse().toList().toArray());
+    }
+
+    @Test
+    public void shouldAcceptPrimitiveArrayTraverser() {
+        List result = (List) __.__(new long[] {10L, 7L}).reverse().next();
+        assertEquals(7L, result.get(0));
+        assertEquals(10L, result.get(1));
+        assertEquals(2, result.size());
+    }
+
+    @Test
+    public void shouldAcceptObjectArrayTraverser() {
+        List result = (List) __.__(Arrays.asList(2, "hello", 10L)).reverse().next();
+        assertArrayEquals(new Object[] {10L, "hello", 2}, result.toArray());
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStepTest.java
new file mode 100644
index 0000000..9a442fa
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStepTest.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+import org.mockito.internal.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+public class SplitGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.split("a"));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertArrayEquals(new String[]{"h", "llo"}, __.__("hello").split("e").next().toArray());
+        assertArrayEquals(new String[]{"ab", "bc"}, __.__("abc|abc").split("c|a").next().toArray());
+
+        assertArrayEquals(new String[]{"helloworld"}, __.__("helloworld").split(null).next().toArray());
+        assertArrayEquals(new String[]{"hello", "world"}, __.__("hello world").split(null).next().toArray());
+        assertArrayEquals(new String[]{"hello", "world"}, __.__("hello   world").split(null).next().toArray());
+        assertArrayEquals(new String[]{"hello", "world"}, __.__("hello world").split("").next().toArray());
+        assertArrayEquals(new String[]{"hello", "world"}, __.__("hello world").split(" ").next().toArray());
+        assertArrayEquals(new String[]{"hello world"}, __.__("hello world").split("  ").next().toArray());
+
+        List<List<String>> resList = new ArrayList<>();
+        resList.add(Arrays.asList("t", "is"));
+        resList.add(Arrays.asList("t", "at"));
+        resList.add(Collections.singletonList("test"));
+        resList.add(null);
+        resList.add(Collections.emptyList());
+        assertArrayEquals(resList.toArray(),
+                __.__("this", "that", "test", null, "").split("h").toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList("a1a", "b1b", "c1c")).split("1").next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStepTest.java
new file mode 100644
index 0000000..b9c792d
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStepTest.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+
+public class SplitLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.split(Scope.local, "a"));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertArrayEquals(new String[]{"h", "llo"}, __.__("hello").split(Scope.local, "e").next().toArray());
+        assertArrayEquals(new String[]{"ab", "bc"}, __.__("abc|abc").split(Scope.local, "c|a").next().toArray());
+
+        List<List<String>> resList = new ArrayList<>();
+        resList.add(Arrays.asList("helloworld"));
+        resList.add(Arrays.asList("hello", "world"));
+        resList.add(Arrays.asList("hello", "world"));
+        resList.add(null);
+        assertArrayEquals(resList.toArray(),
+                __.__(Arrays.asList("helloworld", "hello world", "hello   world", null)).split(Scope.local, null).next().toArray());
+
+        resList = new ArrayList<>();
+        resList.add(Arrays.asList("t", "is"));
+        resList.add(Arrays.asList("t", "at"));
+        resList.add(Collections.singletonList("test"));
+        resList.add(null);
+        resList.add(Collections.emptyList());
+        assertArrayEquals(resList.toArray(),
+                __.__(Arrays.asList("this", "that", "test", null, "")).split(Scope.local, "h").next().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingNonStringArrayList() {
+        __.__(Arrays.asList(1, 2, 2)).split(Scope.local, "1").next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringGlobalStepTest.java
new file mode 100644
index 0000000..1399d86
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringGlobalStepTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+public class SubstringGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+                __.substring(1),
+                __.substring(1, 2));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("hello world", __.__("hello world").substring(0).next());
+        assertEquals("ello world", __.__("hello world").substring(1).next());
+        assertEquals("d", __.__("hello world").substring(-1).next());
+        assertEquals("d", __.__("hello world").substring(10).next());
+        assertEquals("", __.__("hello world").substring(11).next());
+
+        assertEquals("", __.__("hello world").substring(0, 0).next());
+        assertEquals("h", __.__("hello world").substring(0, 1).next());
+        assertEquals("", __.__("hello world").substring(1, 0).next());
+        assertEquals("hello worl", __.__("hello world").substring(0, -1).next());
+        assertEquals("", __.__("hello world").substring(-1, 0).next());
+        assertEquals("ello worl", __.__("hello world").substring(1, -1).next());
+        assertEquals("", __.__("hello world").substring(-1, 1).next());
+        assertEquals("rl", __.__("hello world").substring(-3, -1).next());
+        assertEquals("", __.__("hello world").substring(-1, -3).next());
+        assertEquals("d", __.__("hello world").substring(-1, 11).next());
+        assertEquals("ello world", __.__("hello world").substring(1, 11).next());
+        assertEquals("d", __.__("hello world").substring(10, 11).next());
+        assertEquals("hello world", __.__("hello world").substring(-11, 11).next());
+        assertEquals("h", __.__("hello world").substring(-11, 1).next());
+
+        assertArrayEquals(new String[]{"st", "llo wo", null, ""},
+                __.__("test", "hello world", null, "").substring(2, 8).toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList("aa", "bb", "cc")).substring(1).next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringLocalStepTest.java
new file mode 100644
index 0000000..12ad954
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SubstringLocalStepTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+public class SubstringLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+                __.substring(Scope.local, 1),
+                __.substring(Scope.local, 1, 2));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("hello world", __.__("hello world").substring(Scope.local, 0).next());
+        assertEquals("ello world", __.__("hello world").substring(Scope.local, 1).next());
+        assertEquals("d", __.__("hello world").substring(Scope.local, -1).next());
+
+        assertEquals("", __.__("hello world").substring(Scope.local, 0, 0).next());
+        assertEquals("ello worl", __.__("hello world").substring(Scope.local, 1, -1).next());
+        assertEquals("", __.__("hello world").substring(Scope.local, -1, -3).next());
+        assertEquals("hello world", __.__("hello world").substring(Scope.local, -11, 11).next());
+
+        assertArrayEquals(new String[]{"st", "llo wo", null, ""},
+                ((List<?>) __.__(Arrays.asList("test", "hello world", null, "")).substring(Scope.local, 2, 8).next()).toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingNonStringArrayList() {
+        __.__(Arrays.asList(1, 2, 3)).substring(Scope.local, 1).next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerGlobalStepTest.java
new file mode 100644
index 0000000..27c2f4d
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerGlobalStepTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class ToLowerGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.toLower());
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("test", __.__("TEST").toLower().next());
+        assertArrayEquals(new String[]{"hello", "test", "no.123", null, ""},
+                __.__("hElLo", "TEST", "NO.123", null, "").toLower().toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList("a", "b", "c")).toLower().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerLocalStepTest.java
new file mode 100644
index 0000000..c1c2086
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToLowerLocalStepTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class ToLowerLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.toLower(Scope.local));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("hello", __.__("HELLO").toLower(Scope.local).next());
+        assertArrayEquals(new String[]{"test"}, ((List<?>) __.__(Collections.singletonList("TEST")).toLower(Scope.local).next()).toArray());
+        assertArrayEquals(new String[]{"test"}, ((List<?>) __.__(new HashSet<>(Collections.singletonList("TEST"))).toLower(Scope.local).next()).toArray());
+        assertArrayEquals(new String[]{"hello", "test", "no.123", null, ""},
+                ((List<?>) __.__(Arrays.asList("hElLo", "TEST", "NO.123", null, "")).toLower(Scope.local).next()).toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingNonStringList() {
+        __.__(Arrays.asList(1, 2, 3)).toLower(Scope.local).next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperGlobalStepTest.java
new file mode 100644
index 0000000..1b92c5b
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperGlobalStepTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class ToUpperGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.toUpper());
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("TEST", __.__("test").toUpper().next());
+        assertArrayEquals(new String[]{"HELLO", "TEST", "NO.123", null, ""},
+                __.__("hElLo", "test", "no.123", null, "").toUpper().toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList("a", "b", "c")).toUpper().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperLocalStepTest.java
new file mode 100644
index 0000000..c041772
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ToUpperLocalStepTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class ToUpperLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.toUpper(Scope.local));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("HELLO", __.__("hello").toUpper(Scope.local).next());
+        assertArrayEquals(new String[]{"TEST"}, ((List<?>) __.__(Collections.singletonList("test")).toUpper(Scope.local).next()).toArray());
+        assertArrayEquals(new String[]{"TEST"}, ((List<?>) __.__(new HashSet<>(Collections.singletonList("test"))).toUpper(Scope.local).next()).toArray());
+        assertArrayEquals(new String[]{"HELLO", "TEST", "NO.123", null, ""},
+                ((List<?>) __.__(Arrays.asList("hElLo", "test", "no.123", null, "")).toUpper(Scope.local).next()).toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingNonStringList() {
+        __.__(Arrays.asList(1, 2, 3)).toUpper(Scope.local).next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStepTest.java
new file mode 100644
index 0000000..7756d01
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStepTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class TraversalMergeStepTest extends StepTest {
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Arrays.asList(
+                __.merge(Collections.emptyList()),
+                __.merge(Collections.emptySet()),
+                __.merge(__.V().fold()));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals(Collections.emptySet(), __.__(Collections.emptyList()).merge(Collections.emptyList()).next());
+        assertEquals(new HashSet(Arrays.asList(1, 2, 3)), __.__(Collections.emptyList()).merge(Arrays.asList(1, 2, 3)).next());
+        assertEquals(new HashSet(Arrays.asList(1, 2, 3)), __.__(Arrays.asList(1, 2, 3)).merge(Collections.emptyList()).next());
+
+        assertEquals(new HashSet(Arrays.asList(5L, 8L, 7L, 10L)), __.__(new long[] {5L, 8L, 10L}).merge(new long[] {7L, 10L}).next());
+        assertEquals(new HashSet(Arrays.asList(5L, 8L, 10L, 7L)), __.__(new long[] {5L, 8L, 10L}).merge(__.constant(new long[] {7L, 8L, 10L})).next());
+
+        assertEquals(new HashSet(Arrays.asList(7L, 8L, 11L)), __.__(1).constant(new Long[] {7L}).merge(new Long[] {8L, 11L}).next());
+        assertEquals(new HashSet(Arrays.asList(7L, 8L, 11L)), __.__(1).constant(new Long[] {7L, 8L}).merge(__.constant(new Long[] {8L, 11L})).next());
+
+        assertEquals(new HashSet(Arrays.asList(5.5, 8.0, 10.1)), __.__(new double[] {5.5, 8.0, 10.1}).merge(new double[] {5.5, 8.0, 10.1}).next());
+        assertEquals(new HashSet(Arrays.asList(5.5, 8.0, 10.1, 7.1, 10.5)), __.__(new double[] {5.5, 8.0, 10.1}).merge(__.constant(new double[] {7.1, 10.5})).next());
+
+        final Set<Integer> setA = new HashSet<>();
+        setA.add(5); setA.add(6); setA.add(7);
+        final Set<Integer> setB = new HashSet<>();
+        setB.add(7); setB.add(8);
+        assertEquals(new HashSet(Arrays.asList(5, 6, 7, 8)), __.__(setA).merge(setB).next());
+        assertEquals(new HashSet(Arrays.asList(5, 6 ,7, 8)), __.__(setA).merge(__.constant(setB)).next());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimGlobalStepTest.java
new file mode 100644
index 0000000..017de3f
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimGlobalStepTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class TrimGlobalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.trim());
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("test", __.__("   test   ").trim().next());
+        assertArrayEquals(new String[]{"hello world", "test", null, "", ""},
+                __.inject(" hello world ", "  test  ", null, "", " ").trim().toList().toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList(" a ", " b ", " c" )).trim().next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimLocalStepTest.java
new file mode 100644
index 0000000..2ab0243
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TrimLocalStepTest.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Yang Xia (http://github.com/xiazcy)
+ */
+public class TrimLocalStepTest extends StepTest {
+
+    @Override
+    protected List<Traversal> getTraversals() {
+        return Collections.singletonList(__.trim(Scope.local));
+    }
+
+    @Test
+    public void testReturnTypes() {
+        assertEquals("test", __.__("   test   ").trim(Scope.local).next());
+        assertArrayEquals(new String[]{"hello world", "test", null, "", ""},
+                __.inject(" hello world ", "  test  ", null, "", " ").trim(Scope.local).toList().toArray());
+
+        assertArrayEquals(new String[]{"a", "b", "c", null},
+                ((List<?>) __.inject(Arrays.asList(" a ", "  b  ", "   c ", null)).trim(Scope.local).next()).toArray());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowWithIncomingArrayList() {
+        __.__(Arrays.asList(1, 2, 3)).trim().next();
+    }
+
+    @Test
+    public void test(){
+        Object shouldntCast = __.inject("1").lTrim(Scope.local).next();
+    }
+
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
index c5d4d7e..bacf05b 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategyTest.java
@@ -50,6 +50,7 @@
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.hamcrest.core.IsIterableContaining.hasItem;
 import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsIterableContaining.hasItem;
 import static org.junit.Assert.assertEquals;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ReferenceElementStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ReferenceElementStrategyTest.java
deleted file mode 100644
index d689972..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ReferenceElementStrategyTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.junit.Test;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class ReferenceElementStrategyTest {
-
-    private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance()).
-            withStrategies(ReferenceElementStrategy.instance());
-
-    @Test
-    public void shouldAppendOneReferenceElementStep() {
-        final Traversal<Vertex, ?> t = g.V().union(out(), in()).groupCount();
-        t.asAdmin().applyStrategies();
-        assertThat((t.asAdmin().getEndStep() instanceof ReferenceElementStrategy.ReferenceElementStep), is(true));
-        assertEquals(1, TraversalHelper.getStepsOfAssignableClass(ReferenceElementStrategy.ReferenceElementStep.class, t.asAdmin()).size());
-    }
-}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ReferenceElementStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ReferenceElementStrategyTest.java
new file mode 100644
index 0000000..f718cf5
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ReferenceElementStrategyTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.junit.Test;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class ReferenceElementStrategyTest {
+
+    private static final GraphTraversalSource g = traversal().withEmbedded(EmptyGraph.instance()).
+            withStrategies(ReferenceElementStrategy.instance());
+
+    @Test
+    public void shouldAppendOneReferenceElementStep() {
+        final Traversal<Vertex, ?> t = g.V().union(out(), in()).groupCount();
+        t.asAdmin().applyStrategies();
+        assertThat((t.asAdmin().getEndStep() instanceof ReferenceElementStrategy.ReferenceElementStep), is(true));
+        assertEquals(1, TraversalHelper.getStepsOfAssignableClass(ReferenceElementStrategy.ReferenceElementStep.class, t.asAdmin()).size());
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java
index f6c6b51..25db43d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/DotNetTranslatorTest.java
@@ -201,6 +201,11 @@
     }
 
     @Test
+    public void shouldTranslateCardinalityValue() {
+        assertTranslation("CardinalityValue.Set(\"test\")", VertexProperty.Cardinality.set("test"));
+    }
+
+    @Test
     public void shouldTranslateHasNull() {
         String script = translator.translate(g.V().has("k", (Object) null).asAdmin().getBytecode()).getScript();
         assertEquals("g.V().Has(\"k\",(object) null)", script);
@@ -275,6 +280,64 @@
     }
 
     @Test
+    public void shouldTranslateStringFunctionWithAndWithoutScopes(){
+        assertEquals("g.Inject(1).AsString()",
+                translator.translate(g.inject(1).asString().asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(1).AsString<object>(Scope.Local)",
+                translator.translate(g.inject(1).asString(Scope.local).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").Length()",
+                translator.translate(g.inject("hello").length().asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").Length<object>(Scope.Local)",
+                translator.translate(g.inject("hello").length(Scope.local).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").LTrim()",
+                translator.translate(g.inject("hello").lTrim().asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").LTrim<object>(Scope.Local)",
+                translator.translate(g.inject("hello").lTrim(Scope.local).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").RTrim()",
+                translator.translate(g.inject("hello").rTrim().asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").RTrim<object>(Scope.Local)",
+                translator.translate(g.inject("hello").rTrim(Scope.local).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").ToUpper()",
+                translator.translate(g.inject("hello").toUpper().asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").ToUpper<object>(Scope.Local)",
+                translator.translate(g.inject("hello").toUpper(Scope.local).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").ToLower()",
+                translator.translate(g.inject("hello").toLower().asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").ToLower<object>(Scope.Local)",
+                translator.translate(g.inject("hello").toLower(Scope.local).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").Trim()",
+                translator.translate(g.inject("hello").trim().asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").Trim<object>(Scope.Local)",
+                translator.translate(g.inject("hello").trim(Scope.local).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").Replace(\"o\",\"a\")",
+                translator.translate(g.inject("hello").replace("o", "a").asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").Replace<object>(Scope.Local,\"o\",\"a\")",
+                translator.translate(g.inject("hello").replace(Scope.local, "o", "a").asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").Split(\"o\")",
+                translator.translate(g.inject("hello").split("o").asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").Split<object>(Scope.Local,\"o\")",
+                translator.translate(g.inject("hello").split(Scope.local, "o").asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").Substring(1)",
+                translator.translate(g.inject("hello").substring(1).asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").Substring<object>(Scope.Local,1)",
+                translator.translate(g.inject("hello").substring(Scope.local, 1).asAdmin().getBytecode()).getScript());
+
+        assertEquals("g.Inject(\"hello\").Substring(1,2)",
+                translator.translate(g.inject("hello").substring(1, 2).asAdmin().getBytecode()).getScript());
+        assertEquals("g.Inject(\"hello\").Substring<object>(Scope.Local,1,2)",
+                translator.translate(g.inject("hello").substring(Scope.local, 1, 2).asAdmin().getBytecode()).getScript());
+    }
+
+    @Test
     public void shouldTranslateTx() {
         String script = translator.translate(GraphOp.TX_COMMIT.getBytecode()).getScript();
         assertEquals("g.Tx().Commit()", script);
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java
index fa81e35..13b413d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GolangTranslatorTest.java
@@ -32,7 +32,6 @@
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -67,6 +66,12 @@
     }
 
     @Test
+    public void shouldTranslateCardinalityValue() {
+        assertEquals("g.Inject(gremlingo.CardinalityValue.Set(\"test\"))", translator.translate(
+                g.inject(VertexProperty.Cardinality.set("test")).asAdmin().getBytecode()).getScript());
+    }
+
+    @Test
     public void shouldTranslateMultilineStrings() {
         final String gremlinAsGo = translator.translate(
                 g.addV().property("text", "a" + System.lineSeparator() + "\"and\"" + System.lineSeparator() + "b").asAdmin().getBytecode()).getScript();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java
index 575c733..c82decc 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/GroovyTranslatorTest.java
@@ -35,6 +35,7 @@
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
 import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
@@ -162,6 +163,11 @@
     }
 
     @Test
+    public void shouldTranslateCardinalityValue() {
+        assertTranslation("VertexProperty.Cardinality.set(\"test\")", VertexProperty.Cardinality.set("test"));
+    }
+
+    @Test
     public void shouldTranslateDateUsingLanguageTypeTranslator() {
         final Translator.ScriptTranslator t = GroovyTranslator.of("g",
                 new GroovyTranslator.LanguageTypeTranslator(false));
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java
index 88bff57..9fd8eba 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/JavascriptTranslatorTest.java
@@ -33,6 +33,7 @@
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
 import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
@@ -122,6 +123,11 @@
     }
 
     @Test
+    public void shouldTranslateCardinalityValue() {
+        assertTranslation("CardinalityValue.set(\"test\")", VertexProperty.Cardinality.set("test"));
+    }
+
+    @Test
     public void shouldHaveValidToString() {
         assertEquals("translator[h:gremlin-javascript]", JavascriptTranslator.of("h").toString());
     }
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java
index c2b4e39..f2d14a2 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/translator/PythonTranslatorTest.java
@@ -19,12 +19,14 @@
 package org.apache.tinkerpop.gremlin.process.traversal.translator;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.Merge;
 import org.apache.tinkerpop.gremlin.process.traversal.GraphOp;
 import org.apache.tinkerpop.gremlin.process.traversal.TextP;
 import org.apache.tinkerpop.gremlin.process.traversal.Translator;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.CardinalityValueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
@@ -33,6 +35,9 @@
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
@@ -64,6 +69,15 @@
     }
 
     @Test
+    public void shouldTranslateCardinalityValue() {
+        final Map<Object, Object> m = new HashMap<>();
+        m.put("name", VertexProperty.Cardinality.set("marko"));
+        final String gremlinAsPython = translator.translate(
+                g.mergeV(new HashMap<>()).option(Merge.onMatch, m).asAdmin().getBytecode()).getScript();
+        assertEquals("g.merge_v({}).option(Merge.on_match,{'name':CardinalityValue.set_('marko')})", gremlinAsPython);
+    }
+
+    @Test
     public void shouldTranslateMultilineStrings() {
         final String gremlinAsPython = translator.translate(
                 g.addV().property("text", "a"+ System.lineSeparator() + "\"and\"" + System.lineSeparator() + "b").asAdmin().getBytecode()).getScript();
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index 3238480..d96cac1 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
@@ -22,6 +22,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Compare;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.PBiPredicate;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
@@ -54,7 +55,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.BiPredicate;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
 import static org.hamcrest.Matchers.either;
@@ -75,10 +75,10 @@
         return Arrays.asList(new Object[][]{
                 {"v1", GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
                 {"v2", GraphSONMapper.build().version(GraphSONVersion.V2_0)
-                        .addCustomModule(GraphSONXModuleV2d0.build().create(false))
+                        .addCustomModule(GraphSONXModuleV2.build())
                         .typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
                 {"v3", GraphSONMapper.build().version(GraphSONVersion.V3_0)
-                        .addCustomModule(GraphSONXModuleV3d0.build().create(false))
+                        .addCustomModule(GraphSONXModuleV3.build())
                         .typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()}
         });
     }
@@ -456,7 +456,7 @@
     }
 
     public static class PExt<V> extends P<V> {
-        public PExt(final BiPredicate<V, V> biPredicate, final V value) {
+        public PExt(final PBiPredicate<V, V> biPredicate, final V value) {
             super(biPredicate, value);
         }
 
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java
index 9533353..4b07c95 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java
@@ -64,21 +64,20 @@
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][]{
                 {"v2", GraphSONMapper.build().version(GraphSONVersion.V2_0)
-                        .addCustomModule(GraphSONXModuleV2d0.build().create(false))
+                        .addCustomModule(GraphSONXModuleV2.build())
                         .typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
                 {"v3", GraphSONMapper.build().version(GraphSONVersion.V3_0)
-                        .addCustomModule(GraphSONXModuleV3d0.build().create(false))
+                        .addCustomModule(GraphSONXModuleV3.build())
                         .typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()}
         });
     }
 
-    @Parameterized.Parameter(1)
-    public ObjectMapper mapper;
-
-
     @Parameterized.Parameter(0)
     public String version;
 
+    @Parameterized.Parameter(1)
+    public ObjectMapper mapper;
+
     @Test
     public void elementOrderShouldNotMatter() throws Exception {
         final String bytecodeJSONFail1 = "{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"addV\",\"poc_int\"],[\"property\",\"bigint1value\",{\"@type\":\"g:Int32\",\"@value\":-4294967295}]]}}";
@@ -199,7 +198,7 @@
     }
 
     @Test
-    public void shouldHandleMapWithTypesUsingEmbedTypeSettingV2d0() throws Exception {
+    public void shouldHandleMapWithTypesUsingEmbedTypeSettingV2() throws Exception {
         final ObjectMapper mapper = GraphSONMapper.build()
                 .version(GraphSONVersion.V2_0)
                 .typeInfo(TypeInfo.PARTIAL_TYPES)
@@ -216,7 +215,7 @@
     }
 
     @Test
-    public void shouldNotHandleMapWithTypesUsingEmbedTypeSettingV2d0() throws Exception {
+    public void shouldNotHandleMapWithTypesUsingEmbedTypeSettingV2() throws Exception {
         final ObjectMapper mapper = GraphSONMapper.build()
                 .version(GraphSONVersion.V2_0)
                 .typeInfo(TypeInfo.NO_TYPES)
@@ -233,7 +232,7 @@
     }
 
     @Test
-    public void shouldHandleMapWithTypesUsingEmbedTypeSettingV1d0() throws Exception {
+    public void shouldHandleMapWithTypesUsingEmbedTypeSettingV1() throws Exception {
         final ObjectMapper mapper = GraphSONMapper.build()
                 .version(GraphSONVersion.V1_0)
                 .typeInfo(TypeInfo.PARTIAL_TYPES)
@@ -250,7 +249,7 @@
     }
 
     @Test
-    public void shouldNotHandleMapWithTypesUsingEmbedTypeSettingV1d0() throws Exception {
+    public void shouldNotHandleMapWithTypesUsingEmbedTypeSettingV1() throws Exception {
         final ObjectMapper mapper = GraphSONMapper.build()
                 .version(GraphSONVersion.V1_0)
                 .typeInfo(TypeInfo.NO_TYPES)
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
index 08c0412..21089da 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
@@ -18,7 +18,17 @@
  */
 package org.apache.tinkerpop.gremlin.structure.io.graphson;
 
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.ImmutablePath;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,6 +48,9 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
 import static org.junit.Assert.assertEquals;
@@ -48,21 +61,99 @@
 @RunWith(Parameterized.class)
 public class GraphSONMapperTest {
 
-    /**
-     * No need to test V3 as it does not have an option to be constructed without types
-     */
     @Parameterized.Parameters(name = "{0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][]{
-                {GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
-                {GraphSONMapper.build().version(GraphSONVersion.V2_0).addCustomModule(GraphSONXModuleV2d0.build().create(false)).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
-                {GraphSONMapper.build().version(GraphSONVersion.V2_0).addDefaultXModule(true).typeInfo(TypeInfo.NO_TYPES).create().createMapper()}, // alternate construction of v2
+                {"v1", GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
+                {"v2", GraphSONMapper.build().version(GraphSONVersion.V2_0).addCustomModule(GraphSONXModuleV2.build()).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
+                {"v2-default", GraphSONMapper.build().version(GraphSONVersion.V2_0).addDefaultXModule(true).typeInfo(TypeInfo.NO_TYPES).create().createMapper()}, // alternate construction of v2
+                {"v3", GraphSONMapper.build().version(GraphSONVersion.V3_0).addCustomModule(GraphSONXModuleV3.build()).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
         });
     }
 
-    @Parameterized.Parameter
+    @Parameterized.Parameter(0)
+    public String version;
+
+    @Parameterized.Parameter(1)
     public ObjectMapper mapper;
 
+    @Test
+    public void shouldHandleVertex() throws Exception {
+        final Vertex v = new DetachedVertex(123L, "person", Arrays.asList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("alice").create(),
+                DetachedVertexProperty.build().setId(1).setLabel("age").setValue("31").create()));
+        final String json = mapper.writeValueAsString(v);
+
+        // v2 untyped seems to serialize the VertexProperty label. not changing that since it's already been
+        // introduced a long while back. v3 dips back to v1 style - since it has never existed prior to 3.7.0
+        // we can make this change
+        if (version.startsWith("v1") || version.startsWith("v3"))
+            assertEquals("{\"id\":123,\"label\":\"person\",\"type\":\"vertex\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\"}],\"age\":[{\"id\":1,\"value\":\"31\"}]}}", json);
+        else if (version.startsWith("v2"))
+            assertEquals("{\"id\":123,\"label\":\"person\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\",\"label\":\"name\"}],\"age\":[{\"id\":1,\"value\":\"31\",\"label\":\"age\"}]}}", json);
+        else
+            throw new IllegalStateException("Version not accounted for in asserts");
+    }
+
+    @Test
+    public void shouldHandleEdge() throws Exception {
+        final Edge e = new DetachedEdge(123L, "knows", new HashMap<String,Object>() {{
+            put("weight", 0.5d);
+        }}, 1L, "person", 2L, "person");
+        final String json = mapper.writeValueAsString(e);
+
+        // v2 untyped seems to serialize the VertexProperty label. not changing that since it's already been
+        // introduced a long while back. v3 dips back to v1 style - since it has never existed prior to 3.7.0
+        // we can make this change
+        if (version.startsWith("v1") || version.startsWith("v3"))
+            assertEquals("{\"id\":123,\"label\":\"knows\",\"type\":\"edge\",\"inVLabel\":\"person\",\"outVLabel\":\"person\",\"inV\":2,\"outV\":1,\"properties\":{\"weight\":0.5}}", json);
+        else if (version.startsWith("v2"))
+            assertEquals("{\"id\":123,\"label\":\"knows\",\"inVLabel\":\"person\",\"outVLabel\":\"person\",\"inV\":2,\"outV\":1,\"properties\":{\"weight\":{\"key\":\"weight\",\"value\":0.5}}}", json);
+        else
+            throw new IllegalStateException("Version not accounted for in asserts");
+    }
+
+    @Test
+    public void shouldHandleProperty() throws Exception {
+        final Property p = new DetachedProperty("k", 123);
+        final String json = mapper.writeValueAsString(p);
+        assertEquals("{\"key\":\"k\",\"value\":123}", json);
+    }
+
+    @Test
+    public void shouldHandleVertexProperty() throws Exception {
+        final DetachedVertex v = new DetachedVertex(321L, "person", Collections.emptyMap());
+        final VertexProperty p = new DetachedVertexProperty(123L, "name", "alice",
+                new HashMap<String,Object>() {{
+                    put("current", true);
+                }}, v);
+        final String json = mapper.writeValueAsString(p);
+        assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":\"name\",\"properties\":{\"current\":true}}", json);
+    }
+
+    @Test
+    public void shouldHandleVertexPropertyNoMeta() throws Exception {
+        final DetachedVertex v = new DetachedVertex(321L, "person", Collections.emptyMap());
+        final VertexProperty p = new DetachedVertexProperty(123L, "name", "alice", Collections.emptyMap(), v);
+        final String json = mapper.writeValueAsString(p);
+        assertEquals("{\"id\":123,\"value\":\"alice\",\"label\":\"name\"}", json);
+    }
+
+    @Test
+    public void shouldHandlePath() throws Exception {
+        final Vertex v = new DetachedVertex(123L, "person", Arrays.asList(
+                DetachedVertexProperty.build().setId(1).setLabel("name").setValue("alice").create(),
+                DetachedVertexProperty.build().setId(1).setLabel("age").setValue("31").create()));
+        final Path p = ImmutablePath.make().extend(v, new HashSet<>(Collections.singletonList("a"))).
+                extend(123L, new HashSet<>(Collections.singletonList("b"))).
+                extend("alice", new HashSet<>(Collections.singletonList("c")));
+        final String json = mapper.writeValueAsString(p);
+
+        if (version.startsWith("v1") || version.startsWith("v3"))
+            assertEquals("{\"labels\":[[\"a\"],[\"b\"],[\"c\"]],\"objects\":[{\"id\":123,\"label\":\"person\",\"type\":\"vertex\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\"}],\"age\":[{\"id\":1,\"value\":\"31\"}]}},123,\"alice\"]}", json);
+        else
+            assertEquals("{\"labels\":[[\"a\"],[\"b\"],[\"c\"]],\"objects\":[{\"id\":123,\"label\":\"person\",\"properties\":{\"name\":[{\"id\":1,\"value\":\"alice\",\"label\":\"name\"}],\"age\":[{\"id\":1,\"value\":\"31\",\"label\":\"age\"}]}},123,\"alice\"]}", json);
+    }
 
     @Test
     public void shouldHandleTraversalExplanation() throws Exception {
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
index 0e1c13b..e502a6e 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
@@ -424,7 +424,7 @@
      * TinkerPop which then removes the requirement for providers to expose serializers on the client side for user
      * consumption.
      */
-    private static class CustomClassResolver extends GryoClassResolverV1d0 {
+    private static class CustomClassResolver extends GryoClassResolverV1 {
         private IoXIoRegistry.IoXToVertexSerializer ioXToVertexSerializer = new IoXIoRegistry.IoXToVertexSerializer();
         private IoYIoRegistry.IoYToHashMapSerializer ioYToHashMapSerializer = new IoYIoRegistry.IoYToHashMapSerializer();
 
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/CollectionUtilTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/CollectionUtilTest.java
new file mode 100644
index 0000000..73bd39b
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/CollectionUtilTest.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util;
+
+import org.apache.tinkerpop.gremlin.AssertHelper;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static org.junit.Assert.assertTrue;
+
+public class CollectionUtilTest {
+
+    @Test
+    public void shouldBeUtilityClass() throws Exception {
+        AssertHelper.assertIsUtilityClass(CollectionUtil.class);
+    }
+
+    @Test
+    public void shouldCloneConcurrentHashMapWithPrimitiveValues() {
+        final ConcurrentHashMap<Object, String> source = new ConcurrentHashMap<>();
+        source.put("key", "value");
+        source.put(1, "test");
+
+        final ConcurrentHashMap<?,?> cloned = CollectionUtil.clone(source);
+        assertTrue(source.equals(cloned));
+    }
+
+    @Test
+    public void shouldCloneConcurrentHashMapWithArrayListValues() {
+        final ConcurrentHashMap<String, ArrayList<String>> source = new ConcurrentHashMap<>();
+        final ArrayList<String> value = new ArrayList<>();
+        value.add("test1");
+        value.add("test2");
+        source.put("key", value);
+        source.put("empty", new ArrayList<>());
+
+        final ConcurrentHashMap<?, ?> cloned = CollectionUtil.clone(source);
+        assertTrue(source.equals(cloned));
+    }
+
+    @Test
+    public void shouldCloneConcurrentHashMapWithSetValues() {
+        final ConcurrentHashMap<String, Set<String>> source = new ConcurrentHashMap<>();
+        final HashSet<String> value = new HashSet<>();
+        value.add("test1");
+        value.add("test2");
+        source.put("key", value);
+        source.put("empty", new HashSet<>());
+
+        final ConcurrentHashMap<?, ?> cloned = CollectionUtil.clone(source);
+        assertTrue(source.equals(cloned));
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/MultiMapTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/MultiMapTest.java
new file mode 100644
index 0000000..2a4cef4
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/MultiMapTest.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util;
+
+import org.apache.tinkerpop.gremlin.AssertHelper;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class MultiMapTest {
+
+    @Test
+    public void shouldBeUtilityClass() throws Exception {
+        AssertHelper.assertIsUtilityClass(MultiMap.class);
+    }
+
+    @Test
+    public void shouldPutValueInNewSet() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        MultiMap.put(multi, "here", 1);
+        MultiMap.put(multi, "there", 2);
+
+        final Set<Object> expected = new HashSet<Object>() {{
+            add(1);
+        }};
+        assertEquals(expected, multi.get("here"));
+    }
+
+    @Test
+    public void shouldPutValueInExistingSet() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        MultiMap.put(multi, "here", 1);
+        MultiMap.put(multi, "there", 3);
+
+        final Set<Object> expected1 = new HashSet<Object>() {{
+            add(1);
+        }};
+        assertEquals(expected1, multi.get("here"));
+
+        MultiMap.put(multi, "here", 2);
+
+        final Set<Object> expected2 = new HashSet<Object>() {{
+            add(1);
+            add(2);
+        }};
+        assertEquals(expected2, multi.get("here"));
+    }
+
+    @Test
+    public void shouldPutCollectionInSet() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        final Set<Object> expected = new HashSet<Object>() {{
+            add(1);
+            add(2);
+        }};
+        MultiMap.putAll(multi, "here", expected);
+        assertEquals(expected, multi.get("here"));
+    }
+
+    @Test
+    public void shouldContainEntry() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        MultiMap.put(multi, "here", 1);
+        MultiMap.put(multi, "there", 2);
+        MultiMap.put(multi, "here", 2);
+
+        assertThat(MultiMap.containsEntry(multi, "here", 1), is(true));
+    }
+
+    @Test
+    public void shouldNotContainEntryValue() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        MultiMap.put(multi, "here", 1);
+        MultiMap.put(multi, "there", 2);
+
+        assertThat(MultiMap.containsEntry(multi, "here", 2), is(false));
+    }
+
+    @Test
+    public void shouldNotContainEntryKey() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        MultiMap.put(multi, "here", 1);
+        MultiMap.put(multi, "there", 2);
+
+        assertThat(MultiMap.containsEntry(multi, "that", 2), is(false));
+    }
+
+    @Test
+    public void shouldGetAnEntry() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        MultiMap.put(multi, "here", 1);
+        MultiMap.put(multi, "there", 3);
+
+        final Set<Object> expected1 = new HashSet<Object>() {{
+            add(1);
+        }};
+        assertEquals(expected1, MultiMap.get(multi, "here"));
+
+        MultiMap.put(multi, "here", 2);
+
+        final Set<Object> expected2 = new HashSet<Object>() {{
+            add(1);
+            add(2);
+        }};
+        assertEquals(expected2, MultiMap.get(multi, "here"));
+    }
+
+    @Test
+    public void shouldGetEmptyIfKeyNotPresent() {
+        final Map<String,Set<Object>> multi = new HashMap<>();
+        MultiMap.put(multi, "here", 1);
+        MultiMap.put(multi, "there", 3);
+
+        assertEquals(Collections.emptySet(), MultiMap.get(multi, "not-here"));
+    }
+}
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/tools/MultiMapTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/tools/MultiMapTest.java
deleted file mode 100644
index c502a51..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/tools/MultiMapTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.util.tools;
-
-import org.apache.tinkerpop.gremlin.AssertHelper;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class MultiMapTest {
-
-    @Test
-    public void shouldBeUtilityClass() throws Exception {
-        AssertHelper.assertIsUtilityClass(MultiMap.class);
-    }
-
-    @Test
-    public void shouldPutValueInNewSet() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        MultiMap.put(multi, "here", 1);
-        MultiMap.put(multi, "there", 2);
-
-        final Set<Object> expected = new HashSet<Object>() {{
-            add(1);
-        }};
-        assertEquals(expected, multi.get("here"));
-    }
-
-    @Test
-    public void shouldPutValueInExistingSet() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        MultiMap.put(multi, "here", 1);
-        MultiMap.put(multi, "there", 3);
-
-        final Set<Object> expected1 = new HashSet<Object>() {{
-            add(1);
-        }};
-        assertEquals(expected1, multi.get("here"));
-
-        MultiMap.put(multi, "here", 2);
-
-        final Set<Object> expected2 = new HashSet<Object>() {{
-            add(1);
-            add(2);
-        }};
-        assertEquals(expected2, multi.get("here"));
-    }
-
-    @Test
-    public void shouldPutCollectionInSet() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        final Set<Object> expected = new HashSet<Object>() {{
-            add(1);
-            add(2);
-        }};
-        MultiMap.putAll(multi, "here", expected);
-        assertEquals(expected, multi.get("here"));
-    }
-
-    @Test
-    public void shouldContainEntry() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        MultiMap.put(multi, "here", 1);
-        MultiMap.put(multi, "there", 2);
-        MultiMap.put(multi, "here", 2);
-
-        assertThat(MultiMap.containsEntry(multi, "here", 1), is(true));
-    }
-
-    @Test
-    public void shouldNotContainEntryValue() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        MultiMap.put(multi, "here", 1);
-        MultiMap.put(multi, "there", 2);
-
-        assertThat(MultiMap.containsEntry(multi, "here", 2), is(false));
-    }
-
-    @Test
-    public void shouldNotContainEntryKey() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        MultiMap.put(multi, "here", 1);
-        MultiMap.put(multi, "there", 2);
-
-        assertThat(MultiMap.containsEntry(multi, "that", 2), is(false));
-    }
-
-    @Test
-    public void shouldGetAnEntry() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        MultiMap.put(multi, "here", 1);
-        MultiMap.put(multi, "there", 3);
-
-        final Set<Object> expected1 = new HashSet<Object>() {{
-            add(1);
-        }};
-        assertEquals(expected1, MultiMap.get(multi, "here"));
-
-        MultiMap.put(multi, "here", 2);
-
-        final Set<Object> expected2 = new HashSet<Object>() {{
-            add(1);
-            add(2);
-        }};
-        assertEquals(expected2, MultiMap.get(multi, "here"));
-    }
-
-    @Test
-    public void shouldGetEmptyIfKeyNotPresent() {
-        final Map<String,Set<Object>> multi = new HashMap<>();
-        MultiMap.put(multi, "here", 1);
-        MultiMap.put(multi, "there", 3);
-
-        assertEquals(Collections.emptySet(), MultiMap.get(multi, "not-here"));
-    }
-}
diff --git a/gremlin-dotnet/build/generate.groovy b/gremlin-dotnet/build/generate.groovy
index 77659aa..a1c0947 100644
--- a/gremlin-dotnet/build/generate.groovy
+++ b/gremlin-dotnet/build/generate.groovy
@@ -89,7 +89,8 @@
 
     writer.writeLine("\n\n//********************************************************************************")
     writer.writeLine("//* Do NOT edit this file directly - generated by build/generate.groovy")
-    writer.writeLine("//********************************************************************************\n\n")
+    writer.writeLine("//********************************************************************************\n")
+    writer.writeLine("#nullable disable\n")
 
     writer.writeLine('using System;\n' +
                      'using System.Collections.Generic;\n' +
@@ -174,6 +175,7 @@
             '        }\n' +
             '    }\n' +
             '}\n')
+    writer.writeLine("#nullable restore\n")
 }
 
 
diff --git a/gremlin-dotnet/docker-compose.yml b/gremlin-dotnet/docker-compose.yml
index c85369f..7c84aa0 100644
--- a/gremlin-dotnet/docker-compose.yml
+++ b/gremlin-dotnet/docker-compose.yml
@@ -42,6 +42,8 @@
       timeout: 10s
       retries: 30
       start_period: 30s
+    depends_on:
+      - gremlin-socket-server
 
   gremlin-dotnet-integration-tests:
     container_name: gremlin-dotnet-integration-tests
@@ -50,9 +52,9 @@
       - .:/gremlin-dotnet
       - ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features:/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features
       - ../docker/gremlin-test-server:/gremlin-dotnet/gremlin-test-server
+      - ../gremlin-tools/gremlin-socket-server/conf:/gremlin-dotnet/gremlin-socket-server/conf/
     environment:
       - DOCKER_ENVIRONMENT=true
-      - TEST_TRANSACTIONS=true
     working_dir: /gremlin-dotnet
     command: >
       bash -c "dotnet test ./Gremlin.Net.sln -c Release;
@@ -60,3 +62,10 @@
     depends_on:
       gremlin-server-test-dotnet:
         condition: service_healthy
+
+  gremlin-socket-server:
+    container_name: gremlin-socket-server
+    image: tinkerpop/gremlin-socket-server:${GREMLIN_SERVER}
+    ports:
+      - "45943:45943"
+
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index f404309..a3c6e50 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-dotnet</artifactId>
     <name>Apache TinkerPop :: Gremlin.Net</name>
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
index aace8ef..4e43b81 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
@@ -20,15 +20,16 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>    
+  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <!-- We need both reference elements until this is resolved: https://github.com/dotnet/sdk/issues/1151 -->
     <ProjectReference Include="../Gremlin.Net/Gremlin.Net.csproj" />
 
     <!-- do not edit the version directly - maven updates it automatically -->
-    <PackageReference Include="Gremlin.Net" Version="3.6.8-SNAPSHOT" />
+    <PackageReference Include="Gremlin.Net" Version="3.7.3-SNAPSHOT" />
   </ItemGroup>
 
 </Project>
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
index 45b517a..f24db30 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec
@@ -5,7 +5,7 @@
         <title>Gremlin.Net Template</title>
 
         <!-- do not edit the version directly - maven updates it automatically -->
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
 
         <description>Gremlin.Net template to create a console application with dotnet new.</description>
         <authors>Apache TinkerPop</authors>
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Service.cs b/gremlin-dotnet/src/Gremlin.Net.Template/Service.cs
index 4ded6d3..d4ba4eb 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Service.cs
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Service.cs
@@ -35,7 +35,7 @@
             _g = g;
         }
 
-        public IList<string> FindCreatorsOfSoftware(string softwareName)
+        public IList<string?> FindCreatorsOfSoftware(string softwareName)
         {
             return _g.V().HasLabel("software").Has("name", softwareName).In("created").Values<string>("name").ToList();
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
index cabe587..913bed2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
@@ -45,9 +45,9 @@
         private readonly IMessageSerializer _messageSerializer;
         private readonly Uri _uri;
         private readonly IWebSocketConnection _webSocketConnection;
-        private readonly string _username;
-        private readonly string _password;
-        private readonly string _sessionId;
+        private readonly string? _username;
+        private readonly string? _password;
+        private readonly string? _sessionId;
         private readonly bool _sessionEnabled;
 
         private readonly ConcurrentQueue<(RequestMessage msg, CancellationToken cancellationToken)> _writeQueue = new();
@@ -60,8 +60,8 @@
         private int _writeInProgress = 0;
         private const int Closed = 1;
 
-        public Connection(IWebSocketConnection webSocketConnection, Uri uri, string username, string password,
-            IMessageSerializer messageSerializer, string sessionId)
+        public Connection(IWebSocketConnection webSocketConnection, Uri uri, string? username, string? password,
+            IMessageSerializer messageSerializer, string? sessionId)
         {
             _uri = uri;
             _username = username;
@@ -131,7 +131,8 @@
             var receivedMsg = await _messageSerializer.DeserializeMessageAsync(received).ConfigureAwait(false);
             if (receivedMsg == null)
             {
-                ThrowMessageDeserializedNull();
+                throw new InvalidOperationException(
+                    "Received data deserialized into null object message. Cannot operate on it.");
             }
 
             try
@@ -155,9 +156,6 @@
             }
         }
 
-        private static void ThrowMessageDeserializedNull() =>
-            throw new InvalidOperationException("Received data deserialized into null object message. Cannot operate on it.");
-
         private void HandleReceivedMessage(ResponseMessage<List<object>> receivedMsg)
         {
             var status = receivedMsg.Status;
@@ -302,7 +300,7 @@
             {
                 msgBuilder.AddArgument(kv.Key, kv.Value);
             }
-            msgBuilder.AddArgument(Tokens.ArgsSession, _sessionId);
+            msgBuilder.AddArgument(Tokens.ArgsSession, _sessionId!);
             return msgBuilder.Create();
         }
 
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs
index 3ccbc3c..4657172 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs
@@ -27,11 +27,11 @@
     {
         private readonly WebSocketSettings _webSocketSettings;
         private readonly GremlinServer _gremlinServer;
-        private readonly string _sessionId;
+        private readonly string? _sessionId;
         private readonly IMessageSerializer _messageSerializer;
 
         public ConnectionFactory(GremlinServer gremlinServer, IMessageSerializer messageSerializer,
-            WebSocketSettings webSocketSettings, string sessionId)
+            WebSocketSettings webSocketSettings, string? sessionId)
         {
             _gremlinServer = gremlinServer;
             _messageSerializer = messageSerializer;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Exceptions/ConnectionClosedException.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Exceptions/ConnectionClosedException.cs
index 13417ea..e03c7f6 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Exceptions/ConnectionClosedException.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Exceptions/ConnectionClosedException.cs
@@ -27,8 +27,8 @@
 namespace Gremlin.Net.Driver.Exceptions
 {
     /// <summary>
-    ///     The exception that is thrown for requests that in-flight when the underlyingg websocket is closed by the server.
-    ///     Requests that recieve this exception will be in a non-deteministic state and may need to be retried.
+    ///     The exception that is thrown for requests that in-flight when the underlying websocket is closed by the server.
+    ///     Requests that receive this exception will be in a non-deterministic state and may need to be retried.
     /// </summary>
     /// <remarks>
     ///     It is recommended to use the same request retry policy that is applied when a <see cref="System.Net.WebSockets.WebSocketException" />,
@@ -44,19 +44,19 @@
         /// <summary>
         ///     Gets the Websocket closure description provided by the server.
         /// </summary>
-        public string Description { get; }
+        public string? Description { get; }
 
         /// <summary>
         ///     Initializes a new instance of the <see cref="ConnectionClosedException" /> class.
         /// </summary>
-        public ConnectionClosedException(WebSocketCloseStatus? status, string description)
+        public ConnectionClosedException(WebSocketCloseStatus? status, string? description)
             : base(CreateMessage(status, description))
         {
             Status = status;
             Description = description;
         }
 
-        private static string CreateMessage(WebSocketCloseStatus? status, string description)
+        private static string CreateMessage(WebSocketCloseStatus? status, string? description)
         {
             return $"Connection closed by server. CloseStatus: {status?.ToString() ?? "<none>"}, CloseDescription: {description ?? "<none>"}." +
                 " Any in-progress requests on the connection will be in an unknown state, and may need to be retried.";
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
index 361cf57..e97d8eb 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
@@ -57,8 +57,8 @@
         /// <param name="sessionId">The session Id if Gremlin Client in session mode, defaults to null as session-less Client.</param>
         [Obsolete("This constructor is obsolete. Use the constructor that takes a IMessageSerializer instead.")]
         public GremlinClient(GremlinServer gremlinServer, GraphSONReader graphSONReader, GraphSONWriter graphSONWriter,
-            ConnectionPoolSettings connectionPoolSettings = null,
-            Action<ClientWebSocketOptions> webSocketConfiguration = null, string sessionId = null)
+            ConnectionPoolSettings? connectionPoolSettings = null,
+            Action<ClientWebSocketOptions>? webSocketConfiguration = null, string? sessionId = null)
             : this(gremlinServer, graphSONReader, graphSONWriter, SerializationTokens.GraphSON3MimeType,
                 connectionPoolSettings, webSocketConfiguration, sessionId)
         {
@@ -78,9 +78,9 @@
         /// </param>
         /// <param name="sessionId">The session Id if Gremlin Client in session mode, defaults to null as session-less Client.</param>
         [Obsolete("This constructor is obsolete. Use the constructor that takes a IMessageSerializer instead.")]
-        public GremlinClient(GremlinServer gremlinServer, GraphSONReader graphSONReader, GraphSONWriter graphSONWriter,
-            string mimeType, ConnectionPoolSettings connectionPoolSettings = null,
-            Action<ClientWebSocketOptions> webSocketConfiguration = null, string sessionId = null)
+        public GremlinClient(GremlinServer gremlinServer, GraphSONReader? graphSONReader, GraphSONWriter? graphSONWriter,
+            string mimeType, ConnectionPoolSettings? connectionPoolSettings = null,
+            Action<ClientWebSocketOptions>? webSocketConfiguration = null, string? sessionId = null)
         {
             IMessageSerializer messageSerializer;
             switch (mimeType)
@@ -91,8 +91,8 @@
                     VerifyGraphSONArgumentTypeForMimeType<GraphSON3Writer>(graphSONWriter, nameof(graphSONWriter),
                         mimeType);
                     messageSerializer = new GraphSON3MessageSerializer(
-                        (GraphSON3Reader) graphSONReader ?? new GraphSON3Reader(),
-                        (GraphSON3Writer) graphSONWriter ?? new GraphSON3Writer());
+                        (GraphSON3Reader?) graphSONReader ?? new GraphSON3Reader(),
+                        (GraphSON3Writer?) graphSONWriter ?? new GraphSON3Writer());
                     break;
                 case SerializationTokens.GraphSON2MimeType:
                     VerifyGraphSONArgumentTypeForMimeType<GraphSON2Reader>(graphSONReader, nameof(graphSONReader),
@@ -100,8 +100,8 @@
                     VerifyGraphSONArgumentTypeForMimeType<GraphSON2Writer>(graphSONWriter, nameof(graphSONWriter),
                         mimeType);
                     messageSerializer = new GraphSON2MessageSerializer(
-                        (GraphSON2Reader) graphSONReader ?? new GraphSON2Reader(),
-                        (GraphSON2Writer) graphSONWriter ?? new GraphSON2Writer());
+                        (GraphSON2Reader?) graphSONReader ?? new GraphSON2Reader(),
+                        (GraphSON2Writer?) graphSONWriter ?? new GraphSON2Writer());
                     break;
                 default:
                     throw new ArgumentException(nameof(mimeType), $"{mimeType} not supported");
@@ -135,10 +135,10 @@
                 connectionPoolSettings ?? new ConnectionPoolSettings(), LoggerFactory.CreateLogger<ConnectionPool>());
         }
 
-        private static void VerifyGraphSONArgumentTypeForMimeType<T>(object argument, string argumentName,
+        private static void VerifyGraphSONArgumentTypeForMimeType<T>(object? argument, string argumentName,
             string mimeType)
         {
-            if (argument != null && !(argument is T))
+            if (argument != null && argument is not T)
             {
                 throw new ArgumentException(
                     $"{argumentName} is not a {typeof(T).Name} but the mime type is: {mimeType}", argumentName);
@@ -168,10 +168,10 @@
         ///     that could potentially be controlled by an untrusted user.
         /// </param>
         /// <param name="loggerFactory">A factory to create loggers. If not provided, then nothing will be logged.</param>
-        public GremlinClient(GremlinServer gremlinServer, IMessageSerializer messageSerializer = null,
-            ConnectionPoolSettings connectionPoolSettings = null,
-            Action<ClientWebSocketOptions> webSocketConfiguration = null, string sessionId = null,
-            bool disableCompression = false, ILoggerFactory loggerFactory = null)
+        public GremlinClient(GremlinServer gremlinServer, IMessageSerializer? messageSerializer = null,
+            ConnectionPoolSettings? connectionPoolSettings = null,
+            Action<ClientWebSocketOptions>? webSocketConfiguration = null, string? sessionId = null,
+            bool disableCompression = false, ILoggerFactory? loggerFactory = null)
         {
             messageSerializer ??= new GraphBinaryMessageSerializer();
             var webSocketSettings = new WebSocketSettings
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClientExtensions.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClientExtensions.cs
index 54dabff..8132c7a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClientExtensions.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClientExtensions.cs
@@ -52,9 +52,9 @@
         ///     Thrown when a response is received from Gremlin Server that indicates
         ///     that an error occurred.
         /// </exception>
-        public static async Task<T> SubmitWithSingleResultAsync<T>(this IGremlinClient gremlinClient,
+        public static async Task<T?> SubmitWithSingleResultAsync<T>(this IGremlinClient gremlinClient,
             string requestScript,
-            Dictionary<string, object> bindings = null,
+            Dictionary<string, object>? bindings = null,
             CancellationToken cancellationToken = default)
         {
             var resultCollection = await gremlinClient.SubmitAsync<T>(requestScript, bindings, cancellationToken)
@@ -78,7 +78,7 @@
         ///     Thrown when a response is received from Gremlin Server that indicates
         ///     that an error occurred.
         /// </exception>
-        public static async Task<T> SubmitWithSingleResultAsync<T>(this IGremlinClient gremlinClient,
+        public static async Task<T?> SubmitWithSingleResultAsync<T>(this IGremlinClient gremlinClient,
             RequestMessage requestMessage, CancellationToken cancellationToken = default)
         {
             var resultCollection =
@@ -100,7 +100,7 @@
         ///     that an error occurred.
         /// </exception>
         public static async Task SubmitAsync(this IGremlinClient gremlinClient, string requestScript,
-            Dictionary<string, object> bindings = null, CancellationToken cancellationToken = default)
+            Dictionary<string, object>? bindings = null, CancellationToken cancellationToken = default)
         {
             await gremlinClient.SubmitAsync<object>(requestScript, bindings, cancellationToken).ConfigureAwait(false);
         }
@@ -138,7 +138,7 @@
         /// </exception>
         public static async Task<ResultSet<T>> SubmitAsync<T>(this IGremlinClient gremlinClient,
             string requestScript,
-            Dictionary<string, object> bindings = null,
+            Dictionary<string, object>? bindings = null,
             CancellationToken cancellationToken = default)
         {
             var msgBuilder = RequestMessage.Build(Tokens.OpsEval).AddArgument(Tokens.ArgsGremlin, requestScript);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinServer.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinServer.cs
index 43ef159..fbe5bae 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinServer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinServer.cs
@@ -39,7 +39,7 @@
         /// <param name="username">The username to submit on requests that require authentication.</param>
         /// <param name="password">The password to submit on requests that require authentication.</param>
         public GremlinServer(string hostname = "localhost", int port = 8182, bool enableSsl = false,
-            string username = null, string password = null)
+            string? username = null, string? password = null)
         {
             Uri = CreateUri(hostname, port, enableSsl);
             Username = username;
@@ -55,12 +55,12 @@
         /// <summary>
         ///     Gets the username to submit on requests that require authentication.
         /// </summary>
-        public string Username { get; }
+        public string? Username { get; }
 
         /// <summary>
         ///     Gets the password to submit on requests that require authentication.
         /// </summary>
-        public string Password { get; }
+        public string? Password { get; }
 
         private Uri CreateUri(string hostname, int port, bool enableSsl)
         {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/IMessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/IMessageSerializer.cs
index e1a6a0e..0f2d79f 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/IMessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/IMessageSerializer.cs
@@ -48,7 +48,7 @@
         /// <param name="message">The serialized message to deserialize.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>The deserialized <see cref="ResponseMessage{T}"/>.</returns>
-        Task<ResponseMessage<List<object>>> DeserializeMessageAsync(byte[] message,
+        Task<ResponseMessage<List<object>>?> DeserializeMessageAsync(byte[] message,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs
index a273cc0..bbb4c16 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs
@@ -29,20 +29,33 @@
     ///     The message returned from the server.
     /// </summary>
     /// <typeparam name="T">The type of the data returned.</typeparam>
-    public class ResponseMessage<T>
+    public record ResponseMessage<T>
     {
         /// <summary>
-        ///     Gets or sets the identifier of the <see cref="RequestMessage"/> that generated this <see cref="ResponseMessage{T}"/>.
+        ///     Initializes a new instance of the <see cref="ResponseMessage{T}" /> record.
         /// </summary>
-        public Guid? RequestId { get; set; }
+        /// <param name="requestId">The identifier of the <see cref="RequestMessage"/> that generated this <see cref="ResponseMessage{T}"/>.</param>
+        /// <param name="status">Status information about this <see cref="ResponseMessage{T}"/>.</param>
+        /// <param name="result">The result with its data and optional meta information.</param>
+        public ResponseMessage(Guid? requestId, ResponseStatus status, ResponseResult<T> result)
+        {
+            RequestId = requestId;
+            Status = status;
+            Result = result;
+        }
+        
+        /// <summary>
+        ///     Gets the identifier of the <see cref="RequestMessage"/> that generated this <see cref="ResponseMessage{T}"/>.
+        /// </summary>
+        public Guid? RequestId { get; }
 
         /// <summary>
-        ///     Gets or sets status information about this <see cref="ResponseMessage{T}"/>.
+        ///     Gets status information about this <see cref="ResponseMessage{T}"/>.
         /// </summary>
-        public ResponseStatus Status { get; set; }
+        public ResponseStatus Status { get; }
 
         /// <summary>
-        ///     Gets or sets the result with its data and optional meta information.
+        ///     Gets the result with its data and optional meta information.
         /// </summary>
         public ResponseResult<T> Result { get; set; }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
index abc2907..387893a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
@@ -30,16 +30,27 @@
     ///     <see cref="ResponseMessage{T}"/> by the server.
     /// </summary>
     /// <typeparam name="T">The type of the <see cref="Data"/>.</typeparam>
-    public class ResponseResult<T>
+    public record ResponseResult<T>
     {
         /// <summary>
-        ///     Gets or sets the data of this result.
+        /// Initializes a new instance of the <see cref="ResponseResult{T}" /> record.
         /// </summary>
-        public T Data { get; set; }
+        /// <param name="data">The data of this result.</param>
+        /// <param name="meta">The (optional) meta data of this result.</param>
+        public ResponseResult(T? data, Dictionary<string, object>? meta = null)
+        {
+            Data = data;
+            Meta = meta ?? new Dictionary<string, object>();
+        }
+        
+        /// <summary>
+        ///     Gets the data of this result.
+        /// </summary>
+        public T? Data { get; }
 
         /// <summary>
-        ///     Gets or sets meta data of this result.
+        ///     Gets meta data of this result.
         /// </summary>
-        public Dictionary<string, object> Meta { get; set; }
+        public Dictionary<string, object> Meta { get; }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseStatus.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseStatus.cs
index 63530a3..1d36113 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseStatus.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseStatus.cs
@@ -29,22 +29,36 @@
     /// <summary>
     ///     Represents status information of a <see cref="ResponseMessage{T}"/>.
     /// </summary>
-    public class ResponseStatus
+    public record ResponseStatus
     {
         /// <summary>
-        ///     Gets or sets the <see cref="ResponseStatusCode"/>.
+        ///     Initializes a new instance of the <see cref="ResponseStatus" /> record.
         /// </summary>
-        public ResponseStatusCode Code { get; set; }
+        /// <param name="code">The <see cref="ResponseStatusCode" />.</param>
+        /// <param name="attributes">The (optional) attributes with protocol-level information.</param>
+        /// <param name="message">The (optional) message which is just a human-readable string usually associated with errors.</param>
+        public ResponseStatus(ResponseStatusCode code, Dictionary<string, object>? attributes = null,
+            string? message = null)
+        {
+            Code = code;
+            Attributes = attributes ?? new Dictionary<string, object>();
+            Message = message;
+        }
+        
+        /// <summary>
+        ///     Gets the <see cref="ResponseStatusCode"/>.
+        /// </summary>
+        public ResponseStatusCode Code { get; }
 
         /// <summary>
-        ///     Gets or sets the attributes <see cref="Dictionary{TKey,TValue}"/> with protocol-level information.
+        ///     Gets the attributes <see cref="Dictionary{TKey,TValue}"/> with protocol-level information.
         /// </summary>
-        public Dictionary<string, object> Attributes { get; set; }
+        public Dictionary<string, object> Attributes { get; }
 
         /// <summary>
-        ///     Gets or sets the message which is just a human-readable string usually associated with errors.
+        ///     Gets the message which is just a human-readable string usually associated with errors.
         /// </summary>
-        public string Message { get; set; }
+        public string? Message { get; }
     }
 
     internal static class ResponseStatusExtensions
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteConnection.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteConnection.cs
index a623a44..b9e0aa0 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteConnection.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteConnection.cs
@@ -51,10 +51,10 @@
         private readonly List<string> _allowedKeys = new()
         {
             Tokens.ArgsEvalTimeout, "scriptEvaluationTimeout", Tokens.ArgsBatchSize,
-            Tokens.RequestId, Tokens.ArgsUserAgent
+            Tokens.RequestId, Tokens.ArgsUserAgent, Tokens.ArgMaterializeProperties
         };
 
-        private readonly string _sessionId;
+        private readonly string? _sessionId;
         private string Processor => IsSessionBound ? Tokens.ProcessorSession : Tokens.ProcessorTraversal;
 
         /// <inheritdoc />
@@ -69,7 +69,7 @@
         /// <param name="loggerFactory">A factory to create loggers. If not provided, then nothing will be logged.</param>
         /// <exception cref="ArgumentNullException">Thrown when client is null.</exception>
         public DriverRemoteConnection(string host, int port, string traversalSource = "g",
-            ILoggerFactory loggerFactory = null) : this(
+            ILoggerFactory? loggerFactory = null) : this(
             new GremlinClient(new GremlinServer(host, port), loggerFactory: loggerFactory), traversalSource,
             logger: loggerFactory?.CreateLogger<DriverRemoteConnection>() ?? NullLogger<DriverRemoteConnection>.Instance)
         {
@@ -86,8 +86,8 @@
         {
         }
 
-        private DriverRemoteConnection(IGremlinClient client, string traversalSource, string sessionId = null,
-            ILogger<DriverRemoteConnection> logger = null)
+        private DriverRemoteConnection(IGremlinClient client, string traversalSource, string? sessionId = null,
+            ILogger<DriverRemoteConnection>? logger = null)
         {
             _client = client ?? throw new ArgumentNullException(nameof(client));
             _traversalSource = traversalSource ?? throw new ArgumentNullException(nameof(traversalSource));
@@ -110,12 +110,12 @@
         /// <param name="bytecode">The <see cref="Bytecode" /> to submit.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>A <see cref="ITraversal" /> allowing to access the results and side-effects.</returns>
-        public async Task<ITraversal<S, E>> SubmitAsync<S, E>(Bytecode bytecode,
+        public async Task<ITraversal<TStart, TEnd>> SubmitAsync<TStart, TEnd>(Bytecode bytecode,
             CancellationToken cancellationToken = default)
         {
             var requestId = Guid.NewGuid();
             var resultSet = await SubmitBytecodeAsync(requestId, bytecode, cancellationToken).ConfigureAwait(false);
-            return new DriverRemoteTraversal<S, E>(_client, requestId, resultSet);
+            return new DriverRemoteTraversal<TStart, TEnd>(resultSet);
         }
 
         private async Task<IEnumerable<Traverser>> SubmitBytecodeAsync(Guid requestid, Bytecode bytecode,
@@ -132,15 +132,15 @@
 
             if (IsSessionBound)
             {
-                requestMsg.AddArgument(Tokens.ArgsSession, _sessionId);
+                requestMsg.AddArgument(Tokens.ArgsSession, _sessionId!);
             }
 
             var optionsStrategyInst = bytecode.SourceInstructions.Find(
                 s => s.OperatorName == "withStrategies" && s.Arguments[0] is OptionsStrategy);
             if (optionsStrategyInst != null)
             {
-                OptionsStrategy optionsStrategy = optionsStrategyInst.Arguments[0];
-                foreach (KeyValuePair<string,dynamic> pair in optionsStrategy.Configuration)
+                OptionsStrategy optionsStrategy = optionsStrategyInst.Arguments[0]!;
+                foreach (var pair in optionsStrategy.Configuration)
                 {
                     if (_allowedKeys.Contains(pair.Key))
                     {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs
index cf50646..66501ff 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs
@@ -27,12 +27,13 @@
 
 namespace Gremlin.Net.Driver.Remote
 {
-    internal class DriverRemoteTraversal<S, E> : DefaultTraversal<S, E>
+    internal class DriverRemoteTraversal<TStart, TEnd> : DefaultTraversal<TStart, TEnd>
     {
-        public DriverRemoteTraversal(IGremlinClient gremlinClient, Guid requestId,
-            IEnumerable<Traverser> traversers)
+        public DriverRemoteTraversal(IEnumerable<Traverser> traversers)
         {
             Traversers = traversers;
         }
+
+        public override Bytecode Bytecode => throw new NotSupportedException("Remote traversals do not have Bytecode");
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ResponseHandlerForSingleRequestMessage.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ResponseHandlerForSingleRequestMessage.cs
index 93b3097..7993ccb 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ResponseHandlerForSingleRequestMessage.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/ResponseHandlerForSingleRequestMessage.cs
@@ -33,13 +33,13 @@
         public Task<ResultSet<T>> Result => _tcs.Task;
 
         private readonly TaskCompletionSource<ResultSet<T>> _tcs =
-            new TaskCompletionSource<ResultSet<T>>(TaskCreationOptions.RunContinuationsAsynchronously);
+            new(TaskCreationOptions.RunContinuationsAsynchronously);
         
-        private readonly List<T> _result = new List<T>();
+        private readonly List<T> _result = new();
 
         public void HandleReceived(ResponseMessage<List<object>> received)
         {
-            foreach (var d in received.Result.Data)
+            foreach (var d in received.Result.Data!)
             {
                 _result.Add((T) d);
             }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
index 8d3bda4..33ba783 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
@@ -33,92 +33,98 @@
         /// <summary>
         ///     Current TinkerPop version.
         /// </summary>
-        public static string GremlinVersion = "3.6.8-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+        public static string GremlinVersion = "3.7.3-SNAPSHOT"; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
         /// <summary>
         ///     The key for the unique identifier of the request.
         /// </summary>
-        public static string RequestId = "requestId";
+        public const string RequestId = "requestId";
 
         /// <summary>
         ///     Operation used by the client to authenticate itself.
         /// </summary>
-        public static string OpsAuthentication = "authentication";
+        public const string OpsAuthentication = "authentication";
 
         /// <summary>
         ///     Operation used for a request that contains the Bytecode representation of a Traversal.
         /// </summary>
-        public static string OpsBytecode = "bytecode";
+        public const string OpsBytecode = "bytecode";
 
         /// <summary>
         ///     Operation used to evaluate a Gremlin script provided as a string.
         /// </summary>
-        public static string OpsEval = "eval";
+        public const string OpsEval = "eval";
 
         /// <summary>
         ///     Operation used to get all the keys of all side-effects as produced by a previously executed Traversal.
         /// </summary>
-        public static string OpsClose = "close";
+        public const string OpsClose = "close";
 
         /// <summary>
         ///     Default OpProcessor.
         /// </summary>
-        public static string ProcessorTraversal = "traversal";
+        public const string ProcessorTraversal = "traversal";
 
         /// <summary>
         ///     Session OpProcessor.
         /// </summary>
-        public static string ProcessorSession = "session";
+        public const string ProcessorSession = "session";
 
         /// <summary>
         ///     Argument name that allows the definition of the number of items each ResponseMessage should
         ///     contain from a particular result - overrides the resultIterationBatchSize server setting.
         /// </summary>
-        public static string ArgsBatchSize = "batchSize";
+        public const string ArgsBatchSize = "batchSize";
 
         /// <summary>
         ///     Argument name that allows definition of a map of key/value pairs to apply as variables in the
         ///     context of the Gremlin request sent to the server.
         /// </summary>
-        public static string ArgsBindings = "bindings";
+        public const string ArgsBindings = "bindings";
 
         /// <summary>
         ///     Argument name that allows definition of alias names for Graph and TraversalSource objects on the
         ///     remote system.
         /// </summary>
-        public static string ArgsAliases = "aliases";
+        public const string ArgsAliases = "aliases";
 
         /// <summary>
         ///     Argument name that corresponds to the Gremlin to evaluate.
         /// </summary>
-        public static string ArgsGremlin = "gremlin";
+        public const string ArgsGremlin = "gremlin";
 
         /// <summary>
         ///     Argument name that allows to define the id of session.
         /// </summary>
-        public static string ArgsSession = "session";
+        public const string ArgsSession = "session";
 
         /// <summary>
         ///     Argument name that allows a value that is a custom string that the user can pass to a server that
         ///     might accept it for purpose of identifying the kind of client it came from.
         /// </summary>
-        public static string ArgsUserAgent = "userAgent";
+        public const string ArgsUserAgent = "userAgent";
 
         /// <summary>
         ///     Argument name that allows definition of the flavor of Gremlin used (e.g. gremlin-groovy) to process the request.
         /// </summary>
-        public static string ArgsLanguage = "language";
+        public const string ArgsLanguage = "language";
 
         /// <summary>
         ///     Argument name that allows the override of the server setting that determines the maximum time to wait for a
         ///     request to execute on the server.
         /// </summary>
-        public static string ArgsEvalTimeout = "evaluationTimeout";
+        public const string ArgsEvalTimeout = "evaluationTimeout";
+
+        /// <summary>
+        ///     Argument name that allows the override of handling properties.
+        ///     Allowed values: all, tokens
+        /// </summary>
+        public const string ArgMaterializeProperties = "materializeProperties";
 
         /// <summary>
         ///     Argument name for the response to the server authentication challenge. This value is dependent on the SASL
         ///     authentication mechanism required by the server.
         /// </summary>
-        public static string ArgsSasl = "sasl";
+        public const string ArgsSasl = "sasl";
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketConnection.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketConnection.cs
index 0a5bee9..68fe913 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketConnection.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketConnection.cs
@@ -124,7 +124,7 @@
                     throw new ConnectionClosedException(received.CloseStatus, received.CloseStatusDescription);
                 }
 
-                ms.Write(receiveBuffer.Array, receiveBuffer.Offset, received.Count);
+                ms.Write(receiveBuffer.Array!, receiveBuffer.Offset, received.Count);
             } while (!received.EndOfMessage);
 
             return ms.ToArray();
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketSettings.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketSettings.cs
index 7cb794e..62c8ca0 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketSettings.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/WebSocketSettings.cs
@@ -39,7 +39,7 @@
         ///     Gets or sets the delegate that will be invoked with the <see cref="ClientWebSocketOptions" />

         ///     object used to configure WebSocket connections.

         /// </summary>

-        public Action<ClientWebSocketOptions> WebSocketConfigurationCallback { get; set; }

+        public Action<ClientWebSocketOptions>? WebSocketConfigurationCallback { get; set; }

 

         public bool EnableUserAgentOnConnect { get; set; }

 

diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 1b62c90..71464b8 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -22,11 +22,12 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <LangVersion>9</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
     <!-- do not edit the version directly - maven updates it automatically -->
-    <Version>3.6.8-SNAPSHOT</Version>
+    <Version>3.7.3-SNAPSHOT</Version>
     <Title>Gremlin.Net</Title>
     <Authors>Apache TinkerPop</Authors>
     <Description>Gremlin.Net for Apache TinkerPop™ is a language variant and driver for .NET.
@@ -79,6 +80,10 @@
     
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Nullable" Version="1.3.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/IRemoteConnection.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/IRemoteConnection.cs
index cf236af..b721e40 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/IRemoteConnection.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/IRemoteConnection.cs
@@ -39,7 +39,7 @@
         /// <param name="bytecode">The <see cref="Bytecode" /> to send.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>The <see cref="ITraversal" /> with the results and optional side-effects.</returns>
-        Task<ITraversal<S, E>> SubmitAsync<S, E>(Bytecode bytecode, CancellationToken cancellationToken = default);
+        Task<ITraversal<TStart, TEnd>> SubmitAsync<TStart, TEnd>(Bytecode bytecode, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Creates a <see cref="RemoteTransaction" /> in the context of a <see cref="GraphTraversalSource" /> designed to work with
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs
index d84dba1..aa39f59 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs
@@ -45,16 +45,16 @@
         }
 
         /// <inheritdoc />
-        public void Apply<S, E>(ITraversal<S, E> traversal)
+        public void Apply<TStart, TEnd>(ITraversal<TStart, TEnd> traversal)
         {
             ApplyAsync(traversal, CancellationToken.None).WaitUnwrap();
         }
 
         /// <inheritdoc />
-        public async Task ApplyAsync<S, E>(ITraversal<S, E> traversal, CancellationToken cancellationToken = default)
+        public async Task ApplyAsync<TStart, TEnd>(ITraversal<TStart, TEnd> traversal, CancellationToken cancellationToken = default)
         {
             if (traversal.Traversers != null) return;
-            var remoteTraversal = await _remoteConnection.SubmitAsync<S, E>(traversal.Bytecode, cancellationToken)
+            var remoteTraversal = await _remoteConnection.SubmitAsync<TStart, TEnd>(traversal.Bytecode, cancellationToken)
                 .ConfigureAwait(false);
             traversal.Traversers = remoteTraversal.Traversers;
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Binding.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Binding.cs
index 80c8269..ce76181 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Binding.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Binding.cs
@@ -35,7 +35,7 @@
         /// </summary>
         /// <param name="key">The key that identifies the <see cref="Binding" />.</param>
         /// <param name="value">The value of the <see cref="Binding" />.</param>
-        public Binding(string key, object value)
+        public Binding(string key, object? value)
         {
             Key = key;
             Value = value;
@@ -49,18 +49,18 @@
         /// <summary>
         ///     Gets the value of the <see cref="Binding" />.
         /// </summary>
-        public object Value { get; }
+        public object? Value { get; }
 
         /// <inheritdoc />
-        public bool Equals(Binding other)
+        public bool Equals(Binding? other)
         {
             if (other == null)
                 return false;
-            return Key == other.Key && Value.Equals(other.Value);
+            return Key == other.Key && (Value?.Equals(other.Value) ?? other.Value == null);
         }
 
         /// <inheritdoc />
-        public override bool Equals(object other)
+        public override bool Equals(object? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bindings.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bindings.cs
index a6e13b9..746b499 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bindings.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bindings.cs
@@ -34,10 +34,9 @@
         /// <summary>
         ///     Gets an instance of the <see cref="Bindings" /> class.
         /// </summary>
-        public static Bindings Instance { get; } = new Bindings();
+        public static Bindings Instance { get; } = new();
 
-        private static readonly ThreadLocal<Dictionary<object, string>> BoundVariableByValue =
-            new ThreadLocal<Dictionary<object, string>>();
+        private static readonly ThreadLocal<Dictionary<object, string>> BoundVariableByValue = new();
 
         /// <summary>
         ///     Binds the variable to the specified value.
@@ -45,7 +44,7 @@
         /// <param name="variable">The variable to bind.</param>
         /// <param name="value">The value to which the variable should be bound.</param>
         /// <returns>The bound value.</returns>
-        public TV Of<TV>(string variable, TV value)
+        public TV Of<TV>(string variable, TV value) where TV : notnull
         {
             var dict = BoundVariableByValue.Value;
             if (dict == null)
@@ -57,7 +56,7 @@
             return value;
         }
 
-        internal static string GetBoundVariable<TV>(TV value)
+        internal static string? GetBoundVariable<TV>(TV value) where TV : notnull
         {
             var dict = BoundVariableByValue.Value;
             if (dict == null)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs
index e692ed2..604ba67 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Bytecode.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace Gremlin.Net.Process.Traversal
@@ -60,19 +61,19 @@
         /// <summary>
         ///     Gets the traversal source instructions.
         /// </summary>
-        public List<Instruction> SourceInstructions { get; } = new List<Instruction>();
+        public List<Instruction> SourceInstructions { get; } = new();
 
         /// <summary>
         ///     Gets the <see cref="ITraversal" /> instructions.
         /// </summary>
-        public List<Instruction> StepInstructions { get; } = new List<Instruction>();
+        public List<Instruction> StepInstructions { get; } = new();
 
         /// <summary>
         ///     Add a traversal source instruction to the bytecode.
         /// </summary>
         /// <param name="sourceName">The traversal source method name (e.g. withSack()).</param>
         /// <param name="args">The traversal source method arguments.</param>
-        public void AddSource(string sourceName, params object[] args)
+        public void AddSource(string sourceName, params object?[] args)
         {
             SourceInstructions.Add(new Instruction(sourceName, FlattenArguments(args)));
             Bindings.Clear();
@@ -83,17 +84,17 @@
         /// </summary>
         /// <param name="stepName">The traversal method name (e.g. out()).</param>
         /// <param name="args">The traversal method arguments.</param>
-        public void AddStep(string stepName, params object[] args)
+        public void AddStep(string stepName, params object?[] args)
         {
             StepInstructions.Add(new Instruction(stepName, FlattenArguments(args)));
             Bindings.Clear();
         }
 
-        private object[] FlattenArguments(object[] arguments)
+        private object?[] FlattenArguments(object?[] arguments)
         {
             if (arguments.Length == 0)
                 return EmptyArray;
-            var flatArguments = new List<object>();
+            var flatArguments = new List<object?>();
             foreach (var arg in arguments)
             {
                 if (arg is object[] objects)
@@ -108,7 +109,8 @@
             return flatArguments.ToArray();
         }
 
-        private object ConvertArgument(object argument, bool searchBindings)
+        [return: NotNullIfNotNull("argument")]
+        private object? ConvertArgument(object? argument, bool searchBindings)
         {
             if (null == argument)
             {
@@ -129,7 +131,7 @@
             
             if (IsDictionaryType(argument.GetType()))
             {
-                var dict = new Dictionary<object, object>();
+                var dict = new Dictionary<object, object?>();
                 foreach (DictionaryEntry item in (IDictionary)argument)
                 {
                     dict[ConvertArgument(item.Key, true)] = ConvertArgument(item.Value, true);
@@ -138,13 +140,13 @@
             }
             if (IsListType(argument.GetType()))
             {
-                var list = new List<object>(((IList) argument).Count);
-                list.AddRange(from object item in (IList) argument select ConvertArgument(item, true));
+                var list = new List<object?>(((IList) argument).Count);
+                list.AddRange(from object? item in (IList)argument select ConvertArgument(item, true));
                 return list;
             }
             if (IsHashSetType(argument.GetType()))
             {
-                var set = new HashSet<object>();
+                var set = new HashSet<object?>();
                 foreach (var item in (IEnumerable)argument)
                 {
                     set.Add(ConvertArgument(item, true));
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/CardinalityValue.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/CardinalityValue.cs
new file mode 100644
index 0000000..b184eee
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/CardinalityValue.cs
@@ -0,0 +1,92 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace Gremlin.Net.Process.Traversal
+{
+    /// <summary>
+    ///     Holds a property value with the associated <see cref="Traversal.Cardinality" />.
+    /// </summary>
+    public class CardinalityValue : Bytecode
+    {
+        /// <summary>
+        ///     Gets the <see cref="Traversal.Cardinality" /> for the value.
+        /// </summary>
+        public Cardinality? Cardinality
+        {
+            get
+            {
+                return this.SourceInstructions[0].Arguments[0];
+            }
+        }
+
+        /// <summary>
+        ///     Gets the value.
+        /// </summary>
+        public object? Value
+        {
+            get
+            {
+                return this.SourceInstructions[0].Arguments[1];
+            }
+        }
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="CardinalityValue" /> class.
+        /// </summary>
+        public CardinalityValue(Cardinality card, object val)
+        {
+            if (card == null)
+                throw new ArgumentNullException("Cardinality argument must not be null");
+            this.AddSource("CardinalityValueTraversal", card, val);
+        }
+
+        /// <summary>
+        ///     Creates a new <see cref="CardinalityValue" /> with a particular value and Single <see cref="Cardinality" />.
+        /// </summary>
+        public static CardinalityValue Single(object value)
+        {
+            return new CardinalityValue(Cardinality.Single, value);
+        }
+
+        /// <summary>
+        ///     Creates a new <see cref="CardinalityValue" /> with a particular value and Set <see cref="Cardinality" />.
+        /// </summary>
+        public static CardinalityValue Set(object value)
+        {
+            return new CardinalityValue(Cardinality.Set, value);
+        }
+
+        /// <summary>
+        ///     Creates a new <see cref="CardinalityValue" /> with a particular value and List <see cref="Cardinality" />.
+        /// </summary>
+        public static CardinalityValue List(object value)
+        {
+            return new CardinalityValue(Cardinality.List, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DT.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DT.cs
new file mode 100644
index 0000000..c00cd4a
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DT.cs
@@ -0,0 +1,67 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+
+namespace Gremlin.Net.Process.Traversal
+{
+#pragma warning disable 1591
+
+    public class DT : EnumWrapper, IFunction
+    {
+        private DT(string enumValue)
+            : base("DT", enumValue)
+        {
+        }
+
+        public static DT Second => new DT("second");
+        public static DT Minute => new DT("minute");
+        public static DT Hour => new DT("hour");
+        public static DT Day => new DT("day");
+
+
+        private static readonly Dictionary<string, DT> Properties = new()
+        {
+            { "second", Second },
+            { "minute", Minute },
+            { "hour", Hour },
+            { "day", Day },
+        };
+
+        /// <summary>
+        /// Gets the Merge enumeration by value.
+        /// </summary>
+        public static DT GetByValue(string value)
+        {
+            if (!Properties.TryGetValue(value, out var property))
+            {
+                throw new ArgumentException($"No matching DT for value '{value}'");
+            }
+            return property;
+        }
+    }
+
+
+#pragma warning restore 1591
+}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
index aadaa16..9d79093 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -33,14 +34,14 @@
     /// <summary>
     ///     A traversal represents a directed walk over a graph.
     /// </summary>
-    public abstract class DefaultTraversal<S, E> : ITraversal<S, E>
+    public abstract class DefaultTraversal<TStart, TEnd> : ITraversal<TStart, TEnd>
     {
-        private IEnumerator<Traverser> _traverserEnumerator;
+        private IEnumerator<Traverser>? _traverserEnumerator;
 
         /// <summary>
         ///     Gets the <see cref="Traversal.Bytecode" /> representation of this traversal.
         /// </summary>
-        public Bytecode Bytecode { get; protected set; }
+        public abstract Bytecode Bytecode { get; }
         
         /// <summary>
         ///     Determines if this traversal was spawned anonymously or not.
@@ -50,7 +51,7 @@
         /// <summary>
         ///     Gets or sets the <see cref="Traverser" />'s of this traversal that hold the results of the traversal.
         /// </summary>
-        public IEnumerable<Traverser> Traversers { get; set; }
+        public IEnumerable<Traverser>? Traversers { get; set; }
 
         ITraversal ITraversal.Iterate()
         {
@@ -63,7 +64,7 @@
         protected ICollection<ITraversalStrategy> TraversalStrategies { get; set; } = new List<ITraversalStrategy>();
 
         private IEnumerator<Traverser> TraverserEnumerator
-            => _traverserEnumerator ?? (_traverserEnumerator = GetTraverserEnumerator());
+            => _traverserEnumerator ??= GetTraverserEnumerator();
 
         private bool _nextAvailable;
         private bool _fetchedNext;
@@ -110,23 +111,23 @@
         }
 
         /// <inheritdoc />
-        public E Current => GetCurrent<E>();
+        public TEnd? Current => GetCurrent<TEnd>();
 
-        object IEnumerator.Current => GetCurrent();
+        object? IEnumerator.Current => GetCurrent();
 
-        private TReturn GetCurrent<TReturn>()
+        private TReturn? GetCurrent<TReturn>()
         {
             var value = GetCurrent();
             var returnType = typeof(TReturn);
             if (value == null || value.GetType() == returnType)
             {
                 // Avoid evaluating type comparisons
-                return (TReturn) value;
+                return (TReturn?) value;
             }
             return (TReturn) GetValue(returnType, value);
         }
 
-        private object GetCurrent()
+        private object? GetCurrent()
         {
             // Use dynamic to object to prevent runtime dynamic conversion evaluation
             return TraverserEnumerator.Current?.Object;
@@ -135,7 +136,8 @@
         /// <summary>
         /// Gets the value, converting to the expected type when necessary and supported. 
         /// </summary>
-        private static object GetValue(Type type, object value)
+        [return: NotNullIfNotNull("value")]
+        private static object? GetValue(Type type, object? value)
         {
             var genericType = type.GetTypeInfo().IsGenericType
                 ? type.GetTypeInfo().GetGenericTypeDefinition()
@@ -145,7 +147,8 @@
                 var keyType = type.GenericTypeArguments[0];
                 var valueType = type.GenericTypeArguments[1];
                 var mapType = typeof(Dictionary<,>).MakeGenericType(keyType, valueType);
-                var result = (IDictionary) Activator.CreateInstance(mapType);
+                var result = (IDictionary?)Activator.CreateInstance(mapType) ??
+                             throw new InvalidOperationException($"Cannot convert value {value} to a Dictionary.");
                 foreach (DictionaryEntry kv in dictValue)
                 {
                     result.Add(GetValue(keyType, kv.Key), GetValue(valueType, kv.Value));
@@ -156,7 +159,8 @@
             {
                 var childType = type.GenericTypeArguments[0];
                 var listType = typeof(List<>).MakeGenericType(childType);
-                var result = (IList) Activator.CreateInstance(listType);
+                var result = (IList?)Activator.CreateInstance(listType) ??
+                             throw new InvalidOperationException($"Cannot convert value {value} to a list.");
                 foreach (var itemValue in enumerableValue)
                 {
                     result.Add(itemValue);
@@ -170,6 +174,11 @@
         {
             if (Traversers == null)
                 ApplyStrategies();
+            if (Traversers == null)
+            {
+                throw new InvalidOperationException(
+                    $"Cannot enumerate the traversal as there are no {nameof(Traversers)}. Maybe a strategy needs to be added.");
+            }
             return Traversers.GetEnumerator();
         }
 
@@ -197,7 +206,7 @@
         ///     Gets the next result from the traversal.
         /// </summary>
         /// <returns>The result.</returns>
-        public E Next()
+        public TEnd? Next()
         {
             MoveNext();
             return Current;
@@ -208,7 +217,7 @@
         /// </summary>
         /// <param name="amount">The number of results to get.</param>
         /// <returns>The n-results.</returns>
-        public IEnumerable<E> Next(int amount)
+        public IEnumerable<TEnd?> Next(int amount)
         {
             for (var i = 0; i < amount; i++)
                 yield return Next();
@@ -218,7 +227,7 @@
         ///     Iterates all <see cref="Traverser" /> instances in the traversal.
         /// </summary>
         /// <returns>The fully drained traversal.</returns>
-        public ITraversal<S, E> Iterate()
+        public ITraversal<TStart, TEnd> Iterate()
         {
             Bytecode.AddStep("none");
             while (MoveNext())
@@ -241,9 +250,9 @@
         ///     Puts all the results into a <see cref="List{T}" />.
         /// </summary>
         /// <returns>The results in a list.</returns>
-        public IList<E> ToList()
+        public IList<TEnd?> ToList()
         {
-            var objs = new List<E>();
+            var objs = new List<TEnd?>();
             while (MoveNext())
                 objs.Add(Current);
             return objs;
@@ -253,9 +262,9 @@
         ///     Puts all the results into a <see cref="HashSet{T}" />.
         /// </summary>
         /// <returns>The results in a set.</returns>
-        public ISet<E> ToSet()
+        public ISet<TEnd?> ToSet()
         {
-            var objs = new HashSet<E>();
+            var objs = new HashSet<TEnd?>();
             while (MoveNext())
                 objs.Add(Current);
             return objs;
@@ -268,7 +277,7 @@
         /// <param name="callback">The function to execute on the current traversal.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>The result of the executed <paramref name="callback" />.</returns>
-        public async Task<TReturn> Promise<TReturn>(Func<ITraversal<S, E>, TReturn> callback,
+        public async Task<TReturn> Promise<TReturn>(Func<ITraversal<TStart, TEnd>, TReturn> callback,
             CancellationToken cancellationToken = default)
         {
             await ApplyStrategiesAsync(cancellationToken).ConfigureAwait(false);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
index ac0185c..3df6a6d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
@@ -47,12 +47,12 @@
         /// <param name="enumValue">The value of the enum.</param>
         protected EnumWrapper(string enumName, string enumValue)
         {
-            EnumName = enumName;
-            EnumValue = enumValue;
+            EnumName = enumName ?? throw new ArgumentNullException(nameof(enumName));
+            EnumValue = enumValue ?? throw new ArgumentNullException(nameof(enumValue));
         }
 
         /// <inheritdoc />
-        public bool Equals(EnumWrapper other)
+        public bool Equals(EnumWrapper? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -60,7 +60,7 @@
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
@@ -73,8 +73,7 @@
         {
             unchecked
             {
-                return ((EnumName != null ? EnumName.GetHashCode() : 0) * 397) ^
-                       (EnumValue != null ? EnumValue.GetHashCode() : 0);
+                return (EnumName.GetHashCode() * 397) ^ EnumValue.GetHashCode();
             }
         }
 
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index 37fb0ab..ea63567 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -25,6 +25,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Gremlin.Net.Driver;
 using Gremlin.Net.Structure;
 
 namespace Gremlin.Net.Process.Traversal
@@ -32,7 +33,7 @@
     /// <summary>
     ///     Graph traversals are the primary way in which graphs are processed.
     /// </summary>
-    public class GraphTraversal<S, E> : DefaultTraversal<S, E>
+    public class GraphTraversal<TStart, TEnd> : DefaultTraversal<TStart, TEnd>
     {
         /// <summary>
         ///     Initializes a new instance of the <see cref="GraphTraversal{SType, EType}" /> class.
@@ -65,115 +66,154 @@
             IsAnonymous = anonymous;
         }
 
-        private static GraphTraversal<S2, E2> Wrap<S2, E2>(GraphTraversal<S, E> traversal)
+        /// <inheritdoc />
+        public override Bytecode Bytecode { get; }
+
+        private static GraphTraversal<TNewStart, TNewEnd> Wrap<TNewStart, TNewEnd>(GraphTraversal<TStart, TEnd> traversal)
         {
-            if (typeof(S2) == typeof(S) && typeof(E2) == typeof(E))
+            if (typeof(TNewStart) == typeof(TStart) && typeof(TNewEnd) == typeof(TEnd))
             {
-                return traversal as GraphTraversal<S2, E2>;
+                return (traversal as GraphTraversal<TNewStart, TNewEnd>)!;
             }
             // New wrapper
-            return new GraphTraversal<S2, E2>(traversal.TraversalStrategies, traversal.Bytecode, traversal.IsAnonymous);
+            return new GraphTraversal<TNewStart, TNewEnd>(traversal.TraversalStrategies, traversal.Bytecode, traversal.IsAnonymous);
         }
 
 
         /// <summary>
         ///     Adds the V step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> V (params object[] vertexIdsOrElements)
+        public GraphTraversal<TStart, Vertex> V (params object?[]? vertexIdsOrElements)
         {
             if (vertexIdsOrElements == null)
             {
-                Bytecode.AddStep("V", new object[] { null });
+                Bytecode.AddStep("V", new object?[] { null });
             }
             else
             {
-                var args = new List<object>(vertexIdsOrElements.Length);
+                var args = new List<object?>(vertexIdsOrElements.Length);
                 args.AddRange(vertexIdsOrElements);
                 Bytecode.AddStep("V", args.ToArray());
             }
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
+        }
+
+        /// <summary>
+        ///     Adds the E step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, Edge> E (params object?[]? edgeIdsOrElements)
+        {
+            if (edgeIdsOrElements == null)
+            {
+                Bytecode.AddStep("E", new object?[] { null });
+            }
+            else
+            {
+                var args = new List<object?>(edgeIdsOrElements.Length);
+                args.AddRange(edgeIdsOrElements);
+                Bytecode.AddStep("E", args.ToArray());
+            }
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the addE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> AddE (string edgeLabel)
+        public GraphTraversal<TStart, Edge> AddE (string edgeLabel)
         {
             Bytecode.AddStep("addE", edgeLabel);
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the addE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> AddE (ITraversal edgeLabelTraversal)
+        public GraphTraversal<TStart, Edge> AddE (ITraversal edgeLabelTraversal)
         {
             Bytecode.AddStep("addE", edgeLabelTraversal);
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the addV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> AddV ()
+        public GraphTraversal<TStart, Vertex> AddV ()
         {
             Bytecode.AddStep("addV");
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the addV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> AddV (string vertexLabel)
+        public GraphTraversal<TStart, Vertex> AddV (string vertexLabel)
         {
             Bytecode.AddStep("addV", vertexLabel);
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the addV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> AddV (ITraversal vertexLabelTraversal)
+        public GraphTraversal<TStart, Vertex> AddV (ITraversal vertexLabelTraversal)
         {
             Bytecode.AddStep("addV", vertexLabelTraversal);
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the aggregate step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Aggregate (Scope scope, string sideEffectKey)
+        public GraphTraversal<TStart, TEnd> Aggregate (Scope scope, string sideEffectKey)
         {
             Bytecode.AddStep("aggregate", scope, sideEffectKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the aggregate step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Aggregate (string sideEffectKey)
+        public GraphTraversal<TStart, TEnd> Aggregate (string sideEffectKey)
         {
             Bytecode.AddStep("aggregate", sideEffectKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the all step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> All (P? predicate)
+        {
+            Bytecode.AddStep("all", predicate);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the and step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> And (params ITraversal[] andTraversals)
+        public GraphTraversal<TStart, TEnd> And (params ITraversal[] andTraversals)
         {
             if (andTraversals == null) throw new ArgumentNullException(nameof(andTraversals));
             
             var args = new List<object>(andTraversals.Length);
             args.AddRange(andTraversals);
             Bytecode.AddStep("and", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the any step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Any (P? predicate)
+        {
+            Bytecode.AddStep("any", predicate);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the as step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> As (string stepLabel, params string[] stepLabels)
+        public GraphTraversal<TStart, TEnd> As (string stepLabel, params string[] stepLabels)
         {
             if (stepLabel == null) throw new ArgumentNullException(nameof(stepLabel));
             if (stepLabels == null) throw new ArgumentNullException(nameof(stepLabels));
@@ -181,219 +221,247 @@
             var args = new List<object>(1 + stepLabels.Length) {stepLabel};
             args.AddRange(stepLabels);
             Bytecode.AddStep("as", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the asString step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> AsString ()
+        {
+            Bytecode.AddStep("asString");
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the asString step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> AsString<TNewEnd> (Scope scope)
+        {
+            Bytecode.AddStep("asString", scope);
+            return Wrap<TStart, TNewEnd?>(this);
+        }
+
+        /// <summary>
+        ///     Adds the asDate step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, DateTimeOffset> AsDate()
+        {
+            Bytecode.AddStep("asDate");
+            return Wrap<TStart, DateTimeOffset>(this);
         }
 
         /// <summary>
         ///     Adds the barrier step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Barrier ()
+        public GraphTraversal<TStart, TEnd> Barrier ()
         {
             Bytecode.AddStep("barrier");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the barrier step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Barrier (IConsumer barrierConsumer)
+        public GraphTraversal<TStart, TEnd> Barrier (IConsumer barrierConsumer)
         {
             Bytecode.AddStep("barrier", barrierConsumer);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the barrier step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Barrier (int maxBarrierSize)
+        public GraphTraversal<TStart, TEnd> Barrier (int maxBarrierSize)
         {
             Bytecode.AddStep("barrier", maxBarrierSize);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the both step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> Both (params string[] edgeLabels)
+        public GraphTraversal<TStart, Vertex> Both (params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
             
-            var args = new List<object>(edgeLabels.Length);
+            var args = new List<object?>(edgeLabels.Length);
             args.AddRange(edgeLabels);
             Bytecode.AddStep("both", args.ToArray());
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the bothE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> BothE (params string[] edgeLabels)
+        public GraphTraversal<TStart, Edge> BothE (params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
             
-            var args = new List<object>(edgeLabels.Length);
+            var args = new List<object?>(edgeLabels.Length);
             args.AddRange(edgeLabels);
             Bytecode.AddStep("bothE", args.ToArray());
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the bothV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> BothV ()
+        public GraphTraversal<TStart, Vertex> BothV ()
         {
             Bytecode.AddStep("bothV");
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the branch step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Branch<E2> (IFunction function)
+        public GraphTraversal<TStart, TNewEnd> Branch<TNewEnd> (IFunction? function)
         {
             Bytecode.AddStep("branch", function);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the branch step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Branch<E2> (ITraversal branchTraversal)
+        public GraphTraversal<TStart, TNewEnd> Branch<TNewEnd> (ITraversal branchTraversal)
         {
             Bytecode.AddStep("branch", branchTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By ()
+        public GraphTraversal<TStart, TEnd> By ()
         {
             Bytecode.AddStep("by");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (IComparator comparator)
+        public GraphTraversal<TStart, TEnd> By (IComparator comparator)
         {
             Bytecode.AddStep("by", comparator);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (IFunction function)
+        public GraphTraversal<TStart, TEnd> By (IFunction function)
         {
             Bytecode.AddStep("by", function);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (IFunction function, IComparator comparator)
+        public GraphTraversal<TStart, TEnd> By (IFunction function, IComparator comparator)
         {
             Bytecode.AddStep("by", function, comparator);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (Order order)
+        public GraphTraversal<TStart, TEnd> By (Order order)
         {
             Bytecode.AddStep("by", order);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (string key)
+        public GraphTraversal<TStart, TEnd> By (string? key)
         {
             Bytecode.AddStep("by", key);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (string key, IComparator comparator)
+        public GraphTraversal<TStart, TEnd> By (string? key, IComparator comparator)
         {
             Bytecode.AddStep("by", key, comparator);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (T token)
+        public GraphTraversal<TStart, TEnd> By (T token)
         {
             Bytecode.AddStep("by", token);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (ITraversal traversal)
+        public GraphTraversal<TStart, TEnd> By (ITraversal traversal)
         {
             Bytecode.AddStep("by", traversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the by step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> By (ITraversal traversal, IComparator comparator)
+        public GraphTraversal<TStart, TEnd> By (ITraversal traversal, IComparator comparator)
         {
             Bytecode.AddStep("by", traversal, comparator);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Call<E2> (string service)
+        public GraphTraversal<TStart, TNewEnd> Call<TNewEnd> (string? service)
         {
             Bytecode.AddStep("call", service);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Call<E2> (string service, ITraversal t)
+        public GraphTraversal<TStart, TNewEnd> Call<TNewEnd> (string? service, ITraversal? t)
         {
             Bytecode.AddStep("call", service, t);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Call<E2> (string service, IDictionary<object,object> m)
+        public GraphTraversal<TStart, TNewEnd> Call<TNewEnd> (string? service, IDictionary<object,object>? m)
         {
             Bytecode.AddStep("call", service, m);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Call<E2> (string service, IDictionary<object,object> m, ITraversal t)
+        public GraphTraversal<TStart, TNewEnd> Call<TNewEnd>(string? service, IDictionary<object, object>? m,
+            ITraversal? t)
         {
             Bytecode.AddStep("call", service, m, t);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the cap step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Cap<E2> (string sideEffectKey, params string[] sideEffectKeys)
+        public GraphTraversal<TStart, TNewEnd> Cap<TNewEnd> (string sideEffectKey, params string[] sideEffectKeys)
         {
             if (sideEffectKey == null) throw new ArgumentNullException(nameof(sideEffectKey));
             if (sideEffectKeys == null) throw new ArgumentNullException(nameof(sideEffectKeys));
@@ -401,1119 +469,1296 @@
             var args = new List<object>(1 + sideEffectKeys.Length) { sideEffectKey };
             args.AddRange(sideEffectKeys);
             Bytecode.AddStep("cap", args.ToArray());
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the choose step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Choose<E2> (IFunction choiceFunction)
+        public GraphTraversal<TStart, TNewEnd> Choose<TNewEnd> (IFunction choiceFunction)
         {
             Bytecode.AddStep("choose", choiceFunction);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the choose step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Choose<E2> (IPredicate choosePredicate, ITraversal trueChoice)
+        public GraphTraversal<TStart, TNewEnd> Choose<TNewEnd> (IPredicate choosePredicate, ITraversal trueChoice)
         {
             Bytecode.AddStep("choose", choosePredicate, trueChoice);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the choose step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Choose<E2> (IPredicate choosePredicate, ITraversal trueChoice, ITraversal falseChoice)
+        public GraphTraversal<TStart, TNewEnd> Choose<TNewEnd> (IPredicate choosePredicate, ITraversal trueChoice, ITraversal falseChoice)
         {
             Bytecode.AddStep("choose", choosePredicate, trueChoice, falseChoice);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the choose step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Choose<E2> (ITraversal choiceTraversal)
+        public GraphTraversal<TStart, TNewEnd> Choose<TNewEnd> (ITraversal choiceTraversal)
         {
             Bytecode.AddStep("choose", choiceTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the choose step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Choose<E2> (ITraversal traversalPredicate, ITraversal trueChoice)
+        public GraphTraversal<TStart, TNewEnd> Choose<TNewEnd> (ITraversal traversalPredicate, ITraversal trueChoice)
         {
             Bytecode.AddStep("choose", traversalPredicate, trueChoice);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the choose step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Choose<E2> (ITraversal traversalPredicate, ITraversal trueChoice, ITraversal falseChoice)
+        public GraphTraversal<TStart, TNewEnd> Choose<TNewEnd> (ITraversal traversalPredicate, ITraversal trueChoice, ITraversal falseChoice)
         {
             Bytecode.AddStep("choose", traversalPredicate, trueChoice, falseChoice);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the coalesce step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Coalesce<E2> (params ITraversal[] coalesceTraversals)
+        public GraphTraversal<TStart, TNewEnd> Coalesce<TNewEnd> (params ITraversal[] coalesceTraversals)
         {
             if (coalesceTraversals == null) throw new ArgumentNullException(nameof(coalesceTraversals));
 
             var args = new List<object>(coalesceTraversals.Length);
             args.AddRange(coalesceTraversals);
             Bytecode.AddStep("coalesce", args.ToArray());
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the coin step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Coin (double probability)
+        public GraphTraversal<TStart, TEnd> Coin (double probability)
         {
             Bytecode.AddStep("coin", probability);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the combine step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Combine (object combineObject)
+        {
+            Bytecode.AddStep("combine", combineObject);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the concat step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string> Concat (ITraversal concatTraversal, params ITraversal[]? otherConcatTraversals)
+        {
+            List<object?> args;
+            if (otherConcatTraversals == null)
+            {
+                args = new List<object?> { concatTraversal };
+            }
+            else
+            {
+                args = new List<object?>(1 + otherConcatTraversals.Length) { concatTraversal };
+                args.AddRange(otherConcatTraversals);
+            }
+            Bytecode.AddStep("concat", args.ToArray());
+            return Wrap<TStart, string>(this);
+        }
+
+        /// <summary>
+        ///     Adds the concat step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string> Concat (params string?[] concatStrings)
+        {
+            // need null check?
+
+            var args = new List<object?>(concatStrings.Length);
+            args.AddRange(concatStrings);
+            Bytecode.AddStep("concat", args.ToArray());
+            return Wrap<TStart, string>(this);
+        }
+
+        /// <summary>
+        ///     Adds the conjoin step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd?> Conjoin (string delimiter)
+        {
+            Bytecode.AddStep("conjoin", delimiter);
+            return Wrap<TStart, TEnd?>(this);
         }
 
         /// <summary>
         ///     Adds the connectedComponent step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> ConnectedComponent ()
+        public GraphTraversal<TStart, TEnd> ConnectedComponent ()
         {
             Bytecode.AddStep("connectedComponent");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the constant step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Constant<E2> (E2 e)
+        public GraphTraversal<TStart, TNewEnd> Constant<TNewEnd> (TNewEnd e)
         {
             Bytecode.AddStep("constant", e);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the count step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, long> Count ()
+        public GraphTraversal<TStart, long> Count ()
         {
             Bytecode.AddStep("count");
-            return Wrap<S, long>(this);
+            return Wrap<TStart, long>(this);
         }
 
         /// <summary>
         ///     Adds the count step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, long> Count (Scope scope)
+        public GraphTraversal<TStart, long> Count (Scope scope)
         {
             Bytecode.AddStep("count", scope);
-            return Wrap<S, long>(this);
+            return Wrap<TStart, long>(this);
         }
 
         /// <summary>
         ///     Adds the cyclicPath step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> CyclicPath ()
+        public GraphTraversal<TStart, TEnd> CyclicPath ()
         {
             Bytecode.AddStep("cyclicPath");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the dateAdd step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, DateTimeOffset> DateAdd(DT dateToken, int value)
+        {
+            Bytecode.AddStep("dateAdd", dateToken, value);
+            return Wrap<TStart, DateTimeOffset>(this);
+        }
+
+        /// <summary>
+        ///     Adds the dateDiff step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, long> DateDiff(DateTimeOffset value)
+        {
+            Bytecode.AddStep("dateDiff", value);
+            return Wrap<TStart, long>(this);
+        }
+
+        /// <summary>
+        ///     Adds the dateDiff step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, long> DateDiff(ITraversal dateTraversal)
+        {
+            Bytecode.AddStep("dateDiff", dateTraversal);
+            return Wrap<TStart, long>(this);
         }
 
         /// <summary>
         ///     Adds the dedup step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Dedup (Scope scope, params string[] dedupLabels)
+        public GraphTraversal<TStart, TEnd> Dedup (Scope scope, params string?[] dedupLabels)
         {
             if (dedupLabels == null) throw new ArgumentNullException(nameof(dedupLabels));
 
-            var args = new List<object>(1 + dedupLabels.Length) { scope };
+            var args = new List<object?>(1 + dedupLabels.Length) { scope };
             args.AddRange(dedupLabels);
             Bytecode.AddStep("dedup", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the dedup step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Dedup (params string[] dedupLabels)
+        public GraphTraversal<TStart, TEnd> Dedup (params string?[] dedupLabels)
         {
             if (dedupLabels == null) throw new ArgumentNullException(nameof(dedupLabels));
 
-            var args = new List<object>(dedupLabels.Length);
+            var args = new List<object?>(dedupLabels.Length);
             args.AddRange(dedupLabels);
             Bytecode.AddStep("dedup", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the difference step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Difference (object differenceObject)
+        {
+            Bytecode.AddStep("difference", differenceObject);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the disjunct step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Disjunct (object disjunctObject)
+        {
+            Bytecode.AddStep("disjunct", disjunctObject);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the drop step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Drop ()
+        public GraphTraversal<TStart, TEnd> Drop ()
         {
             Bytecode.AddStep("drop");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the element step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Element> Element ()
+        public GraphTraversal<TStart, Element> Element ()
         {
             Bytecode.AddStep("element");
-            return Wrap<S, Element>(this);
+            return Wrap<TStart, Element>(this);
         }
 
         /// <summary>
         ///     Adds the elementMap step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<object, E2>> ElementMap<E2> (params string[] propertyKeys)
+        public GraphTraversal<TStart, IDictionary<object, TNewEnd>> ElementMap<TNewEnd> (params string?[] propertyKeys)
         {
             if (propertyKeys == null) throw new ArgumentNullException(nameof(propertyKeys));
             
-            var args = new List<object>(0 + propertyKeys.Length);
+            var args = new List<object?>(0 + propertyKeys.Length);
             args.AddRange(propertyKeys);
             Bytecode.AddStep("elementMap", args.ToArray());
-            return Wrap<S, IDictionary<object, E2>>(this);
+            return Wrap<TStart, IDictionary<object, TNewEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the emit step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Emit ()
+        public GraphTraversal<TStart, TEnd> Emit ()
         {
             Bytecode.AddStep("emit");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the emit step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Emit (IPredicate emitPredicate)
+        public GraphTraversal<TStart, TEnd> Emit (IPredicate emitPredicate)
         {
             Bytecode.AddStep("emit", emitPredicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the emit step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Emit (ITraversal emitTraversal)
+        public GraphTraversal<TStart, TEnd> Emit (ITraversal emitTraversal)
         {
             Bytecode.AddStep("emit", emitTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the fail step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Fail ()
+        public GraphTraversal<TStart, TEnd> Fail ()
         {
             Bytecode.AddStep("fail");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the fail step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Fail (string msg)
+        public GraphTraversal<TStart, TEnd> Fail (string? msg)
         {
             Bytecode.AddStep("fail", msg);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the fail step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Fail (string msg, IDictionary<string,object> m)
+        public GraphTraversal<TStart, TEnd> Fail (string? msg, IDictionary<string,object> m)
         {
             Bytecode.AddStep("fail", msg, m);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the filter step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Filter (IPredicate predicate)
+        public GraphTraversal<TStart, TEnd> Filter (IPredicate? predicate)
         {
             Bytecode.AddStep("filter", predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the filter step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Filter (ITraversal filterTraversal)
+        public GraphTraversal<TStart, TEnd> Filter (ITraversal filterTraversal)
         {
             Bytecode.AddStep("filter", filterTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the flatMap step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> FlatMap<E2> (IFunction function)
+        public GraphTraversal<TStart, TNewEnd> FlatMap<TNewEnd> (IFunction? function)
         {
             Bytecode.AddStep("flatMap", function);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the flatMap step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> FlatMap<E2> (ITraversal flatMapTraversal)
+        public GraphTraversal<TStart, TNewEnd> FlatMap<TNewEnd> (ITraversal flatMapTraversal)
         {
             Bytecode.AddStep("flatMap", flatMapTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the fold step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IList<E>> Fold ()
+        public GraphTraversal<TStart, IList<TEnd>> Fold ()
         {
             Bytecode.AddStep("fold");
-            return Wrap<S, IList<E>>(this);
+            return Wrap<TStart, IList<TEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the fold step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Fold<E2> (E2 seed, IBiFunction foldFunction)
+        public GraphTraversal<TStart, TNewEnd> Fold<TNewEnd> (TNewEnd seed, IBiFunction? foldFunction)
         {
             Bytecode.AddStep("fold", seed, foldFunction);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the format step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string> Format(string format)
+        {
+            Bytecode.AddStep("format", format);
+            return Wrap<TStart, string>(this);
         }
 
         /// <summary>
         ///     Adds the from step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> From (string fromStepLabel)
+        public GraphTraversal<TStart, TEnd> From (string? fromStepLabel)
         {
             Bytecode.AddStep("from", fromStepLabel);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the from step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> From (ITraversal fromVertex)
+        public GraphTraversal<TStart, TEnd> From (ITraversal fromVertex)
         {
             Bytecode.AddStep("from", fromVertex);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the from step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> From (Vertex fromVertex)
+        public GraphTraversal<TStart, TEnd> From (Vertex? fromVertex)
         {
             Bytecode.AddStep("from", fromVertex);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the group step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<K, V>> Group<K, V> ()
+        public GraphTraversal<TStart, IDictionary<K, V>> Group<K, V> ()
         {
             Bytecode.AddStep("group");
-            return Wrap<S, IDictionary<K, V>>(this);
+            return Wrap<TStart, IDictionary<K, V>>(this);
         }
 
         /// <summary>
         ///     Adds the group step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Group (string sideEffectKey)
+        public GraphTraversal<TStart, TEnd> Group (string sideEffectKey)
         {
             Bytecode.AddStep("group", sideEffectKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the groupCount step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<K, long>> GroupCount<K> ()
+        public GraphTraversal<TStart, IDictionary<K, long>> GroupCount<K> ()
         {
             Bytecode.AddStep("groupCount");
-            return Wrap<S, IDictionary<K, long>>(this);
+            return Wrap<TStart, IDictionary<K, long>>(this);
         }
 
         /// <summary>
         ///     Adds the groupCount step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> GroupCount (string sideEffectKey)
+        public GraphTraversal<TStart, TEnd> GroupCount (string sideEffectKey)
         {
             Bytecode.AddStep("groupCount", sideEffectKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (string propertyKey)
+        public GraphTraversal<TStart, TEnd> Has (string? propertyKey)
         {
             Bytecode.AddStep("has", propertyKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (string propertyKey, object value)
+        public GraphTraversal<TStart, TEnd> Has (string? propertyKey, object? value)
         {
             Bytecode.AddStep("has", propertyKey, value);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (string propertyKey, P predicate)
+        public GraphTraversal<TStart, TEnd> Has (string? propertyKey, P? predicate)
         {
             Bytecode.AddStep("has", propertyKey, predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (string label, string propertyKey, object value)
+        public GraphTraversal<TStart, TEnd> Has (string? label, string? propertyKey, object? value)
         {
             Bytecode.AddStep("has", label, propertyKey, value);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (string label, string propertyKey, P predicate)
+        public GraphTraversal<TStart, TEnd> Has (string? label, string? propertyKey, P? predicate)
         {
             Bytecode.AddStep("has", label, propertyKey, predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (string propertyKey, ITraversal propertyTraversal)
+        public GraphTraversal<TStart, TEnd> Has (string? propertyKey, ITraversal propertyTraversal)
         {
             Bytecode.AddStep("has", propertyKey, propertyTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (T accessor, object value)
+        public GraphTraversal<TStart, TEnd> Has (T accessor, object? value)
         {
             Bytecode.AddStep("has", accessor, value);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (T accessor, P predicate)
+        public GraphTraversal<TStart, TEnd> Has (T accessor, P? predicate)
         {
             Bytecode.AddStep("has", accessor, predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the has step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Has (T accessor, ITraversal propertyTraversal)
+        public GraphTraversal<TStart, TEnd> Has (T accessor, ITraversal propertyTraversal)
         {
             Bytecode.AddStep("has", accessor, propertyTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasId step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasId (object id, params object[] otherIds)
+        public GraphTraversal<TStart, TEnd> HasId (object? id, params object?[]? otherIds)
         {
-            List<object> args;
+            List<object?> args;
             if (otherIds == null)
             {
-                args = new List<object> { id, null };
+                args = new List<object?> { id, null };
             }
             else
             {
-                args = new List<object>(1 + otherIds.Length) { id };
+                args = new List<object?>(1 + otherIds.Length) { id };
                 args.AddRange(otherIds);
             }
             Bytecode.AddStep("hasId", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasId step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasId (P predicate)
+        public GraphTraversal<TStart, TEnd> HasId (P? predicate)
         {
             Bytecode.AddStep("hasId", predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasKey step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasKey (P predicate)
+        public GraphTraversal<TStart, TEnd> HasKey (P? predicate)
         {
             Bytecode.AddStep("hasKey", predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasKey step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasKey (string label, params string[] otherLabels)
+        public GraphTraversal<TStart, TEnd> HasKey (string? label, params string?[]? otherLabels)
         {
-            List<object> args;
+            List<object?> args;
             if (otherLabels == null)
             {
-                args = new List<object> { label, null };
+                args = new List<object?> { label, null };
             }
             else
             {
-                args = new List<object>(1 + otherLabels.Length) { label };
+                args = new List<object?>(1 + otherLabels.Length) { label };
                 args.AddRange(otherLabels);
             }
             Bytecode.AddStep("hasKey", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasLabel step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasLabel (P predicate)
+        public GraphTraversal<TStart, TEnd> HasLabel (P? predicate)
         {
             Bytecode.AddStep("hasLabel", predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasLabel step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasLabel (string label, params string[] otherLabels)
+        public GraphTraversal<TStart, TEnd> HasLabel (string? label, params string?[]? otherLabels)
         {
-            List<object> args;
+            List<object?> args;
             if (otherLabels == null)
             {
-                args = new List<object> { label, null };
+                args = new List<object?> { label, null };
             }
             else
             {
-                args = new List<object>(1 + otherLabels.Length) { label };
+                args = new List<object?>(1 + otherLabels.Length) { label };
                 args.AddRange(otherLabels);
             }
             Bytecode.AddStep("hasLabel", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasNot step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasNot (string propertyKey)
+        public GraphTraversal<TStart, TEnd> HasNot (string? propertyKey)
         {
             Bytecode.AddStep("hasNot", propertyKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasValue step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasValue (object value, params object[] otherValues)
+        public GraphTraversal<TStart, TEnd> HasValue (object? value, params object?[]? otherValues)
         {
-            List<object> args;
+            List<object?> args;
             if (otherValues == null)
             {
-                args = new List<object> { value, null };
+                args = new List<object?> { value, null };
             }
             else
             {
-                args = new List<object>(1 + otherValues.Length) { value };
+                args = new List<object?>(1 + otherValues.Length) { value };
                 args.AddRange(otherValues);
             }
             Bytecode.AddStep("hasValue", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the hasValue step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> HasValue (P predicate)
+        public GraphTraversal<TStart, TEnd> HasValue (P? predicate)
         {
             Bytecode.AddStep("hasValue", predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the id step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, object> Id ()
+        public GraphTraversal<TStart, object> Id ()
         {
             Bytecode.AddStep("id");
-            return Wrap<S, object>(this);
+            return Wrap<TStart, object>(this);
         }
 
         /// <summary>
         ///     Adds the identity step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Identity ()
+        public GraphTraversal<TStart, TEnd> Identity ()
         {
             Bytecode.AddStep("identity");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the in step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> In (params string[] edgeLabels)
+        public GraphTraversal<TStart, Vertex> In (params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
             
-            var args = new List<object>(edgeLabels.Length);
+            var args = new List<object?>(edgeLabels.Length);
             args.AddRange(edgeLabels);
             Bytecode.AddStep("in", args.ToArray());
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the inE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> InE (params string[] edgeLabels)
+        public GraphTraversal<TStart, Edge> InE (params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
             
-            var args = new List<object>(edgeLabels.Length);
+            var args = new List<object?>(edgeLabels.Length);
             args.AddRange(edgeLabels);
             Bytecode.AddStep("inE", args.ToArray());
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the inV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> InV ()
+        public GraphTraversal<TStart, Vertex> InV ()
         {
             Bytecode.AddStep("inV");
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the index step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Index<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Index<TNewEnd> ()
         {
             Bytecode.AddStep("index");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the inject step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Inject (params E[] injections)
+        public GraphTraversal<TStart, TEnd> Inject (params TEnd?[]? injections)
         {
             // null injections is treated as g.inject(null) meaning inject a single null traverser
             if (injections == null)
             {
-                Bytecode.AddStep("inject", new object[] { null });
+                Bytecode.AddStep("inject", new object?[] { null });
             }
             else
             {
-                var args = new List<object>(injections.Length);
-                args.AddRange(injections.Cast<object>());
+                var args = new List<object?>(injections.Length);
+                args.AddRange(injections.Cast<object?>());
                 Bytecode.AddStep("inject", args.ToArray());
             }
 
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the intersect step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Intersect (object intersectObject)
+        {
+            Bytecode.AddStep("intersect", intersectObject);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the is step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Is (object value)
+        public GraphTraversal<TStart, TEnd> Is (object? value)
         {
             Bytecode.AddStep("is", value);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the is step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Is (P predicate)
+        public GraphTraversal<TStart, TEnd> Is (P? predicate)
         {
             Bytecode.AddStep("is", predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the key step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, string> Key ()
+        public GraphTraversal<TStart, string> Key ()
         {
             Bytecode.AddStep("key");
-            return Wrap<S, string>(this);
+            return Wrap<TStart, string>(this);
         }
 
         /// <summary>
         ///     Adds the label step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, string> Label ()
+        public GraphTraversal<TStart, string> Label ()
         {
             Bytecode.AddStep("label");
-            return Wrap<S, string>(this);
+            return Wrap<TStart, string>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the length step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, int?> Length ()
+        {
+            Bytecode.AddStep("length");
+            return Wrap<TStart, int?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the length step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> Length<TNewEnd> (Scope scope)
+        {
+            Bytecode.AddStep("length", scope);
+            return Wrap<TStart, TNewEnd?>(this);
         }
 
         /// <summary>
         ///     Adds the limit step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Limit<E2> (Scope scope, long limit)
+        public GraphTraversal<TStart, TNewEnd> Limit<TNewEnd> (Scope scope, long limit)
         {
             Bytecode.AddStep("limit", scope, limit);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the limit step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Limit<E2> (long limit)
+        public GraphTraversal<TStart, TNewEnd> Limit<TNewEnd> (long limit)
         {
             Bytecode.AddStep("limit", limit);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the local step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Local<E2> (ITraversal localTraversal)
+        public GraphTraversal<TStart, TNewEnd> Local<TNewEnd> (ITraversal localTraversal)
         {
             Bytecode.AddStep("local", localTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the loops step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, int> Loops ()
+        public GraphTraversal<TStart, int> Loops ()
         {
             Bytecode.AddStep("loops");
-            return Wrap<S, int>(this);
+            return Wrap<TStart, int>(this);
         }
 
         /// <summary>
         ///     Adds the loops step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, int> Loops (string loopName)
+        public GraphTraversal<TStart, int> Loops (string? loopName)
         {
             Bytecode.AddStep("loops", loopName);
-            return Wrap<S, int>(this);
+            return Wrap<TStart, int>(this);
+        }
+
+        /// <summary>
+        ///     Adds the lTrim step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> LTrim ()
+        {
+            Bytecode.AddStep("lTrim");
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the lTrim step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> LTrim<TNewEnd> (Scope scope)
+        {
+            Bytecode.AddStep("lTrim", scope);
+            return Wrap<TStart, TNewEnd?>(this);
         }
 
         /// <summary>
         ///     Adds the map step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Map<E2> (IFunction function)
+        public GraphTraversal<TStart, TNewEnd> Map<TNewEnd> (IFunction? function)
         {
             Bytecode.AddStep("map", function);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the map step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Map<E2> (ITraversal mapTraversal)
+        public GraphTraversal<TStart, TNewEnd> Map<TNewEnd> (ITraversal mapTraversal)
         {
             Bytecode.AddStep("map", mapTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the match step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<string, E2>> Match<E2> (params ITraversal[] matchTraversals)
+        public GraphTraversal<TStart, IDictionary<string, TNewEnd>> Match<TNewEnd> (params ITraversal[] matchTraversals)
         {
             if (matchTraversals == null) throw new ArgumentNullException(nameof(matchTraversals));
 
             var args = new List<object>(matchTraversals.Length);
             args.AddRange(matchTraversals);
             Bytecode.AddStep("match", args.ToArray());
-            return Wrap<S, IDictionary<string, E2>>(this);
+            return Wrap<TStart, IDictionary<string, TNewEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the math step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, double> Math (string expression)
+        public GraphTraversal<TStart, double> Math (string expression)
         {
             Bytecode.AddStep("math", expression);
-            return Wrap<S, double>(this);
+            return Wrap<TStart, double>(this);
         }
 
         /// <summary>
         ///     Adds the max step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Max<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Max<TNewEnd> ()
         {
             Bytecode.AddStep("max");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the max step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Max<E2> (Scope scope)
+        public GraphTraversal<TStart, TNewEnd> Max<TNewEnd> (Scope scope)
         {
             Bytecode.AddStep("max", scope);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the mean step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Mean<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Mean<TNewEnd> ()
         {
             Bytecode.AddStep("mean");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the mean step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Mean<E2> (Scope scope)
+        public GraphTraversal<TStart, TNewEnd> Mean<TNewEnd> (Scope scope)
         {
             Bytecode.AddStep("mean", scope);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the merge step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Merge (object mergeObject)
+        {
+            Bytecode.AddStep("merge", mergeObject);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the mergeE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> MergeE ()
+        public GraphTraversal<TStart, Edge> MergeE ()
         {
             Bytecode.AddStep("mergeE");
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the mergeE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> MergeE (IDictionary<object,object> m)
+        public GraphTraversal<TStart, Edge> MergeE (IDictionary<object,object>? m)
         {
             Bytecode.AddStep("mergeE", m);
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the mergeE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> MergeE (ITraversal t)
+        public GraphTraversal<TStart, Edge> MergeE (ITraversal? t)
         {
             Bytecode.AddStep("mergeE", t);
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the mergeV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> MergeV ()
+        public GraphTraversal<TStart, Vertex> MergeV ()
         {
             Bytecode.AddStep("mergeV");
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the mergeV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> MergeV (IDictionary<object,object> m)
+        public GraphTraversal<TStart, Vertex> MergeV (IDictionary<object,object>? m)
         {
             Bytecode.AddStep("mergeV", m);
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the mergeV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> MergeV (ITraversal t)
+        public GraphTraversal<TStart, Vertex> MergeV (ITraversal? t)
         {
             Bytecode.AddStep("mergeV", t);
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the min step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Min<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Min<TNewEnd> ()
         {
             Bytecode.AddStep("min");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the min step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Min<E2> (Scope scope)
+        public GraphTraversal<TStart, TNewEnd> Min<TNewEnd> (Scope scope)
         {
             Bytecode.AddStep("min", scope);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the none step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> None ()
+        public GraphTraversal<TStart, TEnd> None ()
         {
             Bytecode.AddStep("none");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the not step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Not (ITraversal notTraversal)
+        public GraphTraversal<TStart, TEnd> Not (ITraversal notTraversal)
         {
             Bytecode.AddStep("not", notTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the option step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Option (object pickToken, ITraversal traversalOption)
+        public GraphTraversal<TStart, TEnd> Option (object pickToken, ITraversal? traversalOption)
         {
             Bytecode.AddStep("option", pickToken, traversalOption);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the option step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Option (object pickToken, IDictionary<object,object> traversalOption)
+        public GraphTraversal<TStart, TEnd> Option (object pickToken, IDictionary<object,object>? traversalOption)
         {
             Bytecode.AddStep("option", pickToken, traversalOption);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the option step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Option (ITraversal traversalOption)
+        public GraphTraversal<TStart, TEnd> Option (object pickToken, IDictionary<object,object> traversalOption, Cardinality cardinality)
+        {
+            Bytecode.AddStep("option", pickToken, traversalOption, cardinality);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the option step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Option (ITraversal? traversalOption)
         {
             Bytecode.AddStep("option", traversalOption);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the optional step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Optional<E2> (ITraversal optionalTraversal)
+        public GraphTraversal<TStart, TNewEnd> Optional<TNewEnd> (ITraversal optionalTraversal)
         {
             Bytecode.AddStep("optional", optionalTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the or step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Or (params ITraversal[] orTraversals)
+        public GraphTraversal<TStart, TEnd> Or (params ITraversal[] orTraversals)
         {
             if (orTraversals == null) throw new ArgumentNullException(nameof(orTraversals));
 
             var args = new List<object>(orTraversals.Length);
             args.AddRange(orTraversals);
             Bytecode.AddStep("or", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the order step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Order ()
+        public GraphTraversal<TStart, TEnd> Order ()
         {
             Bytecode.AddStep("order");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the order step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Order (Scope scope)
+        public GraphTraversal<TStart, TEnd> Order (Scope scope)
         {
             Bytecode.AddStep("order", scope);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the otherV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> OtherV ()
+        public GraphTraversal<TStart, Vertex> OtherV ()
         {
             Bytecode.AddStep("otherV");
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the out step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> Out (params string[] edgeLabels)
+        public GraphTraversal<TStart, Vertex> Out (params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
             
-            var args = new List<object>(edgeLabels.Length);
+            var args = new List<object?>(edgeLabels.Length);
             args.AddRange(edgeLabels);
             Bytecode.AddStep("out", args.ToArray());
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the outE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> OutE (params string[] edgeLabels)
+        public GraphTraversal<TStart, Edge> OutE (params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
             
-            var args = new List<object>(edgeLabels.Length);
+            var args = new List<object?>(edgeLabels.Length);
             args.AddRange(edgeLabels);
             Bytecode.AddStep("outE", args.ToArray());
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
         }
 
         /// <summary>
         ///     Adds the outV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> OutV ()
+        public GraphTraversal<TStart, Vertex> OutV ()
         {
             Bytecode.AddStep("outV");
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the pageRank step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> PageRank ()
+        public GraphTraversal<TStart, TEnd> PageRank ()
         {
             Bytecode.AddStep("pageRank");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the pageRank step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> PageRank (double alpha)
+        public GraphTraversal<TStart, TEnd> PageRank (double alpha)
         {
             Bytecode.AddStep("pageRank", alpha);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the path step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Path> Path ()
+        public GraphTraversal<TStart, Path> Path ()
         {
             Bytecode.AddStep("path");
-            return Wrap<S, Path>(this);
+            return Wrap<TStart, Path>(this);
         }
 
         /// <summary>
         ///     Adds the peerPressure step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> PeerPressure ()
+        public GraphTraversal<TStart, TEnd> PeerPressure ()
         {
             Bytecode.AddStep("peerPressure");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the product step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Product (object productObject)
+        {
+            Bytecode.AddStep("product", productObject);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the profile step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Profile<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Profile<TNewEnd> ()
         {
             Bytecode.AddStep("profile");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the profile step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Profile (string sideEffectKey)
+        public GraphTraversal<TStart, TEnd> Profile (string sideEffectKey)
         {
             Bytecode.AddStep("profile", sideEffectKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the program step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Program (object vertexProgram)
+        public GraphTraversal<TStart, TEnd> Program (object vertexProgram)
         {
             Bytecode.AddStep("program", vertexProgram);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the project step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<string, E2>> Project<E2> (string projectKey, params string[] otherProjectKeys)
+        public GraphTraversal<TStart, IDictionary<string, TNewEnd>> Project<TNewEnd>(string? projectKey,
+            params string?[] otherProjectKeys)
         {
             // Using null as a key is allowed in Java, but we cannot support it in .NET as null is not allowed as a
             //  Dictionary key.
             if (projectKey == null) throw new ArgumentNullException(nameof(projectKey));
             if (otherProjectKeys == null) throw new ArgumentNullException(nameof(otherProjectKeys));
             
-            var args = new List<object>(1 + otherProjectKeys.Length) { projectKey };
+            var args = new List<object?>(1 + otherProjectKeys.Length) { projectKey };
             args.AddRange(otherProjectKeys);
             Bytecode.AddStep("project", args.ToArray());
-            return Wrap<S, IDictionary<string, E2>>(this);
+            return Wrap<TStart, IDictionary<string, TNewEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the properties step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Properties<E2> (params string[] propertyKeys)
+        public GraphTraversal<TStart, TNewEnd> Properties<TNewEnd> (params string?[] propertyKeys)
         {
             // Using null as a key is allowed in Java, but we cannot support it in .NET as null is not allowed as a
             //  Dictionary key.
             if (propertyKeys == null) throw new ArgumentNullException(nameof(propertyKeys));
             
-            var args = new List<object>(propertyKeys.Length);
+            var args = new List<object?>(propertyKeys.Length);
             args.AddRange(propertyKeys);
             Bytecode.AddStep("properties", args.ToArray());
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the property step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Property(Cardinality cardinality, object key, object value,
-            params object[] keyValues)
+        public GraphTraversal<TStart, TEnd> Property(Cardinality cardinality, object? key, object? value,
+            params object?[] keyValues)
         {
             if (keyValues == null) throw new ArgumentNullException(nameof(keyValues));
 
-            var args = new List<object>(3 + keyValues.Length) { cardinality, key, value };
+            var args = new List<object?>(3 + keyValues.Length) { cardinality, key, value };
             args.AddRange(keyValues);
             Bytecode.AddStep("property", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the property step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Property (object key, object value, params object[] keyValues)
+        public GraphTraversal<TStart, TEnd> Property (object? key, object? value, params object?[] keyValues)
         {
             if (keyValues == null) throw new ArgumentNullException(nameof(keyValues));
 
-            var args = new List<object>(2 + keyValues.Length) { key, value };
+            var args = new List<object?>(2 + keyValues.Length) { key, value };
             args.AddRange(keyValues);
             Bytecode.AddStep("property", args.ToArray());
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
@@ -1528,544 +1773,697 @@
         /// <summary>
         ///     Adds the propertyMap step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<string, E2>> PropertyMap<E2> (params string[] propertyKeys)
+        public GraphTraversal<TStart, IDictionary<string, TNewEnd>> PropertyMap<TNewEnd> (params string?[] propertyKeys)
         {
             if (propertyKeys == null) throw new ArgumentNullException(nameof(propertyKeys));
             
-            var args = new List<object>(propertyKeys.Length);
+            var args = new List<object?>(propertyKeys.Length);
             args.AddRange(propertyKeys);
             Bytecode.AddStep("propertyMap", args.ToArray());
-            return Wrap<S, IDictionary<string, E2>>(this);
+            return Wrap<TStart, IDictionary<string, TNewEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the range step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Range<E2> (Scope scope, long low, long high)
+        public GraphTraversal<TStart, TNewEnd> Range<TNewEnd> (Scope scope, long low, long high)
         {
             Bytecode.AddStep("range", scope, low, high);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the range step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Range<E2> (long low, long high)
+        public GraphTraversal<TStart, TNewEnd> Range<TNewEnd> (long low, long high)
         {
             Bytecode.AddStep("range", low, high);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the read step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Read ()
+        public GraphTraversal<TStart, TEnd> Read ()
         {
             Bytecode.AddStep("read");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the repeat step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Repeat (string loopName, ITraversal repeatTraversal)
+        public GraphTraversal<TStart, TEnd> Repeat (string loopName, ITraversal repeatTraversal)
         {
             Bytecode.AddStep("repeat", loopName, repeatTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the repeat step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Repeat (ITraversal repeatTraversal)
+        public GraphTraversal<TStart, TEnd> Repeat (ITraversal repeatTraversal)
         {
             Bytecode.AddStep("repeat", repeatTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the replace step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> Replace (string? oldChar, string? newChar)
+        {
+            Bytecode.AddStep("replace", oldChar, newChar);
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the replace step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> Replace<TNewEnd> (Scope scope, string? oldChar, string? newChar)
+        {
+            Bytecode.AddStep("replace", scope, oldChar, newChar);
+            return Wrap<TStart, TNewEnd?>(this);
+        }
+
+        /// <summary>
+        ///     Adds the reverse step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TEnd> Reverse ()
+        {
+            Bytecode.AddStep("reverse");
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the rTrim step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> RTrim ()
+        {
+            Bytecode.AddStep("rTrim");
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the rTrim step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> RTrim<TNewEnd> (Scope scope)
+        {
+            Bytecode.AddStep("rTrim", scope);
+            return Wrap<TStart, TNewEnd?>(this);
         }
 
         /// <summary>
         ///     Adds the sack step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Sack<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Sack<TNewEnd> ()
         {
             Bytecode.AddStep("sack");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the sack step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Sack (IBiFunction sackOperator)
+        public GraphTraversal<TStart, TEnd> Sack (IBiFunction sackOperator)
         {
             Bytecode.AddStep("sack", sackOperator);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the sample step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Sample (Scope scope, int amountToSample)
+        public GraphTraversal<TStart, TEnd> Sample (Scope scope, int amountToSample)
         {
             Bytecode.AddStep("sample", scope, amountToSample);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the sample step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Sample (int amountToSample)
+        public GraphTraversal<TStart, TEnd> Sample (int amountToSample)
         {
             Bytecode.AddStep("sample", amountToSample);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the select step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, ICollection<E2>> Select<E2> (Column column)
+        public GraphTraversal<TStart, ICollection<TNewEnd>> Select<TNewEnd> (Column column)
         {
             Bytecode.AddStep("select", column);
-            return Wrap<S, ICollection<E2>>(this);
+            return Wrap<TStart, ICollection<TNewEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the select step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Select<E2> (Pop pop, string selectKey)
+        public GraphTraversal<TStart, TNewEnd> Select<TNewEnd> (Pop pop, string? selectKey)
         {
             Bytecode.AddStep("select", pop, selectKey);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the select step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<string, E2>> Select<E2>(Pop pop, string selectKey1, string selectKey2,
-            params string[] otherSelectKeys)
+        public GraphTraversal<TStart, IDictionary<string, TNewEnd>> Select<TNewEnd>(Pop pop, string? selectKey1,
+            string? selectKey2, params string?[] otherSelectKeys)
         {
             if (otherSelectKeys == null) throw new ArgumentNullException(nameof(otherSelectKeys));
 
-            var args = new List<object>(3 + otherSelectKeys.Length) { pop, selectKey1, selectKey2 };
+            var args = new List<object?>(3 + otherSelectKeys.Length) { pop, selectKey1, selectKey2 };
             args.AddRange(otherSelectKeys);
             Bytecode.AddStep("select", args.ToArray());
-            return Wrap<S, IDictionary<string, E2>>(this);
+            return Wrap<TStart, IDictionary<string, TNewEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the select step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Select<E2> (Pop pop, ITraversal keyTraversal)
+        public GraphTraversal<TStart, TNewEnd> Select<TNewEnd> (Pop pop, ITraversal keyTraversal)
         {
             Bytecode.AddStep("select", pop, keyTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the select step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Select<E2> (string selectKey)
+        public GraphTraversal<TStart, TNewEnd> Select<TNewEnd> (string? selectKey)
         {
             Bytecode.AddStep("select", selectKey);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the select step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<string, E2>> Select<E2>(string selectKey1, string selectKey2,
-            params string[] otherSelectKeys)
+        public GraphTraversal<TStart, IDictionary<string, TNewEnd>> Select<TNewEnd>(string? selectKey1,
+            string? selectKey2, params string?[] otherSelectKeys)
         {
             if (otherSelectKeys == null) throw new ArgumentNullException(nameof(otherSelectKeys));
 
-            var args = new List<object>(2 + otherSelectKeys.Length) { selectKey1, selectKey2 };
+            var args = new List<object?>(2 + otherSelectKeys.Length) { selectKey1, selectKey2 };
             args.AddRange(otherSelectKeys);
             Bytecode.AddStep("select", args.ToArray());
-            return Wrap<S, IDictionary<string, E2>>(this);
+            return Wrap<TStart, IDictionary<string, TNewEnd>>(this);
         }
 
         /// <summary>
         ///     Adds the select step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Select<E2> (ITraversal keyTraversal)
+        public GraphTraversal<TStart, TNewEnd> Select<TNewEnd> (ITraversal keyTraversal)
         {
             Bytecode.AddStep("select", keyTraversal);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the shortestPath step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Path> ShortestPath ()
+        public GraphTraversal<TStart, Path> ShortestPath ()
         {
             Bytecode.AddStep("shortestPath");
-            return Wrap<S, Path>(this);
+            return Wrap<TStart, Path>(this);
         }
 
         /// <summary>
         ///     Adds the sideEffect step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> SideEffect (IConsumer consumer)
+        public GraphTraversal<TStart, TEnd> SideEffect (IConsumer? consumer)
         {
             Bytecode.AddStep("sideEffect", consumer);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the sideEffect step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> SideEffect (ITraversal sideEffectTraversal)
+        public GraphTraversal<TStart, TEnd> SideEffect (ITraversal sideEffectTraversal)
         {
             Bytecode.AddStep("sideEffect", sideEffectTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the simplePath step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> SimplePath ()
+        public GraphTraversal<TStart, TEnd> SimplePath ()
         {
             Bytecode.AddStep("simplePath");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the skip step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Skip<E2> (Scope scope, long skip)
+        public GraphTraversal<TStart, TNewEnd> Skip<TNewEnd> (Scope scope, long skip)
         {
             Bytecode.AddStep("skip", scope, skip);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the skip step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Skip<E2> (long skip)
+        public GraphTraversal<TStart, TNewEnd> Skip<TNewEnd> (long skip)
         {
             Bytecode.AddStep("skip", skip);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the split step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, List<string>?> Split (string? splitChar)
+        {
+            Bytecode.AddStep("split", splitChar);
+            return Wrap<TStart, List<string>?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the split step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, List<TNewEnd>?> Split<TNewEnd> (Scope scope, string? splitChar)
+        {
+            Bytecode.AddStep("split", scope, splitChar);
+            return Wrap<TStart, List<TNewEnd>?>(this);
         }
 
         /// <summary>
         ///     Adds the store step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Store (string sideEffectKey)
+        public GraphTraversal<TStart, TEnd> Store (string sideEffectKey)
         {
             Bytecode.AddStep("store", sideEffectKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the subgraph step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> Subgraph (string sideEffectKey)
+        public GraphTraversal<TStart, Edge> Subgraph (string sideEffectKey)
         {
             Bytecode.AddStep("subgraph", sideEffectKey);
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
+        }
+
+        /// <summary>
+        ///     Adds the subgraph step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> Substring (int startIndex)
+        {
+            Bytecode.AddStep("substring", startIndex);
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the subgraph step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> Substring<TNewEnd> (Scope scope, int startIndex)
+        {
+            Bytecode.AddStep("substring", scope,  startIndex);
+            return Wrap<TStart, TNewEnd?>(this);
+        }
+
+        /// <summary>
+        ///     Adds the subgraph step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> Substring (int startIndex, int endIndex)
+        {
+            Bytecode.AddStep("substring", startIndex, endIndex);
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the subgraph step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> Substring<TNewEnd> (Scope scope, int startIndex, int endIndex)
+        {
+            Bytecode.AddStep("substring", scope, startIndex, endIndex);
+            return Wrap<TStart, TNewEnd?>(this);
         }
 
         /// <summary>
         ///     Adds the sum step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Sum<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Sum<TNewEnd> ()
         {
             Bytecode.AddStep("sum");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the sum step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Sum<E2> (Scope scope)
+        public GraphTraversal<TStart, TNewEnd> Sum<TNewEnd> (Scope scope)
         {
             Bytecode.AddStep("sum", scope);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the tail step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Tail<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Tail<TNewEnd> ()
         {
             Bytecode.AddStep("tail");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the tail step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Tail<E2> (Scope scope)
+        public GraphTraversal<TStart, TNewEnd> Tail<TNewEnd> (Scope scope)
         {
             Bytecode.AddStep("tail", scope);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the tail step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Tail<E2> (Scope scope, long limit)
+        public GraphTraversal<TStart, TNewEnd> Tail<TNewEnd> (Scope scope, long limit)
         {
             Bytecode.AddStep("tail", scope, limit);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the tail step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Tail<E2> (long limit)
+        public GraphTraversal<TStart, TNewEnd> Tail<TNewEnd> (long limit)
         {
             Bytecode.AddStep("tail", limit);
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the timeLimit step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> TimeLimit (long timeLimit)
+        public GraphTraversal<TStart, TEnd> TimeLimit (long timeLimit)
         {
             Bytecode.AddStep("timeLimit", timeLimit);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the times step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Times (int maxLoops)
+        public GraphTraversal<TStart, TEnd> Times (int maxLoops)
         {
             Bytecode.AddStep("times", maxLoops);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the to step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> To (Direction direction, params string[] edgeLabels)
+        public GraphTraversal<TStart, Vertex> To (Direction? direction, params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
 
-            var args = new List<object>(1 + edgeLabels.Length) { direction };
+            var args = new List<object?>(1 + edgeLabels.Length) { direction };
             args.AddRange(edgeLabels);
             Bytecode.AddStep("to", args.ToArray());
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the to step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> To (string toStepLabel)
+        public GraphTraversal<TStart, TEnd> To (string? toStepLabel)
         {
             Bytecode.AddStep("to", toStepLabel);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the to step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> To (ITraversal toVertex)
+        public GraphTraversal<TStart, TEnd> To (ITraversal toVertex)
         {
             Bytecode.AddStep("to", toVertex);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the to step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> To (Vertex toVertex)
+        public GraphTraversal<TStart, TEnd> To (Vertex? toVertex)
         {
             Bytecode.AddStep("to", toVertex);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the toE step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Edge> ToE (Direction direction, params string[] edgeLabels)
+        public GraphTraversal<TStart, Edge> ToE (Direction? direction, params string?[] edgeLabels)
         {
             if (edgeLabels == null) throw new ArgumentNullException(nameof(edgeLabels));
             
-            var args = new List<object>(1 + edgeLabels.Length) {direction};
+            var args = new List<object?>(1 + edgeLabels.Length) {direction};
             args.AddRange(edgeLabels);
             Bytecode.AddStep("toE", args.ToArray());
-            return Wrap<S, Edge>(this);
+            return Wrap<TStart, Edge>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the toLower step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> ToLower ()
+        {
+            Bytecode.AddStep("toLower");
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the toLower step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> ToLower<TNewEnd> (Scope scope)
+        {
+            Bytecode.AddStep("toLower", scope);
+            return Wrap<TStart, TNewEnd?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the toUpper step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> ToUpper ()
+        {
+            Bytecode.AddStep("toUpper");
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the toUpper step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> ToUpper<TNewEnd> (Scope scope)
+        {
+            Bytecode.AddStep("toUpper", scope);
+            return Wrap<TStart, TNewEnd?>(this);
         }
 
         /// <summary>
         ///     Adds the toV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, Vertex> ToV (Direction direction)
+        public GraphTraversal<TStart, Vertex> ToV (Direction? direction)
         {
             Bytecode.AddStep("toV", direction);
-            return Wrap<S, Vertex>(this);
+            return Wrap<TStart, Vertex>(this);
         }
 
         /// <summary>
         ///     Adds the tree step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Tree<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Tree<TNewEnd> ()
         {
             Bytecode.AddStep("tree");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the tree step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Tree (string sideEffectKey)
+        public GraphTraversal<TStart, TEnd> Tree (string sideEffectKey)
         {
             Bytecode.AddStep("tree", sideEffectKey);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
+        }
+
+        /// <summary>
+        ///     Adds the trim step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, string?> Trim ()
+        {
+            Bytecode.AddStep("trim");
+            return Wrap<TStart, string?>(this);
+        }
+        
+        /// <summary>
+        ///     Adds the trim step to this <see cref="GraphTraversal{SType, EType}" />.
+        /// </summary>
+        public GraphTraversal<TStart, TNewEnd?> Trim<TNewEnd> (Scope scope)
+        {
+            Bytecode.AddStep("trim", scope);
+            return Wrap<TStart, TNewEnd?>(this);
         }
 
         /// <summary>
         ///     Adds the unfold step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Unfold<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Unfold<TNewEnd> ()
         {
             Bytecode.AddStep("unfold");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the union step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Union<E2> (params ITraversal[] unionTraversals)
+        public GraphTraversal<TStart, TNewEnd> Union<TNewEnd> (params ITraversal[] unionTraversals)
         {
             if (unionTraversals == null) throw new ArgumentNullException(nameof(unionTraversals));
             
             var args = new List<object>(unionTraversals.Length);
             args.AddRange(unionTraversals);
             Bytecode.AddStep("union", args.ToArray());
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the until step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Until (IPredicate untilPredicate)
+        public GraphTraversal<TStart, TEnd> Until (IPredicate untilPredicate)
         {
             Bytecode.AddStep("until", untilPredicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the until step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Until (ITraversal untilTraversal)
+        public GraphTraversal<TStart, TEnd> Until (ITraversal untilTraversal)
         {
             Bytecode.AddStep("until", untilTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the value step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Value<E2> ()
+        public GraphTraversal<TStart, TNewEnd> Value<TNewEnd> ()
         {
             Bytecode.AddStep("value");
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the valueMap step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<TKey, TValue>> ValueMap<TKey, TValue> (params string[] propertyKeys)
+        public GraphTraversal<TStart, IDictionary<TKey, TValue>> ValueMap<TKey, TValue> (params string?[] propertyKeys)
         {
             if (propertyKeys == null) throw new ArgumentNullException(nameof(propertyKeys));
             
-            var args = new List<object>(propertyKeys.Length);
+            var args = new List<object?>(propertyKeys.Length);
             args.AddRange(propertyKeys);
             Bytecode.AddStep("valueMap", args.ToArray());
-            return Wrap<S, IDictionary<TKey, TValue>>(this);
+            return Wrap<TStart, IDictionary<TKey, TValue>>(this);
         }
 
         /// <summary>
         ///     Adds the valueMap step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, IDictionary<TKey, TValue>> ValueMap<TKey, TValue>(bool includeTokens,
-            params string[] propertyKeys)
+        public GraphTraversal<TStart, IDictionary<TKey, TValue>> ValueMap<TKey, TValue>(bool includeTokens,
+            params string?[] propertyKeys)
         {
             if (propertyKeys == null) throw new ArgumentNullException(nameof(propertyKeys));
 
-            var args = new List<object>(1 + propertyKeys.Length) { includeTokens };
+            var args = new List<object?>(1 + propertyKeys.Length) { includeTokens };
             args.AddRange(propertyKeys);
             Bytecode.AddStep("valueMap", args.ToArray());
-            return Wrap<S, IDictionary<TKey, TValue>>(this);
+            return Wrap<TStart, IDictionary<TKey, TValue>>(this);
         }
 
         /// <summary>
         ///     Adds the values step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E2> Values<E2> (params string[] propertyKeys)
+        public GraphTraversal<TStart, TNewEnd> Values<TNewEnd> (params string?[] propertyKeys)
         {
             if (propertyKeys == null) throw new ArgumentNullException(nameof(propertyKeys));
             
-            var args = new List<object>(propertyKeys.Length);
+            var args = new List<object?>(propertyKeys.Length);
             args.AddRange(propertyKeys);
             Bytecode.AddStep("values", args.ToArray());
-            return Wrap<S, E2>(this);
+            return Wrap<TStart, TNewEnd>(this);
         }
 
         /// <summary>
         ///     Adds the where step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Where (P predicate)
+        public GraphTraversal<TStart, TEnd> Where (P predicate)
         {
             Bytecode.AddStep("where", predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the where step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Where (string startKey, P predicate)
+        public GraphTraversal<TStart, TEnd> Where (string startKey, P predicate)
         {
             Bytecode.AddStep("where", startKey, predicate);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the where step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Where (ITraversal whereTraversal)
+        public GraphTraversal<TStart, TEnd> Where (ITraversal whereTraversal)
         {
             Bytecode.AddStep("where", whereTraversal);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the with step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> With (string key)
+        public GraphTraversal<TStart, TEnd> With (string key)
         {
             Bytecode.AddStep("with", key);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the with step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> With (string key, object value)
+        public GraphTraversal<TStart, TEnd> With (string key, object? value)
         {
             Bytecode.AddStep("with", key, value);
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
         /// <summary>
         ///     Adds the write step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public GraphTraversal<S, E> Write ()
+        public GraphTraversal<TStart, TEnd> Write ()
         {
             Bytecode.AddStep("write");
-            return Wrap<S, E>(this);
+            return Wrap<TStart, TEnd>(this);
         }
 
 
         /// <summary>
         /// Make a copy of a traversal that is reset for iteration.
         /// </summary>
-        public GraphTraversal<S, E> Clone()
+        public GraphTraversal<TStart, TEnd> Clone()
         {
-            return new GraphTraversal<S, E>(TraversalStrategies, new Bytecode(Bytecode));
+            return new GraphTraversal<TStart, TEnd>(TraversalStrategies, new Bytecode(Bytecode));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
index 6f18bc2..675c1ad 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
@@ -38,7 +38,7 @@
     /// </summary>
     public class GraphTraversalSource
     {
-        private readonly IRemoteConnection _connection;
+        private readonly IRemoteConnection? _connection;
 
         public bool IsSessionBound => _connection is { IsSessionBound: true };
         
@@ -89,7 +89,7 @@
             return With(key, true);
         }
 
-        public GraphTraversalSource With(string key, object value)
+        public GraphTraversalSource With(string key, object? value)
         {
             var optionsStrategyInst = Bytecode.SourceInstructions.Find(
                 inst => inst.OperatorName == "withStrategies" && inst.Arguments[0] is OptionsStrategy);
@@ -102,7 +102,7 @@
                 return WithStrategies(optionsStrategy);
             }
 
-            optionsStrategy = optionsStrategyInst.Arguments[0];
+            optionsStrategy = optionsStrategyInst.Arguments[0]!;
             optionsStrategy.Configuration[key] = value;
             return new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                 new Bytecode(Bytecode));
@@ -125,7 +125,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(object initialValue)
+        public GraphTraversalSource WithSack(object? initialValue)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -133,7 +133,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(object initialValue, IBinaryOperator mergeOperator)
+        public GraphTraversalSource WithSack(object? initialValue, IBinaryOperator? mergeOperator)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -141,7 +141,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(object initialValue, IUnaryOperator splitOperator)
+        public GraphTraversalSource WithSack(object? initialValue, IUnaryOperator? splitOperator)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -149,7 +149,8 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(object initialValue, IUnaryOperator splitOperator, IBinaryOperator mergeOperator)
+        public GraphTraversalSource WithSack(object? initialValue, IUnaryOperator? splitOperator,
+            IBinaryOperator? mergeOperator)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -157,7 +158,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(ISupplier initialValue)
+        public GraphTraversalSource WithSack(ISupplier? initialValue)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -165,7 +166,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(ISupplier initialValue, IBinaryOperator mergeOperator)
+        public GraphTraversalSource WithSack(ISupplier? initialValue, IBinaryOperator? mergeOperator)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -173,7 +174,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(ISupplier initialValue, IUnaryOperator splitOperator)
+        public GraphTraversalSource WithSack(ISupplier? initialValue, IUnaryOperator? splitOperator)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -181,7 +182,8 @@
             return source;
         }
 
-        public GraphTraversalSource WithSack(ISupplier initialValue, IUnaryOperator splitOperator, IBinaryOperator mergeOperator)
+        public GraphTraversalSource WithSack(ISupplier? initialValue, IUnaryOperator? splitOperator,
+            IBinaryOperator? mergeOperator)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -189,7 +191,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSideEffect(string key, object initialValue)
+        public GraphTraversalSource WithSideEffect(string? key, object? initialValue)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -197,7 +199,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSideEffect(string key, object initialValue, IBinaryOperator reducer)
+        public GraphTraversalSource WithSideEffect(string? key, object? initialValue, IBinaryOperator reducer)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -205,7 +207,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSideEffect(string key, ISupplier initialValue)
+        public GraphTraversalSource WithSideEffect(string? key, ISupplier? initialValue)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -213,7 +215,7 @@
             return source;
         }
 
-        public GraphTraversalSource WithSideEffect(string key, ISupplier initialValue, IBinaryOperator reducer)
+        public GraphTraversalSource WithSideEffect(string? key, ISupplier? initialValue, IBinaryOperator? reducer)
         {
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
@@ -233,20 +235,20 @@
             return source;
         }
 
-        public GraphTraversalSource WithoutStrategies(params Type[] traversalStrategyClasses)
+        public GraphTraversalSource WithoutStrategies(params Type?[] traversalStrategyClasses)
         {
             if (traversalStrategyClasses == null) throw new ArgumentNullException(nameof(traversalStrategyClasses));
             
             var source = new GraphTraversalSource(new List<ITraversalStrategy>(TraversalStrategies),
                                                   new Bytecode(Bytecode));
-            var args = new List<object>(traversalStrategyClasses.Length);
+            var args = new List<object?>(traversalStrategyClasses.Length);
             args.AddRange(traversalStrategyClasses);
             source.Bytecode.AddSource("withoutStrategies", args.ToArray());
             return source;
         }
 
         [Obsolete("Use the Bindings class instead.", false)]
-        public GraphTraversalSource WithBindings(object bindings)
+        public GraphTraversalSource WithBindings(object? bindings)
         {
             return this;
         }
@@ -277,35 +279,35 @@
                 throw new InvalidOperationException(
                     "This GraphTraversalSource is already bound to a transaction - child transactions are not supported");
             }
-            return _connection.Tx(this);
+            return _connection!.Tx(this);
         }
 
         /// <summary>
         ///     Add a GraphComputer class used to execute the traversal.
         ///     This adds a <see cref="VertexProgramStrategy" /> to the strategies.
         /// </summary>
-        public GraphTraversalSource WithComputer(string graphComputer = null, int? workers = null, string persist = null,
-            string result = null, ITraversal vertices = null, ITraversal edges = null,
-            Dictionary<string, dynamic> configuration = null)
+        public GraphTraversalSource WithComputer(string? graphComputer = null, int? workers = null,
+            string? persist = null, string? result = null, ITraversal? vertices = null, ITraversal? edges = null,
+            Dictionary<string, dynamic>? configuration = null)
         {
-            return WithStrategies(new VertexProgramStrategy(graphComputer, workers, persist, result, vertices, edges, configuration));
+            return WithStrategies(new VertexProgramStrategy(graphComputer, workers, persist, result, vertices, edges,
+                configuration));
         }
 
-
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the E step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<Edge, Edge> E(params object[] edgesIds)
+        public GraphTraversal<Edge, Edge> E(params object?[]? edgesIds)
         {
             var traversal = new GraphTraversal<Edge, Edge>(TraversalStrategies, new Bytecode(Bytecode));
             if (edgesIds == null)
             {
-                traversal.Bytecode.AddStep("E", new object[] { null });
+                traversal.Bytecode.AddStep("E", new object?[] { null });
             }
             else
             {
-                var args = new List<object>(edgesIds.Length);
+                var args = new List<object?>(edgesIds.Length);
                 args.AddRange(edgesIds);
                 traversal.Bytecode.AddStep("E", args.ToArray());
             }
@@ -316,16 +318,16 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the V step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<Vertex, Vertex> V(params object[] vertexIds)
+        public GraphTraversal<Vertex, Vertex> V(params object?[]? vertexIds)
         {
             var traversal = new GraphTraversal<Vertex, Vertex>(TraversalStrategies, new Bytecode(Bytecode));
             if (vertexIds == null)
             {
-                traversal.Bytecode.AddStep("V", new object[] { null });
+                traversal.Bytecode.AddStep("V", new object?[] { null });
             }
             else
             {
-                var args = new List<object>(vertexIds.Length);
+                var args = new List<object?>(vertexIds.Length);
                 args.AddRange(vertexIds);
                 traversal.Bytecode.AddStep("V", args.ToArray());
             }
@@ -358,7 +360,7 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the mergeE step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<Edge, Edge> MergeE(IDictionary<object,object> m)
+        public GraphTraversal<Edge, Edge> MergeE(IDictionary<object,object>? m)
         {
             var traversal = new GraphTraversal<Edge, Edge>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("mergeE", m);
@@ -369,7 +371,7 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the mergeE step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<Edge, Edge> MergeE(ITraversal t)
+        public GraphTraversal<Edge, Edge> MergeE(ITraversal? t)
         {
             var traversal = new GraphTraversal<Edge, Edge>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("mergeE", t);
@@ -413,7 +415,7 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the mergeV step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<Vertex, Vertex> MergeV(IDictionary<object,object> m)
+        public GraphTraversal<Vertex, Vertex> MergeV(IDictionary<object,object>? m)
         {
             var traversal = new GraphTraversal<Vertex, Vertex>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("mergeV", m);
@@ -424,7 +426,7 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the mergeV step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<Vertex, Vertex> MergeV(ITraversal t)
+        public GraphTraversal<Vertex, Vertex> MergeV(ITraversal? t)
         {
             var traversal = new GraphTraversal<Vertex, Vertex>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("mergeV", t);
@@ -435,19 +437,19 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the inject step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<S, S> Inject<S>(params S[] starts)
+        public GraphTraversal<TStart, TStart> Inject<TStart>(params TStart?[]? starts)
         {
-            var traversal = new GraphTraversal<S, S>(TraversalStrategies, new Bytecode(Bytecode));
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
 
             // null starts is treated as g.inject(null) meaning inject a single null traverser
             if (starts == null)
             {
-                traversal.Bytecode.AddStep("inject", new object[] { null });
+                traversal.Bytecode.AddStep("inject", new object?[] { null });
             }
             else
             {
-                var args = new List<object>(starts.Length);
-                args.AddRange(starts.Cast<object>());
+                var args = new List<object?>(starts.Length);
+                args.AddRange(starts.Cast<object?>());
                 traversal.Bytecode.AddStep("inject", args.ToArray());
             }
 
@@ -458,10 +460,10 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the io step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<S, S> Io<S>(string file)
+        public GraphTraversal<TStart, TStart> Io<TStart>(string file)
         {
-            var traversal = new GraphTraversal<S, S>(TraversalStrategies, new Bytecode(Bytecode));
-                traversal.Bytecode.AddStep("io", file);
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
+            traversal.Bytecode.AddStep("io", file);
             return traversal;
         }
 
@@ -469,9 +471,9 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the call step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<S, S> Call<S>()
+        public GraphTraversal<TStart, TStart> Call<TStart>()
         {
-            var traversal = new GraphTraversal<S, S>(TraversalStrategies, new Bytecode(Bytecode));
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("call");
             return traversal;
         }
@@ -480,9 +482,9 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the call step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<S, S> Call<S>(string service)
+        public GraphTraversal<TStart, TStart> Call<TStart>(string? service)
         {
-            var traversal = new GraphTraversal<S, S>(TraversalStrategies, new Bytecode(Bytecode));
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("call", service);
             return traversal;
         }
@@ -491,9 +493,9 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the call step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<S, S> Call<S>(string service, IDictionary<object,object> m)
+        public GraphTraversal<TStart, TStart> Call<TStart>(string? service, IDictionary<object, object>? m)
         {
-            var traversal = new GraphTraversal<S, S>(TraversalStrategies, new Bytecode(Bytecode));
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("call", service, m);
             return traversal;
         }
@@ -502,9 +504,9 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the call step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<S, S> Call<S>(string service, ITraversal t)
+        public GraphTraversal<TStart, TStart> Call<TStart>(string? service, ITraversal? t)
         {
-            var traversal = new GraphTraversal<S, S>(TraversalStrategies, new Bytecode(Bytecode));
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("call", service, t);
             return traversal;
         }
@@ -513,13 +515,26 @@
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the call step to that
         ///     traversal.
         /// </summary>
-        public GraphTraversal<S, S> Call<S>(string service, IDictionary<object,object> m, ITraversal t)
+        public GraphTraversal<TStart, TStart> Call<TStart>(string? service, IDictionary<object, object>? m,
+            ITraversal? t)
         {
-            var traversal = new GraphTraversal<S, S>(TraversalStrategies, new Bytecode(Bytecode));
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
             traversal.Bytecode.AddStep("call", service, m, t);
             return traversal;
         }
 
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> off this graph traversal source and adds the union step to that
+        ///     traversal.
+        /// </summary>
+        public GraphTraversal<TStart, TStart> Union<TStart>(params ITraversal[] unionTraversals)
+        {
+            var traversal = new GraphTraversal<TStart, TStart>(TraversalStrategies, new Bytecode(Bytecode));
+            var args = new List<object>(unionTraversals.Length);
+            args.AddRange(unionTraversals);
+            traversal.Bytecode.AddStep("union", args.ToArray());
+            return traversal;
+        }
 
     }
     
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
index f0c682d..17874b5 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
@@ -48,7 +48,7 @@
         /// <summary>
         ///     Gets or sets the <see cref="Traverser" />'s of this traversal that hold the results of the traversal.
         /// </summary>
-        IEnumerable<Traverser> Traversers { get; set; }
+        IEnumerable<Traverser>? Traversers { get; set; }
 
         /// <summary>
         ///     Iterates all <see cref="Traverser" /> instances in the traversal.
@@ -60,13 +60,13 @@
     /// <summary>
     ///     A traversal represents a directed walk over a graph.
     /// </summary>
-    public interface ITraversal<S, E> : ITraversal, IEnumerator<E>
+    public interface ITraversal<TStart, TEnd> : ITraversal, IEnumerator<TEnd?>
     {
         /// <summary>
         ///     Gets the next result from the traversal.
         /// </summary>
         /// <returns>The result.</returns>
-        E Next();
+        TEnd? Next();
 
         /// <summary>
         ///     Determines if the traversal contains any additional results for iteration.
@@ -79,13 +79,13 @@
         /// </summary>
         /// <param name="amount">The number of results to get.</param>
         /// <returns>The n-results.</returns>
-        IEnumerable<E> Next(int amount);
+        IEnumerable<TEnd?> Next(int amount);
 
         /// <summary>
         ///     Iterates all <see cref="Traverser" /> instances in the traversal.
         /// </summary>
         /// <returns>The fully drained traversal.</returns>
-        new ITraversal<S, E> Iterate();
+        new ITraversal<TStart, TEnd> Iterate();
 
         /// <summary>
         ///     Gets the next <see cref="Traverser" />.
@@ -97,13 +97,13 @@
         ///     Puts all the results into a <see cref="IList{T}" />.
         /// </summary>
         /// <returns>The results in a list.</returns>
-        IList<E> ToList();
+        IList<TEnd?> ToList();
 
         /// <summary>
         ///     Puts all the results into a <see cref="ISet{T}" />.
         /// </summary>
         /// <returns>The results in a set.</returns>
-        ISet<E> ToSet();
+        ISet<TEnd?> ToSet();
 
         /// <summary>
         ///     Starts a promise to execute a function on the current traversal that will be completed in the future.
@@ -112,7 +112,7 @@
         /// <param name="callback">The function to execute on the current traversal.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>The result of the executed <paramref name="callback" />.</returns>
-        Task<TReturn> Promise<TReturn>(Func<ITraversal<S, E>, TReturn> callback,
+        Task<TReturn> Promise<TReturn>(Func<ITraversal<TStart, TEnd>, TReturn> callback,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalStrategy.cs
index 45a0b97..20b3bc0 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalStrategy.cs
@@ -36,13 +36,13 @@
         ///     Applies the strategy to the given <see cref="ITraversal" />.
         /// </summary>
         /// <param name="traversal">The <see cref="ITraversal" /> the strategy should be applied to.</param>
-        void Apply<S, E>(ITraversal<S, E> traversal);
+        void Apply<TStart, TEnd>(ITraversal<TStart, TEnd> traversal);
 
         /// <summary>
         ///     Applies the strategy to the given <see cref="ITraversal" /> asynchronously.
         /// </summary>
         /// <param name="traversal">The <see cref="ITraversal" /> the strategy should be applied to.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
-        Task ApplyAsync<S, E>(ITraversal<S, E> traversal, CancellationToken cancellationToken = default);
+        Task ApplyAsync<TStart, TEnd>(ITraversal<TStart, TEnd> traversal, CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
index f6453fe..cf9cd0c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
@@ -36,10 +36,10 @@
         /// </summary>
         /// <param name="operatorName">The name of the operator.</param>
         /// <param name="arguments">The arguments.</param>
-        public Instruction(string operatorName, params dynamic[] arguments)
+        public Instruction(string operatorName, params dynamic?[] arguments)
         {
-            OperatorName = operatorName;
-            Arguments = arguments;
+            OperatorName = operatorName ?? throw new ArgumentNullException(nameof(operatorName));
+            Arguments = arguments ?? throw new ArgumentNullException(nameof(arguments));
         }
 
         /// <summary>
@@ -50,7 +50,7 @@
         /// <summary>
         ///     Gets the arguments.
         /// </summary>
-        public dynamic[] Arguments { get; }
+        public dynamic?[] Arguments { get; }
 
         /// <summary>
         ///     String representation of the <see cref="Instruction"/>.
@@ -61,7 +61,7 @@
         }
 
         /// <inheritdoc />
-        public bool Equals(Instruction other)
+        public bool Equals(Instruction? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -69,7 +69,7 @@
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
@@ -83,15 +83,10 @@
             unchecked
             {
                 var hash = 19;
-                if (OperatorName != null)
-                {
-                    hash = hash * 397 + OperatorName.GetHashCode();
-                }
+                hash = hash * 397 + OperatorName.GetHashCode();
 
-                if (Arguments != null)
-                {
-                    hash = Arguments.Aggregate(hash, (current, value) => current * 31 + value.GetHashCode());
-                }
+                hash = Arguments.Aggregate(hash,
+                    (current, value) => current * 31 + (value == null ? 0 : value.GetHashCode()));
 
                 return hash;
             }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
deleted file mode 100644
index a650dc5..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-#region License
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#endregion
-
-using System.Collections.Generic;
-
-namespace Gremlin.Net.Process.Traversal
-{
-    internal static class NamingConversions
-    {
-        /// <summary>
-        ///     Gets the Java name equivalent for a given enum value
-        /// </summary>
-        internal static string GetEnumJavaName(string typeName, string value)
-        {
-            var key = $"{typeName}.{value}";
-            string javaName;
-            if (!CSharpToJavaEnums.TryGetValue(key, out javaName))
-            {
-                throw new KeyNotFoundException($"Java name for {key} not found");
-            }
-            return javaName;
-        }
-
-        internal static readonly IDictionary<string, string> CSharpToJavaEnums = new Dictionary<string, string>
-        {
-            {"Barrier.NormSack", "normSack"},
-            {"Cardinality.List", "list"},
-            {"Cardinality.Set", "set"},
-            {"Cardinality.Single", "single"},
-            {"Column.Keys", "keys"},
-            {"Column.Values", "values"},
-            {"Direction.Both", "BOTH"},
-            {"Direction.In", "IN"},
-            {"Direction.Out", "OUT"},
-            {"GraphSONVersion.V1_0", "V1_0"},
-            {"GraphSONVersion.V2_0", "V2_0"},
-            {"GraphSONVersion.V3_0", "V3_0"},
-            {"GryoVersion.V1_0", "V1_0"},
-            {"GryoVersion.V3_0", "V3_0"},
-            {"Operator.AddAll", "addAll"},
-            {"Operator.And", "and"},
-            {"Operator.Assign", "assign"},
-            {"Operator.Div", "div"},
-            {"Operator.Max", "max"},
-            {"Operator.Min", "min"},
-            {"Operator.Minus", "minus"},
-            {"Operator.Mult", "mult"},
-            {"Operator.Or", "or"},
-            {"Operator.Sum", "sum"},
-            {"Operator.SumLong", "sumLong"},
-            {"Order.Decr", "decr"},
-            {"Order.Incr", "incr"},
-            {"Order.Shuffle", "shuffle"},
-            {"Order.Asc", "asc"},
-            {"Order.Desc", "desc"},
-            {"Pick.Any", "any"},
-            {"Pick.None", "none"},
-            {"Pop.All", "all"},
-            {"Pop.First", "first"},
-            {"Pop.Last", "last"},
-            {"Pop.Mixed", "mixed"},
-            {"Scope.Global", "global"},
-            {"Scope.Local", "local"},
-            {"T.Id", "id"},
-            {"T.Key", "key"},
-            {"T.Label", "label"},
-            {"T.Value", "value"}
-
-        };
-    }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index 733352b..2e4e2b3 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -41,7 +41,7 @@
         /// <param name="operatorName">The name of the predicate.</param>
         /// <param name="value">The value of the predicate.</param>
         /// <param name="other">An optional other predicate that is used as an argument for this predicate.</param>
-        public P(string operatorName, dynamic value, P other = null)
+        public P(string operatorName, dynamic? value, P? other = null)
         {
             OperatorName = operatorName;
             Value = value;
@@ -56,12 +56,12 @@
         /// <summary>
         ///     Gets the value of the predicate.
         /// </summary>
-        public dynamic Value { get; }
+        public dynamic? Value { get; }
 
         /// <summary>
         ///     Gets an optional other predicate that is used as an argument for this predicate.
         /// </summary>
-        public P Other { get; }
+        public P? Other { get; }
 
         /// <summary>
         ///     Returns a composed predicate that represents a logical AND of this predicate and another.
@@ -83,86 +83,86 @@
             return new P("or", this, otherPredicate);
         }
 
-        public static P Between(params object[] args)
+        public static P Between(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("between", value);
         }
 
-        public static P Eq(params object[] args)
+        public static P Eq(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("eq", value);
         }
 
-        public static P Gt(params object[] args)
+        public static P Gt(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("gt", value);
         }
 
-        public static P Gte(params object[] args)
+        public static P Gte(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("gte", value);
         }
 
-        public static P Inside(params object[] args)
+        public static P Inside(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("inside", value);
         }
 
-        public static P Lt(params object[] args)
+        public static P Lt(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("lt", value);
         }
 
-        public static P Lte(params object[] args)
+        public static P Lte(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("lte", value);
         }
 
-        public static P Neq(params object[] args)
+        public static P Neq(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("neq", value);
         }
 
-        public static P Not(params object[] args)
+        public static P Not(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("not", value);
         }
 
-        public static P Outside(params object[] args)
+        public static P Outside(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("outside", value);
         }
 
-        public static P Test(params object[] args)
+        public static P Test(params object[]? args)
         {
-            var value = args != null && args.Length == 1 ? args[0] : args;
+            var value = args is { Length: 1 } ? args[0] : args;
             return new P("test", value);
         }
 
-        public static P Within(params object[] args)
+        public static P Within(params object[]? args)
         {
-            var x = args != null && args.Length == 1 && args[0] is ICollection collection ? collection : args;
+            var x = args is { Length: 1 } && args[0] is ICollection collection ? collection : args;
             return new P("within", ToGenericList(x));
         }
 
-        public static P Without(params object[] args)
+        public static P Without(params object[]? args)
         {
-            var x = args != null && args.Length == 1 && args[0] is ICollection collection ? collection : args;
+            var x = args is { Length: 1 } && args[0] is ICollection collection ? collection : args;
             return new P("without", ToGenericList(x));
         }
 
 
-        private static List<object> ToGenericList(IEnumerable collection)
+        private static List<object> ToGenericList(IEnumerable? collection)
         {
             return collection?.Cast<object>().ToList() ?? Enumerable.Empty<object>().ToList();
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/AbstractTraversalStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/AbstractTraversalStrategy.cs
index 7170aa7..1c7376d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/AbstractTraversalStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/AbstractTraversalStrategy.cs
@@ -84,10 +84,10 @@
         /// <summary>
         ///     Gets the configuration of the strategy.
         /// </summary>
-        public Dictionary<string, dynamic> Configuration { get; } = new Dictionary<string, dynamic>();
+        public Dictionary<string, dynamic?> Configuration { get; } = new();
 
         /// <inheritdoc />
-        public bool Equals(AbstractTraversalStrategy other)
+        public bool Equals(AbstractTraversalStrategy? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -95,18 +95,18 @@
         }
 
         /// <inheritdoc />
-        public virtual void Apply<S, E>(ITraversal<S, E> traversal)
+        public virtual void Apply<TStart, TEnd>(ITraversal<TStart, TEnd> traversal)
         {
         }
 
         /// <inheritdoc />
-        public virtual Task ApplyAsync<S, E>(ITraversal<S, E> traversal, CancellationToken cancellationToken = default)
+        public virtual Task ApplyAsync<TStart, TEnd>(ITraversal<TStart, TEnd> traversal, CancellationToken cancellationToken = default)
         {
             return Task.CompletedTask;
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs
index 6ae8876..ffa38fc 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/HaltedTraverserStrategy.cs
@@ -32,7 +32,7 @@
         {
         }
 
-        public HaltedTraverserStrategy(string haltedTraverserFactoryName = null)
+        public HaltedTraverserStrategy(string? haltedTraverserFactoryName = null)
             : this()
         {
             if (haltedTraverserFactoryName != null)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/PartitionStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/PartitionStrategy.cs
index 8c59ad4..34f7b55 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/PartitionStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/PartitionStrategy.cs
@@ -49,8 +49,8 @@
         /// </param>
         /// <param name="readPartitions">Specifies the partition of the graph to read from.</param>
         /// <param name="includeMetaProperties">Set to true if vertex properties should get assigned to partitions.</param>
-        public PartitionStrategy(string partitionKey = null, string writePartition = null,
-            IEnumerable<string> readPartitions = null, bool? includeMetaProperties = null)
+        public PartitionStrategy(string? partitionKey = null, string? writePartition = null,
+            IEnumerable<string>? readPartitions = null, bool? includeMetaProperties = null)
             : this()
         {
             if (partitionKey != null)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/SubgraphStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/SubgraphStrategy.cs
index af312d6..141b851 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/SubgraphStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/SubgraphStrategy.cs
@@ -44,8 +44,8 @@
         /// <param name="edges">Constrains edges for the <see cref="ITraversal" />.</param>
         /// <param name="vertexProperties">Constrains vertex properties for the <see cref="ITraversal" />.</param>
         /// <param name="checkAdjacentVertices">Determines if filters are applied to the adjacent vertices of an edge.</param>
-        public SubgraphStrategy(ITraversal vertices = null, ITraversal edges = null,
-            ITraversal vertexProperties = null, bool? checkAdjacentVertices = null)
+        public SubgraphStrategy(ITraversal? vertices = null, ITraversal? edges = null,
+            ITraversal? vertexProperties = null, bool? checkAdjacentVertices = null)
             : this()
         {
             if (vertices != null)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/VertexProgramStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/VertexProgramStrategy.cs
index 17bfbaa..149dfe7 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/VertexProgramStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Decoration/VertexProgramStrategy.cs
@@ -35,9 +35,9 @@
         {
         }
 
-        public VertexProgramStrategy(string graphComputer = null, int? workers = null, string persist = null,
-            string result = null, ITraversal vertices = null, ITraversal edges = null,
-            Dictionary<string, dynamic> configuration = null)
+        public VertexProgramStrategy(string? graphComputer = null, int? workers = null, string? persist = null,
+            string? result = null, ITraversal? vertices = null, ITraversal? edges = null,
+            Dictionary<string, dynamic>? configuration = null)
             : this()
         {
             if (graphComputer != null)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/ProductiveByStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/ProductiveByStrategy.cs
index 1586580..e989f48 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/ProductiveByStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Optimization/ProductiveByStrategy.cs
@@ -43,7 +43,7 @@
         ///     Initializes a new instance of the <see cref="ProductiveByStrategy" /> class.
         /// </summary>
         /// <param name="productiveKeys">Specifies keys that will always be productive.</param>
-        public ProductiveByStrategy(IEnumerable<object> productiveKeys = null)
+        public ProductiveByStrategy(IEnumerable<object>? productiveKeys = null)
             : this()
         {
             if (productiveKeys != null)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ReservedKeysVerificationStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ReservedKeysVerificationStrategy.cs
index eccae0d..204f9d8 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ReservedKeysVerificationStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ReservedKeysVerificationStrategy.cs
@@ -47,7 +47,7 @@
         /// <param name="throwException">Throw an exception if a reserved key is used.</param>
         /// <param name="keys">List of keys to define as reserved. If not set then the defaults are used.</param>
         public ReservedKeysVerificationStrategy(bool logWarning = false, bool throwException = false,
-            List<string> keys = null)
+            List<string>? keys = null)
             : this()
         {
             Configuration["logWarning"] = logWarning;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs
index 2bf4968..9a97d1a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs
@@ -41,7 +41,7 @@
         /// <param name="operatorName">The name of the predicate.</param>
         /// <param name="value">The value of the predicate.</param>
         /// <param name="other">An optional other predicate that is used as an argument for this predicate.</param>
-        public TextP(string operatorName, string value, P other = null) : base(operatorName, value, other)
+        public TextP(string operatorName, string value, P? other = null) : base(operatorName, value, other)
         {
         }
 
@@ -86,11 +86,6 @@
             return new TextP("notRegex", value);
         }
 
-        private static T[] ToGenericArray<T>(ICollection<T> collection)
-        {
-            return collection?.ToArray() ?? new T[0];
-        }
-
         /// <inheritdoc />
         public override string ToString()
         {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Translator/GroovyTranslator.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Translator/GroovyTranslator.cs
index 867c719..98dc5c4 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Translator/GroovyTranslator.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Translator/GroovyTranslator.cs
@@ -107,7 +107,7 @@
             return $".{step.OperatorName}({TranslateArguments(step.Arguments)})";

         }

         

-        private string TranslateWithArguments(dynamic[] arguments)

+        private string TranslateWithArguments(dynamic?[] arguments)

         {

             if (arguments[0] == WithOptions.Tokens)

             {

@@ -138,10 +138,10 @@
             { WithOptions.Map, "WithOptions.map" }

         };

 

-        private string TranslateArguments(IEnumerable<object> arguments) =>

+        private string TranslateArguments(IEnumerable<object?> arguments) =>

             string.Join(", ", arguments.Select(TranslateArgument));

 

-        private string TranslateArgument(object argument)

+        private string TranslateArgument(object? argument)

         {

             return argument switch

             {

@@ -157,7 +157,7 @@
                 IEnumerable e => TranslateCollection(e),

                 ITraversal t => TranslateTraversal(t),

                 AbstractTraversalStrategy strategy => TranslateStrategy(strategy),

-                _ => Convert.ToString(argument, CultureInfo.InvariantCulture)

+                _ => Convert.ToString(argument, CultureInfo.InvariantCulture)!

             };

         }

         

diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Traverser.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Traverser.cs
index 573e57f..6c241ef 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Traverser.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Traverser.cs
@@ -33,7 +33,7 @@
         /// </summary>
         /// <param name="obj">The object of the traverser.</param>
         /// <param name="bulk">The number of traversers represented in this traverser.</param>
-        public Traverser(dynamic obj, long bulk = 1)
+        public Traverser(dynamic? obj, long bulk = 1)
         {
             Object = obj;
             Bulk = bulk;
@@ -42,7 +42,7 @@
         /// <summary>
         ///     Gets the object of this traverser.
         /// </summary>
-        public dynamic Object { get; }
+        public dynamic? Object { get; }
 
         /// <summary>
         ///     Gets the number of traversers represented in this traverser.
@@ -50,7 +50,7 @@
         public long Bulk { get; internal set; }
 
         /// <inheritdoc />
-        public bool Equals(Traverser other)
+        public bool Equals(Traverser? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -58,7 +58,7 @@
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
index 93de0b8..51bfe76 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System;
 using System.Collections.Generic;
 using Gremlin.Net.Structure;
 
@@ -42,7 +43,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the V step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Vertex> V(params object[] vertexIdsOrElements)
+        public static GraphTraversal<object, Vertex> V(params object?[]? vertexIdsOrElements)
         {
             return vertexIdsOrElements is { Length: 0 }
                 ? new GraphTraversal<object, Vertex>().V()
@@ -50,6 +51,16 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the E step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, Edge> E(params object?[]? edgeIdsOrElements)
+        {
+            return edgeIdsOrElements is { Length: 0 }
+                ? new GraphTraversal<object, Edge>().E()
+                : new GraphTraversal<object, Edge>().E(edgeIdsOrElements);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the addE step to that traversal.
         /// </summary>
         public static GraphTraversal<object, Edge> AddE(string edgeLabel)
@@ -106,6 +117,14 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> all adds the all step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> All(P? predicate)
+        {
+            return new GraphTraversal<object, object>().All(predicate);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the and step to that traversal.
         /// </summary>
         public static GraphTraversal<object, object> And(params ITraversal[] andTraversals)
@@ -116,6 +135,14 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> any adds the any step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Any(P? predicate)
+        {
+            return new GraphTraversal<object, object>().Any(predicate);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the as step to that traversal.
         /// </summary>
         public static GraphTraversal<object, object> As(string label, params string[] labels)
@@ -124,6 +151,30 @@
                 ? new GraphTraversal<object, object>().As(label)
                 : new GraphTraversal<object, object>().As(label, labels);            
         }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the asString step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> AsString()
+        {
+            return new GraphTraversal<object, string>().AsString();            
+        }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the asString step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, E2?> AsString<E2>(Scope scope)
+        {
+            return new GraphTraversal<object, E2>().AsString<E2>(scope);            
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the asDate step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, DateTimeOffset> AsDate()
+        {
+            return new GraphTraversal<object, DateTimeOffset>().AsDate();
+        }
 
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the barrier step to that traversal.
@@ -152,7 +203,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the both step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Vertex> Both(params string[] edgeLabels)
+        public static GraphTraversal<object, Vertex> Both(params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Vertex>().Both()
@@ -162,7 +213,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the bothE step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Edge> BothE(params string[] edgeLabels)
+        public static GraphTraversal<object, Edge> BothE(params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Edge>().BothE()
@@ -180,7 +231,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the branch step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Branch<E2>(IFunction function)
+        public static GraphTraversal<object, E2> Branch<E2>(IFunction? function)
         {
             return new GraphTraversal<object, E2>().Branch<E2>(function);            
         }
@@ -196,7 +247,7 @@
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public static GraphTraversal<object, E2> Call<E2>(string service)
+        public static GraphTraversal<object, E2> Call<E2>(string? service)
         {
             return new GraphTraversal<object, E2>().Call<E2>(service);
         }
@@ -204,7 +255,7 @@
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public static GraphTraversal<object, E2> Call<E2>(string service, IDictionary<object,object> m)
+        public static GraphTraversal<object, E2> Call<E2>(string? service, IDictionary<object,object>? m)
         {
             return new GraphTraversal<object, E2>().Call<E2>(service, m);
         }
@@ -212,7 +263,7 @@
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public static GraphTraversal<object, E2> Call<E2>(string service, ITraversal t)
+        public static GraphTraversal<object, E2> Call<E2>(string? service, ITraversal? t)
         {
             return new GraphTraversal<object, E2>().Call<E2>(service, t);
         }
@@ -220,7 +271,7 @@
         /// <summary>
         ///     Adds the call step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public static GraphTraversal<object, E2> Call<E2>(string service, IDictionary<object,object> m, ITraversal t)
+        public static GraphTraversal<object, E2> Call<E2>(string? service, IDictionary<object,object>? m, ITraversal? t)
         {
             return new GraphTraversal<object, E2>().Call<E2>(service, m, t);
         }
@@ -302,11 +353,45 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the combine step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Combine(object combineObject)
+        {
+            return new GraphTraversal<object, object>().Combine(combineObject);
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the concat step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string> Concat (ITraversal concatTraversal, ITraversal[]? otherConcatTraversals)
+        {
+            return new GraphTraversal<object, string>().Concat(concatTraversal, otherConcatTraversals);           
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the concat step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string> Concat(params string?[] concatStrings)
+        {
+            return concatStrings is { Length: 0 }
+                ? new GraphTraversal<object, string>().Concat()
+                : new GraphTraversal<object, string>().Concat(concatStrings);
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the conjoin step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object?> Conjoin(string delimiter)
+        {
+            return new GraphTraversal<object, object>().Conjoin(delimiter);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the constant step to that traversal.
         /// </summary>
         public static GraphTraversal<object, E2> Constant<E2>(E2 a)
         {
-            return new GraphTraversal<object, E2>().Constant<E2>(a);            
+            return new GraphTraversal<object, E2>().Constant(a);            
         }
 
         /// <summary>
@@ -334,9 +419,33 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the dateAdd step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, DateTimeOffset> DateAdd(DT dateToken, int value)
+        {
+            return new GraphTraversal<object, DateTimeOffset>().DateAdd(dateToken, value);
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the dateDiff step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, long> DateDiff(DateTimeOffset value)
+        {
+            return new GraphTraversal<object, long>().DateDiff(value);
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the dateDiff step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, long> DateDiff(ITraversal dateTraversal)
+        {
+            return new GraphTraversal<object, long>().DateDiff(dateTraversal);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the dedup step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Dedup(Scope scope, params string[] dedupLabels)
+        public static GraphTraversal<object, object> Dedup(Scope scope, params string?[] dedupLabels)
         {
             return dedupLabels is { Length: 0 }
                 ? new GraphTraversal<object, object>().Dedup(scope)
@@ -346,7 +455,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the dedup step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Dedup(params string[] dedupLabels)
+        public static GraphTraversal<object, object> Dedup(params string?[] dedupLabels)
         {
             return dedupLabels is { Length: 0 }
                 ? new GraphTraversal<object, object>().Dedup()
@@ -354,6 +463,22 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the difference step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Difference(object differenceObject)
+        {
+            return new GraphTraversal<object, object>().Difference(differenceObject);
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the disjunct step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Disjunct(object disjunctObject)
+        {
+            return new GraphTraversal<object, object>().Disjunct(disjunctObject);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the drop step to that traversal.
         /// </summary>
         public static GraphTraversal<object, object> Drop()
@@ -372,7 +497,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the elementMap step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, IDictionary<object, E2>> ElementMap<E2>(params string[] propertyKeys)
+        public static GraphTraversal<object, IDictionary<object, E2>> ElementMap<E2>(params string?[] propertyKeys)
         {
             return propertyKeys is { Length: 0 }
                 ? new GraphTraversal<object, IDictionary<object, E2>>().ElementMap<E2>()
@@ -414,7 +539,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the fail step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Fail(string msg)
+        public static GraphTraversal<object, object> Fail(string? msg)
         {
             return new GraphTraversal<object, object>().Fail(msg);
         }
@@ -422,7 +547,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the filter step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Filter(IPredicate predicate)
+        public static GraphTraversal<object, object> Filter(IPredicate? predicate)
         {
             return new GraphTraversal<object, object>().Filter(predicate);            
         }
@@ -438,7 +563,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the flatMap step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> FlatMap<E2>(IFunction function)
+        public static GraphTraversal<object, E2> FlatMap<E2>(IFunction? function)
         {
             return new GraphTraversal<object, E2>().FlatMap<E2>(function);            
         }
@@ -462,9 +587,17 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the fold step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Fold<E2>(E2 seed, IBiFunction foldFunction)
+        public static GraphTraversal<object, E2> Fold<E2>(E2 seed, IBiFunction? foldFunction)
         {
-            return new GraphTraversal<object, E2>().Fold<E2>(seed, foldFunction);            
+            return new GraphTraversal<object, E2>().Fold(seed, foldFunction);            
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the format step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string> Format<E2>(string format)
+        {
+            return new GraphTraversal<object, string>().Format(format);
         }
 
         /// <summary>
@@ -502,7 +635,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(string propertyKey)
+        public static GraphTraversal<object, object> Has(string? propertyKey)
         {
             return new GraphTraversal<object, object>().Has(propertyKey);            
         }
@@ -510,7 +643,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(string propertyKey, object value)
+        public static GraphTraversal<object, object> Has(string? propertyKey, object? value)
         {
             return new GraphTraversal<object, object>().Has(propertyKey, value);            
         }
@@ -518,7 +651,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(string propertyKey, P predicate)
+        public static GraphTraversal<object, object> Has(string? propertyKey, P? predicate)
         {
             return new GraphTraversal<object, object>().Has(propertyKey, predicate);            
         }
@@ -526,7 +659,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(string label, string propertyKey, object value)
+        public static GraphTraversal<object, object> Has(string? label, string? propertyKey, object? value)
         {
             return new GraphTraversal<object, object>().Has(label, propertyKey, value);            
         }
@@ -534,7 +667,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(string label, string propertyKey, P predicate)
+        public static GraphTraversal<object, object> Has(string? label, string? propertyKey, P? predicate)
         {
             return new GraphTraversal<object, object>().Has(label, propertyKey, predicate);            
         }
@@ -542,7 +675,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(string propertyKey, ITraversal propertyTraversal)
+        public static GraphTraversal<object, object> Has(string? propertyKey, ITraversal propertyTraversal)
         {
             return new GraphTraversal<object, object>().Has(propertyKey, propertyTraversal);            
         }
@@ -550,7 +683,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(T accessor, object value)
+        public static GraphTraversal<object, object> Has(T accessor, object? value)
         {
             return new GraphTraversal<object, object>().Has(accessor, value);            
         }
@@ -558,7 +691,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the has step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Has(T accessor, P predicate)
+        public static GraphTraversal<object, object> Has(T accessor, P? predicate)
         {
             return new GraphTraversal<object, object>().Has(accessor, predicate);            
         }
@@ -574,7 +707,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasId step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasId(object id, params object[] otherIds)
+        public static GraphTraversal<object, object> HasId(object? id, params object?[]? otherIds)
         {
             return otherIds is { Length: 0 }
                 ? new GraphTraversal<object, object>().HasId(id)
@@ -584,7 +717,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasId step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasId(P predicate)
+        public static GraphTraversal<object, object> HasId(P? predicate)
         {
             return new GraphTraversal<object, object>().HasId(predicate);            
         }
@@ -592,7 +725,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasKey step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasKey(P predicate)
+        public static GraphTraversal<object, object> HasKey(P? predicate)
         {
             return new GraphTraversal<object, object>().HasKey(predicate);            
         }
@@ -600,7 +733,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasKey step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasKey(string label, params string[] otherLabels)
+        public static GraphTraversal<object, object> HasKey(string? label, params string?[]? otherLabels)
         {
             return otherLabels is { Length: 0 }
                 ? new GraphTraversal<object, object>().HasKey(label)
@@ -610,7 +743,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasLabel step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasLabel(P predicate)
+        public static GraphTraversal<object, object> HasLabel(P? predicate)
         {
             return new GraphTraversal<object, object>().HasLabel(predicate);            
         }
@@ -618,7 +751,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasLabel step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasLabel(string label, params string[] otherLabels)
+        public static GraphTraversal<object, object> HasLabel(string? label, params string?[]? otherLabels)
         {
             return otherLabels is { Length: 0 }
                 ? new GraphTraversal<object, object>().HasLabel(label)
@@ -628,7 +761,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasNot step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasNot(string propertyKey)
+        public static GraphTraversal<object, object> HasNot(string? propertyKey)
         {
             return new GraphTraversal<object, object>().HasNot(propertyKey);            
         }
@@ -636,7 +769,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasValue step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasValue(object value, params object[] values)
+        public static GraphTraversal<object, object> HasValue(object? value, params object?[]? values)
         {
             return values is { Length: 0 }
                 ? new GraphTraversal<object, object>().HasValue(value)
@@ -646,7 +779,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the hasValue step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> HasValue(P predicate)
+        public static GraphTraversal<object, object> HasValue(P? predicate)
         {
             return new GraphTraversal<object, object>().HasValue(predicate);            
         }
@@ -670,7 +803,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the in step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Vertex> In(params string[] edgeLabels)
+        public static GraphTraversal<object, Vertex> In(params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Vertex>().In()
@@ -680,7 +813,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the inE step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Edge> InE(params string[] edgeLabels)
+        public static GraphTraversal<object, Edge> InE(params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Edge>().InE()
@@ -706,7 +839,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the inject step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Inject(params object[] injections)
+        public static GraphTraversal<object, object> Inject(params object?[] injections)
         {
             return injections is { Length: 0 }
                 ? new GraphTraversal<object, object>().Inject()
@@ -714,9 +847,17 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the intersect step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Intersect(object intersectObject)
+        {
+            return new GraphTraversal<object, object>().Intersect(intersectObject);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the is step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Is(object value)
+        public static GraphTraversal<object, object> Is(object? value)
         {
             return new GraphTraversal<object, object>().Is(value);            
         }
@@ -724,7 +865,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the is step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Is(P predicate)
+        public static GraphTraversal<object, object> Is(P? predicate)
         {
             return new GraphTraversal<object, object>().Is(predicate);            
         }
@@ -744,6 +885,22 @@
         {
             return new GraphTraversal<object, string>().Label();            
         }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the length step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, int?> Length()
+        {
+            return new GraphTraversal<object, int?>().Length();            
+        }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the length step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, E2?> Length<E2>(Scope scope)
+        {
+            return new GraphTraversal<object, E2?>().Length<E2>(scope);            
+        }
 
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the limit step to that traversal.
@@ -780,15 +937,31 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the loops step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, int> Loops(string loopName)
+        public static GraphTraversal<object, int> Loops(string? loopName)
         {
             return new GraphTraversal<object, int>().Loops(loopName);            
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the lTrim step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> LTrim()
+        {
+            return new GraphTraversal<object, string?>().LTrim();
+        }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the lTrim step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, E2?> LTrim<E2>(Scope scope)
+        {
+            return new GraphTraversal<object, E2?>().LTrim<E2>(scope);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the map step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Map<E2>(IFunction function)
+        public static GraphTraversal<object, E2> Map<E2>(IFunction? function)
         {
             return new GraphTraversal<object, E2>().Map<E2>(function);            
         }
@@ -852,6 +1025,14 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the merge step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Merge(object mergeObject)
+        {
+            return new GraphTraversal<object, object>().Merge(mergeObject);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the mergeE step to that traversal.
         /// </summary>
         public static GraphTraversal<object, Edge> MergeE ()
@@ -862,7 +1043,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the mergeE step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Edge> MergeE (IDictionary<object,object> m)
+        public static GraphTraversal<object, Edge> MergeE (IDictionary<object,object>? m)
         {
             return new GraphTraversal<object, Edge>().MergeE(m);
         }
@@ -870,7 +1051,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the mergeE step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Edge> MergeE (ITraversal t)
+        public static GraphTraversal<object, Edge> MergeE (ITraversal? t)
         {
             return new GraphTraversal<object, Edge>().MergeE(t);
         }
@@ -886,7 +1067,7 @@
         /// <summary>
         ///     Adds the mergeV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public static GraphTraversal<object, Vertex> MergeV (IDictionary<object,object> m)
+        public static GraphTraversal<object, Vertex> MergeV (IDictionary<object,object>? m)
         {
             return new GraphTraversal<object, Vertex>().MergeV(m);
         }
@@ -894,7 +1075,7 @@
         /// <summary>
         ///     Adds the mergeV step to this <see cref="GraphTraversal{SType, EType}" />.
         /// </summary>
-        public static GraphTraversal<object, Vertex> MergeV (ITraversal t)
+        public static GraphTraversal<object, Vertex> MergeV (ITraversal? t)
         {
             return new GraphTraversal<object, Vertex>().MergeV(t);
         }
@@ -968,7 +1149,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the out step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Vertex> Out(params string[] edgeLabels)
+        public static GraphTraversal<object, Vertex> Out(params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Vertex>().Out()
@@ -978,7 +1159,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the outE step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Edge> OutE(params string[] edgeLabels)
+        public static GraphTraversal<object, Edge> OutE(params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Edge>().OutE()
@@ -1002,9 +1183,18 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the product step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Product(object productObject)
+        {
+            return new GraphTraversal<object, object>().Product(productObject);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the project step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, IDictionary<string, E2>> Project<E2>(string projectKey, params string[] projectKeys)
+        public static GraphTraversal<object, IDictionary<string, E2>> Project<E2>(string? projectKey,
+            params string?[] projectKeys)
         {
             return projectKeys is { Length: 0 }
                 ? new GraphTraversal<object, IDictionary<string, E2>>().Project<E2>(projectKey)
@@ -1014,7 +1204,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the properties step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Properties<E2>(params string[] propertyKeys)
+        public static GraphTraversal<object, E2> Properties<E2>(params string?[] propertyKeys)
         {
             return propertyKeys is { Length: 0 }
                 ? new GraphTraversal<object, E2>().Properties<E2>()
@@ -1024,7 +1214,8 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the property step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Property(Cardinality cardinality, object key, object value, params object[] keyValues)
+        public static GraphTraversal<object, object> Property(Cardinality cardinality, object? key, object? value,
+            params object?[] keyValues)
         {
             return keyValues is { Length: 0 }
                 ? new GraphTraversal<object, object>().Property(cardinality, key, value)
@@ -1034,7 +1225,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the property step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> Property(object key, object value, params object[] keyValues)
+        public static GraphTraversal<object, object> Property(object? key, object? value, params object?[] keyValues)
         {
             return keyValues is { Length: 0 }
                 ? new GraphTraversal<object, object>().Property(key, value)
@@ -1044,7 +1235,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the propertyMap step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, IDictionary<string, E2>> PropertyMap<E2>(params string[] propertyKeys)
+        public static GraphTraversal<object, IDictionary<string, E2>> PropertyMap<E2>(params string?[] propertyKeys)
         {
             return propertyKeys is { Length: 0 }
                 ? new GraphTraversal<object, IDictionary<string, E2>>().PropertyMap<E2>()
@@ -1084,6 +1275,38 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the replace step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> Replace(string? oldChar, string? newChar)
+        {
+            return new GraphTraversal<object, string?>().Replace(oldChar, newChar);
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the reverse step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, object> Reverse()
+        {
+            return new GraphTraversal<object, object>().Reverse();
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the rTrim step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> RTrim()
+        {
+            return new GraphTraversal<object, string?>().RTrim();
+        }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the rTrim step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, E2?> RTrim<E2>(Scope scope)
+        {
+            return new GraphTraversal<object, E2?>().RTrim<E2>(scope);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the sack step to that traversal.
         /// </summary>
         public static GraphTraversal<object, E2> Sack<E2>()
@@ -1126,7 +1349,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the select step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Select<E2>(Pop pop, string selectKey)
+        public static GraphTraversal<object, E2> Select<E2>(Pop pop, string? selectKey)
         {
             return new GraphTraversal<object, E2>().Select<E2>(pop, selectKey);            
         }
@@ -1134,11 +1357,13 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the select step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, IDictionary<string, E2>> Select<E2>(Pop pop, string selectKey1, string selectKey2, params string[] otherSelectKeys)
+        public static GraphTraversal<object, IDictionary<string, E2>> Select<E2>(Pop pop, string? selectKey1,
+            string? selectKey2, params string?[] otherSelectKeys)
         {
             return otherSelectKeys is { Length: 0 }
                 ? new GraphTraversal<object, IDictionary<string, E2>>().Select<E2>(pop, selectKey1, selectKey2)
-                : new GraphTraversal<object, IDictionary<string, E2>>().Select<E2>(pop, selectKey1, selectKey2, otherSelectKeys);            
+                : new GraphTraversal<object, IDictionary<string, E2>>().Select<E2>(pop, selectKey1, selectKey2,
+                    otherSelectKeys);
         }
 
         /// <summary>
@@ -1152,7 +1377,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the select step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Select<E2>(string selectKey)
+        public static GraphTraversal<object, E2> Select<E2>(string? selectKey)
         {
             return new GraphTraversal<object, E2>().Select<E2>(selectKey);            
         }
@@ -1160,11 +1385,13 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the select step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, IDictionary<string, E2>> Select<E2>(string selectKey1, string selectKey2, params string[] otherSelectKeys)
+        public static GraphTraversal<object, IDictionary<string, E2>> Select<E2>(string? selectKey1, string? selectKey2,
+            params string?[] otherSelectKeys)
         {
             return otherSelectKeys is { Length: 0 }
                 ? new GraphTraversal<object, IDictionary<string, E2>>().Select<E2>(selectKey1, selectKey2)
-                : new GraphTraversal<object, IDictionary<string, E2>>().Select<E2>(selectKey1, selectKey2, otherSelectKeys);            
+                : new GraphTraversal<object, IDictionary<string, E2>>().Select<E2>(selectKey1, selectKey2,
+                    otherSelectKeys);
         }
 
         /// <summary>
@@ -1178,7 +1405,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the sideEffect step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, object> SideEffect(IConsumer consumer)
+        public static GraphTraversal<object, object> SideEffect(IConsumer? consumer)
         {
             return new GraphTraversal<object, object>().SideEffect(consumer);            
         }
@@ -1216,6 +1443,22 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the split step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, List<string>?> Split(string? splitChar)
+        {
+            return new GraphTraversal<object, List<string>?>().Split(splitChar);
+        }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the split step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, List<E2>?> Split<E2>(Scope scope, string? splitChar)
+        {
+            return new GraphTraversal<object, List<E2>?>().Split<E2>(scope, splitChar);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the store step to that traversal.
         /// </summary>
         public static GraphTraversal<object, object> Store(string sideEffectKey)
@@ -1232,6 +1475,22 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the substring step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> Substring(int startIndex)
+        {
+            return new GraphTraversal<object, string?>().Substring(startIndex);
+        }
+
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the substring step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> Substring(int startIndex, int endIndex)
+        {
+            return new GraphTraversal<object, string?>().Substring(startIndex, endIndex);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the sum step to that traversal.
         /// </summary>
         public static GraphTraversal<object, E2> Sum<E2>()
@@ -1298,7 +1557,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the to step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Vertex> To(Direction direction, params string[] edgeLabels)
+        public static GraphTraversal<object, Vertex> To(Direction? direction, params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Vertex>().To(direction)
@@ -1308,17 +1567,49 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the toE step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Edge> ToE(Direction direction, params string[] edgeLabels)
+        public static GraphTraversal<object, Edge> ToE(Direction? direction, params string?[] edgeLabels)
         {
             return edgeLabels is { Length: 0 }
                 ? new GraphTraversal<object, Edge>().ToE(direction)
                 : new GraphTraversal<object, Edge>().ToE(direction, edgeLabels);            
         }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the toLower step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> ToLower()
+        {
+            return new GraphTraversal<object, string?>().ToLower();            
+        }
+                
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the toLower step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, E2?> ToLower<E2>(Scope scope)
+        {
+            return new GraphTraversal<object, E2?>().ToLower<E2>(scope);            
+        }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the ToUpper step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> ToUpper()
+        {
+            return new GraphTraversal<object, string?>().ToUpper();            
+        }
+                
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the ToUpper step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, E2?> ToUpper<E2>(Scope scope)
+        {
+            return new GraphTraversal<object, E2?>().ToUpper<E2>(scope);            
+        }
 
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the toV step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, Vertex> ToV(Direction direction)
+        public static GraphTraversal<object, Vertex> ToV(Direction? direction)
         {
             return new GraphTraversal<object, Vertex>().ToV(direction);            
         }
@@ -1340,6 +1631,22 @@
         }
 
         /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the Trim step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, string?> Trim()
+        {
+            return new GraphTraversal<object, string?>().Trim();
+        }
+        
+        /// <summary>
+        ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the Trim step to that traversal.
+        /// </summary>
+        public static GraphTraversal<object, E2?> Trim<E2>(Scope scope)
+        {
+            return new GraphTraversal<object, E2?>().Trim<E2>(scope);
+        }
+
+        /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the unfold step to that traversal.
         /// </summary>
         public static GraphTraversal<object, E2> Unfold<E2>()
@@ -1384,7 +1691,8 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the valueMap step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, IDictionary<TKey, TValue>> ValueMap<TKey, TValue>(params string[] propertyKeys)
+        public static GraphTraversal<object, IDictionary<TKey, TValue>> ValueMap<TKey, TValue>(
+            params string?[] propertyKeys)
         {
             return propertyKeys is { Length: 0 }
                 ? new GraphTraversal<object, IDictionary<TKey, TValue>>().ValueMap<TKey, TValue>()
@@ -1394,7 +1702,8 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the valueMap step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, IDictionary<TKey, TValue>> ValueMap<TKey, TValue>(bool includeTokens, params string[] propertyKeys)
+        public static GraphTraversal<object, IDictionary<TKey, TValue>> ValueMap<TKey, TValue>(bool includeTokens,
+            params string?[] propertyKeys)
         {
             return propertyKeys is { Length: 0 }
                 ? new GraphTraversal<object, IDictionary<TKey, TValue>>().ValueMap<TKey, TValue>(includeTokens)
@@ -1404,7 +1713,7 @@
         /// <summary>
         ///     Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the values step to that traversal.
         /// </summary>
-        public static GraphTraversal<object, E2> Values<E2>(params string[] propertyKeys)
+        public static GraphTraversal<object, E2> Values<E2>(params string?[] propertyKeys)
         {
             return propertyKeys is { Length: 0 }
                 ? new GraphTraversal<object, E2>().Values<E2>()
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs
index ffdc3b0..83cf4fc 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Utils.cs
@@ -35,8 +35,11 @@
     /// </summary>
     internal static class Utils
     {
+        /// <summary>
+        /// The user agent which is sent with connection requests if enabled.
+        /// </summary>
         public static string UserAgent => _userAgent ??= GenerateUserAgent();
-        private static string _userAgent;
+        private static string? _userAgent;
         
         /// <summary>
         /// Waits the completion of the provided Task.
@@ -50,7 +53,7 @@
             }
             catch (AggregateException ex)
             {
-                if (ex.InnerExceptions.Count == 1)
+                if (ex.InnerException != null)
                 {
                     ExceptionDispatchInfo.Capture(ex.InnerException).Throw();   
                 }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Properties/AssemblyInfo.cs b/gremlin-dotnet/src/Gremlin.Net/Properties/AssemblyInfo.cs
index 4351b0e..e6c1a7e 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Properties/AssemblyInfo.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Properties/AssemblyInfo.cs
@@ -24,4 +24,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Gremlin.Net.UnitTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001009bbf7a5b9966d9207d8abb9d3d3e98f5e387b292742cfb791dc657357221c3ac9b38ab6dab89630dc8edb3cde84a107f493d192116a934afa463355eefd58b82fd08dc2616ee6074a74bf5845652864746e285bd04e2e1a87921e8e2c383d1b302e7bee1fd7cdab5fe2bbed8c6677624d63433548d43a873ab5650ed96fb0687")]
+[assembly: InternalsVisibleTo("Gremlin.Net.IntegrationTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001009bbf7a5b9966d9207d8abb9d3d3e98f5e387b292742cfb791dc657357221c3ac9b38ab6dab89630dc8edb3cde84a107f493d192116a934afa463355eefd58b82fd08dc2616ee6074a74bf5845652864746e285bd04e2e1a87921e8e2c383d1b302e7bee1fd7cdab5fe2bbed8c6677624d63433548d43a873ab5650ed96fb0687")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/Edge.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/Edge.cs
index fddbd69..1989004 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/Edge.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/Edge.cs
@@ -21,6 +21,8 @@
 
 #endregion
 
+using System.Linq;
+
 namespace Gremlin.Net.Structure
 {
     /// <summary>
@@ -35,22 +37,32 @@
         /// <param name="outV">The outgoing/tail vertex of the edge.</param>
         /// <param name="label">The label of the edge.</param>
         /// <param name="inV">The incoming/head vertex of the edge.</param>
-        public Edge(object id, Vertex outV, string label, Vertex inV)
-            : base(id, label)
+        /// <param name="properties">Optional properties of the edge.</param>
+        public Edge(object? id, Vertex outV, string label, Vertex inV, dynamic[]? properties = null)
+            : base(id, label, properties)
         {
             OutV = outV;
             InV = inV;
         }
 
         /// <summary>
-        ///     Gets or sets the incoming/head vertex of this edge.
+        ///     Gets the incoming/head vertex of this edge.
         /// </summary>
-        public Vertex InV { get; set; }
+        public Vertex InV { get; }
 
         /// <summary>
-        ///     Gets or sets the outgoing/tail vertex of this edge.
+        ///     Gets the outgoing/tail vertex of this edge.
         /// </summary>
-        public Vertex OutV { get; set; }
+        public Vertex OutV { get; }
+
+        /// <summary>
+        /// Get property by key
+        /// </summary>
+        /// <returns>property or null when not found</returns>
+        public Property? Property(string key)
+        {
+            return Properties?.Cast<Property>().FirstOrDefault(p => p.Key == key);
+        }
 
         /// <inheritdoc />
         public override string ToString()
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/Element.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/Element.cs
index f4fc847..32935bd 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/Element.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/Element.cs
@@ -22,6 +22,7 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 
 namespace Gremlin.Net.Structure
 {
@@ -35,24 +36,31 @@
         /// </summary>
         /// <param name="id">The id of the element.</param>
         /// <param name="label">The label of the element.</param>
-        protected Element(object id, string label)
+        /// <param name="properties">Optional properties of the element.</param>
+        protected Element(object? id, string label, dynamic[]? properties = null)
         {
             Id = id;
             Label = label;
+            Properties = properties;
         }
 
         /// <summary>
         ///     Gets the id of this <see cref="Element" />.
         /// </summary>
-        public object Id { get; }
+        public object? Id { get; }
 
         /// <summary>
         ///     Gets the label of this <see cref="Element" />.
         /// </summary>
         public string Label { get; }
 
+        /// <summary>
+        ///     Gets the properties of this <see cref="Element" />.
+        /// </summary>
+        public dynamic[]? Properties { get; }
+
         /// <inheritdoc />
-        public bool Equals(Element other)
+        public bool Equals(Element? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -60,7 +68,7 @@
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
@@ -71,7 +79,7 @@
         /// <inheritdoc />
         public override int GetHashCode()
         {
-            return Id.GetHashCode();
+            return Id != null ? Id.GetHashCode() : 0;
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/DataType.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/DataType.cs
index ee33cee..6ccad02 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/DataType.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/DataType.cs
@@ -55,6 +55,7 @@
         public static readonly DataType Cardinality = new DataType(0x16);
         public static readonly DataType Column = new DataType(0x17);
         public static readonly DataType Direction = new DataType(0x18);
+        public static readonly DataType DT = new DataType(0x2F);
         public static readonly DataType Merge = new DataType(0x2E);
         public static readonly DataType Operator = new DataType(0x19);
         public static readonly DataType Order = new DataType(0x1A);
@@ -108,7 +109,7 @@
         }
 
         /// <inheritdoc />
-        public bool Equals(DataType other)
+        public bool Equals(DataType? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -116,7 +117,7 @@
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryMessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryMessageSerializer.cs
index 0ea1435..eeee25d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryMessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryMessageSerializer.cs
@@ -49,7 +49,7 @@
         /// Initializes a new instance of the <see cref="GraphBinaryMessageSerializer" /> class.
         /// </summary>
         /// <param name="registry">The <see cref="TypeSerializerRegistry"/> to use for serialization.</param>
-        public GraphBinaryMessageSerializer(TypeSerializerRegistry registry = null)
+        public GraphBinaryMessageSerializer(TypeSerializerRegistry? registry = null)
         {
             _reader = new GraphBinaryReader(registry);
             _writer = new GraphBinaryWriter(registry);
@@ -81,7 +81,7 @@
         }
 
         /// <inheritdoc />
-        public async Task<ResponseMessage<List<object>>> DeserializeMessageAsync(byte[] message,
+        public async Task<ResponseMessage<List<object>>?> DeserializeMessageAsync(byte[] message,
             CancellationToken cancellationToken = default)
         {
             using var stream = new MemoryStream(message);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryReader.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryReader.cs
index 297bb41..6b11360 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryReader.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryReader.cs
@@ -38,7 +38,7 @@
         /// Initializes a new instance of the <see cref="GraphBinaryReader" /> class.
         /// </summary>
         /// <param name="registry">The <see cref="TypeSerializerRegistry"/> to use for deserialization.</param>
-        public GraphBinaryReader(TypeSerializerRegistry registry = null)
+        public GraphBinaryReader(TypeSerializerRegistry? registry = null)
         {
             _registry = registry ?? TypeSerializerRegistry.Instance;
         }
@@ -47,15 +47,29 @@
         /// Reads only the value for a specific type <typeparamref name="T"/>.
         /// </summary>
         /// <param name="stream">The GraphBinary data to parse.</param>
-        /// <param name="nullable">Whether or not the value can be null.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <typeparam name="T">The type of the object to read.</typeparam>
         /// <returns>The read value.</returns>
-        public async Task<object> ReadValueAsync<T>(Stream stream, bool nullable,
+        public async Task<object?> ReadNullableValueAsync<T>(Stream stream,
             CancellationToken cancellationToken = default)
         {
             var typedSerializer = _registry.GetSerializerFor(typeof(T));
-            return await typedSerializer.ReadValueAsync(stream, this, nullable, cancellationToken)
+            return await typedSerializer.ReadNullableValueAsync(stream, this, cancellationToken)
+                .ConfigureAwait(false);
+        }
+        
+        /// <summary>
+        /// Reads only the value for a specific type <typeparamref name="T"/>.
+        /// </summary>
+        /// <param name="stream">The GraphBinary data to parse.</param>
+        /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
+        /// <typeparam name="T">The type of the object to read.</typeparam>
+        /// <returns>The read value.</returns>
+        public async Task<object> ReadNonNullableValueAsync<T>(Stream stream,
+            CancellationToken cancellationToken = default)
+        {
+            var typedSerializer = _registry.GetSerializerFor(typeof(T));
+            return await typedSerializer.ReadNonNullableValueAsync(stream, this, cancellationToken)
                 .ConfigureAwait(false);
         }
 
@@ -65,14 +79,14 @@
         /// <param name="stream">The GraphBinary data to parse.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>The read value.</returns>
-        public async Task<object> ReadAsync(Stream stream, CancellationToken cancellationToken = default)
+        public async Task<object?> ReadAsync(Stream stream, CancellationToken cancellationToken = default)
         {
             var type = DataType.FromTypeCode(await stream.ReadByteAsync(cancellationToken).ConfigureAwait(false));
 
             if (type == DataType.UnspecifiedNull)
             {
                 await stream.ReadByteAsync(cancellationToken).ConfigureAwait(false); // read value byte to advance the index
-                return default; // should be null (TODO?)
+                return null;
             }
 
             ITypeSerializer typeSerializer;
@@ -82,8 +96,8 @@
             }
             else
             {
-                var customTypeName =
-                    (string)await ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false);
+                var customTypeName = (string)await ReadNonNullableValueAsync<string>(stream, cancellationToken)
+                    .ConfigureAwait(false);
                 typeSerializer = _registry.GetSerializerForCustomType(customTypeName);
             }
             
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryWriter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryWriter.cs
index 132707c..876611f 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryWriter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/GraphBinaryWriter.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -50,36 +51,46 @@
         /// Initializes a new instance of the <see cref="GraphBinaryWriter" /> class.
         /// </summary>
         /// <param name="registry">The <see cref="TypeSerializerRegistry"/> to use for serialization.</param>
-        public GraphBinaryWriter(TypeSerializerRegistry registry = null)
+        public GraphBinaryWriter(TypeSerializerRegistry? registry = null)
         {
             _registry = registry ?? TypeSerializerRegistry.Instance;
         }
 
         /// <summary>
-        /// Writes a value without including type information.
+        /// Writes a nullable value without including type information.
         /// </summary>
         /// <param name="value">The value to write.</param>
         /// <param name="stream">The stream to write to.</param>
-        /// <param name="nullable">Whether or not the value can be null.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>A task that represents the asynchronous write operation.</returns>
-        public async Task WriteValueAsync(object value, Stream stream, bool nullable,
+        public async Task WriteNullableValueAsync(object? value, Stream stream,
             CancellationToken cancellationToken = default)
         {
             if (value == null)
             {
-                if (!nullable)
-                {
-                    throw new IOException("Unexpected null value when nullable is false");
-                }
-
                 await WriteValueFlagNullAsync(stream, cancellationToken).ConfigureAwait(false);
                 return;
             }
             
             var valueType = value.GetType();
             var serializer = _registry.GetSerializerFor(valueType);
-            await serializer.WriteValueAsync(value, stream, this, nullable, cancellationToken).ConfigureAwait(false);
+            await serializer.WriteNullableValueAsync(value, stream, this, cancellationToken).ConfigureAwait(false);
+        }
+        
+        /// <summary>
+        /// Writes a non-nullable value without including type information.
+        /// </summary>
+        /// <param name="value">The value to write.</param>
+        /// <param name="stream">The stream to write to.</param>
+        /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
+        /// <returns>A task that represents the asynchronous write operation.</returns>
+        public async Task WriteNonNullableValueAsync(object value, Stream stream,
+            CancellationToken cancellationToken = default)
+        {
+            if (value == null) throw new IOException($"{nameof(value)} cannot be null");
+            var valueType = value.GetType();
+            var serializer = _registry.GetSerializerFor(valueType);
+            await serializer.WriteNonNullableValueAsync(value, stream, this, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -89,7 +100,7 @@
         /// <param name="stream">The stream to write to.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>A task that represents the asynchronous write operation.</returns>
-        public async Task WriteAsync(object value, Stream stream, CancellationToken cancellationToken = default)
+        public async Task WriteAsync(object? value, Stream stream, CancellationToken cancellationToken = default)
         {
             if (value == null)
             {
@@ -103,7 +114,7 @@
             if (serializer is CustomTypeSerializer customTypeSerializer)
             {
                 await stream.WriteAsync(CustomTypeCodeBytes, cancellationToken).ConfigureAwait(false);
-                await WriteValueAsync(customTypeSerializer.TypeName, stream, false, cancellationToken)
+                await WriteNonNullableValueAsync(customTypeSerializer.TypeName, stream, cancellationToken)
                     .ConfigureAwait(false);
                 await customTypeSerializer.WriteAsync(value, stream, this, cancellationToken).ConfigureAwait(false);
                 return;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ITypeSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ITypeSerializer.cs
index 6bbe52a..40605dd 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ITypeSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ITypeSerializer.cs
@@ -49,15 +49,25 @@
             CancellationToken cancellationToken = default);
 
         /// <summary>
-        /// Writes the value to a stream, composed by the value flag and the sequence of bytes.
+        /// Writes the nullable value to a stream, composed by the value flag and the sequence of bytes.
         /// </summary>
         /// <param name="value">The value to write.</param>
         /// <param name="stream">The stream to write to.</param>
         /// <param name="writer">A <see cref="GraphBinaryWriter"/> that can be used to write nested values.</param>
-        /// <param name="nullable">Whether or not the value can be null.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>A task that represents the asynchronous write operation.</returns>
-        Task WriteValueAsync(object value, Stream stream, GraphBinaryWriter writer, bool nullable,
+        Task WriteNullableValueAsync(object value, Stream stream, GraphBinaryWriter writer,
+            CancellationToken cancellationToken = default);
+        
+        /// <summary>
+        /// Writes the non-nullable value to a stream, composed by the value flag and the sequence of bytes.
+        /// </summary>
+        /// <param name="value">The value to write.</param>
+        /// <param name="stream">The stream to write to.</param>
+        /// <param name="writer">A <see cref="GraphBinaryWriter"/> that can be used to write nested values.</param>
+        /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
+        /// <returns>A task that represents the asynchronous write operation.</returns>
+        Task WriteNonNullableValueAsync(object value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -67,17 +77,26 @@
         /// <param name="reader">A <see cref="GraphBinaryReader"/> that can be used to read nested values.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>The read value.</returns>
-        Task<object> ReadAsync(Stream stream, GraphBinaryReader reader, CancellationToken cancellationToken = default);
+        Task<object?> ReadAsync(Stream stream, GraphBinaryReader reader, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Reads the value from the stream (not the type information).
         /// </summary>
         /// <param name="stream">The GraphBinary data to parse.</param>
         /// <param name="reader">A <see cref="GraphBinaryReader"/> that can be used to read nested values.</param>
-        /// <param name="nullable">Whether or not the value can be null.</param>
         /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
         /// <returns>The read value.</returns>
-        Task<object> ReadValueAsync(Stream stream, GraphBinaryReader reader, bool nullable,
+        Task<object?> ReadNullableValueAsync(Stream stream, GraphBinaryReader reader,
+            CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Reads the value from the stream (not the type information).
+        /// </summary>
+        /// <param name="stream">The GraphBinary data to parse.</param>
+        /// <param name="reader">A <see cref="GraphBinaryReader"/> that can be used to read nested values.</param>
+        /// <param name="cancellationToken">The token to cancel the operation. The default value is None.</param>
+        /// <returns>The read value.</returns>
+        Task<object> ReadNonNullableValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/RequestMessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/RequestMessageSerializer.cs
index e4bf380..8b489e1 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/RequestMessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/RequestMessageSerializer.cs
@@ -45,13 +45,13 @@
             CancellationToken cancellationToken = default)
         {
             await stream.WriteByteAsync(GraphBinaryWriter.VersionByte, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(requestMessage.RequestId, stream, false, cancellationToken)
+            await writer.WriteNonNullableValueAsync(requestMessage.RequestId, stream, cancellationToken)
                 .ConfigureAwait(false);
-            await writer.WriteValueAsync(requestMessage.Operation, stream, false, cancellationToken)
+            await writer.WriteNonNullableValueAsync(requestMessage.Operation, stream, cancellationToken)
                 .ConfigureAwait(false);
-            await writer.WriteValueAsync(requestMessage.Processor, stream, false, cancellationToken)
+            await writer.WriteNonNullableValueAsync(requestMessage.Processor, stream, cancellationToken)
                 .ConfigureAwait(false);
-            await writer.WriteValueAsync(requestMessage.Arguments, stream, false, cancellationToken)
+            await writer.WriteNonNullableValueAsync(requestMessage.Arguments, stream, cancellationToken)
                 .ConfigureAwait(false);
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ResponseMessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ResponseMessageSerializer.cs
index 3a0fa6a..e31c7a2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ResponseMessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/ResponseMessageSerializer.cs
@@ -55,34 +55,23 @@
             }
 
             var requestId =
-                (Guid?)await reader.ReadValueAsync<Guid>(stream, true, cancellationToken).ConfigureAwait(false);
-            var code = (ResponseStatusCode)await reader.ReadValueAsync<int>(stream, false, cancellationToken)
+                (Guid?)await reader.ReadNullableValueAsync<Guid>(stream, cancellationToken).ConfigureAwait(false);
+            var code = (ResponseStatusCode)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken)
                 .ConfigureAwait(false);
-            var message = (string)await reader.ReadValueAsync<string>(stream, true, cancellationToken)
+            var message = (string?)await reader.ReadNullableValueAsync<string>(stream, cancellationToken)
                 .ConfigureAwait(false);
             var dictObj = await reader
-                .ReadValueAsync<Dictionary<string, object>>(stream, false, cancellationToken).ConfigureAwait(false);
+                .ReadNonNullableValueAsync<Dictionary<string, object>>(stream, cancellationToken).ConfigureAwait(false);
             var attributes = (Dictionary<string, object>)dictObj;
 
-            var status = new ResponseStatus
-            {
-                Code = code,
-                Message = message,
-                Attributes = attributes
-            };
-            var result = new ResponseResult<List<object>>
-            {
-                Meta = (Dictionary<string, object>)await reader
-                    .ReadValueAsync<Dictionary<string, object>>(stream, false, cancellationToken).ConfigureAwait(false),
-                Data = (List<object>)await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false)
-            };
+            var status = new ResponseStatus(code, attributes, message);
 
-            return new ResponseMessage<List<object>>
-            {
-                RequestId = requestId,
-                Status = status,
-                Result = result
-            };
+            var meta = (Dictionary<string, object>)await reader
+                .ReadNonNullableValueAsync<Dictionary<string, object>>(stream, cancellationToken).ConfigureAwait(false);
+            var data = (List<object>?)await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            var result = new ResponseResult<List<object>>(data, meta);
+
+            return new ResponseMessage<List<object>>(requestId, status, result);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/TypeSerializerRegistry.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/TypeSerializerRegistry.cs
index 209b1a7..e7f1997 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/TypeSerializerRegistry.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/TypeSerializerRegistry.cs
@@ -23,6 +23,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using System.Linq;
 using System.Numerics;
 using Gremlin.Net.Process.Traversal;
@@ -60,6 +62,7 @@
                 {typeof(Cardinality), EnumSerializers.CardinalitySerializer},
                 {typeof(Column), EnumSerializers.ColumnSerializer},
                 {typeof(Direction), EnumSerializers.DirectionSerializer},
+                {typeof(DT), EnumSerializers.DTSerializer},
                 {typeof(Merge), EnumSerializers.MergeSerializer},
                 {typeof(Operator), EnumSerializers.OperatorSerializer},
                 {typeof(Order), EnumSerializers.OrderSerializer},
@@ -95,7 +98,7 @@
                 {DataType.Float, SingleTypeSerializers.FloatSerializer},
                 {DataType.List, new ListSerializer<object>()},
                 {DataType.Map, new MapSerializer<object, object>()},
-                {DataType.Set, new SetSerializer<HashSet<object>, object>()},
+                {DataType.Set, new SetSerializer<HashSet<object?>, object>()},
                 {DataType.Uuid, new UuidSerializer()},
                 {DataType.Edge, new EdgeSerializer()},
                 {DataType.Path, new PathSerializer()},
@@ -108,6 +111,7 @@
                 {DataType.Cardinality, EnumSerializers.CardinalitySerializer},
                 {DataType.Column, EnumSerializers.ColumnSerializer},
                 {DataType.Direction, EnumSerializers.DirectionSerializer},
+                {DataType.DT, EnumSerializers.DTSerializer},
                 {DataType.Merge, EnumSerializers.MergeSerializer},
                 {DataType.Operator, EnumSerializers.OperatorSerializer},
                 {DataType.Order, EnumSerializers.OrderSerializer},
@@ -169,8 +173,10 @@
             if (IsDictionaryType(valueType, out var dictKeyType, out var dictValueType))
             {
                 var serializerType = typeof(MapSerializer<,>).MakeGenericType(dictKeyType, dictValueType);
-                var serializer = (ITypeSerializer) Activator.CreateInstance(serializerType);
-                _serializerByType[valueType] = serializer;
+                var serializer = (ITypeSerializer?) Activator.CreateInstance(serializerType);
+                _serializerByType[valueType] = serializer ??
+                                               throw new IOException(
+                                                   $"Cannot create a serializer for the dictionary type {valueType}.");
                 return serializer;
             }
 
@@ -178,17 +184,21 @@
             {
                 var memberType = valueType.GetGenericArguments()[0];
                 var serializerType = typeof(SetSerializer<,>).MakeGenericType(valueType, memberType);
-                var serializer = (ITypeSerializer) Activator.CreateInstance(serializerType);
-                _serializerByType[valueType] = serializer;
+                var serializer = (ITypeSerializer?) Activator.CreateInstance(serializerType);
+                _serializerByType[valueType] = serializer ??
+                                               throw new IOException(
+                                                   $"Cannot create a serializer for the set type {valueType}.");
                 return serializer;
             }
 
             if (valueType.IsArray)
             {
                 var memberType = valueType.GetElementType();
-                var serializerType = typeof(ArraySerializer<>).MakeGenericType(memberType);
-                var serializer = (ITypeSerializer) Activator.CreateInstance(serializerType);
-                _serializerByType[valueType] = serializer;
+                var serializerType = typeof(ArraySerializer<>).MakeGenericType(memberType!);
+                var serializer = (ITypeSerializer?) Activator.CreateInstance(serializerType);
+                _serializerByType[valueType] = serializer ??
+                                               throw new IOException(
+                                                   $"Cannot create a serializer for the array type {valueType}.");
                 return serializer;
             }
 
@@ -196,8 +206,10 @@
             {
                 var memberType = valueType.GetGenericArguments()[0];
                 var serializerType = typeof(ListSerializer<>).MakeGenericType(memberType);
-                var serializer = (ITypeSerializer) Activator.CreateInstance(serializerType);
-                _serializerByType[valueType] = serializer;
+                var serializer = (ITypeSerializer?) Activator.CreateInstance(serializerType);
+                _serializerByType[valueType] = serializer ??
+                                               throw new IOException(
+                                                   $"Cannot create a serializer for the list type {valueType}.");
                 return serializer;
             }
 
@@ -214,7 +226,8 @@
             throw new InvalidOperationException($"No serializer found for type '{valueType}'.");
         }
 
-        private static bool IsDictionaryType(Type type, out Type keyType, out Type valueType)
+        private static bool IsDictionaryType(Type type, [NotNullWhen(returnValue: true)] out Type? keyType,
+            [NotNullWhen(returnValue: true)] out Type? valueType)
         {
             var maybeInterfaceType = type
                 .GetInterfaces()
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ArraySerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ArraySerializer.cs
index 4bd85f8..01ef44b 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ArraySerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ArraySerializer.cs
@@ -45,7 +45,7 @@
         protected override async Task WriteValueAsync(TMember[] value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Length, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Length, stream, cancellationToken).ConfigureAwait(false);
             
             foreach (var item in value)
             {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigDecimalSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigDecimalSerializer.cs
index 8a3cdc6..f7fd205 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigDecimalSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigDecimalSerializer.cs
@@ -46,8 +46,8 @@
             CancellationToken cancellationToken = default)
         {
             var (unscaledValue, scale) = GetUnscaledValueAndScale(value);
-            await writer.WriteValueAsync(scale, stream, false, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(unscaledValue, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(scale, stream, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(unscaledValue, stream, cancellationToken).ConfigureAwait(false);
         }
         
         private static (BigInteger, int) GetUnscaledValueAndScale(decimal input)
@@ -79,8 +79,9 @@
         protected override async Task<decimal> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var scale = (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
-            var unscaled = (BigInteger)await reader.ReadValueAsync<BigInteger>(stream, false, cancellationToken)
+            var scale = (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken)
+                .ConfigureAwait(false);
+            var unscaled = (BigInteger)await reader.ReadNonNullableValueAsync<BigInteger>(stream, cancellationToken)
                 .ConfigureAwait(false);
 
             return ConvertScaleAndUnscaledValue(scale, unscaled);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigIntegerSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigIntegerSerializer.cs
index efb67c5..08a2953 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigIntegerSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BigIntegerSerializer.cs
@@ -46,7 +46,7 @@
             CancellationToken cancellationToken = default)
         {
             var bytes = value.ToByteArray().Reverse().ToArray();
-            await writer.WriteValueAsync(bytes.Length, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(bytes.Length, stream, cancellationToken).ConfigureAwait(false);
             await stream.WriteAsync(bytes, cancellationToken).ConfigureAwait(false);
         }
 
@@ -54,7 +54,7 @@
         protected override async Task<BigInteger> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var length = (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+            var length = (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
             var bytes = await stream.ReadAsync(length, cancellationToken).ConfigureAwait(false);
             return new BigInteger(bytes.Reverse().ToArray());
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BindingSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BindingSerializer.cs
index d7ed283..87b884e 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BindingSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BindingSerializer.cs
@@ -44,7 +44,7 @@
         protected override async Task WriteValueAsync(Binding value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Key, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Key, stream, cancellationToken).ConfigureAwait(false);
             await writer.WriteAsync(value.Value, stream, cancellationToken).ConfigureAwait(false);
         }
 
@@ -52,7 +52,7 @@
         protected override async Task<Binding> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var key = (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken)
+            var key = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
                 .ConfigureAwait(false);
             var value = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
             return new Binding(key, value);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BulkSetSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BulkSetSerializer.cs
index d1471eb..6bf95cf 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BulkSetSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/BulkSetSerializer.cs
@@ -56,13 +56,13 @@
         protected override async Task<TList> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var length = (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+            var length = (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
 
             var result = new TList();
             for (var i = 0; i < length; i++)
             {
                 var value = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
-                var bulk = (long)await reader.ReadValueAsync<long>(stream, false, cancellationToken)
+                var bulk = (long)await reader.ReadNonNullableValueAsync<long>(stream, cancellationToken)
                     .ConfigureAwait(false);
                 for (var j = 0; j < bulk; j++)
                 {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteBufferSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteBufferSerializer.cs
index e75550f..ca658f1 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteBufferSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteBufferSerializer.cs
@@ -44,7 +44,7 @@
         protected override async Task WriteValueAsync(byte[] value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Length, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Length, stream, cancellationToken).ConfigureAwait(false);
             await stream.WriteAsync(value, 0, value.Length, cancellationToken).ConfigureAwait(false);
         }
 
@@ -52,7 +52,7 @@
         protected override async Task<byte[]> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var length = (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+            var length = (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
             var buffer = new byte[length];
             await stream.ReadAsync(buffer, 0, length, cancellationToken).ConfigureAwait(false);
             return buffer;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteCodeSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteCodeSerializer.cs
index e41146c..3f043d1 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteCodeSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ByteCodeSerializer.cs
@@ -54,21 +54,21 @@
         private static async Task WriteInstructionsAsync(IReadOnlyCollection<Instruction> instructions, Stream stream,
             GraphBinaryWriter writer, CancellationToken cancellationToken)
         {
-            await writer.WriteValueAsync(instructions.Count, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(instructions.Count, stream, cancellationToken).ConfigureAwait(false);
 
             foreach (var instruction in instructions)
             {
-                await writer.WriteValueAsync(instruction.OperatorName, stream, false, cancellationToken)
+                await writer.WriteNonNullableValueAsync(instruction.OperatorName, stream, cancellationToken)
                     .ConfigureAwait(false);
                 await WriteArgumentsAsync(instruction.Arguments, stream, writer, cancellationToken)
                     .ConfigureAwait(false);
             }
         }
 
-        private static async Task WriteArgumentsAsync(object[] arguments, Stream stream, GraphBinaryWriter writer,
+        private static async Task WriteArgumentsAsync(object?[] arguments, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken)
         {
-            await writer.WriteValueAsync(arguments.Length, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(arguments.Length, stream, cancellationToken).ConfigureAwait(false);
 
             foreach (var value in arguments)
             {
@@ -82,11 +82,11 @@
         {
             var result = new Bytecode();
 
-            var stepsLength = (int) await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+            var stepsLength = (int) await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
             for (var i = 0; i < stepsLength; i++)
             {
                 result.AddStep(
-                    (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false),
+                    (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken).ConfigureAwait(false),
                     await ReadArgumentsAsync(stream, reader, cancellationToken).ConfigureAwait(false));
             }
             
@@ -94,19 +94,19 @@
             for (var i = 0; i < sourcesLength; i++)
             {
                 result.AddSource(
-                    (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false),
+                    (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken).ConfigureAwait(false),
                     await ReadArgumentsAsync(stream, reader, cancellationToken).ConfigureAwait(false));
             }
             
             return result;
         }
 
-        private static async Task<object[]> ReadArgumentsAsync(Stream stream, GraphBinaryReader reader,
+        private static async Task<object?[]> ReadArgumentsAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken)
         {
             var valuesLength =
-                (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
-            var values = new object[valuesLength];
+                (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
+            var values = new object?[valuesLength];
             for (var i = 0; i < valuesLength; i++)
             {
                 values[i] = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ClassSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ClassSerializer.cs
index 55b932f..8dd1763 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ClassSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ClassSerializer.cs
@@ -45,7 +45,7 @@
         protected override async Task WriteValueAsync(GremlinType value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Fqcn, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Fqcn, stream, cancellationToken).ConfigureAwait(false);
         }
 
         
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/CustomTypeSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/CustomTypeSerializer.cs
index 2721c05..8b558ed 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/CustomTypeSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/CustomTypeSerializer.cs
@@ -45,15 +45,23 @@
             CancellationToken cancellationToken = default);
 
         /// <inheritdoc />
-        public abstract Task WriteValueAsync(object value, Stream stream, GraphBinaryWriter writer, bool nullable,
+        public abstract Task WriteNullableValueAsync(object value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default);
 
         /// <inheritdoc />
-        public abstract Task<object> ReadAsync(Stream stream, GraphBinaryReader reader,
+        public abstract Task WriteNonNullableValueAsync(object value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default);
 
         /// <inheritdoc />
-        public abstract Task<object> ReadValueAsync(Stream stream, GraphBinaryReader reader, bool nullable,
+        public abstract Task<object?> ReadAsync(Stream stream, GraphBinaryReader reader,
+            CancellationToken cancellationToken = default);
+
+        /// <inheritdoc />
+        public abstract Task<object?> ReadNullableValueAsync(Stream stream, GraphBinaryReader reader,
+            CancellationToken cancellationToken = default);
+
+        /// <inheritdoc />
+        public abstract Task<object> ReadNonNullableValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EdgeSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EdgeSerializer.cs
index eade891..13de71b 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EdgeSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EdgeSerializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -44,16 +45,16 @@
             CancellationToken cancellationToken = default)
         {
             await writer.WriteAsync(value.Id, stream, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(value.Label, stream, false, cancellationToken).ConfigureAwait(false);
-            
+            await writer.WriteNonNullableValueAsync(value.Label, stream, cancellationToken).ConfigureAwait(false);
+
             await writer.WriteAsync(value.InV.Id, stream, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(value.InV.Label, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.InV.Label, stream, cancellationToken).ConfigureAwait(false);
             await writer.WriteAsync(value.OutV.Id, stream, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(value.OutV.Label, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.OutV.Label, stream, cancellationToken).ConfigureAwait(false);
 
             // Placeholder for the parent vertex
             await writer.WriteAsync(null, stream, cancellationToken).ConfigureAwait(false);
-            
+
             // placeholder for the properties
             await writer.WriteAsync(null, stream, cancellationToken).ConfigureAwait(false);
         }
@@ -63,21 +64,21 @@
             CancellationToken cancellationToken = default)
         {
             var id = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
-            var label = (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken)
+            var label = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
                 .ConfigureAwait(false);
 
             var inV = new Vertex(await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false),
-                (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false));
+                (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken).ConfigureAwait(false));
             var outV = new Vertex(await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false),
-                (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false));
-            
+                (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken).ConfigureAwait(false));
+
             // discard possible parent vertex
             await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
 
-            // discard possible properties
-            await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            var properties = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            var propertiesAsArray = (properties as List<object>)?.ToArray();
 
-            return new Edge(id, outV, label, inV);
+            return new Edge(id, outV, label, inV, propertiesAsArray);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EnumSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EnumSerializer.cs
index 1d94235..a3ea2f8 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EnumSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/EnumSerializer.cs
@@ -60,6 +60,12 @@
             new EnumSerializer<Direction>(DataType.Direction, Direction.GetByValue);
 
         /// <summary>
+        /// A serializer for <see cref="DT"/> values.
+        /// </summary>
+        public static readonly EnumSerializer<DT> DTSerializer =
+            new EnumSerializer<DT>(DataType.DT, DT.GetByValue);
+
+        /// <summary>
         /// A serializer for <see cref="Merge"/> values.
         /// </summary>
         public static readonly EnumSerializer<Merge> MergeSerializer =
@@ -127,7 +133,10 @@
         protected override async Task<TEnum> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var enumValue = (string) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            // This should probably be `reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)` instead,
+            // but it's the same in other GLVs and changing this would be a breaking change for the GraphBinary format.
+            var enumValue = (string?) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            if (enumValue == null) throw new IOException($"Read null as a value for {DataType}");
             return _readFunc.Invoke(enumValue);
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/LambdaSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/LambdaSerializer.cs
index 7be1583..f017aee 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/LambdaSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/LambdaSerializer.cs
@@ -44,23 +44,23 @@
         protected override async Task WriteValueAsync(ILambda value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Language, stream, false, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(value.LambdaExpression, stream, false, cancellationToken)
+            await writer.WriteNonNullableValueAsync(value.Language, stream, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.LambdaExpression, stream, cancellationToken)
                 .ConfigureAwait(false);
-            await writer.WriteValueAsync(value.Arguments, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Arguments, stream, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
         protected override async Task<ILambda> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var language = (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken)
+            var language = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
                 .ConfigureAwait(false);
-            var expression = (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken)
+            var expression = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
                 .ConfigureAwait(false);
             
             // discard the arguments
-            await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+            await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
 
             return new StringBasedLambda(expression, language);
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ListSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ListSerializer.cs
index 05f96e6..d586ecd 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ListSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/ListSerializer.cs
@@ -32,7 +32,7 @@
     /// A generic list serializer.
     /// </summary>
     /// <typeparam name="TMember">The type of elements in the list.</typeparam>
-    public class ListSerializer<TMember> : SimpleTypeSerializer<IList<TMember>>
+    public class ListSerializer<TMember> : SimpleTypeSerializer<IList<TMember?>>
     {
         /// <summary>
         ///     Initializes a new instance of the <see cref="ListSerializer{TList}" /> class.
@@ -42,10 +42,10 @@
         }
 
         /// <inheritdoc />
-        protected override async Task WriteValueAsync(IList<TMember> value, Stream stream, GraphBinaryWriter writer,
+        protected override async Task WriteValueAsync(IList<TMember?> value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Count, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Count, stream, cancellationToken).ConfigureAwait(false);
             
             foreach (var item in value)
             {
@@ -54,14 +54,14 @@
         }
 
         /// <inheritdoc />
-        protected override async Task<IList<TMember>> ReadValueAsync(Stream stream, GraphBinaryReader reader,
+        protected override async Task<IList<TMember?>> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var length = (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
-            var result = new List<TMember>(length);
+            var length = (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
+            var result = new List<TMember?>(length);
             for (var i = 0; i < length; i++)
             {
-                result.Add((TMember) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false));
+                result.Add((TMember?) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false));
             }
 
             return result;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/MapSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/MapSerializer.cs
index d22526f..868155f 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/MapSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/MapSerializer.cs
@@ -33,7 +33,7 @@
     /// </summary>
     /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
     /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-    public class MapSerializer<TKey, TValue> : SimpleTypeSerializer<IDictionary<TKey, TValue>>
+    public class MapSerializer<TKey, TValue> : SimpleTypeSerializer<IDictionary<TKey, TValue?>> where TKey : notnull
     {
         /// <summary>
         ///     Initializes a new instance of the <see cref="MapSerializer{TKey, TValue}" /> class.
@@ -43,10 +43,10 @@
         }
 
         /// <inheritdoc />
-        protected override async Task WriteValueAsync(IDictionary<TKey, TValue> value, Stream stream,
+        protected override async Task WriteValueAsync(IDictionary<TKey, TValue?> value, Stream stream,
             GraphBinaryWriter writer, CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Count, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Count, stream, cancellationToken).ConfigureAwait(false);
 
             foreach (var key in value.Keys)
             {
@@ -56,16 +56,17 @@
         }
 
         /// <inheritdoc />
-        protected override async Task<IDictionary<TKey, TValue>> ReadValueAsync(Stream stream, GraphBinaryReader reader,
+        protected override async Task<IDictionary<TKey, TValue?>> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
             var length = await stream.ReadIntAsync(cancellationToken).ConfigureAwait(false);
-            var result = new Dictionary<TKey, TValue>(length);
+            var result = new Dictionary<TKey, TValue?>(length);
             
             for (var i = 0; i < length; i++)
             {
-                var key = (TKey) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
-                var value = (TValue) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+                var key = (TKey?) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+                if (key == null) throw new IOException("Read null as the key for a dictionary.");
+                var value = (TValue?) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
                 result.Add(key, value);
             }
 
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PSerializer.cs
index 4579c6a..d3cbddc 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PSerializer.cs
@@ -23,6 +23,7 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -50,8 +51,8 @@
 
             var argsLength = value.Other == null ? args.Count : args.Count + 1;
 
-            await writer.WriteValueAsync(value.OperatorName, stream, false, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(argsLength, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.OperatorName, stream, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(argsLength, stream, cancellationToken).ConfigureAwait(false);
 
             foreach (var arg in args)
             {
@@ -68,12 +69,12 @@
         protected override async Task<P> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var operatorName = (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken)
+            var operatorName = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
                 .ConfigureAwait(false);
             var argsLength =
-                (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+                (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
 
-            var args = new object[argsLength];
+            var args = new object?[argsLength];
             for (var i = 0; i < argsLength; i++)
             {
                 args[i] = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
@@ -82,23 +83,30 @@
             if (operatorName == "and" || operatorName == "or")
             {
                 
-                return new P(operatorName, (P) args[0], (P) args[1]);
+                return new P(operatorName, SafelyCastToP(args[0]), SafelyCastToP(args[1]));
             }
 
             if (operatorName == "not")
             {
-                return new P(operatorName, (P) args[0]);
+                return new P(operatorName, SafelyCastToP(args[0]));
             }
 
             if (argsLength == 1)
             {
                 if (DataType == DataType.TextP)
                 {
-                    return new TextP(operatorName, (string) args[0]);
+                    return new TextP(operatorName,
+                        (string?) args[0] ?? throw new IOException("Read null but expected a string"));
                 }
                 return new P(operatorName, args[0]);
             }
             return new P(operatorName, args);
         }
+        
+        private static P SafelyCastToP([NotNull] object? pObject)
+        {
+            if (pObject == null) throw new IOException("Read null but expected P");
+            return (P) pObject;
+        }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PathSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PathSerializer.cs
index a9aba98..fa02d5d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PathSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PathSerializer.cs
@@ -53,7 +53,8 @@
             CancellationToken cancellationToken = default)
         {
             var readLabelObjects =
-                (List<object>)await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+                (List<object>?)await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            if (readLabelObjects == null) throw new IOException("Read null, but expected a list of labels");
             var labels = new List<ISet<string>>();
             foreach (var labelObjectList in readLabelObjects)
             {
@@ -65,8 +66,8 @@
                 labels.Add(labelSet);
             }
             
-            var objects = (List<object>) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
-            
+            var objects = (List<object?>?) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            if (objects == null) throw new IOException("Read null, but expected a list of objects");
             return new Path(labels, objects);
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PropertySerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PropertySerializer.cs
index 08fc6e9..556cd91 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PropertySerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/PropertySerializer.cs
@@ -30,7 +30,8 @@
     /// <summary>
     /// A <see cref="Property"/> serializer.
     /// </summary>
-    public class PropertySerializer : SimpleTypeSerializer<Property>
+    public class 
+        PropertySerializer : SimpleTypeSerializer<Property>
     {
         /// <summary>
         ///     Initializes a new instance of the <see cref="PropertySerializer" /> class.
@@ -43,7 +44,7 @@
         protected override async Task WriteValueAsync(Property value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Key, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Key, stream, cancellationToken).ConfigureAwait(false);
             await writer.WriteAsync(value.Value, stream, cancellationToken).ConfigureAwait(false);
             
             // placeholder for the parent element
@@ -55,7 +56,7 @@
             CancellationToken cancellationToken = default)
         {
             var p = new Property(
-                (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false),
+                (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken).ConfigureAwait(false),
                 await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false));
 
             // discard parent element
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SetSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SetSerializer.cs
index 8983a4c..92a3ddd 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SetSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SetSerializer.cs
@@ -36,7 +36,7 @@
     /// <typeparam name="TSet">The type of the set to serialize.</typeparam>
     /// <typeparam name="TMember">The type of elements in the set.</typeparam>
     public class SetSerializer<TSet, TMember> : SimpleTypeSerializer<TSet>
-        where TSet : ISet<TMember>, new()
+        where TSet : ISet<TMember?>, new()
     {
         /// <summary>
         ///     Initializes a new instance of the <see cref="SetSerializer{TSet,TMember}" /> class.
@@ -52,7 +52,7 @@
             var enumerable = (IEnumerable) value;
             var list = enumerable.Cast<object>().ToList();
 
-            await writer.WriteValueAsync(list.Count, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(list.Count, stream, cancellationToken).ConfigureAwait(false);
             
             foreach (var item in list)
             {
@@ -64,11 +64,11 @@
         protected override async Task<TSet> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var length = (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+            var length = (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
             var result = new TSet();
             for (var i = 0; i < length; i++)
             {
-                result.Add((TMember) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false));
+                result.Add((TMember?) await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false));
             }
 
             return result;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SimpleTypeSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SimpleTypeSerializer.cs
index cf6aa7b..172fbe7 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SimpleTypeSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/SimpleTypeSerializer.cs
@@ -46,34 +46,33 @@
         public DataType DataType { get; }
 
         /// <inheritdoc />
-        public async Task WriteAsync(object value, Stream stream, GraphBinaryWriter writer,
+        public async Task WriteAsync(object? value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await WriteValueAsync((T) value, stream, writer, true, cancellationToken).ConfigureAwait(false);
+            await WriteNullableValueAsync((T?) value, stream, writer, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
-        public async Task WriteValueAsync(object value, Stream stream, GraphBinaryWriter writer, bool nullable,
+        public async Task WriteNullableValueAsync(object? value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
             if (value == null)
             {
-                if (!nullable)
-                {
-                    throw new IOException("Unexpected null value when nullable is false");
-                }
-
                 await writer.WriteValueFlagNullAsync(stream, cancellationToken).ConfigureAwait(false);
                 return;
             }
 
-            if (nullable)
-            {
-                await writer.WriteValueFlagNoneAsync(stream, cancellationToken).ConfigureAwait(false);
-            }
+            await writer.WriteValueFlagNoneAsync(stream, cancellationToken).ConfigureAwait(false);
 
             await WriteValueAsync((T) value, stream, writer, cancellationToken).ConfigureAwait(false);
         }
+        
+        /// <inheritdoc />
+        public async Task WriteNonNullableValueAsync(object value, Stream stream, GraphBinaryWriter writer,
+            CancellationToken cancellationToken = default)
+        {
+            await WriteValueAsync((T) value, stream, writer, cancellationToken).ConfigureAwait(false);
+        }
 
         /// <summary>
         /// Writes a non-nullable value into a stream.
@@ -87,27 +86,31 @@
             CancellationToken cancellationToken = default);
 
         /// <inheritdoc />
-        public async Task<object> ReadAsync(Stream stream, GraphBinaryReader reader,
+        public async Task<object?> ReadAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            return await ReadValueAsync(stream, reader, true, cancellationToken).ConfigureAwait(false);
+            return await ReadNullableValueAsync(stream, reader, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
-        public async Task<object> ReadValueAsync(Stream stream, GraphBinaryReader reader, bool nullable,
+        public async Task<object?> ReadNullableValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            if (nullable)
+            var valueFlag = await stream.ReadByteAsync(cancellationToken).ConfigureAwait(false);
+            if ((valueFlag & 1) == 1)
             {
-                var valueFlag = await stream.ReadByteAsync(cancellationToken).ConfigureAwait(false);
-                if ((valueFlag & 1) == 1)
-                {
-                    return null;
-                }
+                return null;
             }
 
             return await ReadValueAsync(stream, reader, cancellationToken).ConfigureAwait(false);
         }
+        
+        /// <inheritdoc />
+        public async Task<object> ReadNonNullableValueAsync(Stream stream, GraphBinaryReader reader,
+            CancellationToken cancellationToken = default)
+        {
+            return (await ReadValueAsync(stream, reader, cancellationToken).ConfigureAwait(false))!;
+        }
 
         /// <summary>
         /// Reads a non-nullable value according to the type format.
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/StringSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/StringSerializer.cs
index ae2b9a1..034230a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/StringSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/StringSerializer.cs
@@ -45,7 +45,7 @@
             CancellationToken cancellationToken = default)
         {
             var bytes = Encoding.UTF8.GetBytes(value);
-            await writer.WriteValueAsync(bytes.Length, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(bytes.Length, stream, cancellationToken).ConfigureAwait(false);
             await stream.WriteAsync(bytes, cancellationToken).ConfigureAwait(false);
         }
 
@@ -53,7 +53,7 @@
         protected override async Task<string> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var length = (int)await reader.ReadValueAsync<int>(stream, false, cancellationToken).ConfigureAwait(false);
+            var length = (int)await reader.ReadNonNullableValueAsync<int>(stream, cancellationToken).ConfigureAwait(false);
             var bytes = new byte[length];
             await stream.ReadAsync(bytes, 0, length, cancellationToken).ConfigureAwait(false);
             return Encoding.UTF8.GetString(bytes);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalSerializer.cs
index 0b6ba0a..1e00047 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalSerializer.cs
@@ -45,7 +45,7 @@
         protected override async Task WriteValueAsync(ITraversal value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Bytecode, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Bytecode, stream, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalStrategySerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalStrategySerializer.cs
index 6d7f537..24077fa 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalStrategySerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraversalStrategySerializer.cs
@@ -45,9 +45,9 @@
         protected override async Task WriteValueAsync(AbstractTraversalStrategy value, Stream stream,
             GraphBinaryWriter writer, CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(GremlinType.FromFqcn(value.Fqcn), stream, false, cancellationToken)
+            await writer.WriteNonNullableValueAsync(GremlinType.FromFqcn(value.Fqcn), stream, cancellationToken)
                 .ConfigureAwait(false);
-            await writer.WriteValueAsync(value.Configuration, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Configuration, stream, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraverserSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraverserSerializer.cs
index 12ba016..9be8a0c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraverserSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TraverserSerializer.cs
@@ -44,7 +44,7 @@
         protected override async Task WriteValueAsync(Traverser value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
-            await writer.WriteValueAsync(value.Bulk, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Bulk, stream, cancellationToken).ConfigureAwait(false);
             await writer.WriteAsync(value.Object, stream, cancellationToken).ConfigureAwait(false);
         }
 
@@ -52,7 +52,7 @@
         protected override async Task<Traverser> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var bulk = (long)await reader.ReadValueAsync<long>(stream, false, cancellationToken).ConfigureAwait(false);
+            var bulk = (long)await reader.ReadNonNullableValueAsync<long>(stream, cancellationToken).ConfigureAwait(false);
             var v = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
             return new Traverser(v, bulk);
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TypeSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TypeSerializer.cs
index c02ba0e..51793da 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TypeSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/TypeSerializer.cs
@@ -48,8 +48,10 @@
         {
             if (typeof(AbstractTraversalStrategy).IsAssignableFrom(value))
             {
-                var strategyInstance = (AbstractTraversalStrategy) Activator.CreateInstance(value);
-                await writer.WriteValueAsync(strategyInstance.Fqcn, stream, false, cancellationToken)
+                var strategyInstance = (AbstractTraversalStrategy?)Activator.CreateInstance(value) ??
+                                       throw new IOException(
+                                           $"Cannot write the strategy {value} because an instance of that strategy could not be created");
+                await writer.WriteNonNullableValueAsync(strategyInstance.Fqcn, stream, cancellationToken)
                     .ConfigureAwait(false);
             }
             else
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexPropertySerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexPropertySerializer.cs
index bc146dc..f347e0a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexPropertySerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexPropertySerializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -44,7 +45,7 @@
             CancellationToken cancellationToken = default)
         {
             await writer.WriteAsync(value.Id, stream, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(value.Label, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Label, stream, cancellationToken).ConfigureAwait(false);
             await writer.WriteAsync(value.Value, stream, cancellationToken).ConfigureAwait(false);
             
             // placeholder for the parent vertex
@@ -52,24 +53,24 @@
             
             // placeholder for properties
             await writer.WriteAsync(null, stream, cancellationToken).ConfigureAwait(false);
-
         }
 
         /// <inheritdoc />
         protected override async Task<VertexProperty> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            var vp = new VertexProperty(await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false),
-                (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false),
-                await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false));
+            var id = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            var label = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
+                .ConfigureAwait(false);
+            var value = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
 
             // discard the parent vertex
             await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
-            
-            // discard the properties
-            await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
-            
-            return vp;
+
+            var properties = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            var propertiesAsArray = (properties as List<object>)?.ToArray();
+
+            return new VertexProperty(id, label, value, null, propertiesAsArray);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexSerializer.cs
index c656431..0dd492c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphBinary/Types/VertexSerializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -44,7 +45,7 @@
             CancellationToken cancellationToken = default)
         {
             await writer.WriteAsync(value.Id, stream, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(value.Label, stream, false, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(value.Label, stream, cancellationToken).ConfigureAwait(false);
             await writer.WriteAsync(null, stream, cancellationToken).ConfigureAwait(false);
         }
 
@@ -52,13 +53,13 @@
         protected override async Task<Vertex> ReadValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
+            var id = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            var label = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken).ConfigureAwait(false);
 
-            var v = new Vertex(await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false),
-                (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken).ConfigureAwait(false));
-            
-            // discard properties
-            await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
-            return v;
+            var properties = await reader.ReadAsync(stream, cancellationToken).ConfigureAwait(false);
+            var propertiesAsArray = (properties as List<object>)?.ToArray();
+
+            return new Vertex(id, label, propertiesAsArray);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs
index a3f1ff6..36ea1fd 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.IO;
 using System.Numerics;
 using System.Text.Json;
 
@@ -31,6 +32,7 @@
         public dynamic Objectify(JsonElement graphson, GraphSONReader reader)
         {
             var bigInteger = graphson.ValueKind == JsonValueKind.String ? graphson.GetString() : graphson.GetRawText();
+            if (bigInteger == null) throw new IOException("Read null, but expected a BigInteger string representation");
             return BigInteger.Parse(bigInteger);
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BulkSetSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BulkSetSerializer.cs
index 539224a..8f876b6 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BulkSetSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BulkSetSerializer.cs
@@ -42,7 +42,7 @@
             // previous versions.
             return Enumerable.Range(0, graphsonObject.GetArrayLength() / 2).SelectMany<int, object>(i =>
                 Enumerable.Repeat<object>(reader.ToObject(graphsonObject[i * 2]),
-                    (int) reader.ToObject(graphsonObject[i * 2 + 1]))).ToList();
+                    (int) reader.ToObject(graphsonObject[i * 2 + 1])!)).ToList();
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs
index 0feb3a2..adb4efa 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs
@@ -21,6 +21,7 @@
 #endregion
 
 using System;
+using System.IO;
 using System.Text.Json;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -30,7 +31,8 @@
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
             var base64String = graphsonObject.GetString();
-            return Convert.FromBase64String(base64String);
+            return Convert.FromBase64String(base64String ??
+                                            throw new IOException("Read null but expected a base64 byte string"));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs
index 0c3e539..b86cf15 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs
@@ -20,6 +20,7 @@
  */
 #endregion
 
+using System.IO;
 using System.Text.Json;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -31,7 +32,7 @@
         protected override bool StringifyValue => true;
         protected override dynamic FromJsonElement(JsonElement graphson)
         {
-            var deserializedByte = graphson.GetString();
+            var deserializedByte = graphson.GetString() ?? throw new IOException("Read null but expected a string");
             return deserializedByte[0];
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ClassSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ClassSerializer.cs
index 39d1abe..8bd7353 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ClassSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ClassSerializer.cs
@@ -23,6 +23,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
 {
@@ -31,7 +32,8 @@
         public Dictionary<string, dynamic> Dictify(dynamic objectData, GraphSONWriter writer)
         {
             var type = (Type) objectData;
-            return writer.ToDict(Activator.CreateInstance(type));
+            return writer.ToDict(Activator.CreateInstance(type) ??
+                                 throw new IOException($"Cannot write {objectData}. maybe it is not a supported type"));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DTDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DTDeserializer.cs
new file mode 100644
index 0000000..734b345
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DTDeserializer.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.IO;
+using System.Text.Json;
+using Gremlin.Net.Process.Traversal;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+    internal class DTDeserializer : IGraphSONDeserializer
+    {
+        public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
+        {
+            return DT.GetByValue(graphsonObject.GetString() ??
+                                    throw new IOException($"Read null but expected a {nameof(DT)} string representation"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs
index f195522..b4167a6 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs
@@ -22,6 +22,7 @@
 #endregion
 
 using System.Globalization;
+using System.IO;
 using System.Text.Json;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -35,7 +36,9 @@
         {
             if (graphson.ValueKind == JsonValueKind.String)
             {
-                return decimal.Parse(graphson.GetString(), CultureInfo.InvariantCulture);
+                return decimal.Parse(
+                    graphson.GetString() ?? throw new IOException("Read null but expected a decimal string"),
+                    CultureInfo.InvariantCulture);
             }
             return graphson.GetDecimal();
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DirectionDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DirectionDeserializer.cs
index 34d4f61..6835169 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DirectionDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DirectionDeserializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.IO;
 using System.Text.Json;
 using Gremlin.Net.Process.Traversal;
 
@@ -30,7 +31,9 @@
     {
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
-            return Direction.GetByValue(graphsonObject.GetString());
+            return Direction.GetByValue(graphsonObject.GetString() ??
+                                        throw new IOException(
+                                            $"Read null but expected a {nameof(Direction)} string representation"));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs
index 2c1d17f..e23c7a5 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.IO;
 using System.Text.Json;
 using System.Xml;
 
@@ -31,7 +32,9 @@
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
             var duration = graphsonObject.GetString();
-            return XmlConvert.ToTimeSpan(duration);
+            return XmlConvert.ToTimeSpan(duration ??
+                                         throw new IOException(
+                                             "Read null but expected a Duration string representation"));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/EdgeDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/EdgeDeserializer.cs
index 13f4ce0..758b1f8 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/EdgeDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/EdgeDeserializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.Linq;
 using System.Text.Json;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -43,7 +44,16 @@
             var edgeLabel = graphsonObject.TryGetProperty("label", out var labelProperty)
                 ? labelProperty.GetString()
                 : "edge";
-            return new Edge(edgeId, outV, edgeLabel, inV);
+
+            dynamic?[]? properties = null;
+            if (graphsonObject.TryGetProperty("properties", out var propertiesObject)
+                && propertiesObject.ValueKind == JsonValueKind.Object)
+            {
+                properties = propertiesObject.EnumerateObject()
+                    .Select(p => reader.ToObject(p.Value)).ToArray();
+            }
+
+            return new Edge(edgeId, outV, edgeLabel, inV, properties);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON2MessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON2MessageSerializer.cs
index c0c36b1..7f9d7bd 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON2MessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON2MessageSerializer.cs
@@ -35,7 +35,7 @@
         /// </summary>
         /// <param name="graphSONReader">The <see cref="GraphSON2Reader"/> used to deserialize from GraphSON.</param>
         /// <param name="graphSONWriter">The <see cref="GraphSON2Writer"/> used to serialize to GraphSON.</param>
-        public GraphSON2MessageSerializer(GraphSON2Reader graphSONReader = null, GraphSON2Writer graphSONWriter = null)
+        public GraphSON2MessageSerializer(GraphSON2Reader? graphSONReader = null, GraphSON2Writer? graphSONWriter = null)
             : base(MimeType, graphSONReader ?? new GraphSON2Reader(), graphSONWriter ?? new GraphSON2Writer())
         {
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON3MessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON3MessageSerializer.cs
index abb6a75..bc434c7 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON3MessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSON3MessageSerializer.cs
@@ -35,7 +35,7 @@
         /// </summary>
         /// <param name="graphSONReader">The <see cref="GraphSON3Reader"/> used to deserialize from GraphSON.</param>
         /// <param name="graphSONWriter">The <see cref="GraphSON3Writer"/> used to serialize to GraphSON.</param>
-        public GraphSON3MessageSerializer(GraphSON3Reader graphSONReader = null, GraphSON3Writer graphSONWriter = null)
+        public GraphSON3MessageSerializer(GraphSON3Reader? graphSONReader = null, GraphSON3Writer? graphSONWriter = null)
             : base(MimeType, graphSONReader ?? new GraphSON3Reader(), graphSONWriter ?? new GraphSON3Writer())
         {
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONMessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONMessageSerializer.cs
index 4d4ffa1..c9f2b88 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONMessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONMessageSerializer.cs
@@ -23,6 +23,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
@@ -72,17 +73,17 @@
         }
 
         /// <inheritdoc />
-        public virtual Task<ResponseMessage<List<object>>> DeserializeMessageAsync(byte[] message,
+        public virtual Task<ResponseMessage<List<object>>?> DeserializeMessageAsync(byte[] message,
             CancellationToken cancellationToken = default)
         {
             if (message == null) throw new ArgumentNullException(nameof(message));
             if (cancellationToken.CanBeCanceled) cancellationToken.ThrowIfCancellationRequested();
-            if (message.Length == 0) return Task.FromResult<ResponseMessage<List<object>>>(null);
+            if (message.Length == 0) return Task.FromResult<ResponseMessage<List<object>>?>(null);
             
             var reader = new Utf8JsonReader(message);
             var responseMessage =
                 JsonSerializer.Deserialize<ResponseMessage<JsonElement>>(ref reader, JsonDeserializingOptions);
-            if (responseMessage == null) return Task.FromResult<ResponseMessage<List<object>>>(null);;
+            if (responseMessage == null) return Task.FromResult<ResponseMessage<List<object>>?>(null);
             
             var data = _graphSONReader.ToObject(responseMessage.Result.Data);
             return Task.FromResult(CopyMessageWithNewData(responseMessage, data));
@@ -91,16 +92,9 @@
         private static ResponseMessage<List<object>> CopyMessageWithNewData(ResponseMessage<JsonElement> origMsg,
             dynamic data)
         {
-            return new ResponseMessage<List<object>>
-            {
-                RequestId = origMsg.RequestId,
-                Status = origMsg.Status,
-                Result = new ResponseResult<List<object>>
-                {
-                    Data = data == null ? null : new List<object>(data),
-                    Meta = origMsg.Result.Meta
-                }
-            };
+            var result = new ResponseResult<List<object>>(data == null ? null : new List<object>(data),
+                origMsg.Result.Meta);
+            return new ResponseMessage<List<object>>(origMsg.RequestId, origMsg.Status, result);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
index 3208966..209c056 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
@@ -23,6 +23,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.Json;
 
@@ -36,35 +37,35 @@
         /// <summary>
         /// Contains the <see cref="IGraphSONDeserializer" /> instances by their type identifier. 
         /// </summary>
-        protected readonly Dictionary<string, IGraphSONDeserializer> Deserializers = new Dictionary
-            <string, IGraphSONDeserializer>
-            {
-                {"g:Traverser", new TraverserReader()},
-                {"g:Int32", new Int32Converter()},
-                {"g:Int64", new Int64Converter()},
-                {"g:Float", new FloatConverter()},
-                {"g:Double", new DoubleConverter()},
-                {"g:Direction", new DirectionDeserializer()},
-                {"g:Merge", new MergeDeserializer()},
-                {"g:UUID", new UuidDeserializer()},
-                {"g:Date", new DateDeserializer()},
-                {"g:Timestamp", new DateDeserializer()},
-                {"g:Vertex", new VertexDeserializer()},
-                {"g:Edge", new EdgeDeserializer()},
-                {"g:Property", new PropertyDeserializer()},
-                {"g:VertexProperty", new VertexPropertyDeserializer()},
-                {"g:Path", new PathDeserializer()},
-                {"g:T", new TDeserializer()},
+        protected readonly Dictionary<string, IGraphSONDeserializer> Deserializers = new()
+        {
+            { "g:Traverser", new TraverserReader() },
+            { "g:Int32", new Int32Converter() },
+            { "g:Int64", new Int64Converter() },
+            { "g:Float", new FloatConverter() },
+            { "g:Double", new DoubleConverter() },
+            { "g:Direction", new DirectionDeserializer() },
+            { "g:DT", new DTDeserializer() },
+            { "g:Merge", new MergeDeserializer() },
+            { "g:UUID", new UuidDeserializer() },
+            { "g:Date", new DateDeserializer() },
+            { "g:Timestamp", new DateDeserializer() },
+            { "g:Vertex", new VertexDeserializer() },
+            { "g:Edge", new EdgeDeserializer() },
+            { "g:Property", new PropertyDeserializer() },
+            { "g:VertexProperty", new VertexPropertyDeserializer() },
+            { "g:Path", new PathDeserializer() },
+            { "g:T", new TDeserializer() },
 
-                //Extended
-                {"gx:BigDecimal", new DecimalConverter()},
-                {"gx:Duration", new DurationDeserializer()},
-                {"gx:BigInteger", new BigIntegerDeserializer()},
-                {"gx:Byte", new ByteConverter()},
-                {"gx:ByteBuffer", new ByteBufferDeserializer()},
-                {"gx:Char", new CharConverter()},
-                {"gx:Int16", new Int16Converter() }
-            };
+            //Extended
+            { "gx:BigDecimal", new DecimalConverter() },
+            { "gx:Duration", new DurationDeserializer() },
+            { "gx:BigInteger", new BigIntegerDeserializer() },
+            { "gx:Byte", new ByteConverter() },
+            { "gx:ByteBuffer", new ByteBufferDeserializer() },
+            { "gx:Char", new CharConverter() },
+            { "gx:Int16", new Int16Converter() }
+        };
 
         /// <summary>
         ///     Initializes a new instance of the <see cref="GraphSONReader" /> class.
@@ -101,7 +102,7 @@
         /// </summary>
         /// <param name="graphSon">The GraphSON to deserialize.</param>
         /// <returns>The deserialized object.</returns>
-        public virtual dynamic ToObject(JsonElement graphSon)
+        public virtual dynamic? ToObject(JsonElement graphSon)
         {
             switch (graphSon.ValueKind)
             {
@@ -124,7 +125,9 @@
 
             if (graphSon.TryGetProperty(GraphSONTokens.TypeKey, out var graphSonTypeProperty))
             {
-                return ReadValueOfType(graphSon, graphSonTypeProperty.GetString());
+                return ReadValueOfType(graphSon,
+                    graphSonTypeProperty.GetString() ??
+                    throw new IOException("Read GraphSON type key is not a string"));
             }
             return ReadDictionary(graphSon);
             
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
index a7d4d01..f62dac2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using System.Text.Encodings.Web;
@@ -39,45 +40,44 @@
     /// </summary>
     public abstract class GraphSONWriter
     {
-        private static readonly JsonSerializerOptions _jsonOptions = new JsonSerializerOptions
-            {Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping};
-        
+        private static readonly JsonSerializerOptions JsonOptions = new()
+            { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
+
         /// <summary>
         /// Contains the information of serializers by type.
         /// </summary>
-        protected readonly Dictionary<Type, IGraphSONSerializer> Serializers = new Dictionary
-            <Type, IGraphSONSerializer>
-            {
-                {typeof(ITraversal), new TraversalSerializer()},
-                {typeof(Bytecode), new BytecodeSerializer()},
-                {typeof(Binding), new BindingSerializer()},
-                {typeof(RequestMessage), new RequestMessageSerializer()},
-                {typeof(int), new Int32Converter()},
-                {typeof(long), new Int64Converter()},
-                {typeof(float), new FloatConverter()},
-                {typeof(double), new DoubleConverter()},
-                {typeof(Guid), new UuidSerializer()},
-                {typeof(DateTimeOffset), new DateSerializer()},
-                {typeof(Type), new ClassSerializer()},
-                {typeof(EnumWrapper), new EnumSerializer()},
-                {typeof(P), new PSerializer()},
-                {typeof(TextP), new TextPSerializer()},
-                {typeof(Vertex), new VertexSerializer()},
-                {typeof(Edge), new EdgeSerializer()},
-                {typeof(Property), new PropertySerializer()},
-                {typeof(VertexProperty), new VertexPropertySerializer()},
-                {typeof(AbstractTraversalStrategy), new TraversalStrategySerializer()},
-                {typeof(ILambda), new LambdaSerializer()},
+        protected readonly Dictionary<Type, IGraphSONSerializer> Serializers = new()
+        {
+            { typeof(ITraversal), new TraversalSerializer() },
+            { typeof(Bytecode), new BytecodeSerializer() },
+            { typeof(Binding), new BindingSerializer() },
+            { typeof(RequestMessage), new RequestMessageSerializer() },
+            { typeof(int), new Int32Converter() },
+            { typeof(long), new Int64Converter() },
+            { typeof(float), new FloatConverter() },
+            { typeof(double), new DoubleConverter() },
+            { typeof(Guid), new UuidSerializer() },
+            { typeof(DateTimeOffset), new DateSerializer() },
+            { typeof(Type), new ClassSerializer() },
+            { typeof(EnumWrapper), new EnumSerializer() },
+            { typeof(P), new PSerializer() },
+            { typeof(TextP), new TextPSerializer() },
+            { typeof(Vertex), new VertexSerializer() },
+            { typeof(Edge), new EdgeSerializer() },
+            { typeof(Property), new PropertySerializer() },
+            { typeof(VertexProperty), new VertexPropertySerializer() },
+            { typeof(AbstractTraversalStrategy), new TraversalStrategySerializer() },
+            { typeof(ILambda), new LambdaSerializer() },
 
-                //Extended
-                {typeof(decimal), new DecimalConverter()},
-                {typeof(TimeSpan), new DurationSerializer()},
-                {typeof(BigInteger), new BigIntegerSerializer()},
-                {typeof(byte), new ByteConverter()},
-                {typeof(byte[]), new ByteBufferSerializer()},
-                {typeof(char), new CharConverter() },
-                {typeof(short), new Int16Converter() }
-            };
+            //Extended
+            { typeof(decimal), new DecimalConverter() },
+            { typeof(TimeSpan), new DurationSerializer() },
+            { typeof(BigInteger), new BigIntegerSerializer() },
+            { typeof(byte), new ByteConverter() },
+            { typeof(byte[]), new ByteBufferSerializer() },
+            { typeof(char), new CharConverter() },
+            { typeof(short), new Int16Converter() }
+        };
 
         /// <summary>
         ///     Initializes a new instance of the <see cref="GraphSONWriter" /> class.
@@ -106,7 +106,7 @@
         /// <returns>The serialized GraphSON.</returns>
         public virtual string WriteObject(dynamic objectData)
         {
-            return JsonSerializer.Serialize(ToDict(objectData), _jsonOptions);
+            return JsonSerializer.Serialize(ToDict(objectData), JsonOptions);
         }
 
         /// <summary>
@@ -114,7 +114,8 @@
         /// </summary>
         /// <param name="objectData">The object to transform.</param>
         /// <returns>A GraphSON representation of the object ready to be serialized.</returns>
-        public dynamic ToDict(dynamic objectData)
+        [return: NotNullIfNotNull("objectData")]
+        public dynamic? ToDict(dynamic? objectData)
         {
             if (objectData != null)
             {
@@ -132,7 +133,7 @@
             return objectData;         
         }
 
-        private IGraphSONSerializer TryGetSerializerFor(Type type)
+        private IGraphSONSerializer? TryGetSerializerFor(Type type)
         {
             if (Serializers.TryGetValue(type, out var serializer))
             {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ListSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ListSerializer.cs
index add8eb5..154010a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ListSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ListSerializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Text.Json;
 
@@ -28,7 +29,7 @@
 {
     internal class ListSerializer : IGraphSONDeserializer, IGraphSONSerializer
     {
-        private static readonly IReadOnlyList<object> EmptyList = new object[0];
+        private static readonly IReadOnlyList<object> EmptyList = Array.Empty<object>();
         
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
@@ -36,7 +37,7 @@
             {
                 return EmptyList;
             }
-            var result = new object[graphsonObject.GetArrayLength()];
+            var result = new object?[graphsonObject.GetArrayLength()];
             for (var i = 0; i < result.Length; i++)
             {
                 result[i] = reader.ToObject(graphsonObject[i]);
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MapSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MapSerializer.cs
index 99165a7..3ba7e3a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MapSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MapSerializer.cs
@@ -36,7 +36,7 @@
             {
                 return new Dictionary<object, object>(0);
             }
-            var result = new Dictionary<object, object>(graphsonObject.GetArrayLength() / 2);
+            var result = new Dictionary<object, object?>(graphsonObject.GetArrayLength() / 2);
             for (var i = 0; i < graphsonObject.GetArrayLength(); i += 2)
             {
                 result[reader.ToObject(graphsonObject[i])] = reader.ToObject(graphsonObject[i + 1]);
@@ -51,7 +51,7 @@
             {
                 throw new InvalidOperationException("Object must implement IDictionary");
             }
-            var result = new object[map.Count * 2];
+            var result = new object?[map.Count * 2];
             var index = 0;
             foreach (var key in map.Keys)
             {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MergeDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MergeDeserializer.cs
index 26b6869..3a34eb9 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MergeDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MergeDeserializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.IO;
 using System.Text.Json;
 using Gremlin.Net.Process.Traversal;
 
@@ -30,7 +31,8 @@
     {
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
-            return Merge.GetByValue(graphsonObject.GetString());
+            return Merge.GetByValue(graphsonObject.GetString() ??
+                                    throw new IOException("Read null but expected a Merge value"));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs
index 4492685..b12c494 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs
@@ -27,7 +27,7 @@
 
 namespace Gremlin.Net.Structure.IO.GraphSON
 {
-    internal abstract class NumberConverter<T> : IGraphSONDeserializer, IGraphSONSerializer
+    internal abstract class NumberConverter<T> : IGraphSONDeserializer, IGraphSONSerializer where T : notnull
     {
         protected abstract string GraphSONTypeName { get; }
         protected virtual string Prefix => "g";
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs
index d05663b..6e35321 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs
@@ -22,6 +22,7 @@
 #endregion
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.Json;
 
@@ -32,12 +33,14 @@
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
             // "labels" is a object[] where each item is ISet<object>
-            var labelProperty = (object[])reader.ToObject(graphsonObject.GetProperty("labels"));
+            var labelProperty = (object[]?)reader.ToObject(graphsonObject.GetProperty("labels"));
+            if (labelProperty == null) throw new IOException($"Could not read the labels for the {nameof(Path)}");
             var labels = labelProperty
                 .Select(x => new HashSet<string>(((ISet<object>)x).Cast<string>()))
                 .ToList<ISet<string>>();
             // "objects" is an object[]
-            object[] objects = reader.ToObject(graphsonObject.GetProperty("objects"));
+            object?[] objects = reader.ToObject(graphsonObject.GetProperty("objects")) ??
+                               throw new IOException($"Could not read the objects for the {nameof(Path)}");
             return new Path(labels, objects);
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PathDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PathDeserializer.cs
index 3a37f66..baa9722 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PathDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PathDeserializer.cs
@@ -22,6 +22,7 @@
 #endregion
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.Json;
 
@@ -34,7 +35,8 @@
             var labels =
                 graphsonObject.GetProperty("labels").EnumerateArray()
                     .Select(readObjLabels =>
-                        new HashSet<string>(readObjLabels.EnumerateArray().Select(l => l.GetString())))
+                        new HashSet<string>(readObjLabels.EnumerateArray().Select(l =>
+                            l.GetString() ?? throw new IOException("Read null but expected a Path label"))))
                     .ToList<ISet<string>>();
             var objects = graphsonObject.GetProperty("objects").EnumerateArray().Select(o => reader.ToObject(o))
                 .ToList();
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PropertySerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PropertySerializer.cs
index 0a7e6f8..d668442 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PropertySerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/PropertySerializer.cs
@@ -22,6 +22,7 @@
 #endregion
 
 using System.Collections.Generic;
+using System.IO;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
 {
@@ -40,23 +41,25 @@
             return GraphSONUtil.ToTypedValue(nameof(Property), valueDict);
         }
 
-        private dynamic CreateElementDict(Element element, GraphSONWriter writer)
+        private dynamic? CreateElementDict(Element? element, GraphSONWriter writer)
         {
             if (element == null)
                 return null;
             var serializedElement = writer.ToDict(element);
+            if (serializedElement == null)
+            {
+                throw new IOException(
+                    $"Could not write the {nameof(Property.Element)} of this {nameof(Property)}, {nameof(Property.Element)}: {element}");
+            }
             Dictionary<string, dynamic> elementDict = serializedElement;
             if (elementDict.ContainsKey(GraphSONTokens.ValueKey))
             {
                 var elementValueSerialized = elementDict[GraphSONTokens.ValueKey];
                 Dictionary<string, dynamic> elementValueDict = elementValueSerialized;
-                if (elementValueDict != null)
-                {
-                    elementValueDict.Remove("outVLabel");
-                    elementValueDict.Remove("inVLabel");
-                    elementValueDict.Remove("properties");
-                    elementValueDict.Remove("value");
-                }
+                elementValueDict.Remove("outVLabel");
+                elementValueDict.Remove("inVLabel");
+                elementValueDict.Remove("properties");
+                elementValueDict.Remove("value");
             }
             return serializedElement;
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/SetSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/SetSerializer.cs
index 590392e..fce7465 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/SetSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/SetSerializer.cs
@@ -36,7 +36,7 @@
                 return new HashSet<object>();
             }
             // ISet<object>
-            return new HashSet<object>(graphsonObject.EnumerateArray().Select(reader.ToObject));
+            return new HashSet<object?>(graphsonObject.EnumerateArray().Select(reader.ToObject));
         }
 
         public Dictionary<string, dynamic> Dictify(dynamic objectData, GraphSONWriter writer)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
index efbc542..270d36a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.IO;
 using System.Text.Json;
 using Gremlin.Net.Process.Traversal;
 
@@ -30,7 +31,8 @@
     {
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
-            return T.GetByValue(graphsonObject.GetString());
+            return T.GetByValue(graphsonObject.GetString()??
+                                throw new IOException($"Read null but expected a {nameof(T)} string representation"));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/UuidDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/UuidDeserializer.cs
index 58caac7..8e64236 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/UuidDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/UuidDeserializer.cs
@@ -22,6 +22,7 @@
 #endregion
 
 using System;
+using System.IO;
 using System.Text.Json;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -31,7 +32,7 @@
         public dynamic Objectify(JsonElement graphsonObject, GraphSONReader reader)
         {
             var uuidString = graphsonObject.GetString();
-
+            if (uuidString == null) throw new IOException("Read null but expected a GUID string representation");
             return Guid.Parse(uuidString);
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexDeserializer.cs
index 72615ef..9590218 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexDeserializer.cs
@@ -21,6 +21,8 @@
 
 #endregion
 
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -33,7 +35,16 @@
             var label = graphsonObject.TryGetProperty("label", out var labelProperty)
                 ? labelProperty.GetString()
                 : Vertex.DefaultLabel;
-            return new Vertex(id, label);
+
+            dynamic?[]? properties = null;
+            if (graphsonObject.TryGetProperty("properties", out var propertiesObject)
+                && propertiesObject.ValueKind == JsonValueKind.Object)
+            {
+                properties = propertiesObject.EnumerateObject()
+                    .SelectMany(p => (reader.ToObject(p.Value) as IEnumerable<object>)!).ToArray();
+            }
+
+            return new Vertex(id, label, properties);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertyDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertyDeserializer.cs
index 15a99dc..b204185 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertyDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertyDeserializer.cs
@@ -21,6 +21,7 @@
 
 #endregion
 
+using System.Linq;
 using System.Text.Json;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -35,7 +36,15 @@
             var vertex = graphsonObject.TryGetProperty("vertex", out var vertexProperty)
                 ? new Vertex(reader.ToObject(vertexProperty))
                 : null;
-            return new VertexProperty(id, label, value, vertex);
+
+            dynamic?[]? properties = null;
+            if (graphsonObject.TryGetProperty("properties", out var propertiesObject)
+                && propertiesObject.ValueKind == JsonValueKind.Object)
+            {
+                properties = propertiesObject.EnumerateObject()
+                    .Select(p => new Property(p.Name, reader.ToObject(p.Value))).ToArray();
+            }
+            return new VertexProperty(id, label, value, vertex, properties);
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertySerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertySerializer.cs
index 12cc7ac..6000d35 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertySerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/VertexPropertySerializer.cs
@@ -34,9 +34,12 @@
             {
                 {"id", writer.ToDict(vertexProperty.Id)},
                 {"label", vertexProperty.Label},
-                {"value", writer.ToDict(vertexProperty.Value)},
-                {"vertex", writer.ToDict(vertexProperty.Vertex.Id)}
+                {"value", writer.ToDict(vertexProperty.Value)}
             };
+            if (vertexProperty.Vertex != null)
+            {
+                valueDict.Add("vertex", writer.ToDict(vertexProperty.Vertex.Id));
+            }
             return GraphSONUtil.ToTypedValue(nameof(VertexProperty), valueDict);
         }
     }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/Path.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/Path.cs
index d205a88..682aad3 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/Path.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/Path.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Gremlin.Net.Process.Traversal;
 
@@ -36,17 +37,17 @@
     ///     In abstraction, any Path implementation maintains two lists: a list of sets of labels and a list of objects.
     ///     The list of labels are the labels of the steps traversed. The list of objects are the objects traversed.
     /// </remarks>
-    public class Path : IReadOnlyList<object>, IEquatable<Path>
+    public class Path : IReadOnlyList<object?>, IEquatable<Path>
     {
         /// <summary>
         ///     Initializes a new instance of the <see cref="Path" /> class.
         /// </summary>
         /// <param name="labels">The labels associated with the path</param>
         /// <param name="objects">The objects in the <see cref="Path" />.</param>
-        public Path(IList<ISet<string>> labels, IList<object> objects)
+        public Path(IList<ISet<string>> labels, IList<object?> objects)
         {
-            Labels = labels;
-            Objects = objects;
+            Labels = labels ?? throw new ArgumentNullException(nameof(labels));
+            Objects = objects ?? throw new ArgumentNullException(nameof(objects));
         }
 
         /// <summary>
@@ -57,7 +58,7 @@
         /// <summary>
         ///     Gets an ordered list of the objects in the <see cref="Path" />.
         /// </summary>
-        public IList<object> Objects { get; }
+        public IList<object?> Objects { get; }
 
         /// <summary>
         ///     Gets the object associated with the particular label of the path.
@@ -70,15 +71,15 @@
         {
             get
             {
-                var objFound = TryGetValue(label, out object obj);
+                var objFound = TryGetValue(label, out var obj);
                 if (!objFound)
                     throw new KeyNotFoundException($"The step with label {label} does not exist");
-                return obj;
+                return obj!;
             }
         }
 
         /// <inheritdoc />
-        public bool Equals(Path other)
+        public bool Equals(Path? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -90,7 +91,7 @@
         /// </summary>
         /// <param name="index">The index of the path</param>
         /// <returns>The object associated with the index of the path</returns>
-        public dynamic this[int index] => Objects[index];
+        public dynamic? this[int index] => Objects[index];
 
         /// <summary>
         ///     Gets the number of steps in the path.
@@ -131,7 +132,7 @@
         /// <param name="label">The label of the path.</param>
         /// <param name="value">The object associated with the label of the path.</param>
         /// <returns>True, if an object was found for the label.</returns>
-        public bool TryGetValue(string label, out object value)
+        public bool TryGetValue(string label, [NotNullWhen(true)] out object? value)
         {
             value = null;
             for (var i = 0; i < Labels.Count; i++)
@@ -139,43 +140,38 @@
                 if (!Labels[i].Contains(label)) continue;
                 if (value == null)
                     value = Objects[i];
-                else if (value.GetType() == typeof(List<object>))
-                    ((List<object>) value).Add(Objects[i]);
+                else if (value.GetType() == typeof(List<object?>))
+                    ((List<object?>) value).Add(Objects[i]);
                 else
-                    value = new List<object> {value, Objects[i]};
+                    value = new List<object?> {value, Objects[i]};
             }
             return value != null;
         }
 
-        private bool ObjectsEqual(ICollection<object> otherObjects)
+        private bool ObjectsEqual(ICollection<object?> otherObjects)
         {
-            if (Objects == null)
-                return otherObjects == null;
             return Objects.SequenceEqual(otherObjects);
         }
 
         private bool LabelsEqual(ICollection<ISet<string>> otherLabels)
         {
-            if (Labels == null)
-                return otherLabels == null;
             if (Labels.Count != otherLabels.Count)
                 return false;
-            using (var enumOther = otherLabels.GetEnumerator())
-            using (var enumThis = Labels.GetEnumerator())
+            using var enumOther = otherLabels.GetEnumerator();
+            using var enumThis = Labels.GetEnumerator();
+            while (enumOther.MoveNext() && enumThis.MoveNext())
             {
-                while (enumOther.MoveNext() && enumThis.MoveNext())
+                if (!enumOther.Current.SequenceEqual(enumThis.Current))
                 {
-                    if (!enumOther.Current.SequenceEqual(enumThis.Current))
-                    {
-                        return false;
-                    }
+                    return false;
                 }
             }
+
             return true;
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
@@ -189,13 +185,12 @@
             unchecked
             {
                 var hashCode = 19;
-                if (Labels != null)
-                    hashCode = Labels.Where(objLabels => objLabels != null)
-                        .Aggregate(hashCode,
-                            (current1, objLabels) => objLabels.Aggregate(current1,
-                                (current, label) => current * 31 + label.GetHashCode()));
-                if (Objects != null)
-                    hashCode = Objects.Aggregate(hashCode, (current, obj) => current * 31 + obj.GetHashCode());
+                hashCode = Labels
+                    .Aggregate(hashCode,
+                        (current1, objLabels) => objLabels.Aggregate(current1,
+                            (current, label) => current * 31 + label.GetHashCode()));
+                hashCode = Objects.Aggregate(hashCode,
+                    (current, obj) => current * 31 + (obj == null ? 0 : obj.GetHashCode()));
                 return hashCode;
             }
         }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/Property.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/Property.cs
index b2adee7..291287d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/Property.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/Property.cs
@@ -36,7 +36,7 @@
         /// <param name="key">The key of the property.</param>
         /// <param name="value">The value of the property.</param>
         /// <param name="element">The (optional) element that the property is associated with.</param>
-        public Property(string key, dynamic value, Element element = null)
+        public Property(string key, dynamic? value, Element? element = null)
         {
             Key = key;
             Value = value;
@@ -51,15 +51,15 @@
         /// <summary>
         ///     Gets the value of the property.
         /// </summary>
-        public dynamic Value { get; }
+        public dynamic? Value { get; }
 
         /// <summary>
         ///     Gets the element that this property is associated with.
         /// </summary>
-        public Element Element { get; }
+        public Element? Element { get; }
 
         /// <inheritdoc />
-        public bool Equals(Property other)
+        public bool Equals(Property? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -73,7 +73,7 @@
         }
 
         /// <inheritdoc />
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/Vertex.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/Vertex.cs
index f667d26..c430dea 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/Vertex.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/Vertex.cs
@@ -21,6 +21,9 @@
 
 #endregion
 
+using System.Collections.Generic;
+using System.Linq;
+
 namespace Gremlin.Net.Structure
 {
     /// <summary>
@@ -38,11 +41,21 @@
         /// </summary>
         /// <param name="id">The id of the vertex.</param>
         /// <param name="label">The label of the vertex.</param>
-        public Vertex(object id, string label = DefaultLabel)
-            : base(id, label)
+        /// <param name="properties">Optional properties of the vertex.</param>
+        public Vertex(object? id, string label = DefaultLabel, dynamic[]? properties = null)
+            : base(id, label, properties)
         {
         }
 
+        /// <summary>
+        /// Get property by key
+        /// </summary>
+        /// <returns>property or null when not found</returns>
+        public VertexProperty? Property(string key)
+        {
+            return Properties?.Cast<VertexProperty>().FirstOrDefault(p => p.Key == key);
+        }
+
         /// <inheritdoc />
         public override string ToString()
         {
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/VertexProperty.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/VertexProperty.cs
index a8dd943..f8e211d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/VertexProperty.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/VertexProperty.cs
@@ -21,6 +21,8 @@
 
 #endregion
 
+using System.Linq;
+
 namespace Gremlin.Net.Structure
 {
     /// <summary>
@@ -35,8 +37,9 @@
         /// <param name="label">The label of the vertex property.</param>
         /// <param name="value">The id of the vertex property.</param>
         /// <param name="vertex">The (optional) <see cref="Vertex" /> that owns this <see cref="VertexProperty" />.</param>
-        public VertexProperty(object id, string label, dynamic value, Vertex vertex = null)
-            : base(id, label)
+        /// <param name="properties">Optional properties of the VertexProperty.</param>
+        public VertexProperty(object? id, string label, dynamic? value, Vertex? vertex = null, dynamic[]? properties = null)
+            : base(id, label, properties)
         {
             Value = value;
             Vertex = vertex;
@@ -45,18 +48,27 @@
         /// <summary>
         ///     The value of this <see cref="VertexProperty" />.
         /// </summary>
-        public dynamic Value { get; }
+        public dynamic? Value { get; }
 
         /// <summary>
         ///     The <see cref="Vertex" /> that owns this <see cref="VertexProperty" />.
         /// </summary>
-        public Vertex Vertex { get; }
+        public Vertex? Vertex { get; }
 
         /// <summary>
         ///     The key of this <see cref="VertexProperty" />.
         /// </summary>
         public string Key => Label;
 
+        /// <summary>
+        /// Get property by key
+        /// </summary>
+        /// <returns>property or null when not found</returns>
+        public Property? Property(string key)
+        {
+            return Properties?.Cast<Property>().FirstOrDefault(p => p.Key == key);
+        }
+
         /// <inheritdoc />
         public override string ToString()
         {
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 56780bf..f56376f 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-dotnet</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-dotnet-source</artifactId>
     <name>Apache TinkerPop :: Gremlin.Net - Source</name>
@@ -38,7 +38,7 @@
                 <artifactId>gmavenplus-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
+                        <groupId>org.apache.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
                         <version>${groovy.version}</version>
                         <type>pom</type>
@@ -363,7 +363,7 @@
                                 <scope>runtime</scope>
                             </dependency>
                             <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
+                                <groupId>org.apache.groovy</groupId>
                                 <artifactId>groovy-all</artifactId>
                                 <version>${groovy.version}</version>
                                 <type>pom</type>
diff --git a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj b/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
index af2f34b..c22cfcb 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/MessageSerializerBenchmarks.cs b/gremlin-dotnet/test/Gremlin.Net.Benchmarks/MessageSerializerBenchmarks.cs
index 500929a..45be90e 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/MessageSerializerBenchmarks.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.Benchmarks/MessageSerializerBenchmarks.cs
@@ -86,22 +86,22 @@
                 .ConfigureAwait(false);
 
         [Benchmark]
-        public async Task<ResponseMessage<List<object>>> TestReadSmallResponseMessageBinary() =>
+        public async Task<ResponseMessage<List<object>>?> TestReadSmallResponseMessageBinary() =>
             await BinaryMessageSerializer.DeserializeMessageAsync(TestMessages.SmallBinaryResponseMessageBytes)
                 .ConfigureAwait(false);
         
         [Benchmark]
-        public async Task<ResponseMessage<List<object>>> TestReadSmallResponseMessageGraphSON3() =>
+        public async Task<ResponseMessage<List<object>>?> TestReadSmallResponseMessageGraphSON3() =>
             await GraphSON3MessageSerializer.DeserializeMessageAsync(TestMessages.SmallGraphSON3ResponseMessageBytes)
                 .ConfigureAwait(false);
         
         [Benchmark]
-        public async Task<ResponseMessage<List<object>>> TestReadBigResponseMessageBinary() =>
+        public async Task<ResponseMessage<List<object>>?> TestReadBigResponseMessageBinary() =>
             await BinaryMessageSerializer.DeserializeMessageAsync(TestMessages.BigBinaryResponseMessageBytes)
                 .ConfigureAwait(false);
         
         [Benchmark]
-        public async Task<ResponseMessage<List<object>>> TestReadBigResponseMessageGraphSON3() =>
+        public async Task<ResponseMessage<List<object>>?> TestReadBigResponseMessageGraphSON3() =>
             await GraphSON3MessageSerializer.DeserializeMessageAsync(TestMessages.BigGraphSON3ResponseMessageBytes)
                 .ConfigureAwait(false);
     }
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/ConfigProvider.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/ConfigProvider.cs
index 6b84584..3250f67 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/ConfigProvider.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/ConfigProvider.cs
@@ -46,6 +46,8 @@
             if (Convert.ToBoolean(Environment.GetEnvironmentVariable("DOCKER_ENVIRONMENT")))
             {
                 config["TestServerIpAddress"] = config["TestServerIpAddressDocker"];
+                config["GremlinSocketServerIpAddress"] = config["GremlinSocketServerIpAddressDocker"];
+                config["GremlinSocketServerConfig"] = config["GremlinSocketServerConfigDocker"];
             }
 
             return config;
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/GremlinVariantsTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/GremlinVariantsTests.cs
index 0d8a827..9fed29e 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/GremlinVariantsTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/GremlinVariantsTests.cs
@@ -45,6 +45,8 @@
 using static Gremlin.Net.Process.Traversal.TextP;
 using static Gremlin.Net.Process.Traversal.Column;
 using static Gremlin.Net.Process.Traversal.Direction;
+using static Gremlin.Net.Process.Traversal.Cardinality;
+using static Gremlin.Net.Process.Traversal.CardinalityValue;
 using static Gremlin.Net.Process.Traversal.T;
 // end::commonImports[]
 
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs
index 1d45514..f360c75 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Docs/Reference/IntroTests.cs
@@ -62,7 +62,7 @@
 var peopleMarkoKnows = g.V().Has("person", "name", "marko").Out("knows").ToList();
 // end::basicGremlinMarkoKnows[]
 
-            Assert.Equal("person", marko.Label);
+            Assert.Equal("person", marko!.Label);
             Assert.Equal(2, peopleMarkoKnows.Count);
         }
     }
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/ConnectionPoolTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/ConnectionPoolTests.cs
index c4f5f7c..d35c3e3 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/ConnectionPoolTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/ConnectionPoolTests.cs
@@ -34,7 +34,7 @@
     public class ConnectionPoolTests
     {
         private readonly RequestMessageProvider _requestMessageProvider = new RequestMessageProvider();
-        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
         private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestServerPort"]);
 
         private async Task ExecuteMultipleLongRunningRequestsInParallel(IGremlinClient gremlinClient, int nrRequests,
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/DriverRemoteConnectionTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/DriverRemoteConnectionTests.cs
index f4d5015..3415343 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/DriverRemoteConnectionTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/DriverRemoteConnectionTests.cs
@@ -34,7 +34,7 @@
 
 public class DriverRemoteConnectionTests
 {
-    private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+    private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
     private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestServerPort"]);
         
     [Fact]
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientAuthenticationTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientAuthenticationTests.cs
index e56e282..978e5e2 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientAuthenticationTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientAuthenticationTests.cs
@@ -35,14 +35,14 @@
 {
     public class GremlinClientAuthenticationTests
     {
-        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
         private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestSecureServerPort"]);
         private readonly RequestMessageProvider _requestMessageProvider = new RequestMessageProvider();
 
         public static bool IgnoreCertificateValidationLiveDangerouslyWheeeeeeee(
               object sender,
-              X509Certificate certificate,
-              X509Chain chain,
+              X509Certificate? certificate,
+              X509Chain? chain,
               SslPolicyErrors sslPolicyErrors)
         {
            return true;
@@ -51,7 +51,7 @@
         [Fact]
         public async Task ShouldThrowForMissingCredentials()
         {
-            ClientWebSocketOptions optionsSet = null;
+            ClientWebSocketOptions? optionsSet = null;
             var webSocketConfiguration =
                             new Action<ClientWebSocketOptions>(options =>
                             {
@@ -75,7 +75,7 @@
         [InlineData("stephen", "wrongPassword")]
         public async Task ShouldThrowForWrongCredentials(string username, string password)
         {
-            ClientWebSocketOptions optionsSet = null;
+            ClientWebSocketOptions? optionsSet = null;
             var webSocketConfiguration =
                             new Action<ClientWebSocketOptions>(options =>
                             {
@@ -98,7 +98,7 @@
         public async Task ScriptShouldBeEvaluatedAndResultReturnedForCorrectCredentials(string requestMsg,
             string expectedResponse)
         {
-            ClientWebSocketOptions optionsSet = null;
+            ClientWebSocketOptions? optionsSet = null;
             var webSocketConfiguration =
                             new Action<ClientWebSocketOptions>(options =>
                             {
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientBehaviorIntegrationTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientBehaviorIntegrationTests.cs
new file mode 100644
index 0000000..e7cbfd7
--- /dev/null
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientBehaviorIntegrationTests.cs
@@ -0,0 +1,133 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System;
+using System.Threading.Tasks;
+using Gremlin.Net.Driver;
+using Gremlin.Net.Driver.Exceptions;
+using Gremlin.Net.Driver.Messages;
+using Gremlin.Net.IntegrationTest.Util;
+using Gremlin.Net.Structure;
+using Gremlin.Net.Structure.IO.GraphBinary;
+using Gremlin.Net.Structure.IO.GraphSON;
+using Xunit;
+
+namespace Gremlin.Net.IntegrationTest.Driver
+{
+    public class GremlinClientBehaviorIntegrationTests
+    {
+        private static readonly string TestHost = ConfigProvider.Configuration["GremlinSocketServerIpAddress"]!;
+
+        private static readonly SocketServerSettings Settings =
+            SocketServerSettings.FromYaml(ConfigProvider.Configuration["GremlinSocketServerConfig"]);
+
+        private static IMessageSerializer Serializer;
+
+        public GremlinClientBehaviorIntegrationTests()
+        {
+            switch (Settings.Serializer)
+            {
+                case "GraphSONV2":
+                    Serializer = new GraphSON2MessageSerializer();
+                    break;
+                case "GraphSONV3":
+                    Serializer = new GraphSON3MessageSerializer();
+                    break;
+                case "GraphBinaryV1":
+                default:
+                    Serializer = new GraphBinaryMessageSerializer();
+                    break;
+            }
+        }
+
+        [Fact]
+        public async Task ShouldTryCreateNewConnectionIfClosedByServer()
+        {
+            var sessionId = Guid.NewGuid().ToString();
+            var poolSettings = new ConnectionPoolSettings {PoolSize = 1};
+            
+            var gremlinServer = new GremlinServer(TestHost, Settings.Port);
+            using var gremlinClient = new GremlinClient(gremlinServer, messageSerializer: Serializer,
+                connectionPoolSettings: poolSettings, sessionId: sessionId);
+
+            Assert.Equal(1, gremlinClient.NrConnections);
+            
+            //Send close request to server, ensure server closes connection
+            await Assert.ThrowsAsync<ConnectionClosedException>(async () =>
+                await gremlinClient.SubmitWithSingleResultAsync<Vertex>(RequestMessage.Build("1")
+                    .OverrideRequestId(Settings.CloseConnectionRequestId).Create()));
+            
+            //verify that new client reconnects and new requests can be made again
+            var response2 = await gremlinClient.SubmitWithSingleResultAsync<Vertex>(RequestMessage.Build("1")
+                .OverrideRequestId(Settings.SingleVertexRequestId).Create());
+            Assert.NotNull(response2);
+            Assert.Equal(1, gremlinClient.NrConnections);
+        }
+
+        [Fact]
+        public async Task ShouldIncludeUserAgentInHandshakeRequest()
+        {
+            var gremlinServer = new GremlinServer(TestHost, Settings.Port);
+            using var gremlinClient = new GremlinClient(gremlinServer, messageSerializer: Serializer);
+
+            //verify that the server received the correct user agent during connection setup.
+            var userAgentResponse = await gremlinClient.SubmitWithSingleResultAsync<String>(RequestMessage.Build("1")
+                .OverrideRequestId(Settings.UserAgentRequestId).Create());
+            Assert.Equal(Gremlin.Net.Process.Utils.UserAgent, userAgentResponse);
+        }
+
+        [Fact]
+        public async Task ShouldNotIncludeUserAgentInHandshakeRequestIfDisabled()
+        {
+            var poolSettings = new ConnectionPoolSettings { EnableUserAgentOnConnect = false };
+
+            var gremlinServer = new GremlinServer(TestHost, Settings.Port);
+            using var gremlinClient = new GremlinClient(gremlinServer, messageSerializer: Serializer,
+                connectionPoolSettings: poolSettings);
+
+            //verify that the server did not receive any user agent.
+            var userAgentResponse = await gremlinClient.SubmitWithSingleResultAsync<String>(RequestMessage.Build("1")
+                .OverrideRequestId(Settings.UserAgentRequestId).Create());
+            Assert.Equal("", userAgentResponse);
+        }
+
+        [Fact]
+        public async Task ShouldSendPerRequestSettingsToServer()
+        {
+            var gremlinServer = new GremlinServer(TestHost, Settings.Port);
+            using var gremlinClient = new GremlinClient(gremlinServer, messageSerializer: Serializer);
+
+            //verify that new client reconnects and new requests can be made again
+            var response = await gremlinClient.SubmitWithSingleResultAsync<String>(RequestMessage.Build("1")
+                .OverrideRequestId(Settings.PerRequestSettingsRequestId)
+                .AddArgument(Tokens.ArgsEvalTimeout, 1234)
+                .AddArgument(Tokens.ArgsBatchSize, 12)
+                .AddArgument(Tokens.ArgsUserAgent, "helloWorld")
+                .AddArgument(Tokens.ArgMaterializeProperties, "tokens")
+                .Create());
+
+            var expectedResponse = $"requestId={Settings.PerRequestSettingsRequestId} evaluationTimeout=1234, batchSize=12, userAgent=helloWorld, materializeProperties=tokens";
+            Assert.Equal(expectedResponse, response);
+        }
+    }
+}
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs
index 79e3265..553547b 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs
@@ -38,8 +38,8 @@
 {
     public class GremlinClientTests
     {
-        private readonly RequestMessageProvider _requestMessageProvider = new RequestMessageProvider();
-        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+        private readonly RequestMessageProvider _requestMessageProvider = new();
+        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
         private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestServerPort"]);
 
         [Theory]
@@ -67,7 +67,7 @@
 
                 var response = await gremlinClient.SubmitWithSingleResultAsync<string>(requestMsg);
 
-                Assert.Equal(responseMsgSize, response.Length);
+                Assert.Equal(responseMsgSize, response!.Length);
             }
         }
 
@@ -246,7 +246,7 @@
         public async Task ShouldConfigureWebSocketOptionsAsSpecified()
         {
             var gremlinServer = new GremlinServer(TestHost, TestPort);
-            ClientWebSocketOptions optionsSet = null;
+            ClientWebSocketOptions? optionsSet = null;
             var expectedKeepAliveInterval = TimeSpan.FromMilliseconds(11);
             var webSocketConfiguration =
                 new Action<ClientWebSocketOptions>(options =>
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
index 6d6ca72..5a39b7d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
@@ -35,8 +35,8 @@
 {
     public class MessagesTests
     {
-        private readonly RequestMessageProvider _requestMessageProvider = new RequestMessageProvider();
-        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+        private readonly RequestMessageProvider _requestMessageProvider = new();
+        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
         private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestServerPort"]);
 
         [Fact]
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MockedLoggerExtensions.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MockedLoggerExtensions.cs
index fab122f..0722358 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MockedLoggerExtensions.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MockedLoggerExtensions.cs
@@ -32,13 +32,13 @@
     public static void VerifyMessageWasLogged(this ILogger logger, LogLevel expectedLogLevel, string logMessagePart)
     {
         logger.Received().Log(expectedLogLevel, Arg.Any<EventId>(),
-            Arg.Is<Arg.AnyType>((object a) => a.ToString().Contains(logMessagePart)), null,
-            Arg.Any<Func<Arg.AnyType, Exception, string>>());
+            Arg.Is<Arg.AnyType>((object a) => a.ToString()!.Contains(logMessagePart)), null,
+            Arg.Any<Func<Arg.AnyType, Exception?, string>>());
     }
-    
+
     public static void VerifyNothingWasLogged(this ILogger logger)
     {
         logger.DidNotReceive().Log(Arg.Any<LogLevel>(), Arg.Any<EventId>(), Arg.Any<Arg.AnyType>(),
-            Arg.Any<Exception>(), Arg.Any<Func<Arg.AnyType, Exception, string>>());
+            Arg.Any<Exception>(), Arg.Any<Func<Arg.AnyType, Exception?, string>>());
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/PropertyDeserializationTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/PropertyDeserializationTests.cs
new file mode 100644
index 0000000..f4f009e
--- /dev/null
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/PropertyDeserializationTests.cs
@@ -0,0 +1,289 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using Gremlin.Net.Driver;
+using Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection;
+using Gremlin.Net.Process.Traversal;
+using Gremlin.Net.Structure;
+using Gremlin.Net.Structure.IO.GraphBinary;
+using Gremlin.Net.Structure.IO.GraphSON;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Gremlin.Net.IntegrationTest.Driver
+{
+    public class PropertyDeserializationTests
+    {
+        private readonly RemoteConnectionFactory _connectionFactory = new();
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldDeserializeVertexPropertiesForBytecode(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gmodern", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var vertex = g.V(1).Next();
+
+            VerifyVertexProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldRespectMaterializePropertiesTokensForBytecode(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gmodern", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var vertex = g.With(Tokens.ArgMaterializeProperties, "tokens").V(1).Next();
+
+            VerifyEmptyProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldRespectMaterializePropertiesAllForBytecode(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gmodern", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var vertex = g.With(Tokens.ArgMaterializeProperties, "all").V(1).Next();
+
+            VerifyVertexProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldHandleEmptyVertexPropertiesForBytecode(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gimmutable", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var vertex = g.AddV("test").Next();
+
+            VerifyEmptyProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public async Task ShouldDeserializeVertexPropertiesForGremlin(IMessageSerializer serializer)
+        {
+            var client = _connectionFactory.CreateClient(serializer);
+
+            var vertex = await client.SubmitWithSingleResultAsync<Vertex>("gmodern.V(1)");
+
+            VerifyVertexProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public async Task ShouldHandleEmptyVertexPropertiesForGremlin(IMessageSerializer serializer)
+        {
+            var client = _connectionFactory.CreateClient(serializer);
+
+            var vertex = await client.SubmitWithSingleResultAsync<Vertex>("gimmutable.addV('test')");
+
+            VerifyEmptyProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public async Task ShouldRespectMaterializePropertiesAllForGremlin(IMessageSerializer serializer)
+        {
+            var client = _connectionFactory.CreateClient(serializer);
+
+            var vertex = await client.SubmitWithSingleResultAsync<Vertex>("gmodern.with('materializeProperties', 'all').V(1)");
+
+            VerifyVertexProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public async Task ShouldRespectMaterializePropertiesTokensForGremlin(IMessageSerializer serializer)
+        {
+            var client = _connectionFactory.CreateClient(serializer);
+
+            var vertex = await client.SubmitWithSingleResultAsync<Vertex>("gmodern.with('materializeProperties', 'tokens').V(1)");
+
+            VerifyEmptyProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldDeserializeEdgePropertiesForBytecode(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gmodern", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var edge = g.E(7).Next();
+
+            VerifyEdgeProperties(edge);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldHandleEmptyEdgePropertiesForBytecode(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gimmutable", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var v1 = g.AddV("v1").Next();
+            var v2 = g.AddV("v2").Next();
+            var edge = g.AddE("test").From(v1).To(v2).Next();
+
+            VerifyEmptyProperties(edge);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public async Task ShouldDeserializeEdgePropertiesForGremlin(IMessageSerializer serializer)
+        {
+            var client = _connectionFactory.CreateClient(serializer);
+
+            var edge = await client.SubmitWithSingleResultAsync<Edge>("gmodern.E(7)");
+
+            VerifyEdgeProperties(edge);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public async Task ShouldHandleEmptyEdgePropertiesForGremlin(IMessageSerializer serializer)
+        {
+            var client = _connectionFactory.CreateClient(serializer);
+
+            var edge = await client.SubmitWithSingleResultAsync<Edge>(
+                "gimmutable.addV().as('v1').addV().as('v2').addE('test').from('v1').to('v2')");
+
+            VerifyEmptyProperties(edge);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldHandleMultiplePropertiesWithSameNameForVertex(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gimmutable", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var vertex = g.AddV()
+                .Property(Cardinality.List, "test", "value1")
+                .Property(Cardinality.List, "test", "value2")
+                .Property(Cardinality.List, "test", "value3")
+                .Next()!;
+
+            vertex = g.V(vertex.Id).Next();
+
+            Assert.NotNull(vertex);
+
+            var properties = vertex.Properties!;
+            Assert.Equal(3, properties.Length);
+            var propertyValues = properties.Cast<VertexProperty>().Where(p => p.Key == "test").Select(p => p.Value).ToArray();
+            Assert.Equal(3, propertyValues.Length);
+            Assert.Equal(new[] { "value1", "value2", "value3" }, propertyValues);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public void ShouldDeserializeVertexVertexPropertiesForBytecode(IMessageSerializer serializer)
+        {
+            var connection = _connectionFactory.CreateRemoteConnection("gcrew", 2, serializer);
+            var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
+
+            var vertex = g.V(7).Next();
+
+            VerifyVertexVertexProperties(vertex);
+        }
+
+        [Theory]
+        [MemberData(nameof(Serializers))]
+        public async Task ShouldDeserializeVertexVertexPropertiesForGremlin(IMessageSerializer serializer)
+        {
+            var client = _connectionFactory.CreateClient(serializer);
+
+            var vertex = await client.SubmitWithSingleResultAsync<Vertex>("gcrew.V(7)");
+
+            VerifyVertexVertexProperties(vertex);
+        }
+
+        private static void VerifyVertexProperties(Vertex? vertex)
+        {
+            Assert.NotNull(vertex);
+            Assert.Equal(1, vertex.Id);
+            Assert.Equal("person", vertex.Label);
+            Assert.True(2 == vertex.Properties!.Length, $"Unexpected properties count: {JsonSerializer.Serialize(vertex.Properties)}");
+
+            var age = vertex.Property("age");
+            Assert.NotNull(age);
+            Assert.Equal(29, age.Value);
+        }
+
+        private static void VerifyVertexVertexProperties(Vertex? vertex)
+        {
+            Assert.NotNull(vertex);
+            Assert.Equal(7, vertex.Id);
+            Assert.Equal("person", vertex.Label);
+            Assert.True(4 == vertex.Properties!.Length, $"Unexpected properties count: {JsonSerializer.Serialize(vertex.Properties)}");
+
+            var locations = vertex.Properties.Cast<VertexProperty>().Where(p => p.Key == "location");
+            Assert.NotNull(locations);
+            Assert.Equal(3, locations.Count());
+
+            var vertexProperty = locations.First();
+            Assert.Equal("centreville", vertexProperty.Value);
+            Assert.Equal(2, vertexProperty.Properties!.Length);
+
+            var vertexPropertyPropertyStartTime = vertexProperty.Property("startTime");
+            Assert.Equal(1990, vertexPropertyPropertyStartTime!.Value);
+
+            var vertexPropertyPropertyEndTime = vertexProperty.Property("endTime");
+            Assert.Equal(2000, vertexPropertyPropertyEndTime!.Value);
+        }
+
+        private static void VerifyEdgeProperties(Edge? edge)
+        {
+            Assert.NotNull(edge);
+            Assert.Equal(7, edge.Id);
+            Assert.Equal("knows", edge.Label);
+            Assert.True(1 == edge.Properties!.Length, $"Unexpected properties count: {JsonSerializer.Serialize(edge.Properties)}");
+
+            var weight = edge.Property("weight");
+            Assert.NotNull(weight);
+            Assert.Equal(0.5, weight.Value);
+        }
+
+        private static void VerifyEmptyProperties(Element? element)
+        {
+            Assert.NotNull(element);
+            Assert.True((element.Properties?.Length ?? 0) == 0);
+        }
+
+        public static List<object[]> Serializers => new()
+        {
+            new [] { new GraphSON2MessageSerializer() },
+            new [] { new GraphSON3MessageSerializer() },
+            new [] { new GraphBinaryMessageSerializer() }
+        };
+    }
+}
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 29e6a1b..03c914b 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -42,31 +42,33 @@
 {
     internal class CommonSteps : StepDefinition
     {
-        private GraphTraversalSource _g;
-        private string _graphName;
-        private readonly IDictionary<string, object> _parameters = new Dictionary<string, object>();
-        private ITraversal _traversal;
-        private object[] _result;
-        private Exception _error = null;
+        private GraphTraversalSource? _g;
+        private string? _graphName;
+        private readonly IDictionary<string, object?> _parameters = new Dictionary<string, object?>();
+        private ITraversal? _traversal;
+        private object?[]? _result;
+        private Exception? _error;
 
         private static readonly JsonSerializerOptions JsonDeserializingOptions =
             new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
         
         public static ScenarioData ScenarioData { get; set; } = new ScenarioData(new GraphSON3MessageSerializer());
 
-        private static readonly IDictionary<Regex, Func<string, string, object>> Parsers =
-            new Dictionary<string, Func<string, string, object>>
+        private static readonly IDictionary<Regex, Func<string, string, object?>> Parsers =
+            new Dictionary<string, Func<string, string, object?>>
             {
+                {@"str\[(.*)\]", (x, graphName) => x }, //returns the string value as is
                 {@"vp\[(.+)\]", ToVertexProperty},
+                {@"dt\[(.+)\]", ToDateTime},
                 {@"d\[(.*)\]\.([bsilfdmn])", ToNumber},
                 {@"D\[(.+)\]", ToDirection},
                 {@"M\[(.+)\]", ToMerge},
                 {@"v\[(.+)\]", ToVertex},
                 {@"v\[(.+)\]\.id", (x, graphName) => ToVertex(x, graphName).Id},
-                {@"v\[(.+)\]\.sid", (x, graphName) => ToVertex(x, graphName).Id.ToString()},
+                {@"v\[(.+)\]\.sid", (x, graphName) => ToVertex(x, graphName).Id!.ToString()},
                 {@"e\[(.+)\]", ToEdge},
                 {@"e\[(.+)\].id", (x, graphName) => ToEdge(x, graphName).Id},
-                {@"e\[(.+)\].sid", (x, graphName) => ToEdge(x, graphName).Id.ToString()},
+                {@"e\[(.+)\].sid", (x, graphName) => ToEdge(x, graphName).Id!.ToString()},
                 {@"p\[(.+)\]", ToPath},
                 {@"l\[(.*)\]", ToList},
                 {@"s\[(.*)\]", ToSet},
@@ -109,14 +111,14 @@
         [Given("using the parameter (\\w+) defined as \"(.*)\"")]
         public void UsingParameter(string name, string value)
         {
-            var parsedValue = ParseValue(value.Replace("\\\"", "\""), _graphName);
+            var parsedValue = ParseValue(value.Replace("\\\"", "\""), _graphName!);
             _parameters.Add(name, parsedValue);
         }
 
         [Given("using the parameter (\\w+) of P.(\\w+)\\(\"(.*)\"\\)")]
         public void UsingParameterP(string name, string pval, string value)
         {
-            var parsedValue = ParseValue(value.Replace("\\\"", "\""), _graphName);
+            var parsedValue = ParseValue(value.Replace("\\\"", "\""), _graphName!);
             _parameters.Add(name, new P(pval, parsedValue));
         }
 
@@ -128,20 +130,20 @@
                 throw new InvalidOperationException("g should be a traversal source");
             }
 
-            if (ScenarioData.CurrentFeature.Tags.Select(t => t.Name).ToList().Contains("@GraphComputerOnly"))
+            if (ScenarioData.CurrentFeature!.Tags.Any(t => t.Name == "@GraphComputerOnly"))
             {
                 _g = _g.WithComputer();
             }
 
             _traversal =
-                Gremlin.UseTraversal(ScenarioData.CurrentScenario.Name, _g, _parameters);
+                Gremlin.UseTraversal(ScenarioData.CurrentScenario!.Name, _g, _parameters);
         }
 
         [Given("the graph initializer of")]
         public void InitTraversal(string traversalText)
         {
             var traversal =
-                Gremlin.UseTraversal(ScenarioData.CurrentScenario.Name, _g, _parameters);
+                Gremlin.UseTraversal(ScenarioData.CurrentScenario!.Name, _g, _parameters);
             traversal.Iterate();
             
             // We may have modified the so-called `empty` graph
@@ -227,13 +229,13 @@
 
             switch (comparison) {
                 case "containing":
-                    Assert.Equal(true, _error.Message.Contains(expectedMessage));
+                    Assert.Contains(expectedMessage, _error.Message);
                     break;
                 case "starting":
-                    Assert.Equal(true, _error.Message.StartsWith(expectedMessage));
+                    Assert.StartsWith(expectedMessage, _error.Message);
                     break;
                 case "ending":
-                    Assert.Equal(true, _error.Message.EndsWith(expectedMessage));
+                    Assert.EndsWith(expectedMessage, _error.Message);
                     break;
                 default:
                     throw new NotSupportedException(
@@ -245,15 +247,15 @@
         }
 
         [Then("the result should be (\\w+)")]
-        public void AssertResult(string characterizedAs, DataTable table = null)
+        public void AssertResult(string characterizedAs, DataTable? table = null)
         {
-            assertThatNoErrorWasThrown();
+            AssertThatNoErrorWasThrown();
 
             var ordered = characterizedAs == "ordered";
             switch (characterizedAs)
             {
                 case "empty":
-                    Assert.Empty(_result);
+                    Assert.Empty(_result!);
                     return;
                 case "ordered":
                 case "unordered":
@@ -261,16 +263,16 @@
                     Assert.NotNull(table);
                     var rows = table.Rows.ToArray();
                     Assert.Equal("result", rows[0].Cells.First().Value);
-                    var expected = rows.Skip(1).Select(x => ParseValue(x.Cells.First().Value, _graphName));
+                    var expected = rows.Skip(1).Select(x => ParseValue(x.Cells.First().Value, _graphName!));
 
                     if (ordered)
                     {
-                        Assert.Equal(expected, _result);
+                        Assert.Equal(expected, _result!);
                     }
                     else
                     {
                         var expectedArray = expected.ToArray();
-                        foreach (var resultItem in _result)
+                        foreach (var resultItem in _result!)
                         {
                             if (resultItem is Dictionary<object, object> resultItemDict)
                             {
@@ -297,7 +299,7 @@
                                 Assert.True(expectedArrayContainsResultAsSet);
                             }
                             else if (resultItem is double resultItemDouble &&
-                                     expectedArray.Select(e => e.GetType()).Any(t => t == typeof(decimal)))
+                                     expectedArray.Select(e => e!.GetType()).Any(t => t == typeof(decimal)))
                             {
                                 // Java seems to use BigDecimal by default sometimes where .NET uses double, but we only
                                 // care for the value not its type here. So we just convert these to decimal (equivalent
@@ -323,15 +325,15 @@
         [Then("the result should have a count of (\\d+)")]
         public void AssertCount(int count)
         {
-            assertThatNoErrorWasThrown();
+            AssertThatNoErrorWasThrown();
 
-            Assert.Equal(count, _result.Length);
+            Assert.Equal(count, _result!.Length);
         }
 
         [Then("the graph should return (\\d+) for count of (.+)")]
         public void AssertTraversalCount(int expectedCount, string traversalText)
         {
-            assertThatNoErrorWasThrown();
+            AssertThatNoErrorWasThrown();
 
             if (traversalText.StartsWith("\""))
             {
@@ -339,7 +341,7 @@
             }
             
             var traversal =
-                Gremlin.UseTraversal(ScenarioData.CurrentScenario.Name, _g, _parameters);
+                Gremlin.UseTraversal(ScenarioData.CurrentScenario!.Name, _g, _parameters);
             
             var count = 0;
             while (traversal.MoveNext())
@@ -355,7 +357,7 @@
             
         }
 
-        private void assertThatNoErrorWasThrown()
+        private void AssertThatNoErrorWasThrown()
         {
             if (_error != null) throw _error;
         }
@@ -363,7 +365,7 @@
         private static object ToMap(string stringMap, string graphName)
         {
             var jsonMap = JsonSerializer.Deserialize<JsonElement>(stringMap, JsonDeserializingOptions);
-            return ParseMapValue(jsonMap, graphName);
+            return ParseMapValue(jsonMap, graphName)!;
         }
 
         private static object ToLambda(string stringLambda, string graphName)
@@ -392,13 +394,13 @@
                 stringNumber.Substring(0, stringNumber.Length - 1));
         }
 
-        private static object ParseMapValue(JsonElement value, string graphName)
+        private static object? ParseMapValue(JsonElement value, string graphName)
         {
             switch (value.ValueKind)
             {
                 case JsonValueKind.Object:
                 {
-                    return value.EnumerateObject().ToDictionary(property => ParseValue(property.Name, graphName),
+                    return value.EnumerateObject().ToDictionary(property => ParseValue(property.Name, graphName)!,
                         property => ParseMapValue(property.Value, graphName));
                 }
                 case JsonValueKind.Array:
@@ -420,7 +422,7 @@
                     throw new ArgumentOutOfRangeException(nameof(value), value, "Not a supported number type");
                 }
                 case JsonValueKind.String:
-                    return ParseValue(value.GetString(), graphName);
+                    return ParseValue(value.GetString()!, graphName);
                 case JsonValueKind.True:
                     return true;
                 case JsonValueKind.False:
@@ -433,20 +435,25 @@
             }
         }
 
-        private static ISet<object> ToSet(string stringSet, string graphName)
+        private static ISet<object?> ToSet(string stringSet, string graphName)
         {
-            return new HashSet<object>(ToList(stringSet, graphName));
+            return new HashSet<object?>(ToList(stringSet, graphName));
         }
 
-        private static IList<object> ToList(string stringList, string graphName)
+        private static IList<object?> ToList(string stringList, string graphName)
         {
             if (stringList == "")
             {
-                return new List<object>(0);
+                return new List<object?>(0);
             }
             return stringList.Split(',').Select(x => ParseValue(x, graphName)).ToList();
         }
 
+        private static object ToDateTime(string date, string graphName)
+        {
+            return DateTimeOffset.Parse(date);
+        }
+
         private static Vertex ToVertex(string name, string graphName)
         {
             if (ScenarioData.GetByGraphName(graphName).Vertices.ContainsKey(name))
@@ -471,13 +478,14 @@
 
         private static Path ToPath(string value, string graphName)
         {
-            return new Path(new List<ISet<string>>(0), value.Split(',').Select(x => ParseValue(x, graphName)).ToList());
+            return new Path(new List<ISet<string>>(0),
+                value.Split(',').Select(x => ParseValue(x, graphName)).ToList());
         }
 
-        private static object ParseValue(string stringValue, string graphName)
+        private static object? ParseValue(string stringValue, string graphName)
         {
-            Func<string, string, object> parser = null;
-            string extractedValue = null;
+            Func<string, string, object?>? parser = null;
+            string? extractedValue = null;
             foreach (var kv in Parsers)
             {
                 var match = kv.Key.Match(stringValue);
@@ -492,7 +500,7 @@
                     break;
                 }
             }
-            return parser != null ? parser(extractedValue, graphName) : stringValue;
+            return parser != null ? parser(extractedValue!, graphName) : stringValue;
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index f794184..df63253 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -114,7 +114,7 @@
                     }
 
                     StepBlock? currentStep = null;
-                    StepDefinition stepDefinition = null;
+                    StepDefinition? stepDefinition = null;
                     foreach (var step in scenario.Steps)
                     {
                         var previousStep = currentStep;
@@ -238,13 +238,13 @@
             }
         }
 
-        private Exception ExecuteStep(StepDefinition instance, StepBlock stepBlock, Step step)
+        private Exception? ExecuteStep(StepDefinition instance, StepBlock stepBlock, Step step)
         {
             var attribute = Attributes[stepBlock];
             var methodAndParameters = instance.GetType().GetMethods()
                 .Select(m =>
                 {
-                    var attr = (BddAttribute) m.GetCustomAttribute(attribute);
+                    var attr = (BddAttribute?) m.GetCustomAttribute(attribute);
                     
                     if (attr == null)
                     {
@@ -255,7 +255,7 @@
                     {
                         return null;
                     }
-                    var parameters = new List<object>();
+                    var parameters = new List<object?>();
                     for (var i = 1; i < match.Groups.Count; i++)
                     {
                         parameters.Add(match.Groups[i].Value);
@@ -358,7 +358,7 @@
             {
                 throw new InvalidOperationException($"No step definition class matches Given '{stepText}'");
             }
-            return (StepDefinition) Activator.CreateInstance(type);
+            return (StepDefinition) Activator.CreateInstance(type)!;
         }
 
         private ICollection<Type> GetStepDefinitionTypes()
@@ -391,9 +391,9 @@
         {
             var codeBaseUrl = new Uri(GetType().GetTypeInfo().Assembly.Location);
             var codeBasePath = Uri.UnescapeDataString(codeBaseUrl.AbsolutePath);
-            DirectoryInfo rootDir = null;
-            for (var dir = Directory.GetParent(Path.GetDirectoryName(codeBasePath));
-                dir.Parent != null;
+            DirectoryInfo? rootDir = null;
+            for (var dir = Directory.GetParent(Path.GetDirectoryName(codeBasePath)!);
+                dir!.Parent != null;
                 dir = dir.Parent)
             {
                 if (dir.Name == "gremlin-dotnet" && dir.GetFiles("pom.xml").Length == 1)
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index b45d1af..b10a2db 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -27,6 +27,7 @@
 //* Do NOT edit this file directly - generated by build/generate.groovy
 //********************************************************************************
 
+#nullable disable
 
 using System;
 using System.Collections.Generic;
@@ -115,6 +116,15 @@
                {"g_VX1X_repeatXrepeatXunionXout_uses_out_traversesXX_whereXloops_isX0X_timesX1X_timeX2X_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Repeat(__.Repeat(__.Union<object>(__.Out("uses"),__.Out("traverses")).Where(__.Loops().Is(0))).Times(1)).Times(2).Values<object>("name")}}, 
                {"g_V_repeatXa_outXknows_repeatXb_outXcreatedX_filterXloops_isX0XX_emit_lang", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Repeat("a",__.Out("knows").Repeat("b",__.Out("created").Filter(__.Loops("a").Is(0))).Emit()).Emit().Values<object>("lang")}}, 
                {"g_VX6X_repeatXa_bothXcreatedX_simplePathX_emitXrepeatXb_bothXknowsXX_untilXloopsXbX_asXb_whereXloopsXaX_asXbX_hasXname_vadasXX_dedup_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid6"]).Repeat("a",__.Both("created").SimplePath()).Emit(__.Repeat("b",__.Both("knows")).Until(__.Loops("b").As("b").Where(__.Loops("a").As("b"))).Has("name","vadas")).Dedup().Values<object>("name")}}, 
+               {"g_unionXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>()}}, 
+               {"g_unionXV_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.V().Values<object>("name"))}}, 
+               {"g_unionXVXv1X_VX4XX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.V((Vertex) p["v1"]),__.V((Vertex) p["v4"])).Values<object>("name")}}, 
+               {"g_unionXV_hasLabelXsoftwareX_V_hasLabelXpersonXX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.V().HasLabel("software"),__.V().HasLabel("person")).Values<object>("name")}}, 
+               {"g_unionXV_out_out_V_hasLabelXsoftwareXX_path", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.V().Out().Out(),__.V().HasLabel("software")).Path()}}, 
+               {"g_unionXV_out_out_V_hasLabelXsoftwareXX_path_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.V().Out().Out(),__.V().HasLabel("software")).Path().By("name")}}, 
+               {"g_unionXunionXV_out_outX_V_hasLabelXsoftwareXX_path_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.Union<object>(__.V().Out().Out()),__.V().HasLabel("software")).Path().By("name")}}, 
+               {"g_unionXinjectX1X_injectX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.Inject(1),__.Inject(2))}}, 
+               {"g_V_unionXconstantX1X_constantX2X_constantX3XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V((Vertex) p["v2"]).Union<object>(__.Constant<object>(p["xx1"]),__.Constant<object>(p["xx2"]),__.Constant<object>(p["xx3"]))}}, 
                {"g_V_unionXout__inX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Union<object>(__.Out(),__.In()).Values<object>("name")}}, 
                {"g_VX1X_unionXrepeatXoutX_timesX2X__outX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Union<object>(__.Repeat(__.Out()).Times(2),__.Out()).Values<object>("name")}}, 
                {"g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Choose<object>(__.Label().Is("person"),__.Union<object>(__.Out().Values<object>("lang"),__.Out().Values<object>("name")),__.In().Label())}}, 
@@ -123,11 +133,36 @@
                {"g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"],p["vid2"]).Union<object>(__.OutE().Count(),__.InE().Count(),__.OutE().Values<object>("weight").Sum<object>())}}, 
                {"g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"],p["vid2"]).Local<object>(__.Union<object>(__.OutE().Count(),__.InE().Count(),__.OutE().Values<object>("weight").Sum<object>()))}}, 
                {"g_VX1_2X_localXunionXcountXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"],p["vid2"]).Local<object>(__.Union<object>(__.Count()))}}, 
+               {"g_unionXaddVXpersonX_propertyXname_aliceX_addVXpersonX_propertyXname_bobX_addVXpersonX_propertyXname_chrisX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Union<object>(__.AddV("person").Property("name","alice"),__.AddV("person").Property("name","bob"),__.AddV("person").Property("name","chris")).Values<object>("name")}}, 
+               {"g_V_valuesXageX_allXgtX32XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").All(P.Gt(32))}}, 
+               {"g_V_valuesXageX_whereXisXP_gtX33XXX_fold_allXgtX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Where(__.Is(P.Gt(33))).Fold().All(P.Gt(33))}}, 
+               {"g_V_valuesXageX_order_byXdescX_fold_allXgtX10XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Desc).Fold().All(P.Gt(10))}}, 
+               {"g_V_valuesXageX_order_byXdescX_fold_allXgtX30XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Desc).Fold().All(P.Gt(30))}}, 
+               {"g_injectXabc_bcdX_allXeqXbcdXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(new List<object> {"abc", "bcd"}).All(P.Eq("bcd"))}}, 
+               {"g_injectXbcd_bcdX_allXeqXbcdXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).All(P.Eq("bcd"))}}, 
+               {"g_injectXnull_abcX_allXTextP_startingWithXaXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).All(TextP.StartingWith("a"))}}, 
+               {"g_injectX5_8_10_10_7X_allXgteX7XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"],p["xx2"]).All(P.Gte(7))}}, 
+               {"g_injectXnullX_allXeqXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).All(P.Eq(null))}}, 
+               {"g_injectX7X_allXeqX7XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(7).All(P.Eq(7))}}, 
+               {"g_injectXnull_nullX_allXeqXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).All(P.Eq(null))}}, 
+               {"g_injectX3_threeX_allXeqX3XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).All(P.Eq(3))}}, 
                {"g_V_andXhasXage_gt_27X__outE_count_gte_2X_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().And(__.Has("age",P.Gt(27)),__.OutE().Count().Is(P.Gte(2))).Values<object>("name")}}, 
                {"g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().And(__.OutE(),__.Has(T.Label,"person").And().Has("age",P.Gte(32))).Values<object>("name")}}, 
                {"g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("a").Out("knows").And().Out("created").In("created").As("a").Values<object>("name")}}, 
                {"g_V_asXaX_andXselectXaX_selectXaXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("a").And(__.Select<object>("a"),__.Select<object>("a"))}}, 
                {"g_V_hasXname_markoX_and_hasXname_markoX_and_hasXname_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name","marko").And().Has("name","marko").And().Has("name","marko")}}, 
+               {"g_V_valuesXageX_anyXgtX32XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Any(P.Gt(32))}}, 
+               {"g_V_valuesXageX_order_byXdescX_fold_anyXeqX29XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Desc).Fold().Any(P.Eq(29))}}, 
+               {"g_V_valuesXageX_order_byXdescX_fold_anyXgtX10XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Desc).Fold().Any(P.Gt(10))}}, 
+               {"g_V_valuesXageX_order_byXdescX_fold_anyXgtX42XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Desc).Fold().Any(P.Gt(42))}}, 
+               {"g_injectXabc_cdeX_anyXeqXbcdXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(new List<object> {"abc", "cde"}).Any(P.Eq("bcd"))}}, 
+               {"g_injectXabc_bcdX_anyXeqXbcdXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Any(P.Eq("bcd"))}}, 
+               {"g_injectXnull_abcX_anyXTextP_startingWithXaXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Any(TextP.StartingWith("a"))}}, 
+               {"g_injectX5_8_10_10_7X_anyXeqX7XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"],p["xx2"]).Any(P.Eq(7))}}, 
+               {"g_injectXnullX_anyXeqXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Any(P.Eq(null))}}, 
+               {"g_injectX7X_anyXeqX7XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(7).Any(P.Eq(7))}}, 
+               {"g_injectXnull_nullX_anyXeqXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Any(P.Eq(null))}}, 
+               {"g_injectX3_threeX_anyXeqX3XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Any(P.Eq(3))}}, 
                {"g_V_coinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Coin(1.0)}}, 
                {"g_V_coinX0X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Coin(0.0)}}, 
                {"g_withStrategiesXSeedStrategyX_V_order_byXnameX_coinX50X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SeedStrategy(seed: 999999)).V().Order().By("name").Coin(0.5)}}, 
@@ -162,6 +197,8 @@
                {"g_V_both_dedup_age_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Both().Dedup().By("age").Values<object>("name")}}, 
                {"g_VX1X_asXaX_both_asXbX_both_asXcX_dedupXa_bX_age_selectXa_b_cX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).As("a").Both().As("b").Both().As("c").Dedup("a","b").By("age").Select<object>("a","b","c").By("name")}}, 
                {"g_VX1X_valuesXageX_dedupXlocalX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Values<object>("age").Dedup(Scope.Local).Unfold<object>()}}, 
+               {"g_V_properties_dedup_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","josh").AddV("person").Property("name","josh").AddV("person").Property("name","josh"), (g,p) =>g.V().Properties<object>("name").Dedup().Count()}}, 
+               {"g_V_properties_dedup_byXvalueX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","josh").AddV("person").Property("name","josh").AddV("person").Property("name","josh"), (g,p) =>g.V().Properties<object>("name").Dedup().By(T.Value).Count()}}, 
                {"g_V_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("a").AddV().As("b").AddE("knows").To("a"), (g,p) =>g.V().Drop(), (g,p) =>g.V(), (g,p) =>g.E()}}, 
                {"g_V_outE_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().As("a").AddV().As("b").AddE("knows").To("a"), (g,p) =>g.V().OutE().Drop(), (g,p) =>g.V(), (g,p) =>g.E()}}, 
                {"g_V_properties_drop", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property("name","bob").AddV().Property("name","alice"), (g,p) =>g.V().Properties<object>().Drop(), (g,p) =>g.V(), (g,p) =>g.V().Properties<object>()}}, 
@@ -356,23 +393,24 @@
                {"g_withStrategiesXProductiveByStrategyX_VX3X_asXaX_in_out_asXbX_whereXa_eqXbXX_byXageX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ProductiveByStrategy(productiveKeys: new List<object> {})).V(p["vid3"]).As("a").In().Out().As("b").Where("a",P.Eq("b")).By("age").Values<object>("name")}}, 
                {"g_V_asXnX_whereXorXhasLabelXsoftwareX_hasLabelXpersonXXX_selectXnX_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("n").Where(__.Or(__.HasLabel("software"),__.HasLabel("person"))).Select<object>("n").By("name")}}, 
                {"g_V_asXnX_whereXorXselectXnX_hasLabelXsoftwareX_selectXnX_hasLabelXpersonXXX_selectXnX_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("n").Where(__.Or(__.Select<object>("n").HasLabel("software"),__.Select<object>("n").HasLabel("person"))).Select<object>("n").By("name")}}, 
+               {"g_V_hasLabelXpersonX_asXxX_whereXinEXknowsX_count_isXgteX1XXX_selectXxX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").As("x").Where(__.InE("knows").Count().Is(P.Gte(1))).Select<object>("x")}}, 
                {"g_V_coworker", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Filter(__.OutE("created")).Aggregate("p").As("p1").Values<object>("name").As("p1n").Select<object>("p").Unfold<object>().Where(P.Neq("p1")).As("p2").Values<object>("name").As("p2n").Select<object>("p2").Out("created").Choose<object>(__.In("created").Where(P.Eq("p1")),__.Values<object>("name"),__.Constant<object>(p["xx1"])).Group<object,object>().By(__.Select<object>("p1n")).By(__.Group<object,object>().By(__.Select<object>("p2n")).By(__.Unfold<object>().Fold().Project<object>("numCoCreated","coCreated").By(__.Count(Scope.Local)).By())).Unfold<object>()}}, 
                {"g_V_coworker_with_midV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Filter(__.OutE("created")).As("p1").V().HasLabel("person").Where(P.Neq("p1")).Filter(__.OutE("created")).As("p2").Map<object>(__.Out("created").Where(__.In("created").As("p1")).Values<object>("name").Fold()).Group<object,object>().By(__.Select<object>("p1").By("name")).By(__.Group<object,object>().By(__.Select<object>("p2").By("name")).By(__.Project<object>("numCoCreated","coCreated").By(__.Count(Scope.Local)).By())).Unfold<object>()}}, 
                {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").AddV("person").Property("_partition","b").Property("name","bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).V().Values<object>("name")}}, 
                {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").AddV("person").Property("_partition","b").Property("name","bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a", "b"}, writePartition: "a")).V().Values<object>("name")}}, 
                {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").AddV("person").Property("_partition","b").Property("name","bob"), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"c"}, writePartition: "a")).V().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).V().BothE().Values<object>("weight")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"b"}, writePartition: "a")).V().BothE().Values<object>("weight")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a", "b"}, writePartition: "a")).V().BothE().Dedup().Values<object>("weight")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"c"}, writePartition: "a")).V().BothE().Values<object>("weight")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).V().Both().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"b"}, writePartition: "a")).V().Both().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a", "b"}, writePartition: "a")).V().Both().Dedup().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"c"}, writePartition: "a")).V().Both().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).V().Out().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"b"}, writePartition: "a")).V().In().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a", "b"}, writePartition: "a")).V().Out().Values<object>("name")}}, 
-               {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"c"}, writePartition: "a")).V().Out().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).V().BothE().Values<object>("weight")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"b"}, writePartition: "a")).V().BothE().Values<object>("weight")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a", "b"}, writePartition: "a")).V().BothE().Dedup().Values<object>("weight")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"c"}, writePartition: "a")).V().BothE().Values<object>("weight")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).V().Both().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"b"}, writePartition: "a")).V().Both().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a", "b"}, writePartition: "a")).V().Both().Dedup().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"c"}, writePartition: "a")).V().Both().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).V().Out().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"b"}, writePartition: "a")).V().In().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a", "b"}, writePartition: "a")).V().Out().Values<object>("name")}}, 
+               {"g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("_partition","a").Property("name","alice").As("a").AddV("person").Property("_partition","b").Property("name","bob").As("b").AddE("knows").From("a").To("b").Property("_partition","a").Property("weight",1.0).AddE("knows").From("b").To("a").Property("_partition","b").Property("weight",2.0), (g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"c"}, writePartition: "a")).V().Out().Values<object>("name")}}, 
                {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_addVXpersonX_propertyXname_aliceX_addXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).AddV("person").Property("name","alice").AddE("self"), (g,p) =>g.V().Has("person","name","alice").Has("_partition","a"), (g,p) =>g.V(), (g,p) =>g.E().Has("_partition","a"), (g,p) =>g.E()}}, 
                {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectXzeroX_addVXpersonX_propertyXname_aliceX_addXselfX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).Inject(0).AddV("person").Property("name","alice").AddE("self"), (g,p) =>g.V().Has("person","name","alice").Has("_partition","a"), (g,p) =>g.V(), (g,p) =>g.E().Has("_partition","a"), (g,p) =>g.E()}}, 
                {"g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new PartitionStrategy(includeMetaProperties: false, partitionKey: "_partition", readPartitions: new HashSet<string> {"a"}, writePartition: "a")).MergeV((IDictionary<object,object>) p["xx1"]), (g,p) =>g.V().Has("person","name","alice").Has("_partition","a"), (g,p) =>g.V()}}, 
@@ -440,6 +478,7 @@
                {"g_withStrategiesXSubgraphStrategyXedges_hasLabelXusesX_hasXskill_5XXX_V_outE_valueMap_selectXvaluesX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: true, edges: __.HasLabel("uses").Has("skill",5))).V().OutE().ValueMap<object,object>().Select<object>(Column.Values).Unfold<object>()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).V()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_E", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).E()}}, 
+               {"g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_E", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: true, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).E()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_outE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).V(p["vid4"]).OutE()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_inE", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).V(p["vid4"]).InE()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_out", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).V(p["vid4"]).Out()}}, 
@@ -450,6 +489,7 @@
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX11X_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).E(p["eid11"]).BothV()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).E(p["eid12"]).BothV()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).E(p["eid9"]).BothV()}}, 
+               {"g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: true, vertices: __.Has("name",P.Within(new List<object> {"josh", "lop", "ripple"})), edges: __.Or(__.Has("weight",0.4).HasLabel("created"),__.Has("weight",1.0).HasLabel("created")))).E(p["eid9"]).BothV()}}, 
                {"g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29).As("marko").AddV("person").Property("name","vadas").Property("age",27).As("vadas").AddV("software").Property("name","lop").Property("lang","java").As("lop").AddV("person").Property("name","josh").Property("age",32).As("josh").AddV("software").Property("name","ripple").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V(p["vid1"]).As("a").Out("created").AddE("createdBy").To("a"), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).InE()}}, 
                {"g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29).As("marko").AddV("person").Property("name","vadas").Property("age",27).As("vadas").AddV("software").Property("name","lop").Property("lang","java").As("lop").AddV("person").Property("name","josh").Property("age",32).As("josh").AddV("software").Property("name","ripple").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V(p["vid1"]).As("a").Out("created").AddE("createdBy").To("a").Property("weight",2.0), (g,p) =>g.E(), (g,p) =>g.V(p["vid1"]).BothE(), (g,p) =>g.V(p["vid1"]).InE().Has("weight",2.0)}}, 
                {"g_V_outE_propertyXweight_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29).As("marko").AddV("person").Property("name","vadas").Property("age",27).As("vadas").AddV("software").Property("name","lop").Property("lang","java").As("lop").AddV("person").Property("name","josh").Property("age",32).As("josh").AddV("software").Property("name","ripple").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().OutE().Property("weight",null), (g,p) =>g.E().Properties<object>("weight")}}, 
@@ -481,6 +521,8 @@
                {"g_addV_propertyXlabel_personX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(T.Label,"person"), (g,p) =>g.V().HasLabel("person")}}, 
                {"g_addV_propertyXmapX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property("name","foo").Property("age",42), (g,p) =>g.V().Has("name","foo")}}, 
                {"g_addV_propertyXsingle_mapX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single,"name","foo").Property(Cardinality.Single,"age",42), (g,p) =>g.V().Has("name","foo")}}, 
+               {"g_V_hasXname_fooX_propertyXname_setXbarX_age_43X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single,"name","foo").Property("age",42), (g,p) =>g.V().Has("name","foo").Property(Cardinality.Set,"name","bar").Property("age",43), (g,p) =>g.V().Has("name","foo"), (g,p) =>g.V().Has("name","bar"), (g,p) =>g.V().Has("age",43), (g,p) =>g.V().Has("age",42)}}, 
+               {"g_V_hasXname_fooX_propertyXset_name_bar_age_singleX43XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV().Property(Cardinality.Single,"name","foo").Property("age",42), (g,p) =>g.V().Has("name","foo").Property(Cardinality.Set,"name","bar").Property(Cardinality.Single,"age",43), (g,p) =>g.V().Has("name","foo"), (g,p) =>g.V().Has("name","bar"), (g,p) =>g.V().Has("age",43), (g,p) =>g.V().Has("age",42)}}, 
                {"g_addV_propertyXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person"), (g,p) =>g.V().HasLabel("person").Values<object>()}}, 
                {"g_addV_propertyXemptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person"), (g,p) =>g.V().HasLabel("person").Values<object>()}}, 
                {"g_addV_propertyXset_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("foo"), (g,p) =>g.V().HasLabel("foo").Values<object>()}}, 
@@ -488,6 +530,28 @@
                {"g_addVXpersonX_propertyXname_joshX_propertyXage_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","josh").Property("age",null), (g,p) =>g.V().Has("person","age",(object) null)}}, 
                {"g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("friendWeight",null,"acl",null), (g,p) =>g.V().Has("person","name","marko").Has("friendWeight",(object) null), (g,p) =>g.V().Has("person","name","marko").Properties<object>("friendWeight").Has("acl",(object) null), (g,p) =>g.V().Has("person","name","marko").Properties<object>("friendWeight").Count()}}, 
                {"g_V_hasXperson_name_aliceX_propertyXsingle_age_unionXage_constantX1XX_sumX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","alice").Property(Cardinality.Single,"age",50), (g,p) =>g.V().Has("person","name","alice").Property("age",__.Union<object>(__.Values<object>("age"),__.Constant<object>(1)).Sum<object>()), (g,p) =>g.V().Has("person","age",50), (g,p) =>g.V().Has("person","age",51)}}, 
+               {"g_V_limitX3X_addVXsoftwareX_aggregateXa1X_byXlabelX_aggregateXa2X_byXlabelX_capXa1_a2X_selectXa_bX_byXunfoldX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29).As("marko").AddV("person").Property("name","vadas").Property("age",27).As("vadas").AddV("software").Property("name","lop").Property("lang","java").As("lop").AddV("person").Property("name","josh").Property("age",32).As("josh").AddV("software").Property("name","ripple").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Limit<object>(3).AddV("software").Aggregate("a1").By(T.Label).Aggregate("a2").By(T.Label).Cap<object>("a1","a2").Select<object>("a1","a2").By(__.Unfold<object>().Fold())}}, 
+               {"g_injectXstrX_asDate", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("2023-08-02T00:00:00Z").AsDate()}}, 
+               {"g_injectX1694017707000X_asDate", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(1694017707000).AsDate()}}, 
+               {"g_injectX1694017708000LX_asDate", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).AsDate()}}, 
+               {"g_injectX1694017709000dX_asDate", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).AsDate()}}, 
+               {"g_injectX1_2X_asDate", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).AsDate()}}, 
+               {"g_injectXnullX_asDate", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).AsDate()}}, 
+               {"g_injectXinvalidstrX_asDate", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("This String is not an ISO 8601 Date").AsDate()}}, 
+               {"g_injectX1_2X_asString", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"],p["xx2"]).AsString()}}, 
+               {"g_injectX1_2X_asStringXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"],p["xx2"]).AsString<object>(Scope.Local)}}, 
+               {"g_injectXlist_1_2X_asStringXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).AsString<object>(Scope.Local)}}, 
+               {"g_injectX1_nullX_asString", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null,p["xx1"]).AsString()}}, 
+               {"g_injectX1_nullX_asStringXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).AsString<object>(Scope.Local)}}, 
+               {"g_V_valueMapXnameX_asString", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("name").AsString()}}, 
+               {"g_V_valueMapXnameX_order_fold_asStringXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("name").Order().Fold().AsString<object>(Scope.Local)}}, 
+               {"g_V_asString", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().AsString()}}, 
+               {"g_V_fold_asStringXlocalX_orderXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().AsString<object>(Scope.Local).Order(Scope.Local)}}, 
+               {"g_E_asString", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().AsString()}}, 
+               {"g_V_properties", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().AsString()}}, 
+               {"g_V_hasLabelXpersonX_valuesXageX_asString", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("age").AsString()}}, 
+               {"g_V_hasLabelXpersonX_valuesXageX_order_fold_asStringXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("age").Order().Fold().AsString<object>(Scope.Local)}}, 
+               {"g_V_hasLabelXpersonX_valuesXageX_asString_concatX_years_oldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("age").AsString().Concat(" years old")}}, 
                {"g_call", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Call<object>()}}, 
                {"g_callXlistX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Call<object>("--list")}}, 
                {"g_callXlistX_withXstring_stringX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Call<object>("--list").With("service","tinker.search")}}, 
@@ -514,6 +578,50 @@
                {"g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Coalesce<object>(__.Out("likes"),__.Out("knows"),__.Out("created")).GroupCount<object>().By("name")}}, 
                {"g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Coalesce<object>(__.OutE("knows"),__.OutE("created")).OtherV().Path().By("name").By(T.Label)}}, 
                {"g_V_outXcreatedX_order_byXnameX_coalesceXname_constantXxXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out("created").Order().By("name").Coalesce<object>(__.Values<object>("name"),__.Constant<object>("x"))}}, 
+               {"g_injectXnullX_combineXinjectX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Combine(__.Inject(1))}}, 
+               {"g_V_valuesXnameX_combineXV_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Combine(__.V().Fold())}}, 
+               {"g_V_fold_combineXconstantXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Combine(__.Constant<object>(null))}}, 
+               {"g_V_fold_combineXVX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Combine(__.V())}}, 
+               {"g_V_valuesXnameX_fold_combineX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Combine(2)}}, 
+               {"g_V_valuesXnameX_fold_combineXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Combine(null)}}, 
+               {"g_V_valuesXnonexistantX_fold_combineXV_valuesXnameX_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Combine(__.V().Values<object>("name").Fold()).Unfold<object>()}}, 
+               {"g_V_valuesXnameX_fold_combineXV_valuesXnonexistantX_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Combine(__.V().Values<object>("nonexistant").Fold()).Unfold<object>()}}, 
+               {"g_V_valuesXageX_order_byXdescX_fold_combineXV_valuesXageX_order_byXdescX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Desc).Fold().Combine(__.V().Values<object>("age").Order().By(Order.Desc).Fold())}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_combineXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Combine(p["xx1"])}}, 
+               {"g_injectXxx1X_combineXV_valuesXnameX_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Combine(__.V().Values<object>("name").Fold()).Unfold<object>()}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_combineXseattle_vancouverX_orderXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("location").Select<object>(Column.Values).Unfold<object>().Combine(p["xx1"]).Order(Scope.Local)}}, 
+               {"g_V_out_out_path_byXnameX_combineXempty_listX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Combine(p["xx1"])}}, 
+               {"g_V_valuesXageX_order_fold_combineXconstantX27X_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Combine(__.Constant<object>(27).Fold())}}, 
+               {"g_V_out_out_path_byXnameX_combineXdave_kelvinX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Combine(p["xx1"])}}, 
+               {"g_injectXa_null_bX_combineXa_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Combine(p["xx2"])}}, 
+               {"g_injectXa_null_bX_combineXa_null_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Combine(p["xx2"])}}, 
+               {"g_injectX3_threeX_combineXfive_three_7X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Combine(p["xx2"])}}, 
+               {"g_injectXa_bX_concat", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("a","b").Concat()}}, 
+               {"g_injectXa_bX_concat_XcX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("a","b").Concat("c")}}, 
+               {"g_injectXa_bX_concat_Xc_dX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("a","b").Concat("c","d")}}, 
+               {"g_injectXa_bX_concat_Xinject_c_dX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("a","b").Concat(__.Inject("c"))}}, 
+               {"g_injectXaX_concat_Xinject_List_b_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("a").Concat(__.Inject(p["xx1"]))}}, 
+               {"g_injectXListXa_bXcX_concat_XdX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"],"c").Concat("d")}}, 
+               {"g_injectXnullX_concat_XinjectX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Concat()}}, 
+               {"g_injectXnull_aX_concat_Xnull_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null,"a").Concat(null,"b")}}, 
+               {"g_injectXhello_hiX_concat_XV_valuesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("hello","hi").Concat(__.V().Order().By(T.Id).Values<object>("name"))}}, 
+               {"g_V_hasLabel_value_concat_X_X_concat_XpersonX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").Concat(" ").Concat("person")}}, 
+               {"g_hasLabelXpersonX_valuesXnameX_asXaX_constantXMrX_concatXselectXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").As("a").Constant<object>("Mr.").Concat(__.Select<object>("a"))}}, 
+               {"g_hasLabelXsoftwareX_asXaX_valuesXnameX_concatXunsesX_concatXselectXaXvaluesXlangX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").As("a").Values<object>("name").Concat(" uses ").Concat(__.Select<object>("a").Values<object>("lang"))}}, 
+               {"g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_labelX_concatXselectXaX_inV_valuesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE().As("a").V(p["vid1"]).Values<object>("name").Concat(__.Select<object>("a").Label()).Concat(__.Select<object>("a").InV().Values<object>("name"))}}, 
+               {"g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_label_selectXaX_inV_valuesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).OutE().As("a").V(p["vid1"]).Values<object>("name").Concat(__.Select<object>("a").Label(),__.Select<object>("a").InV().Values<object>("name"))}}, 
+               {"g_addVXconstantXprefix_X_concatXVX1X_labelX_label", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29).As("marko").AddV("person").Property("name","vadas").Property("age",27).As("vadas").AddV("software").Property("name","lop").Property("lang","java").As("lop").AddV("person").Property("name","josh").Property("age",32).As("josh").AddV("software").Property("name","ripple").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.AddV(__.Constant<object>("prefix_").Concat(__.V(p["vid1"]).Label())).Label()}}, 
+               {"g_injectXnullX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Conjoin("1")}}, 
+               {"g_V_valuesXnameX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Conjoin("1")}}, 
+               {"g_V_valuesXnonexistantX_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Conjoin(";")}}, 
+               {"g_V_valuesXnameX_order_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Order().Fold().Conjoin("_")}}, 
+               {"g_V_valuesXageX_order_fold_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().Fold().Conjoin(";")}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Conjoin("MARKO")}}, 
+               {"g_injectXmarkoX_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Conjoin("-")}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("location").Select<object>(Column.Values).Unfold<object>().Order(Scope.Local).Conjoin("1")}}, 
+               {"g_V_out_out_path_byXnameX_conjoinXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Conjoin("")}}, 
+               {"g_injectXa_null_bX_conjoinXxyzX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Conjoin("xyz")}}, 
+               {"g_injectX3_threeX_conjoinX_X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Conjoin(";")}}, 
                {"g_V_connectedComponent_hasXcomponentX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ConnectedComponent().Has("gremlin.connectedComponentVertexProgram.component")}}, 
                {"g_V_dedup_connectedComponent_hasXcomponentX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Dedup().ConnectedComponent().Has("gremlin.connectedComponentVertexProgram.component")}}, 
                {"g_V_hasLabelXsoftwareX_connectedComponent_project_byXnameX_byXcomponentX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").ConnectedComponent().Project<object>("name","component").By("name").By("gremlin.connectedComponentVertexProgram.component")}}, 
@@ -534,6 +642,59 @@
                {"g_E_sampleX1X_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E().Sample(1).Count()}}, 
                {"g_V_sampleX1X_byXageX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Sample(1).By("age").Count()}}, 
                {"g_V_order_byXnoX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Order().By("no").Count()}}, 
+               {"g_V_group_byXlabelX_count", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Group<object,object>().By(T.Label).Count()}}, 
+               {"g_V_group_byXlabelX_countXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Group<object,object>().By(T.Label).Count(Scope.Local)}}, 
+               {"g_injectXdatetimeXstrXX_dateAddXDT_hour_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1690934400000)).DateAdd(DT.Hour,2)}}, 
+               {"g_injectXdatetimeXstrXX_dateAddXhour_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1690934400000)).DateAdd(DT.Hour,2)}}, 
+               {"g_injectXdatetimeXstrXX_dateAddXhour_1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1690934400000)).DateAdd(DT.Hour,-1)}}, 
+               {"g_injectXdatetimeXstrXX_dateAddXminute_10X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1690934400000)).DateAdd(DT.Minute,10)}}, 
+               {"g_injectXdatetimeXstrXX_dateAddXsecond_20X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1690934400000)).DateAdd(DT.Second,20)}}, 
+               {"g_injectXdatetimeXstrXX_dateAddXday_11X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1693958400000)).DateAdd(DT.Day,11)}}, 
+               {"g_injectXdatetimeXstr1XX_dateDiffXdatetimeXstr2XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1690934400000)).DateDiff(DateTimeOffset.FromUnixTimeMilliseconds(1691539200000))}}, 
+               {"g_injectXdatetimeXstr1XX_dateDiffXconstantXdatetimeXstr2XXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1691452800000)).DateDiff(__.Constant<object>(DateTimeOffset.FromUnixTimeMilliseconds(1690848000000)))}}, 
+               {"g_injectXdatetimeXstr1XX_dateDiffXinjectXdatetimeXstr2XXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1691452800000)).DateDiff(__.Inject(DateTimeOffset.FromUnixTimeMilliseconds(1696982400000)))}}, 
+               {"g_injectXnullX_differenceXinjectX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Difference(__.Inject(1))}}, 
+               {"g_V_valuesXnameX_differenceXV_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Difference(__.V().Fold())}}, 
+               {"g_V_fold_differenceXconstantXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Difference(__.Constant<object>(null))}}, 
+               {"g_V_fold_differenceXVX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Difference(__.V())}}, 
+               {"g_V_valuesXnameX_fold_differenceX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Difference(2)}}, 
+               {"g_V_valuesXnameX_fold_differenceXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Difference(null)}}, 
+               {"g_V_valuesXnonexistantX_fold_differenceXV_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Difference(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valuesXnameX_fold_differenceXV_valuesXnonexistantX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Difference(__.V().Values<object>("nonexistant").Fold())}}, 
+               {"g_V_valuesXageX_fold_differenceXV_valuesXageX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Difference(__.V().Values<object>("age").Fold())}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_differenceXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Difference(p["xx1"])}}, 
+               {"g_injectXmarkoX_differenceXV_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Difference(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_differenceXseattle_vancouverX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("location").Select<object>(Column.Values).Unfold<object>().Difference(p["xx1"])}}, 
+               {"g_V_out_out_path_byXnameX_differenceXrippleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Difference(p["xx1"])}}, 
+               {"g_V_out_out_path_byXnameX_differenceXempty_listX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Difference(p["xx1"])}}, 
+               {"g_V_valuesXageX_fold_differenceXconstantX27X_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Difference(__.Constant<object>(27).Fold())}}, 
+               {"g_V_out_out_path_byXnameX_differenceXdave_kelvinX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Difference(p["xx1"])}}, 
+               {"g_injectXa_null_bX_differenceXa_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Difference(p["xx2"])}}, 
+               {"g_injectXa_null_bX_differenceXa_null_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Difference(p["xx2"])}}, 
+               {"g_injectX3_threeX_differenceXfive_three_7X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Difference(p["xx2"])}}, 
+               {"g_injectXnullX_disjunctXinjectX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Disjunct(__.Inject(1))}}, 
+               {"g_V_valuesXnameX_disjunctXV_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Disjunct(__.V().Fold())}}, 
+               {"g_V_fold_disjunctXconstantXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Disjunct(__.Constant<object>(null))}}, 
+               {"g_V_fold_disjunctXVX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Disjunct(__.V())}}, 
+               {"g_V_valuesXnameX_fold_disjunctX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Disjunct(2)}}, 
+               {"g_V_valuesXnameX_fold_disjunctXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Disjunct(null)}}, 
+               {"g_V_valuesXnonexistantX_fold_disjunctXV_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Disjunct(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valuesXnameX_fold_disjunctXV_valuesXnonexistantX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Disjunct(__.V().Values<object>("nonexistant").Fold())}}, 
+               {"g_V_valuesXageX_fold_disjunctXV_valuesXageX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Disjunct(__.V().Values<object>("age").Fold())}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_disjunctXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Disjunct(p["xx1"])}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_disjunctXseattle_vancouverX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("location").Select<object>(Column.Values).Unfold<object>().Disjunct(p["xx1"])}}, 
+               {"g_V_out_out_path_byXnameX_disjunctXmarkoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Disjunct(p["xx1"])}}, 
+               {"g_V_out_out_path_byXnameX_disjunctXstephen_markoX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Disjunct(p["xx1"])}}, 
+               {"g_V_out_out_path_byXnameX_disjunctXdave_kelvinX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Disjunct(p["xx1"])}}, 
+               {"g_injectXa_null_bX_disjunctXa_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Disjunct(p["xx2"])}}, 
+               {"g_injectXa_null_bX_disjunctXa_null_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Disjunct(p["xx2"])}}, 
+               {"g_injectX3_threeX_disjunctXfive_three_7X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Disjunct(p["xx2"])}}, 
+               {"g_V_EX11X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().E(p["eid11"])}}, 
+               {"g_EX11X_E", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.E(p["eid11"]).E()}}, 
+               {"g_V_EXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().E(null)}}, 
+               {"g_V_EXlistXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().E(p["xx1"])}}, 
+               {"g_injectX1X_EX11_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(1).E(p["eid11"],null)}}, 
+               {"g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","josh").AddV("person").Property("name","vadas"), (g,p) =>g.Inject(1).Coalesce<object>(__.E().HasLabel("tests"),__.AddE("tests").From(__.V().Has("name","josh")).To(__.V().Has("name","vadas"))), (g,p) =>g.E().HasLabel("tests")}}, 
                {"g_VX1X_properties_element", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V((Vertex) p["v2"]).Properties<object>().Element().Limit<object>(1)}}, 
                {"g_V_properties_element", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>().Element()}}, 
                {"g_V_propertiesXageX_element", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>("age").Element()}}, 
@@ -551,6 +712,17 @@
                {"g_V_age_foldX0_plusX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold<object>(0,Operator.Sum)}}, 
                {"g_injectXa1_b2X_foldXm_addAllX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(new Dictionary<object,object> {{"a", 1}},new Dictionary<object,object> {{"b", 2}}).Fold<object>(new Dictionary<object,object> {},Operator.AddAll)}}, 
                {"g_injectXa1_b2_b4X_foldXm_addAllX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(new Dictionary<object,object> {{"a", 1}},new Dictionary<object,object> {{"b", 2}},new Dictionary<object,object> {{"b", 4}}).Fold<object>(new Dictionary<object,object> {},Operator.AddAll)}}, 
+               {"g_VX1X_formatXstrX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name","marko").Format("Hello world")}}, 
+               {"g_V_formatXstrX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Format("%{name} is %{age} years old")}}, 
+               {"g_injectX1X_asXageX_V_formatXstrX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(1).As("age").V().Format("%{name} is %{age} years old")}}, 
+               {"g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Format("%{_} is %{_} years old").By(__.Values<object>("name")).By(__.Values<object>("age"))}}, 
+               {"g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Format("%{_} %{_} %{_}").By(__.Constant<object>("hello")).By(__.Values<object>("name"))}}, 
+               {"g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Format("%{_}").By(__.Constant<object>("hello")).By(__.Values<object>("name"))}}, 
+               {"g_V_formatXstrX_byXbothE_countX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Format("%{name} has %{_} connections").By(__.BothE().Count())}}, 
+               {"g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Project<object>("name","count").By(__.Values<object>("name")).By(__.BothE().Count()).Format("%{name} has %{count} connections")}}, 
+               {"g_V_elementMap_formatXstrX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ElementMap<object>().Format("%{name} is %{age} years old")}}, 
+               {"g_V_hasLabelXpersonX_asXaX_valuesXnameX_asXp1X_selectXaX_inXknowsX_formatXstrX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").As("a").Values<object>("name").As("p1").Select<object>("a").In("knows").Format("%{p1} knows %{name}")}}, 
+               {"g_V_asXsX_label_asXsubjectX_selectXsX_outE_asXpX_label_asXpredicateX_selectXpX_inV_label_asXobjectX_formatXstrX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("s").Label().As("subject").Select<object>("s").OutE().As("p").Label().As("predicate").Select<object>("p").InV().Label().As("object").Format("%{subject} %{predicate} %{object}")}}, 
                {"g_VX1X_V_valuesXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).V().Values<object>("name")}}, 
                {"g_V_outXknowsX_V_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out("knows").V().Values<object>("name")}}, 
                {"g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("artist","name","Garcia").In("sungBy").As("song").V().Has("artist","name","Willie_Dixon").In("writtenBy").Where(P.Eq("song")).Values<object>("name")}}, 
@@ -560,6 +732,34 @@
                {"g_V_hasLabelXsoftwareX_name_fold_orderXlocalX_index_unfold_order_byXtailXlocal_1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Fold().Order(Scope.Local).Index<object>().Unfold<object>().Order().By(__.Tail<object>(Scope.Local,1))}}, 
                {"g_V_hasLabelXpersonX_name_fold_orderXlocalX_index_withXmapX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").Fold().Order(Scope.Local).Index<object>().With("~tinkerpop.index.indexer",1)}}, 
                {"g_VX1X_valuesXageX_index_unfold_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Values<object>("age").Index<object>().Unfold<object>().Unfold<object>()}}, 
+               {"g_injectXnullX_intersectXinjectX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Intersect(__.Inject(1))}}, 
+               {"g_V_valuesXnameX_intersectXV_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Intersect(__.V().Fold())}}, 
+               {"g_V_fold_intersectXconstantXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Intersect(__.Constant<object>(null))}}, 
+               {"g_V_fold_intersectXVX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Intersect(__.V())}}, 
+               {"g_V_valuesXnameX_fold_intersectX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Intersect(2)}}, 
+               {"g_V_valuesXnameX_fold_intersectXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Intersect(null)}}, 
+               {"g_V_valuesXnonexistantX_fold_intersectXV_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Intersect(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valuesXnameX_fold_intersectXV_valuesXnonexistantX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Intersect(__.V().Values<object>("nonexistant").Fold())}}, 
+               {"g_V_valuesXageX_fold_intersectXV_valuesXageX_foldX_order_local", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Intersect(__.V().Values<object>("age").Fold()).Order(Scope.Local)}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_intersectXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Intersect(p["xx1"])}}, 
+               {"g_injectXmarkoX_intersectX___V_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Intersect(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_intersectXseattle_vancouverX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("location").Select<object>(Column.Values).Unfold<object>().Intersect(p["xx1"])}}, 
+               {"g_V_valuesXageX_fold_intersectX___constantX27X_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Intersect(__.Constant<object>(27).Fold())}}, 
+               {"g_V_out_out_path_byXnameX_intersectXdave_kelvinX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Intersect(p["xx1"])}}, 
+               {"g_injectXa_null_bX_intersectXa_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Intersect(p["xx2"])}}, 
+               {"g_injectXa_null_bX_intersectXa_null_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Intersect(p["xx2"])}}, 
+               {"g_injectX3_threeX_intersectXfive_three_7X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Intersect(p["xx2"])}}, 
+               {"g_injectX__feature___test__nullX_lTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("  feature"," one test",null,""," ").LTrim()}}, 
+               {"g_injectX__feature__X_lTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("  feature  ").LTrim()}}, 
+               {"g_injectXListXa_bXX_lTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).LTrim()}}, 
+               {"g_injectXListX1_2XX_lTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).LTrim<object>(Scope.Local)}}, 
+               {"g_V_valuesXnameX_lTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name"," marko ").Property("age",29).As("marko").AddV("person").Property("name","  vadas  ").Property("age",27).As("vadas").AddV("software").Property("name","  lop").Property("lang","java").As("lop").AddV("person").Property("name","josh  ").Property("age",32).As("josh").AddV("software").Property("name","   ripple   ").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").LTrim()}}, 
+               {"g_V_valuesXnameX_order_fold_lTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name"," marko ").Property("age",29).As("marko").AddV("person").Property("name","  vadas  ").Property("age",27).As("vadas").AddV("software").Property("name","  lop").Property("lang","java").As("lop").AddV("person").Property("name","josh  ").Property("age",32).As("josh").AddV("software").Property("name","   ripple   ").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").Order().Fold().LTrim<object>(Scope.Local)}}, 
+               {"g_injectXfeature_test_nullX_length", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature","test",null).Length()}}, 
+               {"g_injectXfeature_test_nullX_lengthXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature","test",null).Length<object>(Scope.Local)}}, 
+               {"g_injectXListXa_bXX_length", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Length()}}, 
+               {"g_V_valuesXnameX_length", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Length()}}, 
+               {"g_V_valuesXnameX_order_fold_lengthXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Order().Fold().Length<object>(Scope.Local)}}, 
                {"g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Repeat(__.Both().SimplePath()).Until(__.Has("name","peter").Or().Loops().Is(3)).Has("name","peter").Path().By("name")}}, 
                {"g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Repeat(__.Both().SimplePath()).Until(__.Has("name","peter").Or().Loops().Is(2)).Has("name","peter").Path().By("name")}}, 
                {"g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Repeat(__.Both().SimplePath()).Until(__.Has("name","peter").And().Loops().Is(3)).Has("name","peter").Path().By("name")}}, 
@@ -650,6 +850,29 @@
                {"g_injectXnull_10_20_nullX_mean", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null,p["xx1"],p["xx2"],null).Mean<object>()}}, 
                {"g_injectXlistXnull_10_20_nullXX_meanXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Mean<object>(Scope.Local)}}, 
                {"g_VX1X_valuesXageX_meanXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Values<object>("age").Mean<object>(Scope.Local)}}, 
+               {"g_injectXnullX_mergeXinjectX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Merge(__.Inject(1))}}, 
+               {"g_V_valuesXnameX_mergeXV_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Merge(__.V().Fold())}}, 
+               {"g_V_fold_mergeXconstantXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Merge(__.Constant<object>(null))}}, 
+               {"g_V_fold_mergeXVX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Merge(__.V())}}, 
+               {"g_V_elementMap_mergeXconstantXaXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ElementMap<object>().Merge(__.Constant<object>("a"))}}, 
+               {"g_V_fold_mergeXV_asXaX_projectXaX_byXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Merge(__.V().As("a").Project<object>("a").By("name"))}}, 
+               {"g_V_fold_mergeXk_vX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Merge(p["xx1"])}}, 
+               {"g_V_valuesXnameX_fold_mergeX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Merge(2)}}, 
+               {"g_V_valuesXnameX_fold_mergeXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Merge(null)}}, 
+               {"g_V_valuesXnonexistantX_fold_mergeXV_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Merge(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valuesXnameX_fold_mergeXV_valuesXnonexistantX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Merge(__.V().Values<object>("nonexistant").Fold())}}, 
+               {"g_V_valuesXageX_fold_mergeXV_valuesXageX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Merge(__.V().Values<object>("age").Fold())}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_mergeXMARKOX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Merge(p["xx1"])}}, 
+               {"g_injectXmarkoX_mergeXV_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Merge(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_mergeXseattle_vancouverX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("location").Select<object>(Column.Values).Unfold<object>().Merge(p["xx1"])}}, 
+               {"g_V_out_out_path_byXnameX_mergeXempty_listX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Merge(p["xx1"])}}, 
+               {"g_V_valuesXageX_fold_mergeXconstantX27X_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Merge(__.Constant<object>(27).Fold())}}, 
+               {"g_V_out_out_path_byXnameX_mergeXdave_kelvinX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Merge(p["xx1"])}}, 
+               {"g_injectXa_null_bX_mergeXa_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Merge(p["xx2"])}}, 
+               {"g_injectXa_null_bX_mergeXa_null_cX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Merge(p["xx2"])}}, 
+               {"g_injectX3_threeX_mergeXfive_three_7X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Merge(p["xx2"])}}, 
+               {"g_V_asXnameX_projectXnameX_byXnameX_mergeXother_blueprintX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("name").Project<object>("name").By("name").Merge(p["xx1"])}}, 
+               {"g_V_hasXname_markoX_elementMap_mergeXV_hasXname_lopX_elementMapX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name","marko").ElementMap<object>().Merge(__.V().Has("name","lop").ElementMap<object>())}}, 
                {"g_V_mergeEXlabel_selfX_optionXonMatch_emptyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29).AddE("self"), (g,p) =>g.V().MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object,object>) new Dictionary<object,object> {}), (g,p) =>g.E(), (g,p) =>g.E().Properties<object>(), (g,p) =>g.V()}}, 
                {"g_V_mergeEXlabel_selfX_optionXonMatch_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29).AddE("self"), (g,p) =>g.V().MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnMatch, (IDictionary<object,object>) null), (g,p) =>g.E(), (g,p) =>g.E().Properties<object>(), (g,p) =>g.V()}}, 
                {"g_V_mergeEXemptyX_optionXonCreate_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29), (g,p) =>g.V().As("v").MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object,object>) null).Option(Merge.OutV, (ITraversal) __.Select<object>("v")).Option(Merge.InV, (ITraversal) __.Select<object>("v")), (g,p) =>g.E(), (g,p) =>g.V()}}, 
@@ -677,7 +900,7 @@
                {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").As("a").AddV("person").Property("name","vadas").As("b"), (g,p) =>g.WithSideEffect("c",p["xx2"]).WithSideEffect("m",p["xx3"]).MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E().HasLabel("knows").Has("created","Y"), (g,p) =>g.E().HasLabel("knows").Has("created","N")}}, 
                {"g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"), (g,p) =>g.MergeE((IDictionary<object,object>) p["xx1"]), (g,p) =>g.V().Has("person","name","marko").Out("knows").Has("person","name","vadas")}}, 
                {"g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"), (g,p) =>g.Inject(p["xx1"],p["xx2"]).MergeE(), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.V().Has("person","name","marko").Out("knows").Has("person","name","vadas"), (g,p) =>g.V().Has("person","name","vadas").Out("self").Has("person","name","vadas")}}, 
-               {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").As("a").AddV("person").Property("name","vadas").As("b").AddE("knows").Property("weight",1).From("a").To("b"), (g,p) =>g.WithSideEffect("c",p["xx2"]).WithSideEffect("m",p["xx3"]).MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("weight").Drop()).Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created","Y"), (g,p) =>g.E().HasLabel("knows").Has("created","N"), (g,p) =>g.E().HasLabel("knows").Has("weight")}}, 
+               {"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").As("a").AddV("person").Property("name","vadas").As("b").AddE("knows").Property("weight",1.0).From("a").To("b"), (g,p) =>g.WithSideEffect("c",p["xx2"]).WithSideEffect("m",p["xx3"]).MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnCreate, (ITraversal) __.Select<object>("c")).Option(Merge.OnMatch, (ITraversal) __.SideEffect(__.Properties<object>("weight").Drop()).Select<object>("m")), (g,p) =>g.V(), (g,p) =>g.E().HasLabel("knows").Has("created","Y"), (g,p) =>g.E().HasLabel("knows").Has("created","N"), (g,p) =>g.E().HasLabel("knows").Has("weight")}}, 
                {"g_mergeE_with_outVinV_options_map", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"), (g,p) =>g.MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OutV, (IDictionary<object,object>) p["xx2"]).Option(Merge.InV, (IDictionary<object,object>) p["xx3"]), (g,p) =>g.V(), (g,p) =>g.V().Has("name","marko").Out("knows").Has("name","vadas")}}, 
                {"g_mergeE_with_outVinV_options_select", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"), (g,p) =>g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OutV, (ITraversal) __.Select<object>("x")).Option(Merge.InV, (ITraversal) __.Select<object>("y")), (g,p) =>g.V(), (g,p) =>g.V().Has("name","marko").Out("knows").Has("name","vadas")}}, 
                {"g_mergeE_with_eid_specified_and_inheritance_1", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"), (g,p) =>g.MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnCreate, (IDictionary<object,object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p) =>g.E("201"), (g,p) =>g.V().Has("name","marko").Out("knows").Has("name","vadas")}}, 
@@ -741,6 +964,16 @@
                {"g_mergeV_hidden_label_value_onCreate_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {}).Option(Merge.OnCreate, (IDictionary<object,object>) p["xx1"])}}, 
                {"g_mergeV_hidden_id_key_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {}).Option(Merge.OnMatch, (IDictionary<object,object>) p["xx1"])}}, 
                {"g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("vertex"), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {}).Option(Merge.OnMatch, (IDictionary<object,object>) p["xx1"])}}, 
+               {"g_mergeVXname_markoX_optionXonMatch_age_listX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary<object,object>) new Dictionary<object,object> {{"age", CardinalityValue.List(33)}}), (g,p) =>g.V().Has("person","name","marko").Has("age",33), (g,p) =>g.V().Has("person","name","marko").Has("age"), (g,p) =>g.V().Has("person","name","marko").Properties<object>("age")}}, 
+               {"g_mergeVXname_markoX_optionXonMatch_age_setX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary<object,object>) new Dictionary<object,object> {{"age", CardinalityValue.Set(33)}}), (g,p) =>g.V().Has("person","name","marko").Has("age",33), (g,p) =>g.V().Has("person","name","marko").Has("age"), (g,p) =>g.V().Has("person","name","marko").Properties<object>("age")}}, 
+               {"g_mergeVXname_markoX_optionXonMatch_age_setX31XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary<object,object>) new Dictionary<object,object> {{"age", CardinalityValue.Set(31)}}), (g,p) =>g.V().Has("person","name","marko").Has("age",31), (g,p) =>g.V().Has("person","name","marko").Has("age"), (g,p) =>g.V().Has("person","name","marko").Properties<object>("age")}}, 
+               {"g_mergeVXname_markoX_optionXonMatch_age_singleX33XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "marko"}}).Option(Merge.OnMatch, (IDictionary<object,object>) new Dictionary<object,object> {{"age", CardinalityValue.Single(33)}}), (g,p) =>g.V().Has("person","name","marko").Has("age",33), (g,p) =>g.V().Has("person","name","marko").Has("age"), (g,p) =>g.V().Has("person","name","marko").Properties<object>("age")}}, 
+               {"g_mergeVXname_markoX_optionXonMatch_age_33_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary<object,object> {{"age", 33}},Cardinality.Single), (g,p) =>g.V().Has("person","name","marko").Has("age",33), (g,p) =>g.V().Has("person","name","marko").Has("age"), (g,p) =>g.V().Has("person","name","marko").Properties<object>("age")}}, 
+               {"g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary<object,object> {{"name", "allen"}, {"age", CardinalityValue.Set(31)}},Cardinality.Single), (g,p) =>g.V().Has("person","name","marko"), (g,p) =>g.V().Has("person","name","allen").Has("age",31), (g,p) =>g.V().Has("person","name","allen").Has("age"), (g,p) =>g.V().Has("person","name","allen").Properties<object>("age")}}, 
+               {"g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property(Cardinality.List,"age",29).Property(Cardinality.List,"age",31).Property(Cardinality.List,"age",32), (g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "marko"}}).Option(Merge.OnMatch,new Dictionary<object,object> {{"name", "allen"}, {"age", CardinalityValue.Single(31)}},Cardinality.Single), (g,p) =>g.V().Has("person","name","marko"), (g,p) =>g.V().Has("person","name","allen").Has("age",33), (g,p) =>g.V().Has("person","name","allen").Has("age",31), (g,p) =>g.V().Has("person","name","allen").Has("age"), (g,p) =>g.V().Has("person","name","allen").Properties<object>("age")}}, 
+               {"g_mergeVXname_aliceX_optionXonCreate_age_singleX81XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "alice"}, {T.Label, "person"}}).Option(Merge.OnCreate, (IDictionary<object,object>) new Dictionary<object,object> {{"age", CardinalityValue.Single(81)}}), (g,p) =>g.V().Has("person","name","alice").Has("age",81), (g,p) =>g.V().Has("person","name","alice").Has("age"), (g,p) =>g.V().Has("person","name","alice").Properties<object>("age")}}, 
+               {"g_mergeVXname_aliceX_optionXonCreate_age_setX81XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "alice"}, {T.Label, "person"}}).Option(Merge.OnCreate, (IDictionary<object,object>) new Dictionary<object,object> {{"age", CardinalityValue.Set(81)}}), (g,p) =>g.V().Has("person","name","alice").Has("age",81), (g,p) =>g.V().Has("person","name","alice").Has("age"), (g,p) =>g.V().Has("person","name","alice").Properties<object>("age")}}, 
+               {"g_mergeVXname_aliceX_optionXonCreate_age_singleX81X_age_81_setX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {{"name", "alice"}, {T.Label, "person"}}).Option(Merge.OnCreate,new Dictionary<object,object> {{"age", 81}},Cardinality.Set), (g,p) =>g.V().Has("person","name","alice").Has("age",81), (g,p) =>g.V().Has("person","name","alice").Has("age"), (g,p) =>g.V().Has("person","name","alice").Properties<object>("age")}}, 
                {"g_mergeV_hidden_label_key_onMatch_matched_prohibited", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.MergeV((IDictionary<object,object>) new Dictionary<object,object> {}).Option(Merge.OnMatch, (IDictionary<object,object>) p["xx1"])}}, 
                {"g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_match", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29), (g,p) =>g.Inject(p["xx1"],p["xx1"],p["xx2"]).Fold().MergeV((ITraversal) __.Limit<object>(Scope.Local,1)).Option(Merge.OnCreate, (ITraversal) __.Range<object>(Scope.Local,1,2)).Option(Merge.OnMatch, (ITraversal) __.Tail<object>(Scope.Local)), (g,p) =>g.V().Has("person","name","marko").Has("created","N"), (g,p) =>g.V()}}, 
                {"g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_create", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","marko").Property("age",29), (g,p) =>g.Inject(p["xx1"],p["xx1"],p["xx2"]).Fold().MergeV((ITraversal) __.Limit<object>(Scope.Local,1)).Option(Merge.OnCreate, (ITraversal) __.Range<object>(Scope.Local,1,2)).Option(Merge.OnMatch, (ITraversal) __.Tail<object>(Scope.Local)), (g,p) =>g.V().Has("person","name","stephen").HasNot("created"), (g,p) =>g.V()}}, 
@@ -815,6 +1048,23 @@
                {"g_V_peerPressure_hasXclusterX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().PeerPressure().Has("gremlin.peerPressureVertexProgram.cluster")}}, 
                {"g_V_peerPressure_withXpropertyName_clusterX_withXedges_outEXknowsXX_pageRankX1X_byXrankX_withXedges_outEXknowsX_withXtimes_2X_group_byXclusterX_byXrank_sumX_limitX100X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().PeerPressure().With("~tinkerpop.peerPressure.propertyName","cluster").With("~tinkerpop.peerPressure.edges",__.OutE("knows")).PageRank(1.0).With("~tinkerpop.pageRank.propertyName","rank").With("~tinkerpop.pageRank.edges",__.OutE("knows")).With("~tinkerpop.pageRank.times",1).Group<object,object>().By("cluster").By(__.Values<object>("rank").Sum<object>()).Limit<object>(100)}}, 
                {"g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXedges_outEX_withyXpropertyName_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name","ripple").In("created").PeerPressure().With("~tinkerpop.peerPressure.edges",__.OutE()).With("~tinkerpop.peerPressure.propertyName","cluster").Repeat(__.Union<object>(__.Identity(),__.Both())).Times(2).Dedup().ValueMap<object,object>("name","cluster")}}, 
+               {"g_injectXnullX_productXinjectX1XX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Product(__.Inject(1))}}, 
+               {"g_V_valuesXnameX_productXV_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Product(__.V().Fold())}}, 
+               {"g_V_fold_productXconstantXnullXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Product(__.Constant<object>(null))}}, 
+               {"g_V_fold_productXVX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fold().Product(__.V())}}, 
+               {"g_V_valuesXnameX_fold_productX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Product(2)}}, 
+               {"g_V_valuesXnameX_fold_productXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Product(null)}}, 
+               {"g_V_valuesXnonexistantX_fold_productXV_valuesXnameX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("nonexistant").Fold().Product(__.V().Values<object>("name").Fold())}}, 
+               {"g_V_valuesXnameX_fold_productXV_valuesXnonexistantX_foldX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Product(__.V().Values<object>("nonexistant").Fold())}}, 
+               {"g_V_valuesXageX_order_byXdescX_limitX3X_fold_productXV_valuesXageX_order_byXascX_limitX2X_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Desc).Limit<object>(3).Fold().Product(__.V().Values<object>("age").Order().By(Order.Asc).Limit<object>(2).Fold()).Unfold<object>()}}, 
+               {"g_V_out_path_byXvaluesXnameX_toUpperX_productXMARKOX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By(__.Values<object>("name").ToUpper()).Product(p["xx1"]).Unfold<object>()}}, 
+               {"g_injectXmarkoX_productXV_valuesXnameX_order_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Product(__.V().Values<object>("name").Order().Fold()).Unfold<object>()}}, 
+               {"g_V_valueMapXlocationX_selectXvaluesX_unfold_productXdulles_seattle_vancouverX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>("location").Select<object>(Column.Values).Unfold<object>().Product(p["xx1"]).Unfold<object>()}}, 
+               {"g_V_valuesXageX_order_byXascX_fold_productXconstantX27X_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Order().By(Order.Asc).Fold().Product(__.Constant<object>(27).Fold()).Unfold<object>()}}, 
+               {"g_V_out_out_path_byXnameX_productXdave_kelvinX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Product(p["xx1"]).Unfold<object>()}}, 
+               {"g_injectXa_null_bX_productXa_cX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Product(p["xx2"]).Unfold<object>()}}, 
+               {"g_injectXa_null_bX_productXa_null_cX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Product(p["xx2"]).Unfold<object>()}}, 
+               {"g_injectX3_threeX_productXfive_three_7X_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Product(p["xx2"]).Unfold<object>()}}, 
                {"g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Project<object>("a","b").By(__.OutE().Count()).By("age")}}, 
                {"g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out("created").Project<object>("a","b").By("name").By(__.In("created").Count()).Order().By(__.Select<object>("b"),Order.Desc).Select<object>("a")}}, 
                {"g_V_valueMap_projectXxX_byXselectXnameXX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>().Project<object>("x").By(__.Select<object>("name"))}}, 
@@ -825,6 +1075,28 @@
                {"g_V_hasXageX_propertiesXage_nameX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("age").Properties<object>("age","name").Value<object>()}}, 
                {"g_V_propertiesXname_age_nullX_value", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Properties<object>("name","age",null).Value<object>()}}, 
                {"g_V_valuesXname_age_nullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name","age",null)}}, 
+               {"g_injectX__feature___test__nullX_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature  ","one test ",null,""," ").RTrim()}}, 
+               {"g_injectX__feature__X_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("  feature  ").RTrim()}}, 
+               {"g_injectXListXa_bXX_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).RTrim()}}, 
+               {"g_injectXListX1_2XX_rTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).RTrim<object>(Scope.Local)}}, 
+               {"g_V_valuesXnameX_rTrim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name"," marko ").Property("age",29).As("marko").AddV("person").Property("name","  vadas  ").Property("age",27).As("vadas").AddV("software").Property("name","  lop").Property("lang","java").As("lop").AddV("person").Property("name","josh  ").Property("age",32).As("josh").AddV("software").Property("name","   ripple   ").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").RTrim()}}, 
+               {"g_V_valuesXnameX_order_fold_rTrimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name"," marko ").Property("age",29).As("marko").AddV("person").Property("name","  vadas  ").Property("age",27).As("vadas").AddV("software").Property("name","  lop").Property("lang","java").As("lop").AddV("person").Property("name","josh  ").Property("age",32).As("josh").AddV("software").Property("name","   ripple   ").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").Order().Fold().RTrim<object>(Scope.Local)}}, 
+               {"g_injectXthat_this_test_nullX_replaceXh_jX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("that","this","test",null).Replace("h","j")}}, 
+               {"g_injectXthat_this_test_nullX_fold_replaceXlocal_h_jX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("that","this","test",null).Fold().Replace<object>(Scope.Local,"h","j")}}, 
+               {"g_injectXListXa_bXcX_replaceXa_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Replace("a","b")}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_replaceXnull_iX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Replace(null,"g")}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_replaceXa_iX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Replace("p","g")}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_order_fold_replaceXloacl_a_iX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Order().Fold().Replace<object>(Scope.Local,"p","g")}}, 
+               {"g_injectXfeature_test_nullX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature","test one",null).Reverse()}}, 
+               {"g_V_valuesXnameX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Reverse()}}, 
+               {"g_V_valuesXageX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Reverse()}}, 
+               {"g_V_out_path_byXnameX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Path().By("name").Reverse()}}, 
+               {"g_V_out_out_path_byXnameX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Out().Out().Path().By("name").Reverse()}}, 
+               {"g_V_valuesXageX_fold_orderXlocalX_byXdescX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Order(Scope.Local).By(Order.Desc).Reverse()}}, 
+               {"g_V_valuesXnameX_fold_orderXlocalX_by_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Fold().Order(Scope.Local).By().Reverse()}}, 
+               {"g_injectXnullX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).Reverse()}}, 
+               {"g_injectXbX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("b").Reverse()}}, 
+               {"g_injectX3_threeX_reverse", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Reverse()}}, 
                {"g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).As("a").Out("knows").As("b").Select<object>("a","b")}}, 
                {"g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX_byXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).As("a").Out("knows").As("b").Select<object>("a","b").By("name")}}, 
                {"g_VX1X_asXaX_outXknowsX_asXbX_selectXaX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).As("a").Out("knows").As("b").Select<object>("a")}}, 
@@ -908,6 +1180,22 @@
                {"g_V_hasXsong_name_MIGHT_AS_WELLX_shortestPath_targetXhasXsong_name_MAYBE_YOU_KNOW_HOW_I_FEELXX_edgesXoutEXfollowedByXX_distanceXweightX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("song","name","MIGHT AS WELL").ShortestPath().With("~tinkerpop.shortestPath.target",__.Has("song","name","MAYBE YOU KNOW HOW I FEEL")).With("~tinkerpop.shortestPath.edges",__.OutE("followedBy")).With("~tinkerpop.shortestPath.distance","weight")}}, 
                {"g_V_hasXname_markoX_shortestPath_maxDistanceX1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name","marko").ShortestPath().With("~tinkerpop.shortestPath.maxDistance",1)}}, 
                {"g_V_hasXname_vadasX_shortestPath_distanceXweightX_maxDistanceX1_3X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Has("name","vadas").ShortestPath().With("~tinkerpop.shortestPath.distance","weight").With("~tinkerpop.shortestPath.maxDistance",1.3)}}, 
+               {"g_injectXthat_this_testX_spiltXhX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("that","this","test",null).Split("h")}}, 
+               {"g_injectXhello_worldX_spiltXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject("hello world").Split(null)}}, 
+               {"g_injectXListXa_bXcX_splitXa_bX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Split("a")}}, 
+               {"g_V_hasLabelXpersonX_valueXnameX_splitXnullX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").Split(null)}}, 
+               {"g_V_hasLabelXpersonX_valueXnameX_order_fold_splitXlocal_aX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").Order().Fold().Split<object>(Scope.Local,"a").Unfold<object>()}}, 
+               {"g_injectXthat_this_testX_substringX1_8X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("test","hello world",null).Substring(1,8)}}, 
+               {"g_injectXListXa_bXcX_substringX1_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Substring(1,2)}}, 
+               {"g_V_hasLabelXpersonX_valueXnameX_substringX2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Substring(2)}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_substringX1_4X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Substring(1,4)}}, 
+               {"g_V_hasLabelXpersonX_valueXnameX_order_fold_substringXlocal_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Order().Fold().Substring<object>(Scope.Local,2)}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_order_fold_substringXlocal_1_4X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Order().Fold().Substring<object>(Scope.Local,1,4)}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_substringX1_0X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Substring(1,0)}}, 
+               {"g_V_hasLabelXpersonX_valueXnameX_substringXneg3X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("person").Values<object>("name").Substring(-3)}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_substringX1_neg1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Substring(1,-1)}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_substringXneg4_2X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Substring(-4,2)}}, 
+               {"g_V_hasLabelXsoftwareX_valueXnameX_substringXneg3_neg1X", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().HasLabel("software").Values<object>("name").Substring(-3,-1)}}, 
                {"g_V_age_sum", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Sum<object>()}}, 
                {"g_V_foo_sum", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("foo").Sum<object>()}}, 
                {"g_V_age_fold_sumXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").Fold().Sum<object>(Scope.Local)}}, 
@@ -924,6 +1212,24 @@
                {"g_injectXnull_10_5_nullX_sum", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null,p["xx1"],p["xx2"],null).Sum<object>()}}, 
                {"g_injectXlistXnull_10_5_nullXX_sumXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Sum<object>(Scope.Local)}}, 
                {"g_VX1X_valuesXageX_sumXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Values<object>("age").Sum<object>(Scope.Local)}}, 
+               {"g_injectXfeature_test_nullX_toLower", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("FEATURE","tESt",null).ToLower()}}, 
+               {"g_injectXfeature_test_nullX_toLowerXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).ToLower<object>(Scope.Local)}}, 
+               {"g_injectXListXa_bXX_toLower", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).ToLower()}}, 
+               {"g_V_valuesXnameX_toLower", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","MARKO").Property("age",29).As("marko").AddV("person").Property("name","VADAS").Property("age",27).As("vadas").AddV("software").Property("name","LOP").Property("lang","java").As("lop").AddV("person").Property("name","JOSH").Property("age",32).As("josh").AddV("software").Property("name","RIPPLE").Property("lang","java").As("ripple").AddV("person").Property("name","PETER").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").ToLower()}}, 
+               {"g_V_valuesXnameX_toLowerXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","MARKO").Property("age",29).As("marko").AddV("person").Property("name","VADAS").Property("age",27).As("vadas").AddV("software").Property("name","LOP").Property("lang","java").As("lop").AddV("person").Property("name","JOSH").Property("age",32).As("josh").AddV("software").Property("name","RIPPLE").Property("lang","java").As("ripple").AddV("person").Property("name","PETER").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").ToLower<object>(Scope.Local)}}, 
+               {"g_V_valuesXnameX_order_fold_toLowerXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name","MARKO").Property("age",29).As("marko").AddV("person").Property("name","VADAS").Property("age",27).As("vadas").AddV("software").Property("name","LOP").Property("lang","java").As("lop").AddV("person").Property("name","JOSH").Property("age",32).As("josh").AddV("software").Property("name","RIPPLE").Property("lang","java").As("ripple").AddV("person").Property("name","PETER").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").Order().Fold().ToLower<object>(Scope.Local)}}, 
+               {"g_injectXfeature_test_nullX_toUpper", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature","tESt",null).ToUpper()}}, 
+               {"g_injectXfeature_test_nullX_toUpperXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).ToUpper<object>(Scope.Local)}}, 
+               {"g_injectXfeature_test_nullX_asString_toUpper", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("feature","tESt",null).AsString().ToUpper()}}, 
+               {"g_injectXListXa_bXX_toUpper", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).ToUpper()}}, 
+               {"g_V_valuesXnameX_toUpper", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").ToUpper()}}, 
+               {"g_V_valuesXnameX_toUpperXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").ToUpper<object>(Scope.Local)}}, 
+               {"g_V_valuesXnameX_order_fold_toUpperXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("name").Order().Fold().ToUpper<object>(Scope.Local)}}, 
+               {"g_injectX__feature___test__nullX_trim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>("  feature  "," one test ",null,""," ").Trim()}}, 
+               {"g_injectXListXa_bXX_trim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Trim()}}, 
+               {"g_injectXListX1_2XX_trimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject(p["xx1"]).Trim<object>(Scope.Local)}}, 
+               {"g_V_valuesXnameX_trim", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name"," marko ").Property("age",29).As("marko").AddV("person").Property("name","  vadas  ").Property("age",27).As("vadas").AddV("software").Property("name","  lop").Property("lang","java").As("lop").AddV("person").Property("name","josh  ").Property("age",32).As("josh").AddV("software").Property("name","   ripple   ").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").Trim()}}, 
+               {"g_V_valuesXnameX_order_fold_trimXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.AddV("person").Property("name"," marko ").Property("age",29).As("marko").AddV("person").Property("name","  vadas  ").Property("age",27).As("vadas").AddV("software").Property("name","  lop").Property("lang","java").As("lop").AddV("person").Property("name","josh  ").Property("age",32).As("josh").AddV("software").Property("name","   ripple   ").Property("lang","java").As("ripple").AddV("person").Property("name","peter").Property("age",35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight",0.5).AddE("knows").From("marko").To("josh").Property("weight",1.0).AddE("created").From("marko").To("lop").Property("weight",0.4).AddE("created").From("josh").To("ripple").Property("weight",1.0).AddE("created").From("josh").To("lop").Property("weight",0.4).AddE("created").From("peter").To("lop").Property("weight",0.2), (g,p) =>g.V().Values<object>("name").Order().Fold().Trim<object>(Scope.Local)}}, 
                {"g_V_localXoutE_foldX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Local<object>(__.OutE().Fold()).Unfold<object>()}}, 
                {"g_V_valueMap_unfold_mapXkeyX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().ValueMap<object,object>().Unfold<object>().Map<object>((IFunction) p["l1"])}}, 
                {"g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V(p["vid1"]).Repeat(__.Both().SimplePath()).Until(__.HasId(p["vid6"])).Path().By("name").Unfold<object>()}}, 
@@ -1120,6 +1426,7 @@
                {"g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXvaluesXageX_isXgtX29XXX_capXxX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ProductiveByStrategy(productiveKeys: new List<object> {})).V().Aggregate("x").By(__.Values<object>("age").Is(P.Gt(29))).Cap<object>("x")}}, 
                {"g_V_aggregateXxX_byXout_order_byXnameXX_capXxX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Aggregate("x").By(__.Out().Order().By("name")).Cap<object>("x")}}, 
                {"g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXout_order_byXnameXX_capXxX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new ProductiveByStrategy(productiveKeys: new List<object> {})).V().Aggregate("x").By(__.Out().Order().By("name")).Cap<object>("x")}}, 
+               {"g_V_aggregateXaX_hasXperson_age_gteX30XXX_capXaX_unfold_valuesXnameX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Aggregate("a").Has("person","age",P.Gte(30)).Cap<object>("a").Unfold<object>().Values<object>("name")}}, 
                {"g_V_fail", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fail()}}, 
                {"g_V_failXmsgX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Fail("msg")}}, 
                {"g_V_unionXout_failX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Union<object>(__.Out(),__.Fail())}}, 
@@ -1209,3 +1516,5 @@
     }
 }
 
+#nullable restore
+
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 035cf56..04d5a06 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -37,7 +37,7 @@
 
         private static string GetMessage(IgnoreReason reason)
         {
-            string reasonSuffix = null;
+            string? reasonSuffix = null;
             switch (reason)
             {
                 case IgnoreReason.NoReason:
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
index b7660c3..1c8be14 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
@@ -52,8 +52,8 @@
         
         private readonly RemoteConnectionFactory _connectionFactory;
 
-        public Scenario CurrentScenario;
-        public Feature CurrentFeature;
+        public Scenario? CurrentScenario;
+        public Feature? CurrentFeature;
 
         public ScenarioDataPerGraph GetByGraphName(string name)
         {
@@ -109,7 +109,7 @@
             // Property name might not exist and C# doesn't support "null" keys in Dictionary
             if (g.V().Count().Next() == g.V().Has("name").Count().Next())
             {
-                return g.V().Group<string, object>().By("name").By(__.Tail<Vertex>()).Next()
+                return g.V().Group<string, object>().By("name").By(__.Tail<Vertex>()).Next()!
                     .ToDictionary(kv => kv.Key, kv => (Vertex) kv.Value);
             }
             else
@@ -128,7 +128,7 @@
                 return g.E().Group<string, Edge>()
                     .By(lambda)
                     .By(__.Tail<object>())
-                    .Next();
+                    .Next()!;
             }
             catch (ResponseException)
             {
@@ -191,7 +191,7 @@
                 return g.V().Properties<VertexProperty>().Group<string, VertexProperty>()
                     .By(lambda)
                     .By(__.Tail<object>())
-                    .Next();
+                    .Next()!;
             }
             catch (ResponseException)
             {
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
index 1b7da03..3d0ac93 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
   </PropertyGroup>
   <ItemGroup>
     <None Update="appsettings.json">
@@ -18,6 +22,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" />
     <PackageReference Include="xunit" Version="2.8.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="YamlDotNet" Version="12.2.0" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Remote/RemoteStrategyTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Remote/RemoteStrategyTests.cs
index f01116d..33b4ab4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Remote/RemoteStrategyTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Remote/RemoteStrategyTests.cs
@@ -34,7 +34,7 @@
 {
     public class RemoteStrategyTests
     {
-        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
         private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestServerPort"]);
 
         [Fact]
@@ -93,5 +93,7 @@
             TraversalStrategies.Add(traversalStrategy);
             Bytecode = bytecode;
         }
+
+        public override Bytecode Bytecode { get; }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/BytecodeGenerationTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/BytecodeGenerationTests.cs
index adac06b..cea8e23 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/BytecodeGenerationTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/BytecodeGenerationTests.cs
@@ -110,7 +110,7 @@
         [Fact]
         public void AnonymousTraversal_OutXnullX()
         {
-            Assert.Throws<ArgumentNullException>(() => __.Out(null));
+            Assert.Throws<ArgumentNullException>(() => __.Out(null!));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/StrategiesTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/StrategiesTests.cs
index 3a76a84..24c5e63 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/StrategiesTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/BytecodeGeneration/StrategiesTests.cs
@@ -90,7 +90,7 @@
             Assert.Equal("withStrategies", bytecode.SourceInstructions[0].OperatorName);
             Assert.Equal(new MatchAlgorithmStrategy(), bytecode.SourceInstructions[0].Arguments[0]);
             Assert.Contains("greedy",
-                ((MatchAlgorithmStrategy) bytecode.SourceInstructions[0].Arguments[0]).Configuration.Values);
+                ((MatchAlgorithmStrategy) bytecode.SourceInstructions[0].Arguments[0]!).Configuration.Values);
         }
 
         [Fact]
@@ -118,8 +118,9 @@
             Assert.Single(bytecode.SourceInstructions[0].Arguments);
             Assert.Equal("withStrategies", bytecode.SourceInstructions[0].OperatorName);
             Assert.Equal(new ReadOnlyStrategy(), bytecode.SourceInstructions[0].Arguments[0]);
-            Assert.Equal("ReadOnlyStrategy", bytecode.SourceInstructions[0].Arguments[0].ToString());
-            Assert.Equal(new ReadOnlyStrategy().GetHashCode(), bytecode.SourceInstructions[0].Arguments[0].GetHashCode());
+            Assert.Equal("ReadOnlyStrategy", bytecode.SourceInstructions[0].Arguments[0]!.ToString());
+            Assert.Equal(new ReadOnlyStrategy().GetHashCode(),
+                bytecode.SourceInstructions[0].Arguments[0]!.GetHashCode());
             Assert.Equal(0, g.TraversalStrategies.Count);
         }
 
@@ -150,9 +151,9 @@
             Assert.Single(bytecode.SourceInstructions[0].Arguments);
             Assert.Equal("withStrategies", bytecode.SourceInstructions[0].OperatorName);
             Assert.Equal(new SubgraphStrategy(), bytecode.SourceInstructions[0].Arguments[0]);
-            SubgraphStrategy strategy = bytecode.SourceInstructions[0].Arguments[0];
-            Assert.Equal(typeof(GraphTraversal<object, object>), strategy.Configuration["vertices"].GetType());
-            ITraversal traversal = strategy.Configuration["vertices"];
+            SubgraphStrategy strategy = bytecode.SourceInstructions[0].Arguments[0]!;
+            Assert.Equal(typeof(GraphTraversal<object, object>), strategy.Configuration["vertices"]!.GetType());
+            ITraversal traversal = strategy.Configuration["vertices"]!;
             Assert.Equal("has", traversal.Bytecode.StepInstructions[0].OperatorName);
             Assert.Equal(new List<string> {"name", "marko"}, traversal.Bytecode.StepInstructions[0].Arguments);
             Assert.Equal(false, strategy.Configuration["checkAdjacentVertices"]);
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
index ef46d58..2f48dca 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
@@ -84,7 +84,7 @@
             var vertex = g.V(1).Next();
 
             Assert.Equal(new Vertex(1), vertex);
-            Assert.Equal(1, vertex.Id);
+            Assert.Equal(1, vertex!.Id);
         }
 
         [Fact]
@@ -143,7 +143,7 @@
             var shortestPath =
                 g.V(5).Repeat(__.Both().SimplePath()).Until(__.HasId(6)).Limit<Vertex>(1).Path().Next();
 
-            Assert.Equal(4, shortestPath.Count);
+            Assert.Equal(4, shortestPath!.Count);
             Assert.Equal(new Vertex(6), shortestPath[3]);
         }
 
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTransactionTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTransactionTests.cs
index 257f20b..12d637c 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTransactionTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTransactionTests.cs
@@ -33,7 +33,7 @@
     {
         private readonly IRemoteConnection _connection = new RemoteConnectionFactory().CreateRemoteConnection("gtx");
 
-        [IgnoreIfTransactionsNotSupportedFact]
+        [Fact]
         public async Task ShouldSupportRemoteTransactionsCommit()
         {
             var g = AnonymousTraversalSource.Traversal().WithRemote(_connection);
@@ -57,7 +57,7 @@
             Assert.Equal(2, count);
         }
         
-        [IgnoreIfTransactionsNotSupportedFact]
+        [Fact]
         public async Task ShouldSupportRemoteTransactionsRollback()
         {
             var g = AnonymousTraversalSource.Traversal().WithRemote(_connection);
@@ -90,18 +90,5 @@
             g.V().Drop().Iterate();
         }
     }
-
-    public sealed class IgnoreIfTransactionsNotSupportedFact : FactAttribute
-    {
-        public IgnoreIfTransactionsNotSupportedFact()
-        {
-            if (!TransactionsSupported)
-            {
-                Skip = "Transactions not supported";
-            }
-        }
-
-        private static bool TransactionsSupported =>
-            Convert.ToBoolean(Environment.GetEnvironmentVariable("TEST_TRANSACTIONS"));
-    }
+    
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs
index 8fe6c2e..f24b1c4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/RemoteConnectionFactory.cs
@@ -32,36 +32,45 @@
 {
     internal class RemoteConnectionFactory : IDisposable
     {
-        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
         private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestServerPort"]);
 
-        private readonly IList<DriverRemoteConnectionImpl> _connections = new List<DriverRemoteConnectionImpl>();
+        private readonly IList<IDisposable> _cleanUp = new List<IDisposable>();
         private readonly IMessageSerializer _messageSerializer;
 
-        public RemoteConnectionFactory(IMessageSerializer messageSerializer = null)
+        public RemoteConnectionFactory(IMessageSerializer? messageSerializer = null)
         {
             _messageSerializer = messageSerializer ?? new GraphSON3MessageSerializer();
         }
-        
+
         public IRemoteConnection CreateRemoteConnection(int connectionPoolSize = 2)
         {
             // gmodern is the standard test traversalsource that the main body of test uses
             return CreateRemoteConnection("gmodern", connectionPoolSize);
         }
 
-        public IRemoteConnection CreateRemoteConnection(string traversalSource, int connectionPoolSize = 2)
+        public IRemoteConnection CreateRemoteConnection(string traversalSource,
+            int connectionPoolSize = 2,
+            IMessageSerializer? messageSerializer = null)
         {
-            var c = new DriverRemoteConnectionImpl(
-                new GremlinClient(new GremlinServer(TestHost, TestPort), _messageSerializer,
-                    connectionPoolSettings: new ConnectionPoolSettings { PoolSize = connectionPoolSize }),
-                traversalSource);
-            _connections.Add(c);
+            var c = new DriverRemoteConnectionImpl(CreateClient(messageSerializer, connectionPoolSize), traversalSource);
+            _cleanUp.Add(c);
+            return c;
+        }
+
+        public IGremlinClient CreateClient(IMessageSerializer? messageSerializer = null, int connectionPoolSize = 2)
+        {
+            var c = new GremlinClient(new GremlinServer(TestHost, TestPort),
+                    messageSerializer ?? _messageSerializer,
+                    connectionPoolSettings: new() { PoolSize = connectionPoolSize });
+
+            _cleanUp.Add(c);
             return c;
         }
 
         public void Dispose()
         {
-            foreach (var connection in _connections)
+            foreach (var connection in _cleanUp)
             {
                 connection.Dispose();
             }
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Util/SocketServerSettings.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Util/SocketServerSettings.cs
new file mode 100644
index 0000000..2ae0e22
--- /dev/null
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Util/SocketServerSettings.cs
@@ -0,0 +1,94 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System;
+using System.IO;
+using YamlDotNet.Serialization;
+
+namespace Gremlin.Net.IntegrationTest.Util;
+
+public class SocketServerSettings
+{
+    [YamlMember(Alias = "PORT", ApplyNamingConventions = false)]
+    public int Port { get; set; }
+
+    /**
+     * Configures which serializer will be used. Ex: "GraphBinaryV1" or "GraphSONV2"
+     */
+    [YamlMember(Alias = "SERIALIZER", ApplyNamingConventions = false)]
+    public String Serializer { get; set; }
+
+    /**
+     * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
+     * graph.
+     */
+    [YamlMember(Alias = "SINGLE_VERTEX_REQUEST_ID", ApplyNamingConventions = false)]
+    public Guid SingleVertexRequestId { get; set; }
+
+    /**
+     * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
+     * graph. After a 2 second delay, server sends a Close WebSocket frame on the same connection.
+     */
+    [YamlMember(Alias = "SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID", ApplyNamingConventions = false)]
+    public Guid SingleVertexDelayedCloseConnectionRequestId { get; set; }
+
+    /**
+     * Server waits for 1 second, then responds with a 500 error status code
+     */
+    [YamlMember(Alias = "FAILED_AFTER_DELAY_REQUEST_ID", ApplyNamingConventions = false)]
+    public Guid FailedAfterDelayRequestId { get; set; }
+
+    /**
+     * Server waits for 1 second then responds with a close web socket frame
+     */
+    [YamlMember(Alias = "CLOSE_CONNECTION_REQUEST_ID", ApplyNamingConventions = false)]
+    public Guid CloseConnectionRequestId { get; set; }
+
+    /**
+     * Same as CLOSE_CONNECTION_REQUEST_ID
+     */
+    [YamlMember(Alias = "CLOSE_CONNECTION_REQUEST_ID_2", ApplyNamingConventions = false)]
+    public Guid CloseConnectionRequestId2 { get; set; }
+
+    /**
+     * If a request with this ID comes to the server, the server responds with the user agent (if any) that was captured
+     * during the web socket handshake.
+     */
+    [YamlMember(Alias = "USER_AGENT_REQUEST_ID", ApplyNamingConventions = false)]
+    public Guid UserAgentRequestId { get; set; }
+    
+    /**
+     * If a request with this ID comes to the server, the server responds with a string containing all overridden
+     * per request settings from the request message. String will be of the form
+     * "requestId=19436d9e-f8fc-4b67-8a76-deec60918424 evaluationTimeout=1234, batchSize=12, userAgent=testUserAgent"
+     */
+    [YamlMember(Alias = "PER_REQUEST_SETTINGS_REQUEST_ID", ApplyNamingConventions = false)]
+    public Guid PerRequestSettingsRequestId { get; set; }
+    
+    public static SocketServerSettings FromYaml(String path)
+    {
+        var deserializer = new YamlDotNet.Serialization.DeserializerBuilder().IgnoreUnmatchedProperties().Build();
+
+        return deserializer.Deserialize<SocketServerSettings>(File.ReadAllText(path));
+    }
+}
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/appsettings.json b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/appsettings.json
index 5d095ff..b62dbe8 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/appsettings.json
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/appsettings.json
@@ -2,5 +2,9 @@
   "TestServerIpAddress": "localhost",
   "TestServerIpAddressDocker": "gremlin-server-test-dotnet",
   "TestServerPort": 45940,
-  "TestSecureServerPort": 45941
+  "TestSecureServerPort": 45941,
+  "GremlinSocketServerIpAddress": "localhost",
+  "GremlinSocketServerIpAddressDocker": "gremlin-socket-server",
+  "GremlinSocketServerConfig": "../../../../../../gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml",
+  "GremlinSocketServerConfigDocker": "../../../../../gremlin-socket-server/conf/test-ws-gremlin.yaml"
 }
diff --git a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
index 2c59038..bf0848b 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/ServiceTests.cs b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/ServiceTests.cs
index 1faa0b8..faef08e 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/ServiceTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/ServiceTests.cs
@@ -34,7 +34,7 @@
 {
     public class ServiceTests
     {
-        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"];
+        private static readonly string TestHost = ConfigProvider.Configuration["TestServerIpAddress"]!;
         private static readonly int TestPort = Convert.ToInt32(ConfigProvider.Configuration["TestServerPort"]);
         private const string TestTraversalSource = "gmodern";
 
@@ -48,7 +48,7 @@
             
                 var creators = service.FindCreatorsOfSoftware("lop");
 
-                Assert.Equal(new List<string> {"marko", "josh", "peter"}, creators);
+                Assert.Equal(new List<string?> {"marko", "josh", "peter"}, creators);
             }
         }
 
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionPoolTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionPoolTests.cs
index 12899b2..3708a2e 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionPoolTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionPoolTests.cs
@@ -27,6 +27,7 @@
 using System.Threading.Tasks;
 using Gremlin.Net.Driver;
 using Gremlin.Net.Driver.Exceptions;
+using Gremlin.Net.Driver.Messages;
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
 using NSubstitute.ExceptionExtensions;
@@ -188,7 +189,8 @@
             fakedConnection.IsOpen.Returns(false);
             mockedConnectionFactory.CreateConnection().Returns(_ => OpenConnection);
 
-            await returnedConnection.SubmitAsync<bool>(null, CancellationToken.None);
+            await returnedConnection.SubmitAsync<bool>(RequestMessage.Build(string.Empty).Create(),
+                CancellationToken.None);
             returnedConnection.Dispose();
 
             Assert.Equal(1, pool.NrConnections);
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionTests.cs
index ef71d23..9b2956f 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/ConnectionTests.cs
@@ -32,7 +32,6 @@
 using Gremlin.Net.Structure.IO.GraphBinary;
 using NSubstitute;
 using NSubstitute.ExceptionExtensions;
-using NSubstitute.Extensions;
 using Xunit;
 
 namespace Gremlin.Net.UnitTest.Driver
@@ -77,7 +76,7 @@
                 mockedClientWebSocket
                     .ReceiveAsync(Arg.Any<ArraySegment<byte>>(), Arg.Any<CancellationToken>())
                     .Returns(new WebSocketReceiveResult(0, WebSocketMessageType.Close, true, (WebSocketCloseStatus)closeStatus, closeStatus.ToString()));
-    
+
                 await AssertExpectedConnectionClosedException((WebSocketCloseStatus?)closeStatus, closeStatus.ToString(), () => webSocketConnection.ReceiveMessageAsync());
             }
 
@@ -86,7 +85,7 @@
                 .ReceiveAsync(Arg.Any<ArraySegment<byte>>(), Arg.Any<CancellationToken>())
                 .Returns(new WebSocketReceiveResult(0, WebSocketMessageType.Close, true, null, null));
             await AssertExpectedConnectionClosedException(null, null, () => webSocketConnection.ReceiveMessageAsync());
-            
+
             mockedClientWebSocket
                 .ReceiveAsync(Arg.Any<ArraySegment<byte>>(), Arg.Any<CancellationToken>())
                 .Returns(new WebSocketReceiveResult(0, WebSocketMessageType.Close, true, null, string.Empty));
@@ -198,7 +197,7 @@
             var task = connection.SubmitAsync<object>(RequestMessage.Build(string.Empty).Create(),
                 cts.Token);
             cts.Cancel();
-            
+
             await Assert.ThrowsAsync<TaskCanceledException>(async () => await task);
             Assert.True(task.IsCanceled);
             await mockedClientWebSocket.Received(1).SendAsync(Arg.Any<ArraySegment<byte>>(),
@@ -207,7 +206,7 @@
                 Arg.Any<CancellationToken>());
             await mockedClientWebSocket.DidNotReceive().ReceiveAsync(Arg.Any<ArraySegment<byte>>(), cts.Token);
         }
-        
+
         [Fact]
         public async Task ShouldProperlyHandleCancellationForSubmitAsyncIfAlreadyCancelled()
         {
@@ -218,7 +217,7 @@
 
             var task = connection.SubmitAsync<object>(RequestMessage.Build(string.Empty).Create(),
                 token);
-            
+
             await Assert.ThrowsAsync<TaskCanceledException>(async () => await task);
             Assert.True(task.IsCanceled);
             await mockedClientWebSocket.DidNotReceive().SendAsync(Arg.Any<ArraySegment<byte>>(),
@@ -227,7 +226,7 @@
                 Arg.Any<CancellationToken>());
             await mockedClientWebSocket.DidNotReceive().ReceiveAsync(Arg.Any<ArraySegment<byte>>(), token);
         }
-        
+
         [Fact]
         public async Task ShouldContinueSubmittingOtherMessagesIfOneIsCancelled()
         {
@@ -238,7 +237,7 @@
                 Arg.Any<bool>(), Arg.Any<CancellationToken>()).Returns(tcs.Task);
             var connection = GetConnection(mockedClientWebSocket);
             var cts = new CancellationTokenSource();
-            
+
             var taskToCancel = connection.SubmitAsync<object>(RequestMessage.Build(string.Empty).Create(),
                 cts.Token);
             var taskToComplete = connection.SubmitAsync<object>(RequestMessage.Build(string.Empty).Create(),
@@ -247,14 +246,14 @@
             var taskToComplete2 = connection.SubmitAsync<object>(RequestMessage.Build(string.Empty).Create(),
                 CancellationToken.None);
             tcs.TrySetResult();
-            
+
             await Assert.ThrowsAsync<TaskCanceledException>(async () => await taskToCancel);
             Assert.True(taskToCancel.IsCanceled);
             await Task.Delay(TimeSpan.FromMilliseconds(200)); // wait a bit to let the messages being sent
             await mockedClientWebSocket.Received(3).SendAsync(Arg.Any<ArraySegment<byte>>(),
                 Arg.Any<WebSocketMessageType>(), Arg.Any<bool>(), Arg.Any<CancellationToken>());
         }
-        
+
         [Fact]
         public async Task ShouldContinueSubmittingOtherMessagesIfOneIsAlreadyCancelled()
         {
@@ -270,11 +269,11 @@
             fakeMessageSerializer.SerializeMessageAsync(messageToSend, Arg.Any<CancellationToken>())
                 .Returns(bytesToSend);
             var connection = GetConnection(mockedClientWebSocket, fakeMessageSerializer);
-            
+
             var taskToCancel = connection.SubmitAsync<object>(RequestMessage.Build(string.Empty).Create(),
                 cancelledToken);
             var taskToComplete = connection.SubmitAsync<object>(messageToSend, CancellationToken.None);
-            
+
             await Assert.ThrowsAsync<TaskCanceledException>(async () => await taskToCancel);
             Assert.True(taskToCancel.IsCanceled);
             await mockedClientWebSocket.Received(1).SendAsync(bytesToSend, Arg.Any<WebSocketMessageType>(),
@@ -287,10 +286,8 @@
             var fakeMessageSerializer = Substitute.For<IMessageSerializer>();
             var receivedBytes = new byte[] { 1, 2, 3 };
             var messageToCancel = RequestMessage.Build(string.Empty).Create();
-            var receivedMessage = new ResponseMessage<List<object>>
-            {
-                RequestId = messageToCancel.RequestId, Status = new ResponseStatus { Code = ResponseStatusCode.Success }
-            };
+            var receivedMessage = new ResponseMessage<List<object>>(messageToCancel.RequestId,
+                new ResponseStatus(ResponseStatusCode.Success), new ResponseResult<List<object>>(null));
             fakeMessageSerializer.DeserializeMessageAsync(receivedBytes, Arg.Any<CancellationToken>())
                 .Returns(receivedMessage);
             var fakeWebSocketConnection = Substitute.For<IWebSocketConnection>();
@@ -299,24 +296,24 @@
             var connection = GetConnection(fakeWebSocketConnection, fakeMessageSerializer);
             await connection.ConnectAsync(CancellationToken.None);
             var cts = new CancellationTokenSource();
-            
+
             var submitTask = connection.SubmitAsync<object>(messageToCancel, cts.Token);
             cts.Cancel();
             receiveTaskCompletionSource.SetResult(receivedBytes);
             await Assert.ThrowsAsync<TaskCanceledException>(() => submitTask);
-            
+
             Assert.Equal(0, connection.NrRequestsInFlight);
         }
 
         private static Connection GetConnection(IClientWebSocket clientWebSocket,
-            IMessageSerializer messageSerializer = null, Uri uri = null)
+            IMessageSerializer? messageSerializer = null, Uri? uri = null)
         {
             return GetConnection(new WebSocketConnection(clientWebSocket, new WebSocketSettings()), messageSerializer,
                 uri);
         }
-        
+
         private static Connection GetConnection(IWebSocketConnection webSocketConnection,
-            IMessageSerializer messageSerializer = null, Uri uri = null)
+            IMessageSerializer? messageSerializer = null, Uri? uri = null)
         {
             uri ??= new Uri("wss://localhost:8182");
             messageSerializer ??= new GraphBinaryMessageSerializer();
@@ -329,9 +326,10 @@
                 sessionId: null);
         }
 
-        private static async Task AssertExpectedConnectionClosedException(WebSocketCloseStatus? expectedCloseStatus, string expectedCloseDescription, Func<Task> func)
+        private static async Task AssertExpectedConnectionClosedException(WebSocketCloseStatus? expectedCloseStatus,
+            string? expectedCloseDescription, Func<Task> func)
         {
-            ConnectionClosedException exception = await Assert.ThrowsAsync<ConnectionClosedException>(func);
+            var exception = await Assert.ThrowsAsync<ConnectionClosedException>(func);
             Assert.Equal(expectedCloseStatus, exception.Status);
             Assert.Equal(expectedCloseDescription, exception.Description);
         }
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/DriverRemoteConnectionTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/DriverRemoteConnectionTests.cs
index de09081..0f0aea4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/DriverRemoteConnectionTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/DriverRemoteConnectionTests.cs
@@ -45,7 +45,7 @@
         [Fact]
         public void ShouldThrowWhenGivenNullAsGremlinClient()
         {
-            Assert.Throws<ArgumentNullException>(() => new DriverRemoteConnection(null));
+            Assert.Throws<ArgumentNullException>(() => new DriverRemoteConnection(null!));
         }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/GraphSONMessageSerializerTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/GraphSONMessageSerializerTests.cs
index 6b7951f..6aae175 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/GraphSONMessageSerializerTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Driver/GraphSONMessageSerializerTests.cs
@@ -36,7 +36,7 @@
         {
             var sut = CreateMessageSerializer();
 
-            await Assert.ThrowsAsync<ArgumentNullException>(()=> sut.DeserializeMessageAsync(null));
+            await Assert.ThrowsAsync<ArgumentNullException>(()=> sut.DeserializeMessageAsync(null!));
         }
 
         [Fact]
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
index 379f0e0..a3bce02 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/BytecodeTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/BytecodeTests.cs
index d9ab4a7..1f91af6 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/BytecodeTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/BytecodeTests.cs
@@ -62,7 +62,7 @@
             bytecode.AddStep("someStep", new Dictionary<string, object> {{"someKey", b.Of("valVariable", "valValue")}});
 
             var arg = bytecode.StepInstructions[0].Arguments[0] as IDictionary;
-            Assert.Equal(new Binding("valVariable", "valValue"), arg["someKey"]);
+            Assert.Equal(new Binding("valVariable", "valValue"), arg!["someKey"]);
         }
 
         [Fact]
@@ -74,7 +74,7 @@
             bytecode.AddStep("someStep", new Dictionary<string, object> {{b.Of("keyVariable", "keyValue"), 1234}});
 
             var arg = bytecode.StepInstructions[0].Arguments[0];
-            var binding = ((Dictionary<object, object>) arg).Keys.First() as Binding;
+            var binding = ((Dictionary<object, object>) arg!).Keys.First() as Binding;
             Assert.Equal(new Binding("keyVariable", "keyValue"), binding);
         }
 
@@ -87,7 +87,7 @@
             bytecode.AddStep("someStep", new List<string> {"test", b.Of("listVariable", "listValue")});
 
             var arg = bytecode.StepInstructions[0].Arguments[0] as IList;
-            Assert.Equal(new Binding("listVariable", "listValue"), arg[1]);
+            Assert.Equal(new Binding("listVariable", "listValue"), arg![1]);
         }
 
         [Fact]
@@ -99,7 +99,7 @@
             bytecode.AddStep("someStep", new HashSet<string> { "test", b.Of("setVariable", "setValue") });
 
             var arg = bytecode.StepInstructions[0].Arguments[0] as ISet<object>;
-            Assert.Equal(new Binding("setVariable", "setValue"), arg.ToList()[1]);
+            Assert.Equal(new Binding("setVariable", "setValue"), arg!.ToList()[1]);
         }
 
         [Fact]
@@ -133,7 +133,7 @@
             bytecode.AddSource("someSource", new Dictionary<string, object> { { "someKey", b.Of("valVariable", "valValue") } });
 
             var arg = bytecode.SourceInstructions[0].Arguments[0] as IDictionary;
-            Assert.Equal(new Binding("valVariable", "valValue"), arg["someKey"]);
+            Assert.Equal(new Binding("valVariable", "valValue"), arg!["someKey"]);
         }
 
         [Fact]
@@ -145,7 +145,7 @@
             bytecode.AddSource("someSource", new Dictionary<string, object> { { b.Of("keyVariable", "keyValue"), 1234 } });
 
             var arg = bytecode.SourceInstructions[0].Arguments[0];
-            var binding = ((Dictionary<object, object>)arg).Keys.First() as Binding;
+            var binding = ((Dictionary<object, object>)arg!).Keys.First() as Binding;
             Assert.Equal(new Binding("keyVariable", "keyValue"), binding);
         }
 
@@ -158,7 +158,7 @@
             bytecode.AddSource("someSource", new List<string> { "test", b.Of("listVariable", "listValue") });
 
             var arg = bytecode.SourceInstructions[0].Arguments[0] as IList;
-            Assert.Equal(new Binding("listVariable", "listValue"), arg[1]);
+            Assert.Equal(new Binding("listVariable", "listValue"), arg![1]);
         }
 
         [Fact]
@@ -170,7 +170,7 @@
             bytecode.AddSource("someSource", new HashSet<string> { "test", b.Of("setVariable", "setValue") });
 
             var arg = bytecode.SourceInstructions[0].Arguments[0] as ISet<object>;
-            Assert.Equal(new Binding("setVariable", "setValue"), arg.ToList()[1]);
+            Assert.Equal(new Binding("setVariable", "setValue"), arg!.ToList()[1]);
         }
 
         [Fact]
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/CardinalityValueTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/CardinalityValueTests.cs
new file mode 100644
index 0000000..c30aaf3
--- /dev/null
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/CardinalityValueTests.cs
@@ -0,0 +1,55 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using Gremlin.Net.Process.Traversal;
+using Xunit;
+
+namespace Gremlin.Net.UnitTest.Process.Traversal
+{
+    public class CardinalityValueTests
+    {
+        [Fact]
+        public void ShouldProduceSingleValue()
+        {
+            CardinalityValue val = CardinalityValue.Single("test");
+            Assert.Equal("test", val.Value);
+            Assert.Equal(Cardinality.Single, val.Cardinality);
+        }
+
+        [Fact]
+        public void ShouldProduceListValue()
+        {
+            CardinalityValue val = CardinalityValue.List("test");
+            Assert.Equal("test", val.Value);
+            Assert.Equal(Cardinality.List, val.Cardinality);
+        }
+
+        [Fact]
+        public void ShouldProduceSetValue()
+        {
+            CardinalityValue val = CardinalityValue.Set("test");
+            Assert.Equal("test", val.Value);
+            Assert.Equal(Cardinality.Set, val.Cardinality);
+        }
+    }
+}
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/GraphTraversalSourceTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/GraphTraversalSourceTests.cs
index b08cf6f..6ecd858 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/GraphTraversalSourceTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/GraphTraversalSourceTests.cs
@@ -22,7 +22,9 @@
 #endregion
 
 using System;
+using Gremlin.Net.Process.Remote;
 using Gremlin.Net.Process.Traversal;
+using NSubstitute;
 using Xunit;
 
 namespace Gremlin.Net.UnitTest.Process.Traversal
@@ -57,7 +59,7 @@
         {
             var gLocal = AnonymousTraversalSource.Traversal();
 
-            var gRemote = gLocal.WithRemote(null);
+            var gRemote = gLocal.WithRemote(Substitute.For<IRemoteConnection>());
 
             Assert.Equal(0, gLocal.TraversalStrategies.Count);
             Assert.Equal(1, gRemote.TraversalStrategies.Count);
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversal.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversal.cs
index 51aac86..d618aec 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversal.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversal.cs
@@ -29,7 +29,7 @@
 {
     public class TestTraversal : DefaultTraversal<object, object>
     {
-        public TestTraversal(List<object> traverserObjs)
+        public TestTraversal(List<object?> traverserObjs)
         {
             var traversers = new List<Traverser>(traverserObjs.Count);
             traverserObjs.ForEach(o => traversers.Add(new Traverser(o)));
@@ -37,7 +37,7 @@
             Bytecode = new Bytecode();
         }
 
-        public TestTraversal(IReadOnlyList<object> traverserObjs, IReadOnlyList<long> traverserBulks)
+        public TestTraversal(IReadOnlyList<object?> traverserObjs, IReadOnlyList<long> traverserBulks)
         {
             var traversers = new List<Traverser>(traverserObjs.Count);
             traversers.AddRange(traverserObjs.Select((t, i) => new Traverser(t, traverserBulks[i])));
@@ -49,5 +49,7 @@
         {
             TraversalStrategies = traversalStrategies;
         }
+
+        public override Bytecode Bytecode { get; } = new();
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversalStrategy.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversalStrategy.cs
index 5a23409..697b285 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversalStrategy.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TestTraversalStrategy.cs
@@ -37,12 +37,12 @@
             _traversers = traversersToAddOnApplication;
         }
 
-        public void Apply<S, E>(ITraversal<S, E> traversal)
+        public void Apply<TStart, TEnd>(ITraversal<TStart, TEnd> traversal)
         {
             traversal.Traversers = _traversers;
         }
 
-        public Task ApplyAsync<S, E>(ITraversal<S, E> traversal, CancellationToken cancellationToken)
+        public Task ApplyAsync<TStart, TEnd>(ITraversal<TStart, TEnd> traversal, CancellationToken cancellationToken)
         {
             traversal.Traversers = _traversers;
             return Task.CompletedTask;
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs
index 816d4c1..f3f0dfc 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/Translator/GroovyTranslatorTests.cs
@@ -36,24 +36,24 @@
 public class GroovyTranslatorTests

 {

     private readonly GraphTraversalSource _g = AnonymousTraversalSource.Traversal();

-    

+

     [Fact]

     public void ShouldTranslateStepsWithSingleArguments()

     {

         var translator = GroovyTranslator.Of("g");

 

         var translated = translator.Translate(_g.V().Values<string>("name").Bytecode);

-        

+

         Assert.Equal("g.V().values('name')", translated);

     }

-    

+

     [Fact]

     public void ShouldTranslateStepsWithMultipleArguments()

     {

         var translator = GroovyTranslator.Of("g");

 

         var translated = translator.Translate(_g.V().Values<string>("name", "age").Bytecode);

-        

+

         Assert.Equal("g.V().values('name', 'age')", translated);

     }

 

@@ -62,7 +62,7 @@
     {

         AssertTranslation("null", null);

     }

-    

+

     [Theory]

     [InlineData("3, 5", 3, 5)]

     [InlineData("3.2, 5.1", 3.2, 5.1)]

@@ -79,7 +79,7 @@
     {

         AssertTranslation("new Date(122, 11, 30, 12, 0, 1)", DateTimeOffset.Parse("2022-12-30T12:00:01Z"));

     }

-    

+

     [Fact]

     public void ShouldTranslateDateTimeArgument()

     {

@@ -115,25 +115,25 @@
     {

         AssertTranslation("Column.keys", Column.Keys);

     }

-    

+

     [Fact]

     public void ShouldTranslateDirection()

     {

         AssertTranslation("Direction.BOTH", Direction.Both);

     }

-    

+

     [Fact]

     public void ShouldTranslateOrder()

     {

         AssertTranslation("Order.desc", Order.Desc);

     }

-    

+

     [Fact]

     public void ShouldTranslatePop()

     {

         AssertTranslation("Pop.last", Pop.Last);

     }

-    

+

     [Fact]

     public void ShouldTranslateScope()

     {

@@ -151,14 +151,14 @@
     {

         AssertTranslation("P.between([20, 30])", P.Between(20, 30));

     }

-    

+

     [Fact]

     public void ShouldTranslateValueMapOptions()

     {

         AssertTraversalTranslation("g.V().valueMap().with(WithOptions.tokens, WithOptions.all).V()",

             _g.V().ValueMap<object, object>().With(WithOptions.Tokens, WithOptions.All).V());

     }

-    

+

     [Fact]

     public void ShouldTranslateIndexerOptions()

     {

@@ -172,7 +172,7 @@
         AssertTraversalTranslation("g.withStrategies(new OptionsStrategy('~tinkerpop.valueMap.tokens': true)).V()",

             _g.With(WithOptions.Tokens).V());

     }

-    

+

     [Fact]

     public void TranslationTest()

     {

@@ -424,7 +424,8 @@
                 _g.V().Property(new Dictionary<string, object> { { "name", "test" }, { "age", 30 } }),

                 "g.V().property(['name': 'test', 'age': 30])"

             },

-            

+            { _g.V().E("1"), "g.V().E('1')" },

+

             // TODO: Support WithOptions

             {

                 _g.V("44").ValueMap<object, object>().With(WithOptions.Tokens, WithOptions.Labels),

@@ -490,17 +491,17 @@
         }

     }

 

-    private void AssertTranslation(string expectedTranslation, params object[] objs)

+    private void AssertTranslation(string expectedTranslation, params object?[]? objs)

     {

         AssertTraversalTranslation($"g.inject({expectedTranslation})", _g.Inject(objs));

     }

-    

+

     private static void AssertTraversalTranslation(string expectedTranslation, ITraversal traversal)

     {

         var translator = GroovyTranslator.Of("g");

-        

+

         var translated = translator.Translate(traversal);

-        

+

         Assert.Equal(expectedTranslation, translated);

     }

 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
index 5f87dff..0ed745b 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
@@ -36,7 +36,7 @@
         [InlineData("test")]
         public void ShouldReturnAvailableTraverserObjWhenNextIsCalled(object traverserObj)
         {
-            var traversal = new TestTraversal(new List<object> {traverserObj});
+            var traversal = new TestTraversal(new List<object?> {traverserObj});
 
             var actualObj = traversal.Next();
 
@@ -49,7 +49,7 @@
         [InlineData("test")]
         public void ShouldCheckHasNext(object traverserObj)
         {
-            var traversal = new TestTraversal(new List<object> {traverserObj});
+            var traversal = new TestTraversal(new List<object?> {traverserObj});
 
             Assert.True(traversal.HasNext());
             Assert.True(traversal.HasNext());
@@ -66,7 +66,7 @@
         [InlineData(10)]
         public void ShouldReturnCorrectNrOfResultObjsWhenNextIsCalledWithAmountArgument(int nrOfResults)
         {
-            var objs = new List<object>(20);
+            var objs = new List<object?>(20);
             for (var i = 0; i < 20; i++)
                 objs.Add(i);
             var traversal = new TestTraversal(objs);
@@ -79,9 +79,9 @@
                 Assert.Equal(objs[i], traversedObjsList[i]);
         }
 
-        private List<object> UnfoldBulks(IReadOnlyList<object> objs, IReadOnlyList<long> bulks)
+        private List<object?> UnfoldBulks(IReadOnlyList<object?> objs, IReadOnlyList<long> bulks)
         {
-            var unfoldedObjs = new List<object>();
+            var unfoldedObjs = new List<object?>();
             for (var traverserIdx = 0; traverserIdx < objs.Count; traverserIdx++)
             for (var currentBulkObjIdx = 0; currentBulkObjIdx < bulks[traverserIdx]; currentBulkObjIdx++)
                 unfoldedObjs.Add(objs[traverserIdx]);
@@ -91,7 +91,7 @@
         [Fact]
         public void ShouldDrainAllTraversersWhenIterateIsCalled()
         {
-            var someObjs = new List<object> {1, 2, 3};
+            var someObjs = new List<object?> {1, 2, 3};
             var traversal = new TestTraversal(someObjs);
 
             var drainedTraversal = traversal.Iterate();
@@ -103,7 +103,7 @@
         public void ShouldReturnNullWhenNextIsCalledAndNoTraverserIsAvailable()
         {
             var expectedFirstObj = 1;
-            var traversal = new TestTraversal(new List<object> {expectedFirstObj});
+            var traversal = new TestTraversal(new List<object?> {expectedFirstObj});
 
             var actualFirstObj = traversal.Next();
             var actualSecondObj = traversal.Next();
@@ -115,18 +115,18 @@
         [Fact]
         public void ShouldReturnTraversalsTraverserWhenNextTraverserIsCalled()
         {
-            var someObjs = new List<object> {1, 2, 3};
+            var someObjs = new List<object?> {1, 2, 3};
             var traversal = new TestTraversal(someObjs);
 
             var traverser = traversal.NextTraverser();
 
-            Assert.Equal(traversal.Traversers.First(), traverser);
+            Assert.Equal(traversal.Traversers!.First(), traverser);
         }
 
         [Fact]
         public void ShouldThrowNotSupportedExceptionWhenResetIsCalled()
         {
-            var someObjs = new List<object> {1, 2, 3};
+            var someObjs = new List<object?> {1, 2, 3};
             var traversal = new TestTraversal(someObjs);
 
             Assert.Throws<NotSupportedException>(() => traversal.Reset());
@@ -135,7 +135,7 @@
         [Fact]
         public void ShouldReturnAllTraverserObjsWhenToListIsCalled()
         {
-            var expectedObjs = new List<object> {1, 2, 3};
+            var expectedObjs = new List<object?> {1, 2, 3};
             var traversal = new TestTraversal(expectedObjs);
 
             var traversedObjs = traversal.ToList();
@@ -146,13 +146,13 @@
         [Fact]
         public void ShouldReturnAllTraverserObjWithoutDuplicatesWhenToSetIsCalled()
         {
-            var traverserObjs = new List<object> {1, 1, 2, 3};
+            var traverserObjs = new List<object?> {1, 1, 2, 3};
             var traversal = new TestTraversal(traverserObjs);
 
             var traversedObjSet = traversal.ToSet();
 
             Assert.Equal(3, traversedObjSet.Count);
-            Assert.Equal(new HashSet<object>(traverserObjs), traversedObjSet);
+            Assert.Equal(new HashSet<object?>(traverserObjs), traversedObjSet);
         }
 
         [Fact]
@@ -170,7 +170,7 @@
         [Fact]
         public void ShouldBeUnfoldTraverserBulksWhenToListIsCalled()
         {
-            var objs = new List<object> {1, 2, 3};
+            var objs = new List<object?> {1, 2, 3};
             var bulks = new List<long> {3, 2, 1};
             var traversal = new TestTraversal(objs, bulks);
 
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryMessageSerializerTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryMessageSerializerTests.cs
index 5510678..e175300 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryMessageSerializerTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryMessageSerializerTests.cs
@@ -77,7 +77,7 @@
             var serializer = CreateMessageSerializer();
 
             await Assert.ThrowsAsync<TaskCanceledException>(async () =>
-                await serializer.SerializeMessageAsync(RequestMessage.Build(default).Create(),
+                await serializer.SerializeMessageAsync(RequestMessage.Build(string.Empty).Create(),
                     new CancellationToken(true)));
         }
     
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryTests.cs
index f366aac..5e2a49a 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/GraphBinaryTests.cs
@@ -26,11 +26,13 @@
 using System.Globalization;
 using System.IO;
 using System.Numerics;
+using System.Threading;
 using System.Threading.Tasks;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
 using Gremlin.Net.Structure.IO.GraphBinary;
 using Xunit;
+using Barrier = Gremlin.Net.Process.Traversal.Barrier;
 using Path = Gremlin.Net.Structure.Path;
 
 namespace Gremlin.Net.UnitTest.Structure.IO.GraphBinary
@@ -76,7 +78,7 @@
             var writer = CreateGraphBinaryWriter();
             var serializationStream = new MemoryStream();
             
-            await writer.WriteValueAsync(value, serializationStream, false);
+            await writer.WriteNonNullableValueAsync(value, serializationStream);
 
             var serBytes = serializationStream.ToArray();
             Assert.Equal(expected, serBytes);
@@ -270,9 +272,9 @@
             var reader = CreateGraphBinaryReader();
             var serializationStream = new MemoryStream();
             
-            await writer.WriteValueAsync(expected, serializationStream, false);
+            await writer.WriteNonNullableValueAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = await reader.ReadValueAsync<HashSet<string>>(serializationStream, false);
+            var actual = await reader.ReadNonNullableValueAsync<HashSet<string>>(serializationStream);
             
             Assert.Equal(expected, actual);
             Assert.Equal(expected.GetType(), actual.GetType());
@@ -349,9 +351,9 @@
             var reader = CreateGraphBinaryReader();
             var serializationStream = new MemoryStream();
             
-            await writer.WriteValueAsync(expected, serializationStream, false);
+            await writer.WriteNonNullableValueAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = await reader.ReadValueAsync<Dictionary<string, int>>(serializationStream, false);
+            var actual = await reader.ReadNonNullableValueAsync<Dictionary<string, int>>(serializationStream);
             
             Assert.Equal(expected, actual);
             Assert.Equal(expected.GetType(), actual.GetType());
@@ -379,7 +381,7 @@
             var writer = CreateGraphBinaryWriter();
             var serializationStream = new MemoryStream();
 
-            await writer.WriteValueAsync(toSerialize, serializationStream, false);
+            await writer.WriteNonNullableValueAsync(toSerialize, serializationStream);
 
             var expected = new byte[]
                 {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
@@ -402,13 +404,12 @@
         }
         
         [Fact]
-        public async Task TestVertexWithNullLabel()
+        public async Task WriteNonNullableValueShouldThrowForNullValue()
         {
-            var expected = new Vertex(123, null);
             var writer = CreateGraphBinaryWriter();
             var serializationStream = new MemoryStream();
-            
-            await Assert.ThrowsAsync<IOException>(() => writer.WriteAsync(expected, serializationStream));
+
+            await Assert.ThrowsAsync<IOException>(() => writer.WriteNonNullableValueAsync(null!, serializationStream));
         }
         
         [Fact]
@@ -433,7 +434,7 @@
                 new Path(
                     new List<ISet<string>>
                         {new HashSet<string> {"a", "b"}, new HashSet<string> {"c", "d"}, new HashSet<string> {"e"}},
-                    new List<object> {1, 2, 3});
+                    new List<object?> {1, 2, 3});
             var writer = CreateGraphBinaryWriter();
             var reader = CreateGraphBinaryReader();
             var serializationStream = new MemoryStream();
@@ -536,6 +537,21 @@
         }
 
         [Fact]
+        public async Task TestDT()
+        {
+            var expected = DT.Minute;
+            var writer = CreateGraphBinaryWriter();
+            var reader = CreateGraphBinaryReader();
+            var serializationStream = new MemoryStream();
+
+            await writer.WriteAsync(expected, serializationStream);
+            serializationStream.Position = 0;
+            var actual = await reader.ReadAsync(serializationStream);
+
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
         public async Task TestMerge()
         {
             var expected = Merge.OnCreate;
@@ -668,9 +684,9 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (Bytecode) await reader.ReadAsync(serializationStream);
+            var actual = (Bytecode?) await reader.ReadAsync(serializationStream);
             
-            Assert.Equal(expected.SourceInstructions, actual.SourceInstructions);
+            Assert.Equal(expected.SourceInstructions, actual!.SourceInstructions);
             Assert.Equal(expected.StepInstructions, actual.StepInstructions);
         }
         
@@ -800,9 +816,9 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (StringBasedLambda) await reader.ReadAsync(serializationStream);
+            var actual = (StringBasedLambda?) await reader.ReadAsync(serializationStream);
             
-            Assert.Equal(expected.Language, actual.Language);
+            Assert.Equal(expected.Language, actual!.Language);
             Assert.Equal(expected.LambdaExpression, actual.LambdaExpression);
             Assert.Equal(expected.Arguments, actual.Arguments);
         }
@@ -817,9 +833,9 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (P) await reader.ReadAsync(serializationStream);
+            var actual = (P?) await reader.ReadAsync(serializationStream);
             
-            Assert.Equal(expected.OperatorName, actual.OperatorName);
+            Assert.Equal(expected.OperatorName, actual!.OperatorName);
             Assert.Equal(expected.Other, actual.Other);
             Assert.Equal((object[])expected.Value, (object[])actual.Value);
         }
@@ -834,9 +850,9 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (P) await reader.ReadAsync(serializationStream);
+            var actual = (P?) await reader.ReadAsync(serializationStream);
             
-            Assert.Equal(expected.OperatorName, actual.OperatorName);
+            Assert.Equal(expected.OperatorName, actual!.OperatorName);
             Assert.Equal(expected.Other, actual.Other);
             Assert.Equal(expected.Value, actual.Value);
         }
@@ -851,9 +867,9 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (P) await reader.ReadAsync(serializationStream);
+            var actual = (P?) await reader.ReadAsync(serializationStream);
             
-            Assert.Equal(expected.ToString(), actual.ToString());
+            Assert.Equal(expected.ToString(), actual!.ToString());
         }
         
         [Fact]
@@ -866,9 +882,9 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (TextP) await reader.ReadAsync(serializationStream);
+            var actual = (TextP?) await reader.ReadAsync(serializationStream);
             
-            Assert.Equal(expected.OperatorName, actual.OperatorName);
+            Assert.Equal(expected.OperatorName, actual!.OperatorName);
             Assert.Equal(expected.Other, actual.Other);
             Assert.Equal(expected.Value, actual.Value);
         }
@@ -883,9 +899,9 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (Traverser) await reader.ReadAsync(serializationStream);
+            var actual = (Traverser?) await reader.ReadAsync(serializationStream);
             
-            Assert.Equal(expected.Object, actual.Object);
+            Assert.Equal(expected.Object, actual!.Object);
             Assert.Equal(expected.Bulk, actual.Bulk);
         }
         
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePerson.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePerson.cs
index e474f30..40627c8 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePerson.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePerson.cs
@@ -36,14 +36,14 @@
         public string Name { get; }
         public DateTimeOffset BirthDate { get; }
 
-        public bool Equals(SamplePerson other)
+        public bool Equals(SamplePerson? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
             return Name == other.Name && BirthDate.Equals(other.BirthDate);
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializer.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializer.cs
index 4924808..172d167 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializer.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializer.cs
@@ -40,26 +40,38 @@
         {
             // Write {custom type info}, {value_flag} and {value}
             await stream.WriteAsync(_typeInfoBytes, cancellationToken).ConfigureAwait(false);
-            await WriteValueAsync(value, stream, writer, true, cancellationToken);
+            await WriteNullableValueAsync(value, stream, writer, cancellationToken);
         }
 
-        public override async Task WriteValueAsync(object value, Stream stream, GraphBinaryWriter writer, bool nullable,
+        public override async Task WriteNullableValueAsync(object value, Stream stream, GraphBinaryWriter writer,
             CancellationToken cancellationToken = default)
         {
             if (value == null)
             {
-                if (!nullable)
-                {
-                    throw new IOException("Unexpected null value when nullable is false");
-                }
-
                 await writer.WriteValueFlagNullAsync(stream, cancellationToken).ConfigureAwait(false);
                 return;
             }
 
-            if (nullable)
+            await writer.WriteValueFlagNoneAsync(stream, cancellationToken).ConfigureAwait(false);
+
+            var samplePerson = (SamplePerson)value;
+            var name = samplePerson.Name;
+            
+            // value_length = name_byte_length + name_bytes + long
+            await stream.WriteIntAsync(4 + Encoding.UTF8.GetBytes(name).Length + 8, cancellationToken)
+                .ConfigureAwait(false);
+
+            await writer.WriteNonNullableValueAsync(name, stream, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(samplePerson.BirthDate, stream, cancellationToken)
+                .ConfigureAwait(false);
+        }
+        
+        public override async Task WriteNonNullableValueAsync(object value, Stream stream, GraphBinaryWriter writer,
+            CancellationToken cancellationToken = default)
+        {
+            if (value == null)
             {
-                await writer.WriteValueFlagNoneAsync(stream, cancellationToken).ConfigureAwait(false);
+                throw new IOException("Unexpected null value when nullable is false");
             }
 
             var samplePerson = (SamplePerson)value;
@@ -69,12 +81,12 @@
             await stream.WriteIntAsync(4 + Encoding.UTF8.GetBytes(name).Length + 8, cancellationToken)
                 .ConfigureAwait(false);
 
-            await writer.WriteValueAsync(name, stream, false, cancellationToken).ConfigureAwait(false);
-            await writer.WriteValueAsync(samplePerson.BirthDate, stream, false, cancellationToken)
+            await writer.WriteNonNullableValueAsync(name, stream, cancellationToken).ConfigureAwait(false);
+            await writer.WriteNonNullableValueAsync(samplePerson.BirthDate, stream, cancellationToken)
                 .ConfigureAwait(false);
         }
 
-        public override async Task<object> ReadAsync(Stream stream, GraphBinaryReader reader,
+        public override async Task<object?> ReadAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
             // {custom type info}, {value_flag} and {value}
@@ -84,19 +96,16 @@
                 throw new IOException("{custom_type_info} should not be provided for this custom type");
             }
 
-            return await ReadValueAsync(stream, reader, true, cancellationToken).ConfigureAwait(false);
+            return await ReadNullableValueAsync(stream, reader, cancellationToken).ConfigureAwait(false);
         }
 
-        public override async Task<object> ReadValueAsync(Stream stream, GraphBinaryReader reader, bool nullable,
+        public override async Task<object?> ReadNullableValueAsync(Stream stream, GraphBinaryReader reader,
             CancellationToken cancellationToken = default)
         {
-            if (nullable)
+            var valueFlag = await stream.ReadByteAsync(cancellationToken).ConfigureAwait(false);
+            if ((valueFlag & 1) == 1)
             {
-                var valueFlag = await stream.ReadByteAsync(cancellationToken).ConfigureAwait(false);
-                if ((valueFlag & 1) == 1)
-                {
-                    return null;
-                }
+                return null;
             }
             
             // Read the byte length of the value bytes
@@ -112,10 +121,35 @@
                 throw new IOException($"Not enough readable bytes: {valueLength} (expected: {stream.Length})");
             }
 
-            var name = (string)await reader.ReadValueAsync<string>(stream, false, cancellationToken)
+            var name = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
                 .ConfigureAwait(false);
             var birthDate =
-                (DateTimeOffset)await reader.ReadValueAsync<DateTimeOffset>(stream, false, cancellationToken)
+                (DateTimeOffset)await reader.ReadNonNullableValueAsync<DateTimeOffset>(stream, cancellationToken)
+                    .ConfigureAwait(false);
+
+            return new SamplePerson(name, birthDate);
+        }
+        
+        public override async Task<object> ReadNonNullableValueAsync(Stream stream, GraphBinaryReader reader,
+            CancellationToken cancellationToken = default)
+        {
+            // Read the byte length of the value bytes
+            var valueLength = await stream.ReadIntAsync(cancellationToken).ConfigureAwait(false);
+
+            if (valueLength <= 0)
+            {
+                throw new IOException($"Unexpected value length: {valueLength}");
+            }
+
+            if (valueLength > stream.Length)
+            {
+                throw new IOException($"Not enough readable bytes: {valueLength} (expected: {stream.Length})");
+            }
+
+            var name = (string)await reader.ReadNonNullableValueAsync<string>(stream, cancellationToken)
+                .ConfigureAwait(false);
+            var birthDate =
+                (DateTimeOffset)await reader.ReadNonNullableValueAsync<DateTimeOffset>(stream, cancellationToken)
                     .ConfigureAwait(false);
 
             return new SamplePerson(name, birthDate);
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializerTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializerTests.cs
index 06ccf25..cf7425d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializerTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphBinary/Types/Sample/SamplePersonSerializerTests.cs
@@ -43,15 +43,13 @@
             
             await writer.WriteAsync(expected, serializationStream);
             serializationStream.Position = 0;
-            var actual = (SamplePerson) await reader.ReadAsync(serializationStream);
+            var actual = (SamplePerson?) await reader.ReadAsync(serializationStream);
             
             Assert.Equal(expected, actual);
         }
-
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task ReadValueAndWriteValueShouldBeSymmetric(bool nullable)
+        
+        [Fact]
+        public async Task ReadNullableValueAndWriteNullableValueShouldBeSymmetric()
         {
             var expected = new SamplePerson("Olivia", new DateTimeOffset(2010, 4, 29, 5, 30, 3, TimeSpan.FromHours(1)));
             var registry = TypeSerializerRegistry.Build()
@@ -60,9 +58,27 @@
             var reader = CreateGraphBinaryReader(registry);
             var serializationStream = new MemoryStream();
 
-            await writer.WriteValueAsync(expected, serializationStream, nullable).ConfigureAwait(false);
+            await writer.WriteNullableValueAsync(expected, serializationStream).ConfigureAwait(false);
             serializationStream.Position = 0;
-            var actual = (SamplePerson)await reader.ReadValueAsync<SamplePerson>(serializationStream, nullable)
+            var actual = (SamplePerson?)await reader.ReadNullableValueAsync<SamplePerson>(serializationStream)
+                .ConfigureAwait(false);
+            
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task ReadNonNullableValueAndWriteNonNullableValueShouldBeSymmetric()
+        {
+            var expected = new SamplePerson("Olivia", new DateTimeOffset(2010, 4, 29, 5, 30, 3, TimeSpan.FromHours(1)));
+            var registry = TypeSerializerRegistry.Build()
+                .AddCustomType(typeof(SamplePerson), new SamplePersonSerializer()).Create();
+            var writer = CreateGraphBinaryWriter(registry);
+            var reader = CreateGraphBinaryReader(registry);
+            var serializationStream = new MemoryStream();
+
+            await writer.WriteNonNullableValueAsync(expected, serializationStream).ConfigureAwait(false);
+            serializationStream.Position = 0;
+            var actual = (SamplePerson)await reader.ReadNonNullableValueAsync<SamplePerson>(serializationStream)
                 .ConfigureAwait(false);
             
             Assert.Equal(expected, actual);
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/BytecodeGraphSONSerializerTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/BytecodeGraphSONSerializerTests.cs
index ad78334..da6a6a7 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/BytecodeGraphSONSerializerTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/BytecodeGraphSONSerializerTests.cs
@@ -163,5 +163,7 @@
             Bytecode = bytecode;
             IsAnonymous = true;
         }
+
+        public override Bytecode Bytecode { get; }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSON3MessageSerializerTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSON3MessageSerializerTests.cs
index df75dc2..d1b593b 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSON3MessageSerializerTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSON3MessageSerializerTests.cs
@@ -38,7 +38,7 @@
         var serializer = CreateMessageSerializer();
 
         await Assert.ThrowsAsync<OperationCanceledException>(async () =>
-            await serializer.SerializeMessageAsync(RequestMessage.Build(default).Create(),
+            await serializer.SerializeMessageAsync(RequestMessage.Build(string.Empty).Create(),
                 new CancellationToken(true)));
     }
     
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
index 9c4c211..591e3b4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
@@ -74,7 +74,7 @@
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSON);
             var deserializedValue = reader.ToObject(jsonElement);
         
-            Assert.Equal("test", deserializedValue.Value);
+            Assert.Equal("test", deserializedValue!.Value);
         }
         
         [Fact]
@@ -118,7 +118,7 @@
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(serializedDict);
             var deserializedValue = reader.ToObject(jsonElement);
         
-            var expectedDict = new Dictionary<string, dynamic>
+            var expectedDict = new Dictionary<string, dynamic?>
             {
                 {"age", new List<object> {29}},
                 {"name", new List<object> {"marko"}},
@@ -136,7 +136,7 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            Edge readEdge = reader.ToObject(jsonElement);
+            Edge readEdge = reader.ToObject(jsonElement)!;
         
             Assert.Equal((long) 17, readEdge.Id);
             Assert.Equal("knows", readEdge.Label);
@@ -286,7 +286,7 @@
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(serializedValue);
             var deserializedValue = reader.ToObject(jsonElement);
         
-            Assert.Equal(new List<object> {5, 6, null}, deserializedValue);
+            Assert.Equal(new List<object?> {5, 6, null}, deserializedValue);
         }
         
         [Theory, MemberData(nameof(Versions))]
@@ -296,11 +296,11 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            T readT = reader.ToObject(jsonElement);
+            T readT = reader.ToObject(jsonElement)!;
         
             Assert.Equal(T.Label, readT);
         }
-        
+
         [Theory, MemberData(nameof(Versions))]
         public void ShouldDeserializeDirection(int version)
         {
@@ -314,6 +314,18 @@
         }
 
         [Theory, MemberData(nameof(Versions))]
+        public void ShouldDeserializeDT(int version)
+        {
+            const string serializedValue = "{\"@type\":\"g:DT\",\"@value\":\"minute\"}";
+            var reader = CreateStandardGraphSONReader(version);
+
+            var jsonElement = JsonSerializer.Deserialize<JsonElement>(serializedValue);
+            var deserializedValue = reader.ToObject(jsonElement);
+
+            Assert.Equal(DT.Minute, deserializedValue);
+        }
+
+        [Theory, MemberData(nameof(Versions))]
         public void ShouldDeserializeMerge(int version)
         {
             const string serializedValue = "{\"@type\":\"g:Merge\",\"@value\":\"onMatch\"}";
@@ -333,7 +345,7 @@
             var reader = CreateStandardGraphSONReader(2);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            Path readPath = reader.ToObject(jsonElement);
+            Path readPath = reader.ToObject(jsonElement)!;
         
             Assert.Equal("path[v[1], v[3], lop]", readPath.ToString());
             Assert.Equal(new Vertex(1), readPath[0]);
@@ -351,7 +363,7 @@
             var reader = CreateStandardGraphSONReader(3);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            Path readPath = reader.ToObject(jsonElement);
+            Path readPath = reader.ToObject(jsonElement)!;
         
             Assert.Equal("path[v[5]]", readPath.ToString());
             Assert.Equal(new Vertex(5L), readPath[0]);
@@ -370,13 +382,13 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            Property readProperty = reader.ToObject(jsonElement);
+            Property readProperty = reader.ToObject(jsonElement)!;
         
             Assert.Equal("aKey", readProperty.Key);
             Assert.Equal((long) 17, readProperty.Value);
-            Assert.Equal(typeof(Edge), readProperty.Element.GetType());
+            Assert.Equal(typeof(Edge), readProperty.Element!.GetType());
             var edge = readProperty.Element as Edge;
-            Assert.Equal((long) 122, edge.Id);
+            Assert.Equal((long) 122, edge!.Id);
             Assert.Equal("knows", edge.Label);
             Assert.Equal("x", edge.InV.Id);
             Assert.Equal("y", edge.OutV.Id);
@@ -415,7 +427,7 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            VertexProperty readVertexProperty = reader.ToObject(jsonElement);
+            VertexProperty readVertexProperty = reader.ToObject(jsonElement)!;
         
             Assert.Equal("anId", readVertexProperty.Id);
             Assert.Equal("aKey", readVertexProperty.Label);
@@ -431,7 +443,7 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            VertexProperty readVertexProperty = reader.ToObject(jsonElement);
+            VertexProperty readVertexProperty = reader.ToObject(jsonElement)!;
         
             Assert.Equal(1, readVertexProperty.Id);
             Assert.Equal("name", readVertexProperty.Label);
@@ -460,7 +472,7 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            Vertex deserializedValue = reader.ToObject(jsonElement);
+            Vertex deserializedValue = reader.ToObject(jsonElement)!;
         
             Assert.Equal("person", deserializedValue.Label);
         }
@@ -473,11 +485,11 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(graphSon);
-            Vertex readVertex = reader.ToObject(jsonElement);
+            Vertex readVertex = reader.ToObject(jsonElement)!;
         
             Assert.Equal(new Vertex(1), readVertex);
             Assert.Equal("person", readVertex.Label);
-            Assert.Equal(typeof(int), readVertex.Id.GetType());
+            Assert.Equal(typeof(int), readVertex.Id!.GetType());
         }
         
         [Theory, MemberData(nameof(VersionsSupportingCollections))]
@@ -576,7 +588,7 @@
             var reader = CreateStandardGraphSONReader(version);
         
             var jsonElement = JsonSerializer.Deserialize<JsonElement>(json);
-            Traverser deserializedValue = reader.ToObject(jsonElement);
+            Traverser deserializedValue = reader.ToObject(jsonElement)!;
             
             Assert.Equal(10, deserializedValue.Bulk);
             Assert.Equal(1, deserializedValue.Object);
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
index 61c9740..7b57bc4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
@@ -277,6 +277,17 @@
         }
 
         [Theory, MemberData(nameof(Versions))]
+        public void ShouldSerializeDT(int version)
+        {
+            var writer = CreateGraphSONWriter(version);
+
+            var serializedEnum = writer.WriteObject(DT.Minute);
+
+            var expectedGraphSON = "{\"@type\":\"g:DT\",\"@value\":\"minute\"}";
+            Assert.Equal(expectedGraphSON, serializedEnum);
+        }
+
+        [Theory, MemberData(nameof(Versions))]
         public void ShouldSerializeMerge(int version)
         {
             var writer = CreateGraphSONWriter(version);
@@ -303,7 +314,7 @@
         public void ShouldSerializeGList(int version)
         {
             var writer = CreateGraphSONWriter(version);
-            var list = new List<object> {5, 6, null};
+            var list = new List<object?> {5, 6, null};
 
             var serializedGraphSON = writer.WriteObject(list);
 
@@ -560,7 +571,7 @@
 
     internal class TestGraphSONSerializer : IGraphSONSerializer
     {
-        public string TestNamespace { get; set; }
+        public string? TestNamespace { get; set; }
 
         public Dictionary<string, dynamic> Dictify(dynamic objectData, GraphSONWriter writer)
         {
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/TestClass.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/TestClass.cs
index 13d1bca..1fba943 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/TestClass.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/TestClass.cs
@@ -25,6 +25,6 @@
 {
     internal class TestClass
     {
-        public dynamic Value { get; set; }
+        public dynamic? Value { get; set; }
     }
 }
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/PathTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/PathTests.cs
index 6df92ba..a996df1 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/PathTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/PathTests.cs
@@ -40,7 +40,7 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
 
             var path = new Path(labels, objects);
 
@@ -57,7 +57,7 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var path = new Path(labels, new List<object>());
+            var path = new Path(labels, new List<object?>());
 
             var containsKey = path.ContainsKey("c");
 
@@ -73,7 +73,7 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var path = new Path(labels, new List<object>());
+            var path = new Path(labels, new List<object?>());
 
             var containsKey = path.ContainsKey("z");
 
@@ -83,7 +83,7 @@
         [Fact]
         public void ShouldReturnCountOfObjectsForCountProperty()
         {
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(new List<ISet<string>>(), objects);
 
             var count = path.Count;
@@ -94,7 +94,7 @@
         [Fact]
         public void ShouldEnumeratorObjectsIntoListWhenToListIsCalled()
         {
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(new List<ISet<string>>(), objects);
 
             var enumeratedObj = path.ToList();
@@ -112,7 +112,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> {1, new Vertex(1), "hello"});
+                    }, new List<object?> {1, new Vertex(1), "hello"});
             var secondPath =
                 new Path(
                     new List<ISet<string>>
@@ -120,7 +120,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> {1, new Vertex(1), "hello"});
+                    }, new List<object?> {1, new Vertex(1), "hello"});
 
             var equals = firstPath.Equals(secondPath);
 
@@ -137,7 +137,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> {1, new Vertex(1), "hello"});
+                    }, new List<object?> {1, new Vertex(1), "hello"});
             var secondPath =
                 new Path(
                     new List<ISet<string>>
@@ -145,7 +145,7 @@
                         new HashSet<string> {"a"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> {1, new Vertex(1), "hello"});
+                    }, new List<object?> {1, new Vertex(1), "hello"});
 
             var equals = firstPath.Equals(secondPath);
 
@@ -162,7 +162,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> {1, new Vertex(1), "hello"});
+                    }, new List<object?> {1, new Vertex(1), "hello"});
             var secondPath =
                 new Path(
                     new List<ISet<string>>
@@ -170,7 +170,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> {3, new Vertex(1), "hello"});
+                    }, new List<object?> {3, new Vertex(1), "hello"});
 
             var equals = firstPath.Equals(secondPath);
 
@@ -187,7 +187,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 1, new Vertex(1), "hello" });
+                    }, new List<object?> { 1, new Vertex(1), "hello" });
             object secondPath =
                 new Path(
                     new List<ISet<string>>
@@ -195,7 +195,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 1, new Vertex(1), "hello" });
+                    }, new List<object?> { 1, new Vertex(1), "hello" });
 
             var equals = firstPath.Equals(secondPath);
 
@@ -212,7 +212,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 1, new Vertex(1), "hello" });
+                    }, new List<object?> { 1, new Vertex(1), "hello" });
             object secondPath =
                 new Path(
                     new List<ISet<string>>
@@ -220,7 +220,7 @@
                         new HashSet<string> {"a"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 1, new Vertex(1), "hello" });
+                    }, new List<object?> { 1, new Vertex(1), "hello" });
 
             var equals = firstPath.Equals(secondPath);
 
@@ -237,7 +237,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 1, new Vertex(1), "hello" });
+                    }, new List<object?> { 1, new Vertex(1), "hello" });
             object secondPath =
                 new Path(
                     new List<ISet<string>>
@@ -245,7 +245,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 3, new Vertex(1), "hello" });
+                    }, new List<object?> { 3, new Vertex(1), "hello" });
 
             var equals = firstPath.Equals(secondPath);
 
@@ -255,7 +255,7 @@
         [Fact]
         public void ShouldReturnFalseForEqualsWhereOtherIsNull()
         {
-            var path = new Path(new List<ISet<string>> {new HashSet<string> {"a", "b"},}, new List<object> {1});
+            var path = new Path(new List<ISet<string>> { new HashSet<string> { "a", "b" }, }, new List<object?> { 1 });
 
             var equals = path.Equals(null);
 
@@ -272,7 +272,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 1, new Vertex(1), "hello" });
+                    }, new List<object?> { 1, new Vertex(1), "hello" });
             var secondPath =
                 new Path(
                     new List<ISet<string>>
@@ -280,7 +280,7 @@
                         new HashSet<string> {"a", "b"},
                         new HashSet<string> {"c", "b"},
                         new HashSet<string>()
-                    }, new List<object> { 1, new Vertex(1), "hello" });
+                    }, new List<object?> { 1, new Vertex(1), "hello" });
 
             var firstHashCode = firstPath.GetHashCode();
             var secondHashCode = secondPath.GetHashCode();
@@ -291,7 +291,7 @@
         [Fact]
         public void ShouldThrowWhenInvalidIndexIsAccessed()
         {
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(new List<ISet<string>>(), objects);
 
             Assert.Throws<ArgumentOutOfRangeException>(() => path[3]);
@@ -300,7 +300,7 @@
         [Fact]
         public void ShouldReturnObjectsByTheirIndex()
         {
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(new List<ISet<string>>(), objects);
 
             Assert.Equal(1, path[0]);
@@ -317,7 +317,7 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(labels, objects);
 
             var bObjects = path["b"];
@@ -334,7 +334,7 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(labels, objects);
 
             Assert.Equal(1, path["a"]);
@@ -345,7 +345,7 @@
         [Fact]
         public void ShouldThrowWhenUnknownKeyIsAccessed()
         {
-            var path = new Path(new List<ISet<string>>(), new List<object>());
+            var path = new Path(new List<ISet<string>>(), new List<object?>());
 
             Assert.Throws<KeyNotFoundException>(() => path["unknownKey"]);
         }
@@ -359,7 +359,7 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(labels, objects);
 
             var pathStr = path.ToString();
@@ -376,10 +376,10 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(labels, objects);
 
-            var success = path.TryGetValue("b", out object actualObj);
+            var success = path.TryGetValue("b", out object? actualObj);
 
             Assert.True(success);
             Assert.Equal(new List<object> {1, new Vertex(1)}, actualObj);
@@ -394,10 +394,10 @@
                 new HashSet<string> {"c", "b"},
                 new HashSet<string>()
             };
-            var objects = new List<object> {1, new Vertex(1), "hello"};
+            var objects = new List<object?> {1, new Vertex(1), "hello"};
             var path = new Path(labels, objects);
 
-            var success = path.TryGetValue("b", out object actualObj);
+            var success = path.TryGetValue("b", out var actualObj);
 
             Assert.True(success);
             Assert.Equal(new Vertex(1), actualObj);
@@ -406,9 +406,9 @@
         [Fact]
         public void ShouldReturnFalseForTryGetWhenUnknownKeyIsProvided()
         {
-            var path = new Path(new List<ISet<string>>(), new List<object>());
+            var path = new Path(new List<ISet<string>>(), new List<object?>());
 
-            var success = path.TryGetValue("unknownKey", out object _);
+            var success = path.TryGetValue("unknownKey", out _);
 
             Assert.False(success);
         }
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index d332a93..cc12323 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-dotnet</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-dotnet-tests</artifactId>
     <name>Apache TinkerPop :: Gremlin.Net - Tests</name>
@@ -166,18 +166,13 @@
                                 <version>${project.version}</version>
                             </dependency>
                             <dependency>
-                                <groupId>org.apache.tinkerpop</groupId>
-                                <artifactId>neo4j-gremlin</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
                                 <groupId>ch.qos.logback</groupId>
                                 <artifactId>logback-classic</artifactId>
                                 <version>${logback.version}</version>
                                 <scope>runtime</scope>
                             </dependency>
                             <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
+                                <groupId>org.apache.groovy</groupId>
                                 <artifactId>groovy-all</artifactId>
                                 <version>${groovy.version}</version>
                                 <type>pom</type>
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 1ee479c..c5ded4b 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-driver</artifactId>
     <name>Apache TinkerPop :: Gremlin Driver</name>
@@ -32,6 +32,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
             <version>${netty.version}</version>
@@ -60,6 +65,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-socket-server</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -70,21 +81,17 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>4.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>io.github.hakky54</groupId>
             <artifactId>logcaptor</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
diff --git a/gremlin-driver/src/main/java/examples/Connections.java b/gremlin-driver/src/main/java/examples/Connections.java
index e4aab62..458d5c8 100644
--- a/gremlin-driver/src/main/java/examples/Connections.java
+++ b/gremlin-driver/src/main/java/examples/Connections.java
@@ -22,15 +22,15 @@
 import org.apache.tinkerpop.gremlin.driver.Channelizer;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
 import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
 import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
 
diff --git a/gremlin-driver/src/main/java/examples/pom.xml b/gremlin-driver/src/main/java/examples/pom.xml
index fd00694..85417ef 100644
--- a/gremlin-driver/src/main/java/examples/pom.xml
+++ b/gremlin-driver/src/main/java/examples/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>org.apache.tinkerpop</groupId>
     <artifactId>run-examples</artifactId>
-    <version>3.6.5</version>
+    <version>3.7.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 415edde..7ce5c40 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -19,17 +19,18 @@
 package org.apache.tinkerpop.gremlin.driver;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
 import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLException;
 import java.net.ConnectException;
@@ -363,6 +364,7 @@
         options.getOverrideRequestId().ifPresent(request::overrideRequestId);
         options.getUserAgent().ifPresent(userAgent -> request.addArg(Tokens.ARGS_USER_AGENT, userAgent));
         options.getLanguage().ifPresent(lang -> request.addArg(Tokens.ARGS_LANGUAGE, lang));
+        options.getMaterializeProperties().ifPresent(mp -> request.addArg(Tokens.ARGS_MATERIALIZE_PROPERTIES, mp));
 
         return submitAsync(request.create());
     }
@@ -660,6 +662,7 @@
                 options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_EVAL_TIMEOUT, timeout));
                 options.getOverrideRequestId().ifPresent(request::overrideRequestId);
                 options.getUserAgent().ifPresent(userAgent -> request.add(Tokens.ARGS_USER_AGENT, userAgent));
+                options.getMaterializeProperties().ifPresent(mp -> request.addArg(Tokens.ARGS_MATERIALIZE_PROPERTIES, mp));
 
                 return submitAsync(request.create());
             } catch (RuntimeException re) {
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 702ecb0..870bb8b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -27,8 +27,10 @@
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import io.netty.util.concurrent.Future;
 import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.nio.NioEventLoopGroup;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
@@ -1035,7 +1037,7 @@
 
         public Cluster create() {
             if (addresses.size() == 0) addContactPoint("localhost");
-            if (null == serializer) serializer = Serializers.GRAPHBINARY_V1D0.simpleInstance();
+            if (null == serializer) serializer = Serializers.GRAPHBINARY_V1.simpleInstance();
             return new Cluster(this);
         }
     }
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 056c53c..db79fe0 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -18,10 +18,11 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
index 21bce9c..ee31353 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
@@ -21,8 +21,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.util.TimeUtil;
 
 import java.util.ArrayList;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index cb11c4e..c76a20e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -21,15 +21,16 @@
 import io.netty.util.AttributeMap;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
 import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.java
index c6ad4bd..4455a4e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java
deleted file mode 100644
index bb8423b..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ServiceLoader;
-
-/**
- * Serializes data to and from Gremlin Server.  Typically, the object being serialized or deserialized will be an item
- * from an {@link Iterator} as returned from the {@code ScriptEngine} or an incoming {@link RequestMessage}.
- * {@link MessageSerializer} instances are instantiated to a cache via {@link ServiceLoader} and indexed based on
- * the mime types they support.  If a mime type is supported more than once, the first {@link MessageSerializer}
- * instance loaded for that mime type is assigned. If a mime type is not found the server default is chosen. The
- * default may change from version to version so it is best to not rely on it when developing applications and to
- * always be explicit in specifying the type you wish to bind to.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface MessageSerializer<M> {
-
-    static final Logger logger = LoggerFactory.getLogger(MessageSerializer.class);
-
-    /**
-     * Gets the "mapper" that performs the underlying serialization work.
-     */
-    M getMapper();
-
-    /**
-     * Serialize a {@link ResponseMessage} to a Netty {@code ByteBuf}.
-     *
-     * @param responseMessage The response message to serialize to bytes.
-     * @param allocator       The Netty allocator for the {@code ByteBuf} to return back.
-     */
-    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
-
-    /**
-     * Serialize a {@link ResponseMessage} to a Netty {@code ByteBuf}.
-     *
-     * @param requestMessage The request message to serialize to bytes.
-     * @param allocator      The Netty allocator for the {@code ByteBuf} to return back.
-     */
-    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException;
-
-    /**
-     * Deserialize a Netty {@code ByteBuf} into a {@link RequestMessage}.
-     */
-    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException;
-
-    /**
-     * Deserialize a Netty {@code ByteBuf} into a {@link ResponseMessage}.
-     */
-    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException;
-
-    /**
-     * The list of mime types that the serializer supports. They should be ordered in preferred ordered where the
-     * greatest fidelity match is first.
-     */
-    public String[] mimeTypesSupported();
-
-    /**
-     * Configure the serializer with mapper settings as required.  The default implementation does not perform any
-     * function and it is up to the interface implementation to determine how the configuration will be executed
-     * and what its requirements are.  An implementation may choose to use the list of available graphs to help
-     * initialize a serializer.  The implementation should account for the possibility of a null value being
-     * provided for that parameter.
-     */
-    public default void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
index cd5c2b6..f439157 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.OptionsStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
@@ -29,10 +29,11 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_BATCH_SIZE;
-import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_EVAL_TIMEOUT;
-import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_USER_AGENT;
-import static org.apache.tinkerpop.gremlin.driver.Tokens.REQUEST_ID;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_BATCH_SIZE;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_MATERIALIZE_PROPERTIES;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_USER_AGENT;
+import static org.apache.tinkerpop.gremlin.util.Tokens.REQUEST_ID;
 
 /**
  * Options that can be supplied on a per request basis.
@@ -50,6 +51,7 @@
     private final UUID overrideRequestId;
     private final String userAgent;
     private final String language;
+    private final String materializeProperties;
 
     private RequestOptions(final Builder builder) {
         this.aliases = builder.aliases;
@@ -59,6 +61,7 @@
         this.overrideRequestId = builder.overrideRequestId;
         this.userAgent = builder.userAgent;
         this.language = builder.language;
+        this.materializeProperties = builder.materializeProperties;
     }
 
     public Optional<UUID> getOverrideRequestId() {
@@ -89,6 +92,8 @@
         return Optional.ofNullable(language);
     }
 
+    public Optional<String> getMaterializeProperties() { return Optional.ofNullable(materializeProperties); }
+
     public static Builder build() {
         return new Builder();
     }
@@ -107,6 +112,8 @@
                 builder.batchSize(((Number) options.get(ARGS_BATCH_SIZE)).intValue());
             if (options.containsKey(ARGS_USER_AGENT))
                 builder.userAgent((String) options.get(ARGS_USER_AGENT));
+            if (options.containsKey(ARGS_MATERIALIZE_PROPERTIES))
+                builder.materializeProperties((String) options.get(ARGS_MATERIALIZE_PROPERTIES));
         }
         return builder.create();
     }
@@ -118,6 +125,7 @@
         private Long timeout = null;
         private UUID overrideRequestId = null;
         private String userAgent = null;
+        private String materializeProperties = null;
         private String language = null;
         private boolean maintainStateAfterException = false;
 
@@ -186,6 +194,14 @@
             return this;
         }
 
+        /**
+         * Sets the materializeProperties identifier to be sent on the request.
+         */
+        public Builder materializeProperties(final String materializeProperties) {
+            this.materializeProperties = materializeProperties;
+            return this;
+        }
+
         public RequestOptions create() {
             return new RequestOptions(this);
         }
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
index 58793e8..4c34aad 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
-import org.apache.tinkerpop.gremlin.driver.message.ResponseResult;
+import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Element;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
index 01a900b..4d60b8d 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
index bebae85..0845dbf 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
@@ -19,7 +19,8 @@
 package org.apache.tinkerpop.gremlin.driver;
 
 import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.TypeDescription;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
deleted file mode 100644
index ba9b6fd..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-
-/**
- * String constants used in gremlin-driver and gremlin-server.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class Tokens {
-    private Tokens() {}
-
-    public static final String OPS_AUTHENTICATION = "authentication";
-    public static final String OPS_BYTECODE = "bytecode";
-    public static final String OPS_EVAL = "eval";
-    public static final String OPS_INVALID = "invalid";
-    public static final String OPS_CLOSE = "close";
-
-    /**
-     * The key for the unique identifier of the request.
-     */
-    public static final String REQUEST_ID = "requestId";
-
-    /**
-     * Argument name that allows definition of the number of iterations each {@link ResponseMessage} should contain -
-     * overrides the @{code resultIterationBatchSize} server setting.
-     */
-    public static final String ARGS_BATCH_SIZE = "batchSize";
-
-    /**
-     * Argument name that allows to provide a map of key/value pairs to apply as variables in the context of
-     * the Gremlin request sent to the server.
-     */
-    public static final String ARGS_BINDINGS = "bindings";
-
-    /**
-     * Argument name that allows definition of alias names for {@link Graph} and {@link TraversalSource} objects on
-     * the remote system.
-     */
-    public static final String ARGS_ALIASES = "aliases";
-    public static final String ARGS_FORCE = "force";
-
-    /**
-     * Argument name that corresponds to the Gremlin to evaluate.
-     */
-    public static final String ARGS_GREMLIN = "gremlin";
-
-    /**
-     * Argument name that allows definition of the flavor of Gremlin used (e.g. gremlin-groovy) to process the request.
-     */
-    public static final String ARGS_LANGUAGE = "language";
-
-    /**
-     * Argument name that allows the override of the server setting that determines the maximum time to wait for a
-     * request to execute on the server.
-     */
-    public static final String ARGS_EVAL_TIMEOUT = "evaluationTimeout";
-    public static final String ARGS_HOST = "host";
-    public static final String ARGS_SESSION = "session";
-    public static final String ARGS_MANAGE_TRANSACTION = "manageTransaction";
-
-    /**
-     * Argument name that is intended to be used with a session which when its value is {@code true} makes it so
-     * that a processing error or request timeout will not close the session, but leave it to continue processing in
-     * whatever state it may hold. This argument only applies to the {@code UnifiedChannelizer}.
-     */
-    public static final String ARGS_MAINTAIN_STATE_AFTER_EXCEPTION = "maintainStateAfterException";
-    public static final String ARGS_SASL = "sasl";
-    public static final String ARGS_SASL_MECHANISM = "saslMechanism";
-
-    /**
-     * A value that is a custom string that the user can pass to a server that might accept it for purpose of
-     * identifying the kind of client it came from.
-     */
-    public static final String ARGS_USER_AGENT = "userAgent";
-
-    public static final String VAL_TRAVERSAL_SOURCE_ALIAS = "g";
-
-    /**
-     * The value of this key holds a string representation of the data held by a {@link Failure} as produced by
-     * {@link Failure#format()}.
-     */
-    public static final String STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE = "failStepMessage";
-
-    /**
-     * Refers to the hierarchy of exception names for a particular exception thrown on the server.
-     */
-    public static final String STATUS_ATTRIBUTE_EXCEPTIONS = "exceptions";
-
-    /**
-     * Refers to the stacktrace for an exception thrown on the server
-     */
-    public static final String STATUS_ATTRIBUTE_STACK_TRACE = "stackTrace";
-
-    /**
-     * A {@link ResultSet#statusAttributes()} key for user-facing warnings.
-     * <p>
-     * Implementations that set this key should consider using one of
-     * these two recommended value types:
-     * <ul>
-     *     <li>A {@code List} implementation containing
-     *     references for which {@code String#valueOf(Object)} produces
-     *     a meaningful return value.  For example, a list of strings.</li>
-     *     <li>Otherwise, any single non-list object for which
-     *     {@code String#valueOf(Object)} produces a meaningful return value.
-     *     For example, a string.</li>
-     * </ul>
-     */
-    public static final String STATUS_ATTRIBUTE_WARNINGS = "warnings";
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java
index a960d44..fc4b5d5 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/exception/ResponseException.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver.exception;
 
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
index 606549a..67f7e3d 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
@@ -27,13 +27,13 @@
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpVersion;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.UserAgent;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
 
 import java.util.List;
 import java.util.function.UnaryOperator;
@@ -65,8 +65,8 @@
         final String mimeType = serializer.mimeTypesSupported()[0];
         // only GraphSON3 and GraphBinary recommended for serialization of Bytecode requests
         if (requestMessage.getArg("gremlin") instanceof Bytecode &&
-                !mimeType.equals(SerTokens.MIME_GRAPHSON_V3D0) &&
-                !mimeType.equals(SerTokens.MIME_GRAPHBINARY_V1D0)) {
+                !mimeType.equals(SerTokens.MIME_GRAPHSON_V3) &&
+                !mimeType.equals(SerTokens.MIME_GRAPHBINARY_V1)) {
             throw new ResponseException(ResponseStatusCode.REQUEST_ERROR_SERIALIZATION, String.format(
                     "An error occurred during serialization of this request [%s] - it could not be sent to the server - Reason: only GraphSON3 and GraphBinary recommended for serialization of Bytecode requests, but used %s",
                     requestMessage, serializer.getClass().getName()));
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java
index d6d7cce..9b46db2 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinResponseDecoder.java
@@ -24,11 +24,11 @@
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
 import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
 
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
index 8bb8173..05226f7 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
@@ -18,11 +18,11 @@
  */
 package org.apache.tinkerpop.gremlin.driver.handler;
 
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
index 2e93061..3ef1eed 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tinkerpop.gremlin.driver.handler;
 
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java
deleted file mode 100644
index 21fa12c..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.message;
-
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
-/**
- * The model for a request message sent to the server.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class RequestMessage {
-    /**
-     * An "invalid" message.  Used internally only.
-     */
-    public static final RequestMessage INVALID = new RequestMessage(Tokens.OPS_INVALID);
-
-    private final UUID requestId;
-    private final String op;
-    private final String processor;
-    private final Map<String, Object> args;
-
-    private RequestMessage(final UUID requestId, final String op, final String processor, final Map<String, Object> args) {
-        this.requestId = requestId;
-        this.op = op;
-        this.processor = processor;
-        this.args = Optional.ofNullable(args).orElse(new HashMap<>());
-    }
-
-    /**
-     * Empty constructor for serialization.
-     */
-    private RequestMessage() {
-        this(null);
-    }
-
-    private RequestMessage(final String op) {
-        this(null, op, null, null);
-    }
-
-    /**
-     * The id of the current request and is used to track the message within Gremlin Server and in its response.  This
-     * value should be unique per request made.
-     */
-    public UUID getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * The operation or command to perform as defined by a particular Processor.
-     */
-    public String getOp() {
-        return op;
-    }
-
-    /**
-     * The name of the Processor that should handle the {@link #op}.  Defaults to the standard processor if
-     * not specified.
-     */
-    public String getProcessor() {
-        return processor;
-    }
-
-    /**
-     * A {@link Map} of arguments that are supplied to the {@link #op}.  Each {@link #op} accepts different argument,
-     * so consult the documentation for a particular one to understand what is expected.
-     */
-    public Map<String, Object> getArgs() {
-        return args;
-    }
-
-    public <T> Optional<T> optionalArgs(final String key) {
-        final Object o = args.get(key);
-        return o == null ? Optional.empty() : Optional.of((T) o);
-    }
-
-    public <T> T getArg(final String key) {
-        return (T) args.get(key);
-    }
-
-    public <T> T getArgOrDefault(final String key, final T def) {
-        return (T) optionalArgs(key).orElse(def);
-    }
-
-    public static Builder from(final RequestMessage msg) {
-        final Builder builder = build(msg.op)
-                .overrideRequestId(msg.requestId)
-                .processor(msg.processor);
-        msg.args.forEach(builder::addArg);
-        return builder;
-    }
-
-    public static Builder build(final String op) {
-        return new Builder(op);
-    }
-
-    /**
-     * Builder class for {@link RequestMessage}.
-     */
-    public static final class Builder {
-        public static final String OP_PROCESSOR_NAME = "";
-        private UUID requestId;
-        private String op;
-        private String processor = OP_PROCESSOR_NAME;
-        private Map<String, Object> args = new HashMap<>();
-
-        private Builder(final String op) {
-            this.op = op;
-        }
-
-        /**
-         * If this value is not set in the builder then the {@link RequestMessage#processor} defaults to
-         * the standard op processor (empty string).
-         *
-         * @param processor the name of the processor
-         */
-        public Builder processor(final String processor) {
-            this.processor = processor;
-            return this;
-        }
-
-        /**
-         * Override the request identifier with a specified one, otherwise the {@link Builder} will randomly generate
-         * a {@link UUID}.
-         */
-        public Builder overrideRequestId(final UUID requestId) {
-            this.requestId = requestId;
-            return this;
-        }
-
-        public Builder addArg(final String key, final Object val) {
-            args.put(key, val);
-            return this;
-        }
-
-        public Builder add(final Object... keyValues) {
-            args.putAll(ElementHelper.asMap(keyValues));
-            return this;
-        }
-
-        /**
-         * Create the request message given the settings provided to the {@link Builder}.
-         */
-        public RequestMessage create() {
-            return new RequestMessage(null == requestId ? UUID.randomUUID() : requestId, op, processor, args);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "RequestMessage{" +
-                ", requestId=" + requestId +
-                ", op='" + op + '\'' +
-                ", processor='" + processor + '\'' +
-                ", args=" + args +
-                '}';
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java
deleted file mode 100644
index 19c4d98..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.message;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class ResponseMessage {
-
-    /**
-     * The current request that generated this response.
-     */
-    private final UUID requestId;
-    private final ResponseStatus responseStatus;
-    private final ResponseResult responseResult;
-
-    private ResponseMessage(final UUID requestId, final ResponseStatus responseStatus,
-                            final ResponseResult responseResult) {
-        this.requestId = requestId;
-        this.responseResult = responseResult;
-        this.responseStatus = responseStatus;
-    }
-
-    public UUID getRequestId() {
-        return requestId;
-    }
-
-    public ResponseStatus getStatus() {
-        return responseStatus;
-    }
-
-    public ResponseResult getResult() {
-        return responseResult;
-    }
-
-    @Override
-    public String toString() {
-        return "ResponseMessage{" +
-                "requestId=" + requestId +
-                ", status=" + responseStatus +
-                ", result=" + responseResult +
-                '}';
-    }
-
-    public static Builder build(final RequestMessage requestMessage) {
-        return new Builder(requestMessage);
-    }
-
-    public static Builder build(final UUID requestId) {
-        return new Builder(requestId);
-    }
-
-    public final static class Builder {
-
-        private final UUID requestId;
-        private ResponseStatusCode code = ResponseStatusCode.SUCCESS;
-        private Object result = null;
-        private String statusMessage = "";
-        private Map<String, Object> attributes = Collections.emptyMap();
-        private Map<String, Object> metaData = Collections.emptyMap();
-
-        private Builder(final RequestMessage requestMessage) {
-            this.requestId = requestMessage.getRequestId();
-        }
-
-        private Builder(final UUID requestId) {
-            this.requestId = requestId;
-        }
-
-        public Builder code(final ResponseStatusCode code) {
-            this.code = code;
-            return this;
-        }
-
-        public Builder statusMessage(final String message) {
-            this.statusMessage = message;
-            return this;
-        }
-
-        public Builder statusAttributes(final Map<String, Object> attributes) {
-            this.attributes = attributes;
-            return this;
-        }
-
-        public Builder statusAttributeException(final Throwable ex) {
-            statusAttribute(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS, IteratorUtils.asList(
-                    IteratorUtils.map(ExceptionUtils.getThrowableList(ex), t -> t.getClass().getName())));
-            statusAttribute(Tokens.STATUS_ATTRIBUTE_STACK_TRACE, ExceptionUtils.getStackTrace(ex));
-            return this;
-        }
-
-        public Builder statusAttribute(final String key, final Object value) {
-            if (this.attributes == Collections.EMPTY_MAP)
-                attributes = new HashMap<>();
-            attributes.put(key, value);
-            return this;
-        }
-
-        public Builder result(final Object result) {
-            this.result = result;
-            return this;
-        }
-
-        public Builder responseMetaData(final Map<String, Object> metaData) {
-            this.metaData = metaData;
-            return this;
-        }
-
-        public ResponseMessage create() {
-            final ResponseResult responseResult = new ResponseResult(result, metaData);
-            final ResponseStatus responseStatus = new ResponseStatus(code, statusMessage, attributes);
-            return new ResponseMessage(requestId, responseStatus, responseResult);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java
deleted file mode 100644
index 988de82..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.message;
-
-import java.util.Map;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class ResponseResult {
-    private final Object data;
-    private final Map<String, Object> meta;
-
-    public ResponseResult(final Object data, final Map<String, Object> meta) {
-        this.data = data;
-        this.meta = meta;
-    }
-
-    public Object getData() {
-        return data;
-    }
-
-    public Map<String, Object> getMeta() {
-        return meta;
-    }
-
-    @Override
-    public String toString() {
-        return "ResponseResult{" +
-                "data=" + data +
-                ", meta=" + meta +
-                '}';
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java
deleted file mode 100644
index ad9a36e..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.message;
-
-import java.util.Map;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class ResponseStatus {
-    private final ResponseStatusCode code;
-    private final String message;
-    private final Map<String, Object> attributes;
-
-    public ResponseStatus(final ResponseStatusCode code, final String message, final Map<String, Object> attributes) {
-        this.code = code;
-        this.message = message;
-        this.attributes = attributes;
-    }
-
-    /**
-     * Gets the {@link ResponseStatusCode} that describes how the server responded to the request.
-     */
-    public ResponseStatusCode getCode() {
-        return code;
-    }
-
-    /**
-     * Gets the message associated with the code.
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Gets the meta-data related to the response.  If meta-data is returned it is to be considered specific to the
-     * "op" that is executed.  Not all "op" implementations will return meta-data.
-     */
-    public Map<String, Object> getAttributes() {
-        return attributes;
-    }
-
-    @Override
-    public String toString() {
-        return "ResponseStatus{" +
-                "code=" + code +
-                ", message='" + message + '\'' +
-                ", attributes=" + attributes +
-                '}';
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
deleted file mode 100644
index a87c640..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.message;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Failure;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.stream.Stream;
-
-/**
- * Response status codes for Gremlin Server responses. Result codes tend to map to
- * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">HTTP status codes</a>.  It is not a one-to-one
- * mapping and there are mapper status codes to be considered.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public enum ResponseStatusCode {
-
-    /**
-     * Code 200: The server successfully processed a request to completion - there are no messages remaining in this
-     * stream.
-     *
-     * @since 3.0.0-incubating
-     */
-    SUCCESS(200),
-
-    /**
-     * Code 204: The server processed the request but there is no result to return (e.g. an {@link Iterator} with no
-     * elements).
-     *
-     * @since 3.0.0-incubating
-     */
-    NO_CONTENT(204),
-
-    /**
-     * Code 206: The server successfully returned some content, but there is more in the stream to arrive - wait for a
-     * {@link #SUCCESS} to signify the end of the stream.
-     *
-     * @since 3.0.0-incubating
-     */
-    PARTIAL_CONTENT(206),
-
-    /**
-     * Code 401: The server could not authenticate the request or the client requested a resource it did not have
-     * access to.
-     *
-     * @since 3.0.0-incubating
-     */
-    UNAUTHORIZED(401),
-
-    /**
-     * Code 403: The server could authenticate the request, but will not fulfill it.  This is a general purpose code
-     * that would typically be returned if the request is authenticated but not authorized to do what it is doing.
-     *
-     * @since 3.0.1-incubating
-     */
-    FORBIDDEN(403),
-
-    /**
-     * Code 407: A challenge from the server for the client to authenticate its request.
-     *
-     * @since 3.0.1-incubating
-     */
-    AUTHENTICATE(407),
-
-    /**
-     * Code 429: Indicates that too many requests have been sent in a given amount of time.
-     *
-     * @since 3.5.0
-     */
-    TOO_MANY_REQUESTS(429),
-
-    /**
-     * Code 497: The request message contains objects that were not serializable on the client side.
-     *
-     * @since 3.3.6
-     */
-    REQUEST_ERROR_SERIALIZATION(497),
-
-    /**
-     * Code 498: The request message was not properly formatted which means it could not be parsed at all or the "op"
-     * code was not recognized such that Gremlin Server could properly route it for processing.  Check the message
-     * format and retry the request.
-     *
-     * @since 3.0.0-incubating
-     */
-    REQUEST_ERROR_MALFORMED_REQUEST(498),
-
-    /**
-     * Code 499: The request message was parseable, but the arguments supplied in the message were in conflict or
-     * incomplete. Check the message format and retry the request.
-     *
-     * @since 3.0.0-incubating
-     */
-    REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS(499),
-
-    /**
-     * Code 500: A general server error occurred that prevented the request from being processed.
-     *
-     * @since 3.0.0-incubating
-     */
-    SERVER_ERROR(500),
-
-    /**
-     * Code 595: A server error that is produced when the {@link GraphTraversal#fail()} step is triggered. The
-     * returned exception will include information consistent with the {@link Failure} interface.
-     *
-     * @since 3.6.0
-     */
-    SERVER_ERROR_FAIL_STEP(595),
-
-    /**
-     * Code 596: A server error that indicates that the client should retry the request. A graph will typically return
-     * this error when a transaction fails due to a locking exception or some other sort of concurrent modification.
-     * In other words, the request was likely valid but the state of the server at the particular time the request
-     * arrived could not be processed to success, but could be at a later moment.
-     *
-     * @since 3.4.11
-     */
-    SERVER_ERROR_TEMPORARY(596),
-
-    /**
-     * Code 597: The request submitted for processing evaluated by the server with errors and could not be processed.
-     * Check the script or remote traversal submitted for errors or other problems and then resubmit.
-     *
-     * @since 3.0.0-incubating
-     */
-    SERVER_ERROR_EVALUATION(597),
-
-    /**
-     * Code 598: The server exceeded one of the timeout settings for the request and could therefore only partially
-     * responded or did not respond at all.
-     *
-     * @since 3.0.0-incubating
-     */
-    SERVER_ERROR_TIMEOUT(598),
-
-    /**
-     * Code 599: The server was not capable of serializing an object that was returned from the script supplied on the
-     * request. Either transform the object into something Gremlin Server can process within the script or install
-     * mapper serialization classes to Gremlin Server.
-     *
-     * @since 3.0.0-incubating
-     */
-    SERVER_ERROR_SERIALIZATION(599);
-
-    private final int value;
-    private final static Map<Integer, ResponseStatusCode> codeValueMap = new HashMap<>();
-
-    static {
-        Stream.of(ResponseStatusCode.values()).forEach(code -> codeValueMap.put(code.getValue(), code));
-    }
-
-    public static ResponseStatusCode getFromValue(final int codeValue) {
-        return codeValueMap.get(codeValue);
-    }
-
-    ResponseStatusCode(final int value) {
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public boolean isSuccess() {
-        return String.valueOf(this.value).startsWith("2");
-    }
-
-    /**
-     * Indicates whether the status code can only be used in the last response for a particular request.
-     */
-    public boolean isFinalResponse() {
-        return this != PARTIAL_CONTENT && this != AUTHENTICATE;
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index 831c606..ee2364e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -33,6 +33,11 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_BATCH_SIZE;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_USER_AGENT;
+import static org.apache.tinkerpop.gremlin.util.Tokens.REQUEST_ID;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_MATERIALIZE_PROPERTIES;
 import static org.apache.tinkerpop.gremlin.driver.RequestOptions.getRequestOptions;
 
 /**
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java
deleted file mode 100644
index c7a358b..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.type.TypeReference;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractGraphSONMessageSerializerV1d0 extends AbstractMessageSerializer<ObjectMapper> {
-    private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV1d0.class);
-
-    protected ObjectMapper mapper;
-
-    protected final TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {
-    };
-
-    public AbstractGraphSONMessageSerializerV1d0() {
-        final GraphSONMapper.Builder builder = configureBuilder(initBuilder(null));
-        mapper = builder.create().createMapper();
-    }
-
-    public AbstractGraphSONMessageSerializerV1d0(final GraphSONMapper mapper) {
-        this.mapper = mapper.createMapper();
-    }
-
-    abstract byte[] obtainHeader();
-
-    abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
-
-    @Override
-    public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
-        final GraphSONMapper.Builder initialBuilder = initBuilder(null);
-        addIoRegistries(config, initialBuilder);
-        applyMaxTokenLimits(initialBuilder, config);
-        mapper = configureBuilder(initialBuilder).create().createMapper();
-    }
-
-    @Override
-    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        ByteBuf encodedMessage = null;
-        try {
-            final byte[] payload = mapper.writeValueAsBytes(responseMessage);
-            encodedMessage = allocator.buffer(payload.length);
-            encodedMessage.writeBytes(payload);
-
-            return encodedMessage;
-        } catch (Exception ex) {
-            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
-            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        ByteBuf encodedMessage = null;
-        try {
-            final byte[] header = obtainHeader();
-            final byte[] payload = mapper.writeValueAsBytes(requestMessage);
-
-            encodedMessage = allocator.buffer(header.length + payload.length);
-            encodedMessage.writeBytes(header);
-            encodedMessage.writeBytes(payload);
-
-            return encodedMessage;
-        } catch (Exception ex) {
-            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
-            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
-        try {
-            final byte[] payload = new byte[msg.readableBytes()];
-            msg.readBytes(payload);
-            return mapper.readValue(payload, RequestMessage.class);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
-        try {
-            final byte[] payload = new byte[msg.readableBytes()];
-            msg.readBytes(payload);
-            final Map<String, Object> responseData = mapper.readValue(payload, mapTypeReference);
-            final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
-            final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
-            return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
-                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
-                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
-                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
-                    .result(result.get(SerTokens.TOKEN_DATA))
-                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
-                    .create();
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    private GraphSONMapper.Builder initBuilder(final GraphSONMapper.Builder builder) {
-        final GraphSONMapper.Builder b = null == builder ? GraphSONMapper.build() : builder;
-        return b.addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule())
-                .version(GraphSONVersion.V1_0);
-    }
-
-    private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder builder, final Map<String, Object> config) {
-        if(config != null) {
-            if(config.containsKey("maxNumberLength")) {
-                builder.maxNumberLength((int)config.get("maxNumberLength"));
-            }
-            if(config.containsKey("maxStringLength")) {
-                builder.maxStringLength((int)config.get("maxStringLength"));
-            }
-            if(config.containsKey("maxNestingDepth")) {
-                builder.maxNestingDepth((int)config.get("maxNestingDepth"));
-            }
-        }
-        return builder;
-    }
-
-    @Override
-    public ObjectMapper getMapper() {
-        return this.mapper;
-    }
-
-    public final static class GremlinServerModule extends SimpleModule {
-        public GremlinServerModule() {
-            super("graphson-gremlin-server");
-            addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
-        }
-    }
-
-    public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
-        public ResponseMessageSerializer() {
-            super(ResponseMessage.class);
-        }
-
-        @Override
-        public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-            ser(responseMessage, jsonGenerator, serializerProvider, null);
-        }
-
-        @Override
-        public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider,
-                                      final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-            ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
-        }
-
-        public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
-                        final SerializerProvider serializerProvider,
-                        final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
-            jsonGenerator.writeStartObject();
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-
-            jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
-            jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_STATUS);
-
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
-            jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
-            jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
-            jsonGenerator.writeEndObject();
-
-            jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_RESULT);
-            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-            if (null == responseMessage.getResult().getData())
-                jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
-            else
-                GraphSONUtil.writeWithType(SerTokens.TOKEN_DATA, responseMessage.getResult().getData(), jsonGenerator, serializerProvider, typeSerializer);
-            jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
-            jsonGenerator.writeEndObject();
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
deleted file mode 100644
index 8751ef7..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMessageSerializer<ObjectMapper> {
-    private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV2d0.class);
-
-    protected ObjectMapper mapper;
-
-    public AbstractGraphSONMessageSerializerV2d0() {
-        final GraphSONMapper.Builder builder = configureBuilder(initBuilder(null));
-        mapper = builder.create().createMapper();
-    }
-
-    @Deprecated
-    public AbstractGraphSONMessageSerializerV2d0(final GraphSONMapper mapper) {
-        this.mapper = mapper.createMapper();
-    }
-
-    public AbstractGraphSONMessageSerializerV2d0(final GraphSONMapper.Builder mapperBuilder) {
-        this.mapper = configureBuilder(mapperBuilder).create().createMapper();
-    }
-
-    abstract byte[] obtainHeader();
-
-    abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
-
-    @Override
-    public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
-        final GraphSONMapper.Builder initialBuilder = initBuilder(null);
-        addIoRegistries(config, initialBuilder);
-        applyMaxTokenLimits(initialBuilder, config);
-        mapper = configureBuilder(initialBuilder).create().createMapper();
-    }
-
-    @Override
-    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        ByteBuf encodedMessage = null;
-        try {
-            final byte[] payload = mapper.writeValueAsBytes(responseMessage);
-            encodedMessage = allocator.buffer(payload.length);
-            encodedMessage.writeBytes(payload);
-
-            return encodedMessage;
-        } catch (Exception ex) {
-            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
-            logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        ByteBuf encodedMessage = null;
-        try {
-            final byte[] header = obtainHeader();
-            final byte[] payload = mapper.writeValueAsBytes(requestMessage);
-
-            encodedMessage = allocator.buffer(header.length + payload.length);
-            encodedMessage.writeBytes(header);
-            encodedMessage.writeBytes(payload);
-
-            return encodedMessage;
-        } catch (Exception ex) {
-            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
-
-            logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
-        try {
-            final byte[] payload = new byte[msg.readableBytes()];
-            msg.readBytes(payload);
-            return mapper.readValue(payload, RequestMessage.class);
-        } catch (Exception ex) {
-            logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
-        try {
-            final byte[] payload = new byte[msg.readableBytes()];
-            msg.readBytes(payload);
-            return mapper.readValue(payload, ResponseMessage.class);
-        } catch (Exception ex) {
-            logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-
-    private GraphSONMapper.Builder initBuilder(final GraphSONMapper.Builder builder) {
-        final GraphSONMapper.Builder b = null == builder ? GraphSONMapper.build() : builder;
-        return b.addCustomModule(GraphSONXModuleV2d0.build().create(false))
-                .version(GraphSONVersion.V2_0);
-    }
-
-    private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder builder, final Map<String, Object> config) {
-        if(config != null) {
-            if(config.containsKey("maxNumberLength")) {
-                builder.maxNumberLength((int)config.get("maxNumberLength"));
-            }
-            if(config.containsKey("maxStringLength")) {
-                builder.maxStringLength((int)config.get("maxStringLength"));
-            }
-            if(config.containsKey("maxNestingDepth")) {
-                builder.maxNestingDepth((int)config.get("maxNestingDepth"));
-            }
-        }
-        return builder;
-    }
-
-    @Override
-    public ObjectMapper getMapper() {
-        return this.mapper;
-    }
-
-    public final static class GremlinServerModule extends SimpleModule {
-        public GremlinServerModule() {
-            super("graphson-gremlin-server");
-
-            // SERIALIZERS
-            addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
-            addSerializer(RequestMessage.class, new RequestMessageSerializer());
-
-            //DESERIALIZERS
-            addDeserializer(ResponseMessage.class, new ResponseMessageDeserializer());
-            addDeserializer(RequestMessage.class, new RequestMessageDeserializer());
-        }
-    }
-
-    public final static class RequestMessageSerializer extends StdSerializer<RequestMessage> {
-        public RequestMessageSerializer() {
-            super(RequestMessage.class);
-        }
-
-        @Override
-        public void serialize(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            ser(requestMessage, jsonGenerator, serializerProvider, null);
-        }
-
-        @Override
-        public void serializeWithType(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider,
-                                      final TypeSerializer typeSerializer) throws IOException {
-            ser(requestMessage, jsonGenerator, serializerProvider, typeSerializer);
-        }
-
-        public void ser(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
-                        final SerializerProvider serializerProvider,
-                        final TypeSerializer typeSerializer) throws IOException {
-            GraphSONUtil.writeStartObject(requestMessage, jsonGenerator, typeSerializer);
-
-            jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, requestMessage.getRequestId().toString());
-            jsonGenerator.writeStringField(SerTokens.TOKEN_OP, requestMessage.getOp());
-            jsonGenerator.writeStringField(SerTokens.TOKEN_PROCESSOR, requestMessage.getProcessor());
-            jsonGenerator.writeObjectField(SerTokens.TOKEN_ARGS, requestMessage.getArgs());
-
-            GraphSONUtil.writeEndObject(requestMessage, jsonGenerator, typeSerializer);
-        }
-    }
-
-    public final static class RequestMessageDeserializer extends AbstractObjectDeserializer<RequestMessage> {
-        protected RequestMessageDeserializer() {
-            super(RequestMessage.class);
-        }
-
-        @Override
-        public RequestMessage createObject(final Map<String, Object> data) {
-            final Map<String, Object> args = (Map<String, Object>) data.get(SerTokens.TOKEN_ARGS);
-            RequestMessage.Builder builder = RequestMessage.build(data.get(SerTokens.TOKEN_OP).toString())
-                    .overrideRequestId(UUID.fromString(data.get(SerTokens.TOKEN_REQUEST).toString()));
-
-            if (data.containsKey(SerTokens.TOKEN_PROCESSOR))
-                builder = builder.processor(data.get(SerTokens.TOKEN_PROCESSOR).toString());
-
-            if (args != null) {
-                for (Map.Entry<String, Object> kv : args.entrySet()) {
-                    builder = builder.addArg(kv.getKey(), kv.getValue());
-                }
-            }
-
-            return builder.create();
-        }
-    }
-
-    public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
-        public ResponseMessageSerializer() {
-            super(ResponseMessage.class);
-        }
-
-        @Override
-        public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException {
-            ser(responseMessage, jsonGenerator, serializerProvider, null);
-        }
-
-        @Override
-        public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider,
-                                      final TypeSerializer typeSerializer) throws IOException {
-            ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
-        }
-
-        public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
-                        final SerializerProvider serializerProvider,
-                        final TypeSerializer typeSerializer) throws IOException {
-            GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
-
-            jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
-            jsonGenerator.writeFieldName(SerTokens.TOKEN_STATUS);
-
-            GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
-            jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
-            jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
-            jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
-            GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
-
-            jsonGenerator.writeFieldName(SerTokens.TOKEN_RESULT);
-
-            GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
-
-            if (null == responseMessage.getResult().getData()){
-                jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
-            } else {
-                jsonGenerator.writeFieldName(SerTokens.TOKEN_DATA);
-                final Object result = responseMessage.getResult().getData();
-                serializerProvider.findTypedValueSerializer(result.getClass(), true, null).serialize(result, jsonGenerator, serializerProvider);
-            }
-
-            jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
-            GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
-
-            GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
-        }
-    }
-    
-    public final static class ResponseMessageDeserializer extends AbstractObjectDeserializer<ResponseMessage> {
-        protected ResponseMessageDeserializer() {
-            super(ResponseMessage.class);
-        }
-        
-        @Override
-        public ResponseMessage createObject(final Map<String, Object> data) {
-            final Map<String, Object> status = (Map<String, Object>) data.get(SerTokens.TOKEN_STATUS);
-            final Map<String, Object> result = (Map<String, Object>) data.get(SerTokens.TOKEN_RESULT);
-            return ResponseMessage.build(UUID.fromString(data.get(SerTokens.TOKEN_REQUEST).toString()))
-                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
-                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
-                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
-                    .result(result.get(SerTokens.TOKEN_DATA))
-                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
-                    .create();
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractMessageSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractMessageSerializer.java
deleted file mode 100644
index 50124a6..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractMessageSerializer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.Mapper;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Base {@link MessageSerializer} that serializers can implement to get some helper methods around configuring a
- * {@link Mapper.Builder}.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractMessageSerializer<M> implements MessageSerializer<M> {
-    public static final String TOKEN_IO_REGISTRIES = "ioRegistries";
-
-    /**
-     * Reads a list of fully qualified class names from the value of the {@link #TOKEN_IO_REGISTRIES} configuration
-     * key. These classes should equate to {@link IoRegistry} implementations that will be assigned to the
-     * {@link Mapper.Builder}.  The assumption is that the {@link IoRegistry} either has a static {@code instance()}
-     * method or has a zero-arg constructor from which it can be instantiated.
-     */
-    protected void addIoRegistries(final Map<String, Object> config, final Mapper.Builder builder) {
-        final List<String> classNameList = getListStringFromConfig(TOKEN_IO_REGISTRIES, config);
-
-        classNameList.stream().forEach(className -> {
-            try {
-                final Class<?> clazz = Class.forName(className);
-                try {
-                    // try instance() first and then getInstance() which was deprecated in 3.2.4
-                    final Method instanceMethod = tryInstanceMethod(clazz);
-                    if (IoRegistry.class.isAssignableFrom(instanceMethod.getReturnType()))
-                        builder.addRegistry((IoRegistry) instanceMethod.invoke(null));
-                    else
-                        throw new Exception();
-                } catch (Exception methodex) {
-                    // tried instance() and that failed so try newInstance() no-arg constructor
-                    builder.addRegistry((IoRegistry) clazz.newInstance());
-                }
-            } catch (Exception ex) {
-                throw new IllegalStateException(ex);
-            }
-        });
-    }
-
-    protected Method tryInstanceMethod(final Class clazz) {
-        Method instanceMethod;
-        try {
-            instanceMethod = clazz.getDeclaredMethod("instance");
-        } catch (Exception methodex) {
-            instanceMethod = null;
-        }
-
-        if (null == instanceMethod) {
-            try {
-                instanceMethod = clazz.getDeclaredMethod("getInstance");
-            } catch (Exception methodex) {
-                instanceMethod = null;
-            }
-        }
-
-        return instanceMethod;
-    }
-
-    /**
-     * Gets a {@link List} of strings from the configuration object.
-     */
-    protected List<String> getListStringFromConfig(final String token, final Map<String, Object> config) {
-        final List<String> classNameList;
-        try {
-            classNameList = (List<String>) config.getOrDefault(token, Collections.emptyList());
-        } catch (Exception ex) {
-            throw new IllegalStateException(String.format("Invalid configuration value of [%s] for [%s] setting on %s serialization configuration",
-                    config.getOrDefault(token, ""), token, this.getClass().getName()), ex);
-        }
-
-        return classNameList;
-    }
-}
\ No newline at end of file
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphBinaryMessageSerializerV1.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphBinaryMessageSerializerV1.java
deleted file mode 100644
index c983a89..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphBinaryMessageSerializerV1.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.Unpooled;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryIo;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.RequestMessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.ResponseMessageSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import org.javatuples.Pair;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Base64;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-public class GraphBinaryMessageSerializerV1 extends AbstractMessageSerializer<GraphBinaryMapper> implements MessageTextSerializer<GraphBinaryMapper> {
-
-    public static final String TOKEN_CUSTOM = "custom";
-    public static final String TOKEN_BUILDER = "builder";
-    public static final String TOKEN_SERIALIZE_RESULT_TO_STRING = "serializeResultToString";
-
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHBINARY_V1D0;
-    private static final String MIME_TYPE_STRINGD = SerTokens.MIME_GRAPHBINARY_V1D0 + "-stringd";
-
-    private static final Base64.Encoder base64Encoder = Base64.getEncoder();
-    private static final Base64.Decoder base64Decoder = Base64.getDecoder();
-
-    private byte[] header = MIME_TYPE.getBytes(UTF_8);
-    private boolean serializeToString = false;
-    private GraphBinaryReader reader;
-    private GraphBinaryWriter writer;
-    private RequestMessageSerializer requestSerializer;
-    private ResponseMessageSerializer responseSerializer;
-    private GraphBinaryMapper mapper;
-
-    /**
-     * Creates a new instance of the message serializer using the default type serializers.
-     */
-    public GraphBinaryMessageSerializerV1() {
-        this(TypeSerializerRegistry.INSTANCE);
-    }
-
-    public GraphBinaryMessageSerializerV1(final TypeSerializerRegistry registry) {
-        reader = new GraphBinaryReader(registry);
-        writer = new GraphBinaryWriter(registry);
-        mapper = new GraphBinaryMapper(writer, reader);
-
-        requestSerializer = new RequestMessageSerializer();
-        responseSerializer = new ResponseMessageSerializer();
-    }
-
-    public GraphBinaryMessageSerializerV1(final TypeSerializerRegistry.Builder builder) {
-        this(builder.create());
-    }
-
-    @Override
-    public GraphBinaryMapper getMapper() {
-        return mapper;
-    }
-
-    @Override
-    public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
-        final String builderClassName = (String) config.get(TOKEN_BUILDER);
-        final TypeSerializerRegistry.Builder builder;
-
-        if (builderClassName != null) {
-            try {
-                final Class<?> clazz = Class.forName(builderClassName);
-                final Constructor<?> ctor = clazz.getConstructor();
-                builder = (TypeSerializerRegistry.Builder) ctor.newInstance();
-            } catch (Exception ex) {
-                throw new IllegalStateException(ex);
-            }
-        } else {
-            builder = TypeSerializerRegistry.build();
-        }
-
-        final List<String> classNameList = getListStringFromConfig(TOKEN_IO_REGISTRIES, config);
-        classNameList.forEach(className -> {
-            try {
-                final Class<?> clazz = Class.forName(className);
-                try {
-                    final Method instanceMethod = tryInstanceMethod(clazz);
-                    final IoRegistry ioreg = (IoRegistry) instanceMethod.invoke(null);
-                    final List<Pair<Class, CustomTypeSerializer>> classSerializers = ioreg.find(GraphBinaryIo.class, CustomTypeSerializer.class);
-                    for (Pair<Class,CustomTypeSerializer> cs : classSerializers) {
-                        builder.addCustomType(cs.getValue0(), cs.getValue1());
-                    }
-                } catch (Exception methodex) {
-                    throw new IllegalStateException(String.format("Could not instantiate IoRegistry from an instance() method on %s", className), methodex);
-                }
-            } catch (Exception ex) {
-                throw new IllegalStateException(ex);
-            }
-        });
-
-        addCustomClasses(config, builder);
-
-        this.serializeToString = Boolean.parseBoolean(config.getOrDefault(TOKEN_SERIALIZE_RESULT_TO_STRING, "false").toString());
-        this.header = this.serializeToString ? MIME_TYPE_STRINGD.getBytes(UTF_8) : MIME_TYPE.getBytes(UTF_8);
-
-        final TypeSerializerRegistry registry = builder.create();
-        reader = new GraphBinaryReader(registry);
-        writer = new GraphBinaryWriter(registry);
-
-        requestSerializer = new RequestMessageSerializer();
-        responseSerializer = new ResponseMessageSerializer();
-    }
-
-    @Override
-    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        final ByteBuf buffer = allocator.buffer();
-
-        try {
-            final ResponseMessage msgToWrite = !serializeToString ? responseMessage :
-                    ResponseMessage.build(responseMessage.getRequestId())
-                            .code(responseMessage.getStatus().getCode())
-                            .statusAttributes(responseMessage.getStatus().getAttributes())
-                            .responseMetaData(responseMessage.getResult().getMeta())
-                            .result(serializeResultToString(responseMessage))
-                            .statusMessage(responseMessage.getStatus().getMessage()).create();
-
-            responseSerializer.writeValue(msgToWrite, buffer, writer);
-        } catch (Exception ex) {
-            buffer.release();
-            throw ex;
-        }
-
-        return buffer;
-    }
-
-    @Override
-    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        final ByteBuf buffer = allocator.buffer().writeByte(header.length).writeBytes(header);
-
-        try {
-            requestSerializer.writeValue(requestMessage, buffer, writer);
-        } catch (Exception ex) {
-            buffer.release();
-            throw ex;
-        }
-
-        return buffer;
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
-        return requestSerializer.readValue(msg, reader);
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
-        return responseSerializer.readValue(msg, reader);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
-    }
-
-    @Override
-    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        final ByteBuf bb = serializeResponseAsBinary(responseMessage, allocator);
-        return base64Encoder.encodeToString(convertToBytes(bb));
-    }
-
-    @Override
-    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        final ByteBuf bb = allocator.buffer();
-
-        try {
-            requestSerializer.writeValue(requestMessage, bb, writer);
-        } catch (Exception ex) {
-            bb.release();
-            throw ex;
-        }
-
-        return base64Encoder.encodeToString(convertToBytes(bb));
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
-        return deserializeRequest(convertToByteBuf(msg));
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
-        return deserializeResponse(convertToByteBuf(msg));
-    }
-
-    private byte[] convertToBytes(final ByteBuf bb) {
-        byte[] bytes = new byte[bb.readableBytes()];
-        bb.getBytes(bb.readerIndex(), bytes);
-        return bytes;
-    }
-
-    private ByteBuf convertToByteBuf(final String msg) {
-        final byte[] b = base64Decoder.decode(msg);
-        final ByteBuf bb = Unpooled.buffer(b.length);
-        bb.writeBytes(b);
-        return bb;
-    }
-
-    private void addCustomClasses(final Map<String, Object> config, final TypeSerializerRegistry.Builder builder) {
-        final List<String> classNameList = getListStringFromConfig(TOKEN_CUSTOM, config);
-
-        classNameList.forEach(serializerDefinition -> {
-            final String className;
-            final String serializerName;
-            if (serializerDefinition.contains(";")) {
-                final String[] split = serializerDefinition.split(";");
-                if (split.length != 2)
-                    throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
-
-                className = split[0];
-                serializerName = split[1];
-            } else {
-                throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
-            }
-
-            try {
-                final Class clazz = Class.forName(className);
-                final Class serializerClazz = Class.forName(serializerName);
-                final CustomTypeSerializer serializer = (CustomTypeSerializer) serializerClazz.newInstance();
-                builder.addCustomType(clazz, serializer);
-            } catch (Exception ex) {
-                throw new IllegalStateException("CustomTypeSerializer could not be instantiated", ex);
-            }
-        });
-    }
-
-    private Object serializeResultToString(final ResponseMessage msg) {
-        if (msg.getResult() == null) return "null";
-        if (msg.getResult().getData() == null) return "null";
-
-        // the IteratorHandler should return a collection so keep it as such
-        final Object o = msg.getResult().getData();
-        if (o instanceof Collection) {
-            return ((Collection) o).stream().map(d -> null == d ? "null" : d.toString()).collect(Collectors.toList());
-        } else {
-            return o.toString();
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
deleted file mode 100644
index f175c30..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 1.0.x schema.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONMessageSerializerGremlinV1d0 extends AbstractGraphSONMessageSerializerV1d0 {
-
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1D0;
-
-    private static byte[] header;
-
-    static {
-        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
-        buffer.put((byte) MIME_TYPE.length());
-        buffer.put(MIME_TYPE.getBytes());
-        header = buffer.array();
-    }
-
-    public GraphSONMessageSerializerGremlinV1d0() {
-        super();
-    }
-
-    public GraphSONMessageSerializerGremlinV1d0(final GraphSONMapper mapper) {
-        super(mapper);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
-    }
-
-    @Override
-    byte[] obtainHeader() {
-        return header;
-    }
-
-    @Override
-    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
-        // already set to 1.0 in AbstractGraphSONMessageSerializerV1d0
-        return builder.addCustomModule(new GraphSONMessageSerializerV1d0.GremlinServerModule())
-                .typeInfo(TypeInfo.PARTIAL_TYPES);
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0.java
deleted file mode 100644
index 9230e6c..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 2.0.x schema and the extended module.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As for release 3.4.0, replaced by {@link GraphSONMessageSerializerV2d0}.
- */
-@Deprecated
-public final class GraphSONMessageSerializerGremlinV2d0 extends AbstractGraphSONMessageSerializerV2d0 {
-
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V2D0;
-
-    private static byte[] header;
-
-    static {
-        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
-        buffer.put((byte) MIME_TYPE.length());
-        buffer.put(MIME_TYPE.getBytes());
-        header = buffer.array();
-    }
-
-    /**
-     * Creates a default GraphSONMessageSerializerGremlin.
-     * <p>
-     * By default this will internally instantiate a {@link GraphSONMapper} and register
-     * a {@link GremlinServerModule} and {@link GraphSONXModuleV2d0} to the mapper.
-     *
-     * @see #GraphSONMessageSerializerGremlinV2d0(GraphSONMapper.Builder)
-     */
-    public GraphSONMessageSerializerGremlinV2d0() {
-        super();
-    }
-
-    /**
-     * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
-     * {@link #GraphSONMessageSerializerGremlinV2d0(GraphSONMapper.Builder)} instead.
-     */
-    @Deprecated
-    public GraphSONMessageSerializerGremlinV2d0(final GraphSONMapper mapper) {
-        super(mapper);
-    }
-
-    /**
-     * Create a GraphSONMessageSerializerGremlin with a provided {@link GraphSONMapper.Builder}.
-     * <p>
-     * Note that to make this mapper usable in the context of request messages and responses,
-     * this method will automatically register a {@link GremlinServerModule} to the provided
-     * mapper.
-     */
-    public GraphSONMessageSerializerGremlinV2d0(final GraphSONMapper.Builder mapperBuilder) {
-        super(mapperBuilder);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{SerTokens.MIME_GRAPHSON_V2D0, SerTokens.MIME_JSON};
-    }
-
-    @Override
-    byte[] obtainHeader() {
-        return header;
-    }
-
-    @Override
-    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
-        // already set to 2.0 in AbstractGraphSONMessageSerializerV2d0
-        return builder.typeInfo(TypeInfo.PARTIAL_TYPES).addCustomModule(new GremlinServerModule());
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
deleted file mode 100644
index 87e6b0c..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Serialize results to JSON with version 1.0.x schema.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.6.5, replaced by {@link GraphSONUntypedMessageSerializerV1d0}. In the future this will
- * become what was formerly known as {@link GraphSONMessageSerializerGremlinV1d0} which makes the naming consistent
- * for all GraphSON versions.
- */
-@Deprecated
-public final class GraphSONMessageSerializerV1d0 extends AbstractGraphSONMessageSerializerV1d0 implements MessageTextSerializer<ObjectMapper> {
-    private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV1d0.class);
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1D0_UNTYPED;
-
-    private static byte[] header;
-
-    static {
-        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
-        buffer.put((byte) MIME_TYPE.length());
-        buffer.put(MIME_TYPE.getBytes());
-        header = buffer.array();
-    }
-
-    public GraphSONMessageSerializerV1d0() {
-        super();
-    }
-
-    public GraphSONMessageSerializerV1d0(final GraphSONMapper mapper) {
-        super(mapper);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
-    }
-
-    @Override
-    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
-        // already set to 1.0 in AbstractGraphSONMessageSerializerV1d0
-        return builder.addCustomModule(new GremlinServerModule())
-                .typeInfo(TypeInfo.NO_TYPES);
-    }
-
-    @Override
-    byte[] obtainHeader() {
-        return header;
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
-        try {
-            final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
-            final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
-            final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
-            return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
-                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
-                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
-                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
-                    .result(result.get(SerTokens.TOKEN_DATA))
-                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
-                    .create();
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(responseMessage);
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, RequestMessage.class);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(requestMessage);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0.java
deleted file mode 100644
index ae5042d..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 2.0.x schema and the extended module.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONMessageSerializerV2d0 extends AbstractGraphSONMessageSerializerV2d0 implements MessageTextSerializer<ObjectMapper> {
-    private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV2d0.class);
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V2D0;
-
-    private static byte[] header;
-
-    static {
-        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
-        buffer.put((byte) MIME_TYPE.length());
-        buffer.put(MIME_TYPE.getBytes());
-        header = buffer.array();
-    }
-
-    /**
-     * Creates a default GraphSONMessageSerializer. By default this will internally instantiate a {@link GraphSONMapper}
-     * and register a {@link GremlinServerModule} and {@link GraphSONXModuleV2d0} to the mapper.
-     *
-     * @see #GraphSONMessageSerializerV2d0(GraphSONMapper.Builder)
-     */
-    public GraphSONMessageSerializerV2d0() {
-        super();
-    }
-
-    /**
-     * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
-     * {@link #GraphSONMessageSerializerV2d0(GraphSONMapper.Builder)} instead.
-     */
-    @Deprecated
-    public GraphSONMessageSerializerV2d0(final GraphSONMapper mapper) {
-        super(mapper);
-    }
-
-    /**
-     * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
-     *
-     * Note that to make this mapper usable in the context of request messages and responses,
-     * this method will automatically register a {@link GremlinServerModule} to the provided
-     * mapper.
-     */
-    public GraphSONMessageSerializerV2d0(final GraphSONMapper.Builder mapperBuilder) {
-        super(mapperBuilder);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
-    }
-
-    @Override
-    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
-        // already set to 2.0 in AbstractGraphSONMessageSerializerV2d0
-        return builder.typeInfo(TypeInfo.PARTIAL_TYPES).addCustomModule(new GremlinServerModule());
-    }
-
-    @Override
-    byte[] obtainHeader() {
-        return header;
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, ResponseMessage.class);
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(responseMessage);
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, RequestMessage.class);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(requestMessage);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
deleted file mode 100644
index 5aebf77..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3d0;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 3.0.x schema and the extended module.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONMessageSerializerV3d0 extends AbstractGraphSONMessageSerializerV2d0 implements MessageTextSerializer<ObjectMapper> {
-    private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV3d0.class);
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V3D0;
-
-    private static byte[] header;
-
-    static {
-        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
-        buffer.put((byte) MIME_TYPE.length());
-        buffer.put(MIME_TYPE.getBytes());
-        header = buffer.array();
-    }
-
-    /**
-     * Creates a default GraphSONMessageSerializer.
-     * <p>
-     * By default this will internally instantiate a {@link GraphSONMapper} and register
-     * a {@link GremlinServerModule} and {@link GraphSONXModuleV3d0} to the mapper.
-     *
-     * @see #GraphSONMessageSerializerV3d0(GraphSONMapper.Builder)
-     */
-    public GraphSONMessageSerializerV3d0() {
-        super();
-    }
-
-    /**
-     * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
-     * {@link #GraphSONMessageSerializerV3d0(GraphSONMapper.Builder)} instead.
-     */
-    @Deprecated
-    public GraphSONMessageSerializerV3d0(final GraphSONMapper mapper) {
-        super(mapper);
-    }
-
-    /**
-     * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
-     *
-     * Note that to make this mapper usable in the context of request messages and responses,
-     * this method will automatically register a {@link GremlinServerModule} to the provided
-     * mapper.
-     */
-    public GraphSONMessageSerializerV3d0(final GraphSONMapper.Builder mapperBuilder) {
-        super(mapperBuilder);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
-    }
-
-    @Override
-    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
-        // override the 2.0 in AbstractGraphSONMessageSerializerV2d0
-        return builder.version(GraphSONVersion.V3_0).addCustomModule(new GremlinServerModule());
-    }
-
-    @Override
-    byte[] obtainHeader() {
-        return header;
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, ResponseMessage.class);
-        } catch (Exception ex) {
-            logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, GraphSONMessageSerializerV3d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(responseMessage);
-        } catch (Exception ex) {
-            logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage.toString(), GraphSONMessageSerializerV3d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, RequestMessage.class);
-        } catch (Exception ex) {
-            logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, GraphSONMessageSerializerV3d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(requestMessage);
-        } catch (Exception ex) {
-            logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage.toString(), GraphSONMessageSerializerV3d0.class.getName()), ex);
-            throw new SerializationException(ex);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV1d0.java
deleted file mode 100644
index e2664de..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV1d0.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Serialize results to JSON with version 1.0.x schema and serialization which does not embed types.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONUntypedMessageSerializerV1d0 extends AbstractGraphSONMessageSerializerV1d0 implements MessageTextSerializer<ObjectMapper> {
-    private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV1d0.class);
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1D0_UNTYPED;
-
-    private static byte[] header;
-
-    static {
-        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
-        buffer.put((byte) MIME_TYPE.length());
-        buffer.put(MIME_TYPE.getBytes());
-        header = buffer.array();
-    }
-
-    public GraphSONUntypedMessageSerializerV1d0() {
-        super();
-    }
-
-    public GraphSONUntypedMessageSerializerV1d0(final GraphSONMapper mapper) {
-        super(mapper);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
-    }
-
-    @Override
-    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
-        // already set to 1.0 in AbstractGraphSONMessageSerializerV1d0
-        return builder.addCustomModule(new GremlinServerModule())
-                .typeInfo(TypeInfo.NO_TYPES);
-    }
-
-    @Override
-    byte[] obtainHeader() {
-        return header;
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
-        try {
-            final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
-            final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
-            final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
-            return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
-                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
-                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
-                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
-                    .result(result.get(SerTokens.TOKEN_DATA))
-                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
-                    .create();
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(responseMessage);
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, RequestMessage.class);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(requestMessage);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV2d0.java
deleted file mode 100644
index 5d77d4a..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV2d0.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Serialize results to JSON with version 2.0.x schema and the extended module without embedded types.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class GraphSONUntypedMessageSerializerV2d0 extends AbstractGraphSONMessageSerializerV2d0 implements MessageTextSerializer<ObjectMapper> {
-    private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV2d0.class);
-    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V2D0_UNTYPED;
-
-    private static byte[] header;
-
-    static {
-        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
-        buffer.put((byte) MIME_TYPE.length());
-        buffer.put(MIME_TYPE.getBytes());
-        header = buffer.array();
-    }
-
-    /**
-     * Creates a default GraphSONMessageSerializer.
-     *
-     * By default this will internally instantiate a {@link GraphSONMapper} and register
-     * a {@link GremlinServerModule} and {@link GraphSONXModuleV2d0} to the mapper.
-     *
-     * @see #GraphSONUntypedMessageSerializerV2d0(GraphSONMapper.Builder)
-     */
-    public GraphSONUntypedMessageSerializerV2d0() {
-        super();
-    }
-
-    /**
-     * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
-     * {@link #GraphSONUntypedMessageSerializerV2d0(GraphSONMapper.Builder)} instead.
-     */
-    @Deprecated
-    public GraphSONUntypedMessageSerializerV2d0(final GraphSONMapper mapper) {
-        super(mapper);
-    }
-
-    /**
-     * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
-     *
-     * Note that to make this mapper usable in the context of request messages and responses,
-     * this method will automatically register a {@link GremlinServerModule} to the provided
-     * mapper.
-     */
-    public GraphSONUntypedMessageSerializerV2d0(final GraphSONMapper.Builder mapperBuilder) {
-        super(mapperBuilder);
-    }
-
-    @Override
-    public String[] mimeTypesSupported() {
-        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
-    }
-
-    @Override
-    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
-        // already set to 2.0 in AbstractGraphSONMessageSerializerV2d0
-        return builder.typeInfo(TypeInfo.NO_TYPES).addCustomModule(new GremlinServerModule());
-    }
-
-    @Override
-    byte[] obtainHeader() {
-        return header;
-    }
-
-    @Override
-    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, ResponseMessage.class);
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(responseMessage);
-        } catch (Exception ex) {
-            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
-        try {
-            return mapper.readValue(msg, RequestMessage.class);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-
-    @Override
-    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
-        try {
-            return mapper.writeValueAsString(requestMessage);
-        } catch (Exception ex) {
-            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
-            throw new SerializationException(ex);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java
deleted file mode 100644
index 6ef0885..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/MessageTextSerializer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-
-/**
- * An extension to the MessageSerializer interface that allows a format to be compatible with text-based
- * websocket messages.  This interface is for internal purposes only.  Implementers who have mapper serialization
- * needs should NOT implement this interface as it will not be used.  Gremlin Server only supports plain JSON
- * for text-based requests.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface MessageTextSerializer<M> extends MessageSerializer<M> {
-    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
-
-    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException;
-
-    public RequestMessage deserializeRequest(final String msg) throws SerializationException;
-
-    public ResponseMessage deserializeResponse(final String msg) throws SerializationException;
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBuffer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBuffer.java
deleted file mode 100644
index 5aecac2..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBuffer.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Represents a {@link Buffer} backed by Netty's {@link ByteBuf}.
- */
-final class NettyBuffer implements Buffer {
-    private final ByteBuf buffer;
-
-    /**
-     * Creates a new instance.
-     * @param buffer The buffer to wrap.
-     */
-    NettyBuffer(ByteBuf buffer) {
-        if (buffer == null) {
-            throw new IllegalArgumentException("buffer can't be null");
-        }
-
-        this.buffer = buffer;
-    }
-
-    @Override
-    public int readableBytes() {
-        return this.buffer.readableBytes();
-    }
-
-    @Override
-    public int readerIndex() {
-        return this.buffer.readerIndex();
-    }
-
-    @Override
-    public Buffer readerIndex(final int readerIndex) {
-        this.buffer.readerIndex(readerIndex);
-        return this;
-    }
-
-    @Override
-    public int writerIndex() {
-        return this.buffer.writerIndex();
-    }
-
-    @Override
-    public Buffer writerIndex(final int writerIndex) {
-        this.buffer.writerIndex(writerIndex);
-        return this;
-    }
-
-    @Override
-    public Buffer markWriterIndex() {
-        this.buffer.markWriterIndex();
-        return this;
-    }
-
-    @Override
-    public Buffer resetWriterIndex() {
-        this.buffer.resetWriterIndex();
-        return this;
-    }
-
-    @Override
-    public int capacity() {
-        return this.buffer.capacity();
-    }
-
-    @Override
-    public boolean isDirect() {
-        return this.buffer.isDirect();
-    }
-
-    @Override
-    public boolean readBoolean() {
-        return this.buffer.readBoolean();
-    }
-
-    @Override
-    public byte readByte() {
-        return this.buffer.readByte();
-    }
-
-    @Override
-    public short readShort() {
-        return this.buffer.readShort();
-    }
-
-    @Override
-    public int readInt() {
-        return this.buffer.readInt();
-    }
-
-    @Override
-    public long readLong() {
-        return this.buffer.readLong();
-    }
-
-    @Override
-    public float readFloat() {
-        return this.buffer.readFloat();
-    }
-
-    @Override
-    public double readDouble() {
-        return this.buffer.readDouble();
-    }
-
-    @Override
-    public Buffer readBytes(final byte[] destination) {
-        this.buffer.readBytes(destination);
-        return this;
-    }
-
-    @Override
-    public Buffer readBytes(final byte[] destination, final int dstIndex, final int length) {
-        this.buffer.readBytes(destination, dstIndex, length);
-        return this;
-    }
-
-    @Override
-    public Buffer readBytes(final ByteBuffer dst) {
-        this.buffer.readBytes(dst);
-        return this;
-    }
-
-    @Override
-    public Buffer readBytes(final OutputStream out, final int length) throws IOException {
-        this.buffer.readBytes(out, length);
-        return this;
-    }
-
-    @Override
-    public Buffer writeBoolean(final boolean value) {
-        this.buffer.writeBoolean(value);
-        return this;
-    }
-
-    @Override
-    public Buffer writeByte(final int value) {
-        this.buffer.writeByte(value);
-        return this;
-    }
-
-    @Override
-    public Buffer writeShort(final int value) {
-        this.buffer.writeShort(value);
-        return this;
-    }
-
-    @Override
-    public Buffer writeInt(final int value) {
-        this.buffer.writeInt(value);
-        return this;
-    }
-
-    @Override
-    public Buffer writeLong(final long value) {
-        this.buffer.writeLong(value);
-        return this;
-    }
-
-    @Override
-    public Buffer writeFloat(final float value) {
-        this.buffer.writeFloat(value);
-        return this;
-    }
-
-    @Override
-    public Buffer writeDouble(final double value) {
-        this.buffer.writeDouble(value);
-        return this;
-    }
-
-    @Override
-    public Buffer writeBytes(final byte[] src) {
-        this.buffer.writeBytes(src);
-        return this;
-    }
-
-    @Override
-    public Buffer writeBytes(final ByteBuffer src) {
-        this.buffer.writeBytes(src);
-        return this;
-    }
-
-    @Override
-    public Buffer writeBytes(byte[] src, final int srcIndex, final int length) {
-        this.buffer.writeBytes(src, srcIndex, length);
-        return this;
-    }
-
-    @Override
-    public boolean release() {
-        return this.buffer.release();
-    }
-
-    @Override
-    public Buffer retain() {
-        this.buffer.retain();
-        return this;
-    }
-
-    @Override
-    public int referenceCount() {
-        return this.buffer.refCnt();
-    }
-
-    @Override
-    public ByteBuffer[] nioBuffers() {
-        return this.buffer.nioBuffers();
-    }
-
-    @Override
-    public ByteBuffer nioBuffer() {
-        return this.buffer.nioBuffer();
-    }
-
-    @Override
-    public ByteBuffer nioBuffer(final int index, final int length) {
-        return this.buffer.nioBuffer(index, length);
-    }
-
-    @Override
-    public ByteBuffer[] nioBuffers(final int index, final int length) {
-        return this.buffer.nioBuffers(index, length);
-    }
-
-    @Override
-    public int nioBufferCount() {
-        return this.buffer.nioBufferCount();
-    }
-
-    @Override
-    public Buffer getBytes(final int index, final byte[] dst) {
-        this.buffer.getBytes(index, dst);
-        return this;
-    }
-
-    /**
-     * Returns the underlying buffer.
-     */
-    public ByteBuf getUnderlyingBuffer() {
-        return this.buffer;
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBufferFactory.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBufferFactory.java
deleted file mode 100644
index 46ef31b..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBufferFactory.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.BufferFactory;
-
-import java.nio.ByteBuffer;
-import java.util.function.Consumer;
-
-/**
- * Represents a factory to create {@link Buffer} instances from wrapped {@link ByteBuf} instances.
- */
-public class NettyBufferFactory implements BufferFactory<ByteBuf> {
-    @Override
-    public Buffer create(final ByteBuf value) {
-        return new NettyBuffer(value);
-    }
-
-    @Override
-    public Buffer wrap(final ByteBuffer value) {
-        return create(Unpooled.wrappedBuffer(value));
-    }
-
-    private static ByteBuf getFromIndex(final Buffer buffer, final int index) {
-        if (buffer.nioBufferCount() == 1) {
-            // Heap and direct buffers usually take a single buffer
-            // It will create a new ByteBuf using the same backing byte array
-            return Unpooled.wrappedBuffer(buffer.nioBuffer(index, buffer.capacity() - index));
-        }
-
-        // Use a wrapper or composite buffer
-        return Unpooled.wrappedBuffer(buffer.nioBuffers(index, buffer.capacity() - index));
-    }
-
-    /**
-     * Utility method to allow reading from the underlying bytes using a Netty {@link ByteBuf} instance for
-     * interoperability, advancing the reader index of the {@link Buffer} after the consumer is called.
-     *
-     * Note that the {@link ByteBuf} used by the consumer should not be released by the caller.
-     * In case the provided {@link Buffer} instance is not a {@link NettyBuffer}, it will create a {@link ByteBuf}
-     * wrapper for the consumer to use, releasing it after use.
-     */
-    public static void readRaw(final Buffer buffer, final Consumer<ByteBuf> consumer) {
-        if (buffer instanceof NettyBuffer) {
-            consumer.accept(((NettyBuffer)buffer).getUnderlyingBuffer());
-            return;
-        }
-
-        // Create a new ByteBuf as a wrapper
-        final int initialIndex = buffer.readerIndex();
-        final ByteBuf newBuffer = getFromIndex(buffer, initialIndex);
-
-        try {
-            // Invoke the consumer to read from the ByteBuf
-            consumer.accept(newBuffer);
-
-            // Advance the reader index of the Buffer implementation
-            buffer.readerIndex(initialIndex + newBuffer.readerIndex());
-        } finally {
-            newBuffer.release();
-        }
-    }
-
-    /**
-     * Allows writing from the underlying bytes using a Netty {@link ByteBuf} instance for interoperability,
-     * advancing the writer index of the {@link Buffer} after the consumer is called.
-     *
-     * Note that the {@link ByteBuf} used by the consumer should not be released by the caller.
-     * In case the provided {@link Buffer} instance is not a {@link NettyBuffer}, it will create a {@link ByteBuf}
-     * wrapper for the consumer to use, releasing it after use.
-     */
-    public static void writeRaw(final Buffer buffer, final Consumer<ByteBuf> consumer) {
-        if (buffer instanceof NettyBuffer) {
-            consumer.accept(((NettyBuffer)buffer).getUnderlyingBuffer());
-            return;
-        }
-
-        // Create a new ByteBuf as a wrapper
-        final int initialIndex = buffer.writerIndex();
-        final ByteBuf newBuffer = getFromIndex(buffer, initialIndex);
-
-        // Set writer index to 0
-        newBuffer.writerIndex(0);
-
-        try {
-            // Invoke the consumer to read from the ByteBuf
-            consumer.accept(newBuffer);
-
-            // Advance the reader index of the Buffer implementation
-            buffer.writerIndex(initialIndex + newBuffer.writerIndex());
-        } finally {
-            newBuffer.release();
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/RequestMessageGryoSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/RequestMessageGryoSerializer.java
deleted file mode 100644
index 6622dca..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/RequestMessageGryoSerializer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class RequestMessageGryoSerializer implements SerializerShim<RequestMessage> {
-    @Override
-    public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final RequestMessage requestMessage) {
-        kryo.writeObject(output, requestMessage.getRequestId());
-        output.writeString(requestMessage.getProcessor());
-        output.writeString(requestMessage.getOp());
-        kryo.writeObject(output, requestMessage.getArgs());
-    }
-
-    @Override
-    public <I extends InputShim> RequestMessage read(final KryoShim<I, ?> kryo, final I input, final Class<RequestMessage> aClass) {
-        final UUID id = kryo.readObject(input, UUID.class);
-        final String processor = input.readString();
-        final String op = input.readString();
-
-        final RequestMessage.Builder builder = RequestMessage.build(op)
-                .overrideRequestId(id)
-                .processor(processor);
-
-        final Map<String, Object> args = kryo.readObject(input, HashMap.class);
-        args.forEach(builder::addArg);
-        return builder.create();
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/ResponseMessageGryoSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/ResponseMessageGryoSerializer.java
deleted file mode 100644
index 8e02982..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/ResponseMessageGryoSerializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
-
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class ResponseMessageGryoSerializer implements SerializerShim<ResponseMessage> {
-    @Override
-    public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final ResponseMessage responseMessage) {
-        kryo.writeObjectOrNull(output, responseMessage.getRequestId() != null ? responseMessage.getRequestId() : null, UUID.class);
-
-        // status
-        output.writeShort((short) responseMessage.getStatus().getCode().getValue());
-        output.writeString(responseMessage.getStatus().getMessage());
-        kryo.writeClassAndObject(output, responseMessage.getStatus().getAttributes());
-
-        // result
-        kryo.writeClassAndObject(output, responseMessage.getResult().getData());
-        kryo.writeClassAndObject(output, responseMessage.getResult().getMeta());
-
-    }
-
-    @Override
-    public <I extends InputShim> ResponseMessage read(final KryoShim<I, ?> kryo, final I input, final Class<ResponseMessage> clazz) {
-        final UUID requestId = kryo.readObjectOrNull(input, UUID.class);
-        final int status = input.readShort();
-        final String statusMsg = input.readString();
-        final Map<String,Object> statusAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
-        final Object result = kryo.readClassAndObject(input);
-        final Map<String,Object> metaAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
-
-        return ResponseMessage.build(requestId)
-                .code(ResponseStatusCode.getFromValue(status))
-                .statusMessage(statusMsg)
-                .statusAttributes(statusAttributes)
-                .result(result)
-                .responseMetaData(metaAttributes)
-                .create();
-    }
-}
\ No newline at end of file
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
deleted file mode 100644
index 0a437e3..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class SerTokens {
-    private SerTokens() {}
-
-    public static final String TOKEN_ATTRIBUTES = "attributes";
-    public static final String TOKEN_RESULT = "result";
-    public static final String TOKEN_STATUS = "status";
-    public static final String TOKEN_DATA = "data";
-    public static final String TOKEN_META = "meta";
-    public static final String TOKEN_CODE = "code";
-    public static final String TOKEN_REQUEST = "requestId";
-    public static final String TOKEN_MESSAGE = "message";
-    public static final String TOKEN_PROCESSOR = "processor";
-    public static final String TOKEN_OP = "op";
-    public static final String TOKEN_ARGS = "args";
-
-    public static final String MIME_JSON = "application/json";
-    public static final String MIME_GRAPHSON_V1D0 = "application/vnd.gremlin-v1.0+json";
-    public static final String MIME_GRAPHSON_V1D0_UNTYPED = "application/vnd.gremlin-v1.0+json;types=false";
-    public static final String MIME_GRAPHSON_V2D0 = "application/vnd.gremlin-v2.0+json";
-    public static final String MIME_GRAPHSON_V2D0_UNTYPED = "application/vnd.gremlin-v2.0+json;types=false";
-    public static final String MIME_GRAPHSON_V3D0 = "application/vnd.gremlin-v3.0+json";
-    public static final String MIME_GRAPHBINARY_V1D0 = "application/vnd.graphbinary-v1.0";
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerializationException.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerializationException.java
deleted file mode 100644
index be555da..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerializationException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import java.io.IOException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class SerializationException extends IOException {
-    public SerializationException(final String msg) {
-        super(msg);
-    }
-
-    public SerializationException(final Throwable t) {
-        super(t);
-    }
-
-    public SerializationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
deleted file mode 100644
index 7c06ff6..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-
-/**
- * An enum of the default serializers.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public enum Serializers {
-
-    /**
-     * GraphSON 3.0.
-     */
-    GRAPHSON(SerTokens.MIME_JSON),
-
-    /**
-     * GraphSON 1.0 with types.
-     */
-    GRAPHSON_V1D0(SerTokens.MIME_GRAPHSON_V1D0),
-
-    /**
-     * GraphSON 2.0 without types.
-     */
-    GRAPHSON_V1D0_UNTYPED(SerTokens.MIME_GRAPHSON_V1D0_UNTYPED),
-
-    /**
-     * GraphSON 2.0 with types.
-     */
-    GRAPHSON_V2D0(SerTokens.MIME_GRAPHSON_V2D0),
-
-    /**
-     * GraphSON 2.0 without types.
-     */
-    GRAPHSON_V2D0_UNTYPED(SerTokens.MIME_GRAPHSON_V2D0_UNTYPED),
-
-    /**
-     * GraphSON 3.0 with types.
-     */
-    GRAPHSON_V3D0(SerTokens.MIME_GRAPHSON_V3D0),
-    GRAPHBINARY_V1D0(SerTokens.MIME_GRAPHBINARY_V1D0);
-
-    private String value;
-
-    Serializers(final String mimeType) {
-        this.value = mimeType;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public MessageSerializer<?> simpleInstance() {
-        switch (value) {
-            case SerTokens.MIME_JSON:
-            case SerTokens.MIME_GRAPHSON_V3D0:
-                return new GraphSONMessageSerializerV3d0();
-            case SerTokens.MIME_GRAPHSON_V1D0:
-                return new GraphSONMessageSerializerGremlinV1d0();
-            case SerTokens.MIME_GRAPHSON_V1D0_UNTYPED:
-                return new GraphSONUntypedMessageSerializerV1d0();
-            case SerTokens.MIME_GRAPHSON_V2D0:
-                return new GraphSONMessageSerializerV2d0();
-            case SerTokens.MIME_GRAPHSON_V2D0_UNTYPED:
-                return new GraphSONUntypedMessageSerializerV2d0();
-            case SerTokens.MIME_GRAPHBINARY_V1D0:
-                return new GraphBinaryMessageSerializerV1();
-            default:
-                throw new RuntimeException("Could not create a simple MessageSerializer instance of " + value);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/RequestMessageSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/RequestMessageSerializer.java
deleted file mode 100644
index 004bfe9..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/RequestMessageSerializer.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-
-public class RequestMessageSerializer {
-    private static NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
-    public RequestMessage readValue(final ByteBuf byteBuf, final GraphBinaryReader context) throws SerializationException {
-        // Wrap netty's buffer
-        final Buffer buffer = bufferFactory.create(byteBuf);
-
-        final int version = buffer.readByte() & 0xff;
-
-        if (version >>> 7 != 1) {
-            // This is an indication that the request buffer was incorrectly built
-            // Or the buffer offsets are wrong
-            throw new SerializationException("The most significant bit should be set according to the format");
-        }
-
-        try {
-            final UUID id = context.readValue(buffer, UUID.class, false);
-            final String op = context.readValue(buffer, String.class, false);
-            final String processor = context.readValue(buffer, String.class, false);
-
-            final RequestMessage.Builder builder = RequestMessage.build(op).overrideRequestId(id).processor(processor);
-
-            final Map<String, Object> args = context.readValue(buffer, Map.class, false);
-            args.forEach(builder::addArg);
-
-            return builder.create();
-        } catch (IOException ex) {
-            throw new SerializationException(ex);
-        }
-    }
-
-    public void writeValue(final RequestMessage value, final ByteBuf byteBuf, final GraphBinaryWriter context) throws SerializationException {
-        // Wrap netty's buffer
-        final Buffer buffer = bufferFactory.create(byteBuf);
-
-        try {
-            // Version
-            buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
-            // RequestId
-            context.writeValue(value.getRequestId(), buffer, false);
-            // Op
-            context.writeValue(value.getOp(), buffer, false);
-            // Processor
-            context.writeValue(value.getProcessor(), buffer, false);
-            // Args
-            context.writeValue(value.getArgs(), buffer, false);
-        } catch (IOException ex) {
-            throw new SerializationException(ex);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/ResponseMessageSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/ResponseMessageSerializer.java
deleted file mode 100644
index 5a07cdb..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/ResponseMessageSerializer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary;
-
-import io.netty.buffer.ByteBuf;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseResult;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatus;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-
-public class ResponseMessageSerializer {
-    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
-    public ResponseMessage readValue(final ByteBuf byteBuf, final GraphBinaryReader context) throws SerializationException {
-        // Wrap netty's buffer
-        final Buffer buffer = bufferFactory.create(byteBuf);
-        final int version = buffer.readByte() & 0xff;
-
-        if (version >>> 7 != 1) {
-            // This is an indication that the response buffer was incorrectly built
-            // Or the buffer offsets are wrong
-            throw new SerializationException("The most significant bit should be set according to the format");
-        }
-
-        try {
-            return ResponseMessage.build(context.readValue(buffer, UUID.class, true))
-                    .code(ResponseStatusCode.getFromValue(context.readValue(buffer, Integer.class, false)))
-                    .statusMessage(context.readValue(buffer, String.class, true))
-                    .statusAttributes(context.readValue(buffer, Map.class, false))
-                    .responseMetaData(context.readValue(buffer, Map.class, false))
-                    .result(context.read(buffer))
-                    .create();
-        } catch (IOException ex) {
-            throw new SerializationException(ex);
-        }
-    }
-
-    public void writeValue(final ResponseMessage value, final ByteBuf byteBuf, final GraphBinaryWriter context) throws SerializationException {
-        // Wrap netty's buffer
-        final Buffer buffer = bufferFactory.create(byteBuf);
-
-        final ResponseResult result = value.getResult();
-        final ResponseStatus status = value.getStatus();
-
-        try {
-            // Version
-            buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
-            // Nullable request id
-            context.writeValue(value.getRequestId(), buffer, true);
-            // Status code
-            context.writeValue(status.getCode().getValue(), buffer, false);
-            // Nullable status message
-            context.writeValue(status.getMessage(), buffer, true);
-            // Status attributes
-            context.writeValue(status.getAttributes(), buffer, false);
-            // Result meta
-            context.writeValue(result.getMeta(), buffer, false);
-            // Fully-qualified value
-            context.write(result.getData(), buffer);
-        } catch (IOException ex) {
-            throw new SerializationException(ex);
-        }
-    }
-}
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java
index 270277b..c353f45 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/AbstractClient.java
@@ -23,12 +23,14 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.nio.NioEventLoopGroup;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -49,7 +51,7 @@
 
     @Override
     public void submit(final RequestMessage requestMessage, final Consumer<ResponseMessage> callback) throws Exception {
-        callbackResponseHandler.callback = callback;
+        callbackResponseHandler.callbackByRequestId.put(requestMessage.getRequestId(), callback);
         writeAndFlush(requestMessage);
     }
 
@@ -65,7 +67,7 @@
     public CompletableFuture<List<ResponseMessage>> submitAsync(final RequestMessage requestMessage) throws Exception {
         final List<ResponseMessage> results = new ArrayList<>();
         final CompletableFuture<List<ResponseMessage>> f = new CompletableFuture<>();
-        callbackResponseHandler.callback = response -> {
+        callbackResponseHandler.callbackByRequestId.put(requestMessage.getRequestId(), response -> {
             if (f.isDone())
                 throw new RuntimeException("A terminating message was already encountered - no more messages should have been received");
 
@@ -75,7 +77,7 @@
             if (response.getStatus().getCode().isFinalResponse()) {
                 f.complete(results);
             }
-        };
+        });
 
         writeAndFlush(requestMessage);
 
@@ -83,11 +85,11 @@
     }
 
     static class CallbackResponseHandler extends SimpleChannelInboundHandler<ResponseMessage> {
-        public Consumer<ResponseMessage> callback;
+        public Map<UUID, Consumer<ResponseMessage>> callbackByRequestId = new HashMap<>();
 
         @Override
         protected void channelRead0(final ChannelHandlerContext channelHandlerContext, final ResponseMessage response) throws Exception {
-            callback.accept(response);
+            callbackByRequestId.get(response.getRequestId()).accept(response);
         }
     }
 }
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java
index 9a01c5c..43ace82 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/SimpleClient.java
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.driver.simple;
 
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
 
 import java.io.Closeable;
 import java.util.List;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
index 2337b0e..a5de7fb 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
@@ -24,11 +24,11 @@
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
 import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder;
 import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
@@ -39,7 +39,7 @@
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
 import io.netty.handler.codec.http.websocketx.WebSocketVersion;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
index 3766460..4259e25 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
@@ -23,7 +23,7 @@
 import org.apache.tinkerpop.gremlin.driver.Channelizer;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 
 import java.io.BufferedWriter;
@@ -158,7 +158,7 @@
         final int workerPoolSize = Integer.parseInt(options.getOrDefault("workerPoolSize", "2").toString());
         final int tooSlowThreshold = Integer.parseInt(options.getOrDefault("tooSlowThreshold", "125").toString());
         final String channelizer = options.getOrDefault("channelizer", Channelizer.WebSocketChannelizer.class.getName()).toString();
-        final String serializer = options.getOrDefault("serializer", Serializers.GRAPHBINARY_V1D0.name()).toString();
+        final String serializer = options.getOrDefault("serializer", Serializers.GRAPHBINARY_V1.name()).toString();
 
         final boolean exercise = Boolean.parseBoolean(options.getOrDefault("exercise", "false").toString());
         final String script = options.getOrDefault("script", "1+1").toString();
diff --git a/gremlin-driver/src/main/static/NOTICE b/gremlin-driver/src/main/static/NOTICE
index 111e687..d397c71 100644
--- a/gremlin-driver/src/main/static/NOTICE
+++ b/gremlin-driver/src/main/static/NOTICE
@@ -49,11 +49,11 @@
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 ------------------------------------------------------------------------
-Netty 4.1.96
+Netty 4.1.101
 ------------------------------------------------------------------------
 Copyright 2014 The Netty Project
 
 ------------------------------------------------------------------------
-Objenesis 2.4 (Included through gremlin-shaded)
+Objenesis 3.3 - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.objenesis
 ------------------------------------------------------------------------
-Copyright 2006-2016 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientTest.java
deleted file mode 100644
index b69d321..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-
-import java.util.Collections;
-import java.util.Optional;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.whenNew;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({Client.ClusteredClient.class, Client.SessionedClient.class, Host.class, Cluster.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
-public class ClientTest {
-    @Mock
-    private Cluster cluster;
-
-    @Mock
-    private Host mockAvailableHost;
-
-    @Mock
-    private Client.Settings settings;
-
-    private ScheduledExecutorService executor;
-    private ScheduledExecutorService scheduler;
-
-    @Before
-    public void setup() {
-        executor = Executors.newScheduledThreadPool(1);
-        scheduler = Executors.newScheduledThreadPool(1);
-        when(mockAvailableHost.isAvailable()).thenReturn(true);
-        when(cluster.allHosts()).thenReturn(Collections.singletonList(mockAvailableHost));
-        when(cluster.executor()).thenReturn(executor);
-        when(cluster.hostScheduler()).thenReturn(scheduler);
-    }
-
-    @After
-    public void cleanup() {
-        executor.shutdown();
-        scheduler.shutdown();
-    }
-
-    @Test(expected = NoHostAvailableException.class)
-    public void shouldThrowErrorWhenConnPoolInitFailsForClusteredClient() throws Exception {
-        Client.ClusteredClient client = new Client.ClusteredClient(cluster, settings);
-        whenNew(ConnectionPool.class).withAnyArguments().thenThrow(new RuntimeException("cannot initialize client"));
-        client.init();
-    }
-
-    @Test(expected = NoHostAvailableException.class)
-    public void shouldThrowErrorWhenConnPoolInitFailsForSessionClient() throws Exception {
-        final Client.SessionSettings sessionSettings = Client.SessionSettings.build().sessionId("my-session-id").create();
-        when(settings.getSession()).thenReturn(Optional.of(sessionSettings));
-        Client.SessionedClient client = new Client.SessionedClient(cluster, settings);
-        whenNew(ConnectionPool.class).withAnyArguments().thenThrow(new RuntimeException("cannot initialize client"));
-        client.init();
-    }
-
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
index 4e47684..03b8fce 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterConfigTest.java
@@ -20,8 +20,8 @@
 
 import org.apache.commons.configuration2.BaseConfiguration;
 import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
 import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
 import org.junit.Test;
 
@@ -40,10 +40,10 @@
         config.setProperty("serializer.config.maxNestingDepth", 55);
         config.setProperty("hosts", Arrays.asList("localhost"));
 
-        config.setProperty("serializer.className", GraphSONMessageSerializerV3d0.class.getCanonicalName());
+        config.setProperty("serializer.className", GraphSONMessageSerializerV3.class.getCanonicalName());
         final Cluster cluster = Cluster.open(config);
-        assertTrue(cluster.getSerializer() instanceof GraphSONMessageSerializerV3d0);
-        final GraphSONMessageSerializerV3d0 serV3 = (GraphSONMessageSerializerV3d0) cluster.getSerializer();
+        assertTrue(cluster.getSerializer() instanceof GraphSONMessageSerializerV3);
+        final GraphSONMessageSerializerV3 serV3 = (GraphSONMessageSerializerV3) cluster.getSerializer();
         final StreamReadConstraints constraints = serV3.getMapper().getFactory().streamReadConstraints();
 
         assertEquals(999, constraints.getMaxNumberLength());
@@ -59,10 +59,10 @@
         config.setProperty("serializer.config.maxNestingDepth", 55);
         config.setProperty("hosts", Arrays.asList("localhost"));
 
-        config.setProperty("serializer.className", GraphSONMessageSerializerV2d0.class.getCanonicalName());
+        config.setProperty("serializer.className", GraphSONMessageSerializerV2.class.getCanonicalName());
         final Cluster cluster = Cluster.open(config);
-        assertTrue(cluster.getSerializer() instanceof GraphSONMessageSerializerV2d0);
-        final GraphSONMessageSerializerV2d0 serV2 = (GraphSONMessageSerializerV2d0) cluster.getSerializer();
+        assertTrue(cluster.getSerializer() instanceof GraphSONMessageSerializerV2);
+        final GraphSONMessageSerializerV2 serV2 = (GraphSONMessageSerializerV2) cluster.getSerializer();
         final StreamReadConstraints constraints = serV2.getMapper().getFactory().streamReadConstraints();
 
         assertEquals(999, constraints.getMaxNumberLength());
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/MockitoHamcrestMatcherAdapter.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/MockitoHamcrestMatcherAdapter.java
deleted file mode 100644
index 252d9a9..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/MockitoHamcrestMatcherAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.mockito.ArgumentMatcher;
-import org.mockito.internal.matchers.apachecommons.ReflectionEquals;
-
-/**
- * Adapts a Mockito {@code ArgumentMatcher} to a Hamcrest {@code Matcher} so that it can be used with the Hamcrest
- * {@code assertThat}.
- */
-public class MockitoHamcrestMatcherAdapter extends BaseMatcher {
-
-    private final ArgumentMatcher<Object> mockitoMatcher;
-
-    public MockitoHamcrestMatcherAdapter(final ArgumentMatcher<Object> mockitoMatcher) {
-        this.mockitoMatcher = mockitoMatcher;
-    }
-
-    public static MockitoHamcrestMatcherAdapter reflectionEquals(final Object wanted, final String... excludeFields) {
-        return new MockitoHamcrestMatcherAdapter(new ReflectionEquals(wanted, excludeFields));
-    }
-
-    @Override
-    public boolean matches(final Object o) {
-        return mockitoMatcher.matches(o);
-    }
-
-    @Override
-    public void describeTo(final Description description) {
-        description.appendValue(mockitoMatcher.toString());
-    }
-}
\ No newline at end of file
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java
index d6b47c9..a6ccb58 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/RequestMessageTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
index 115736e..50e8769 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SerializationExceptionTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SerializationExceptionTest.java
index ba25279..c6a6364 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SerializationExceptionTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SerializationExceptionTest.java
@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SimpleSocketServer.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SimpleSocketServer.java
deleted file mode 100644
index dc9c513..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SimpleSocketServer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.logging.LogLevel;
-import io.netty.handler.logging.LoggingHandler;
-
-/**
- * Simple Netty Server
- */
-public class SimpleSocketServer {
-    public static final int PORT = 45940;
-    private EventLoopGroup bossGroup;
-    private EventLoopGroup workerGroup;
-
-    public Channel start(final ChannelInitializer<SocketChannel> channelInitializer) throws InterruptedException {
-        bossGroup = new NioEventLoopGroup(1);
-        workerGroup = new NioEventLoopGroup();
-        final ServerBootstrap b = new ServerBootstrap();
-        b.group(bossGroup, workerGroup)
-                .channel(NioServerSocketChannel.class)
-                .handler(new LoggingHandler(LogLevel.INFO))
-                .childHandler(channelInitializer);
-        return b.bind(PORT).sync().channel();
-    }
-
-    public void stop() {
-        bossGroup.shutdownGracefully();
-        workerGroup.shutdownGracefully();
-    }
-
-    public void stopSync() throws InterruptedException {
-        bossGroup.shutdownGracefully().sync();
-        workerGroup.shutdownGracefully().sync();
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestChannelizers.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestChannelizers.java
deleted file mode 100644
index 8e05ff3..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestChannelizers.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.HttpServerCodec;
-import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler;
-
-/**
- * Class that holds the channelizers that can used for testing with the SimpleSocketServer.
- */
-public class TestChannelizers {
-
-    /**
-     * A base ChannelInitializer that setups the pipeline for HTTP handling. This class should be sub-classed by a
-     * handler that handles the actual data being received.
-     */
-    public static abstract class TestHttpServerInitializer extends ChannelInitializer<SocketChannel> {
-        protected static final String WEBSOCKET_PATH = "/gremlin";
-
-        @Override
-        public void initChannel(SocketChannel ch) {
-            final ChannelPipeline pipeline = ch.pipeline();
-            pipeline.addLast(new HttpServerCodec());
-            pipeline.addLast(new HttpObjectAggregator(65536));
-        }
-    }
-
-    /**
-     * A vanilla WebSocket server Initializer implementation using Netty. This initializer would configure the server
-     * for WebSocket handshake and decoding incoming WebSocket frames.
-     */
-    public static abstract class TestWebSocketServerInitializer extends TestChannelizers.TestHttpServerInitializer {
-
-        @Override
-        public void initChannel(SocketChannel ch) {
-            super.initChannel(ch);
-
-            final ChannelPipeline pipeline = ch.pipeline();
-            pipeline.addLast(new WebSocketServerCompressionHandler());
-            pipeline.addLast(new WebSocketServerProtocolHandler(WEBSOCKET_PATH, null, true));
-            this.postInit(ch.pipeline());
-        }
-
-        public abstract void postInit(final ChannelPipeline ch);
-    }
-
-    /**
-     * An initializer that adds a handler that will drop WebSocket frames.
-     */
-    public static class TestWSNoOpInitializer extends TestHttpServerInitializer {
-
-        @Override
-        public void initChannel(SocketChannel ch) {
-            super.initChannel(ch);
-            ch.pipeline().addLast(new TestHandlers.NoOpWebSocketServerHandler(WEBSOCKET_PATH));
-        }
-    }
-
-    /**
-     * An initializer that adds a handler to mimics a server that is throttling connections.
-     */
-    public static class TestConnectionThrottlingInitializer extends TestHttpServerInitializer {
-        int connectionCount = 0;
-
-        @Override
-        public void initChannel(SocketChannel ch) {
-            super.initChannel(ch);
-
-            final ChannelPipeline pipeline = ch.pipeline();
-            if (connectionCount < 1) {
-                pipeline.addLast(new WebSocketServerCompressionHandler());
-                pipeline.addLast(new WebSocketServerProtocolHandler(WEBSOCKET_PATH, null, true));
-                pipeline.addLast(new TestWSGremlinInitializer.ClientTestConfigurableHandler());
-            } else {
-                pipeline.addLast(new TestHandlers.NoOpWebSocketServerHandler(WEBSOCKET_PATH));
-            }
-
-            connectionCount++;
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestHandlers.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestHandlers.java
deleted file mode 100644
index e373b02..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestHandlers.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.util.ReferenceCountUtil;
-
-/**
- * Class that holds the handlers that can used by the initializers in TestChannelizers.
- */
-public class TestHandlers {
-
-    /**
-     * Handler that will drop requests to the WebSocket path.
-     */
-    public static class NoOpWebSocketServerHandler extends ChannelInboundHandlerAdapter {
-        private String websocketPath;
-
-        public NoOpWebSocketServerHandler(String websocketPath) {
-            this.websocketPath = websocketPath;
-        }
-
-        @Override
-        public void channelRead(ChannelHandlerContext ctx, Object msg) {
-            if ((msg instanceof HttpRequest) && ((HttpRequest) msg).uri().endsWith(websocketPath)) {
-                ReferenceCountUtil.release(msg);
-            }
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestWSGremlinInitializer.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestWSGremlinInitializer.java
deleted file mode 100644
index eda187c..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TestWSGremlinInitializer.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver;
-
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-
-import java.util.List;
-import java.util.UUID;
-
-
-/**
- * Initializer which partially mimics the Gremlin Server. This initializer injects a handler in the
- * server pipeline that can be modified to send the desired response for a test case.
- */
-public class TestWSGremlinInitializer extends TestChannelizers.TestWebSocketServerInitializer {
-    private static final Logger logger = LoggerFactory.getLogger(TestWSGremlinInitializer.class);
-    /**
-     * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
-     * graph.
-     */
-    public static final UUID SINGLE_VERTEX_REQUEST_ID =
-            UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
-
-    /**
-     * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
-     * graph. After some delay, server sends a Close WebSocket frame on the same connection.
-     */
-    public static final UUID SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID =
-            UUID.fromString("3cb39c94-9454-4398-8430-03485d08bdae");
-
-    public static final UUID FAILED_AFTER_DELAY_REQUEST_ID =
-            UUID.fromString("edf79c8b-1d32-4102-a5d2-a5feeca40864");
-    public static final UUID CLOSE_CONNECTION_REQUEST_ID =
-            UUID.fromString("0150143b-00f9-48a7-a268-28142d902e18");
-    public static final UUID CLOSE_CONNECTION_REQUEST_ID_2 =
-            UUID.fromString("3c4cf18a-c7f2-4dad-b9bf-5c701eb33000");
-    public static final UUID RESPONSE_CONTAINS_SERVER_ERROR_REQUEST_ID =
-            UUID.fromString("0d333b1d-6e91-4807-b915-50b9ad721d20");
-    /**
-     * If a request with this ID comes to the server, the server responds with the user agent (if any) that was captured
-     * during the web socket handshake.
-     */
-    public static final UUID USER_AGENT_REQUEST_ID =
-            UUID.fromString("20ad7bfb-4abf-d7f4-f9d3-9f1d55bee4ad");
-
-    /**
-     * Gremlin serializer used for serializing/deserializing the request/response. This should be same as client.
-     */
-    private static final GraphSONMessageSerializerV2d0 SERIALIZER = new GraphSONMessageSerializerV2d0();
-    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
-    @Override
-    public void postInit(ChannelPipeline pipeline) {
-        pipeline.addLast(new ClientTestConfigurableHandler());
-    }
-
-    /**
-     * Handler introduced in the server pipeline to configure expected response for test cases.
-     */
-    static class ClientTestConfigurableHandler extends MessageToMessageDecoder<BinaryWebSocketFrame> {
-        private String userAgent = "";
-        @Override
-        protected void decode(final ChannelHandlerContext ctx, final BinaryWebSocketFrame frame, final List<Object> objects)
-                throws Exception {
-            final ByteBuf messageBytes = frame.content();
-            final byte len = messageBytes.readByte();
-            if (len <= 0) {
-                objects.add(RequestMessage.INVALID);
-                return;
-            }
-
-            final ByteBuf contentTypeBytes = ctx.alloc().buffer(len);
-            try {
-                messageBytes.readBytes(contentTypeBytes);
-            } finally {
-                contentTypeBytes.release();
-            }
-            final RequestMessage msg = SERIALIZER.deserializeRequest(messageBytes.discardReadBytes());
-
-            if (msg.getRequestId().equals(SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID)) {
-                logger.info("sending vertex result frame");
-                ctx.channel().writeAndFlush(new TextWebSocketFrame(returnSingleVertexResponse(
-                        SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID)));
-                logger.info("waiting for 2 sec");
-                Thread.sleep(2000);
-                logger.info("sending close frame");
-                ctx.channel().writeAndFlush(new CloseWebSocketFrame());
-            } else if (msg.getRequestId().equals(SINGLE_VERTEX_REQUEST_ID)) {
-                logger.info("sending vertex result frame");
-                ctx.channel().writeAndFlush(new TextWebSocketFrame(returnSingleVertexResponse(SINGLE_VERTEX_REQUEST_ID)));
-            } else if (msg.getRequestId().equals(FAILED_AFTER_DELAY_REQUEST_ID)) {
-                logger.info("waiting for 2 sec");
-                Thread.sleep(1000);
-                final ResponseMessage responseMessage = ResponseMessage.build(msg)
-                        .code(ResponseStatusCode.SERVER_ERROR)
-                        .statusAttributeException(new RuntimeException()).create();
-                ctx.channel().writeAndFlush(new TextWebSocketFrame(SERIALIZER.serializeResponseAsString(responseMessage, allocator)));
-            } else if (msg.getRequestId().equals(CLOSE_CONNECTION_REQUEST_ID)) {
-                Thread.sleep(1000);
-                ctx.channel().writeAndFlush(new CloseWebSocketFrame());
-            } else if (msg.getRequestId().equals(RESPONSE_CONTAINS_SERVER_ERROR_REQUEST_ID)) {
-                Thread.sleep(1000);
-                ctx.channel().writeAndFlush(new CloseWebSocketFrame());
-            } else if (msg.getRequestId().equals(USER_AGENT_REQUEST_ID)) {
-                ctx.channel().writeAndFlush(new TextWebSocketFrame(returnSimpleStringResponse(USER_AGENT_REQUEST_ID, userAgent)));
-            } else {
-                try {
-                    Thread.sleep(Long.parseLong((String) msg.getArgs().get("gremlin")));
-                    ctx.channel().writeAndFlush(new TextWebSocketFrame(returnSingleVertexResponse(msg.getRequestId())));
-                } catch (NumberFormatException nfe) {
-                    // Ignore. Only return a vertex if the query was a long value.
-                }
-            }
-        }
-
-        private String returnSingleVertexResponse(final UUID requestID) throws SerializationException {
-            final TinkerGraph graph = TinkerFactory.createClassic();
-            final GraphTraversalSource g = graph.traversal();
-            final Vertex t = g.V().limit(1).next();
-
-            return SERIALIZER.serializeResponseAsString(ResponseMessage.build(requestID).result(t).create(), allocator);
-        }
-
-        /**
-         * Packages a string message into a ResponseMessage, serializes it, and returns the serialized string
-         * @throws SerializationException
-         */
-        private String returnSimpleStringResponse(final UUID requestID, String message) throws SerializationException {
-            return SERIALIZER.serializeResponseAsString(ResponseMessage.build(requestID).result(message).create(), allocator);
-        }
-
-        /**
-         * Captures and stores User-Agent if included in header
-         */
-        @Override
-        public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) {
-            if(evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
-                WebSocketServerProtocolHandler.HandshakeComplete handshake = (WebSocketServerProtocolHandler.HandshakeComplete) evt;
-                HttpHeaders requestHeaders = handshake.requestHeaders();
-                if(requestHeaders.contains(UserAgent.USER_AGENT_HEADER_NAME)) {
-                    userAgent = requestHeaders.get(UserAgent.USER_AGENT_HEADER_NAME);
-                }
-                else {
-                    ctx.fireUserEventTriggered(evt);
-                }
-            }
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TokensTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TokensTest.java
index 4ab52fb..cbbb2d6 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TokensTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TokensTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.driver;
 
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.junit.Test;
 
 import java.lang.reflect.Constructor;
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java
index e9e781d..1ff5814 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/WebSocketClientBehaviorIntegrateTest.java
@@ -19,7 +19,10 @@
 package org.apache.tinkerpop.gremlin.driver;
 
 import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.AbstractWarningVerificationStrategy;
+import org.apache.tinkerpop.gremlin.socket.server.SimpleSocketServer;
+import org.apache.tinkerpop.gremlin.socket.server.SocketServerSettings;
+import org.apache.tinkerpop.gremlin.socket.server.TestChannelizers;
+import org.apache.tinkerpop.gremlin.socket.server.TestWSGremlinInitializer;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -30,10 +33,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
 
+import java.io.IOException;
+import java.nio.file.FileSystems;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -59,8 +64,15 @@
 
     private static LogCaptor logCaptor;
 
+    private final SocketServerSettings settings;
+
     private SimpleSocketServer server;
 
+    public WebSocketClientBehaviorIntegrateTest() throws IOException {
+        settings = SocketServerSettings.read(FileSystems.getDefault().getPath("..","gremlin-tools", "gremlin-socket-server", "conf", "test-ws-gremlin.yaml"));
+        settings.SERIALIZER = "GraphSONV2";
+    }
+
     @BeforeClass
     public static void setupLogCaptor() {
         logCaptor = LogCaptor.forRoot();
@@ -75,15 +87,15 @@
     public void setUp() throws InterruptedException {
         logCaptor.clearLogs();
 
-        server = new SimpleSocketServer();
+        server = new SimpleSocketServer(settings);
         if (name.getMethodName().equals("shouldAttemptHandshakeForLongerThanDefaultNettySslHandshakeTimeout") ||
                 name.getMethodName().equals("shouldPrintCorrectErrorForRegularWebSocketHandshakeTimeout")) {
             server.start(new TestChannelizers.TestWSNoOpInitializer());
         } else if (name.getMethodName().equals("shouldContinueRunningRemainingConnectionsIfServerThrottlesNewConnections") ||
                 name.getMethodName().equals("shouldReturnCorrectExceptionIfServerThrottlesNewConnectionsAndMaxWaitExceeded")) {
-            server.start(new TestChannelizers.TestConnectionThrottlingInitializer());
+            server.start(new TestChannelizers.TestConnectionThrottlingInitializer(settings));
         } else {
-            server.start(new TestWSGremlinInitializer());
+            server.start(new TestWSGremlinInitializer(settings));
         }
     }
 
@@ -98,16 +110,16 @@
      */
     @Test
     public void shouldIncludeUserAgentInHandshakeRequest() {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
         final Client.ClusteredClient client = cluster.connect();
 
         // trigger the testing server to return captured user agent
         String returnedUserAgent = client.submit("1", RequestOptions.build()
-                        .overrideRequestId(TestWSGremlinInitializer.USER_AGENT_REQUEST_ID).create()).one().getString();
+                        .overrideRequestId(settings.USER_AGENT_REQUEST_ID).create()).one().getString();
         assertEquals(UserAgent.USER_AGENT, returnedUserAgent);
     }
 
@@ -116,17 +128,17 @@
      */
     @Test
     public void shouldNotIncludeUserAgentInHandshakeRequestIfDisabled() {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .enableUserAgentOnConnect(false)
                 .create();
         final Client.ClusteredClient client = cluster.connect();
 
         // trigger the testing server to return captured user agent
         String returnedUserAgent = client.submit("1", RequestOptions.build()
-                .overrideRequestId(TestWSGremlinInitializer.USER_AGENT_REQUEST_ID).create()).one().getString();
+                .overrideRequestId(settings.USER_AGENT_REQUEST_ID).create()).one().getString();
         assertEquals("", returnedUserAgent);
     }
 
@@ -151,7 +163,7 @@
         // pool used just for the purpose of initializing the hosts).
         final Cluster cluster = Cluster.build("localhost").
                 addContactPoint("localhost").
-                addContactPoint("localhost").port(SimpleSocketServer.PORT).
+                addContactPoint("localhost").port(settings.PORT).
                 workerPoolSize(1).
                 minConnectionPoolSize(32).maxConnectionPoolSize(32).create();
 
@@ -188,10 +200,10 @@
      */
     @Test
     public void shouldRemoveConnectionFromPoolWhenServerClose_WithNoPendingRequests() throws InterruptedException {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
         final Client.ClusteredClient client = cluster.connect();
 
@@ -207,7 +219,7 @@
 
         // trigger the testing server to send a WS close frame
         Vertex v = client.submit("1", RequestOptions.build()
-                .overrideRequestId(TestWSGremlinInitializer.SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID).create())
+                .overrideRequestId(settings.SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID).create())
                 .one().getVertex();
 
         assertNotNull(v);
@@ -224,7 +236,7 @@
 
         // assert sanity after connection replacement
         v = client.submit("1",
-                RequestOptions.build().overrideRequestId(TestWSGremlinInitializer.SINGLE_VERTEX_REQUEST_ID).create())
+                RequestOptions.build().overrideRequestId(settings.SINGLE_VERTEX_REQUEST_ID).create())
                 .one().getVertex();
         assertNotNull(v);
     }
@@ -235,10 +247,10 @@
      */
     @Test
     public void shouldRemoveConnectionFromPoolWhenServerClose_WithPendingRequests() throws InterruptedException, ExecutionException {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
 
         final Client.ClusteredClient client = cluster.connect();
@@ -252,9 +264,9 @@
 
         // Send two requests in flight. Both should error out.
         final CompletableFuture<ResultSet> req1 = client.submitAsync("1", RequestOptions.build()
-                .overrideRequestId(TestWSGremlinInitializer.CLOSE_CONNECTION_REQUEST_ID).create());
+                .overrideRequestId(settings.CLOSE_CONNECTION_REQUEST_ID).create());
         final CompletableFuture<ResultSet> req2 = client.submitAsync("1", RequestOptions.build()
-                .overrideRequestId(TestWSGremlinInitializer.CLOSE_CONNECTION_REQUEST_ID_2).create());
+                .overrideRequestId(settings.CLOSE_CONNECTION_REQUEST_ID_2).create());
 
 
         // assert both are sent on same connection
@@ -272,7 +284,7 @@
 
         // assert sanity after connection replacement
         final Vertex v = client.submit("1",
-                RequestOptions.build().overrideRequestId(TestWSGremlinInitializer.SINGLE_VERTEX_REQUEST_ID).create())
+                RequestOptions.build().overrideRequestId(settings.SINGLE_VERTEX_REQUEST_ID).create())
                 .one().getVertex();
         assertNotNull(v);
     }
@@ -283,10 +295,10 @@
      */
     @Test
     public void shouldNotCreateReplacementConnectionWhenClientClosesConnection() throws ExecutionException, InterruptedException {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
         final Client.ClusteredClient client = cluster.connect();
 
@@ -320,7 +332,7 @@
      */
     @Test
     public void shouldAttemptHandshakeForLongerThanDefaultNettySslHandshakeTimeout() {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(1)
                 .connectionSetupTimeoutMillis(20000) // needs to be larger than 10000ms.
@@ -351,7 +363,7 @@
      */
     @Test
     public void shouldPrintCorrectErrorForRegularWebSocketHandshakeTimeout() throws InterruptedException {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(1)
                 .connectionSetupTimeoutMillis(120)
@@ -380,7 +392,7 @@
      */
     @Test
     public void shouldContinueRunningRemainingConnectionsIfServerThrottlesNewConnections() throws ExecutionException, InterruptedException, TimeoutException {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(5)
                 .maxWaitForConnection(15000) // large value ensures that request will eventually find a connection.
@@ -389,7 +401,7 @@
                 .maxInProcessPerConnection(1)
                 .minSimultaneousUsagePerConnection(0)
                 .maxSimultaneousUsagePerConnection(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
 
         final Client.ClusteredClient client = cluster.connect();
@@ -413,7 +425,7 @@
      */
     @Test
     public void shouldReturnCorrectExceptionIfServerThrottlesNewConnectionsAndMaxWaitExceeded() {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxConnectionPoolSize(5)
                 .maxWaitForConnection(250) // small value ensures that requests will return TimeoutException.
@@ -422,7 +434,7 @@
                 .maxInProcessPerConnection(1)
                 .minSimultaneousUsagePerConnection(0)
                 .maxSimultaneousUsagePerConnection(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
 
         final Client.ClusteredClient client = cluster.connect();
@@ -445,9 +457,9 @@
      */
     @Test
     public void shouldContinueRunningIfServerGoesDownTemporarily() throws InterruptedException {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
 
         final Client.ClusteredClient client = cluster.connect();
@@ -457,8 +469,8 @@
         scheduledPool.schedule(() -> {
             try {
                 server.stopSync();
-                server = new SimpleSocketServer();
-                server.start(new TestWSGremlinInitializer());
+                server = new SimpleSocketServer(settings);
+                server.start(new TestWSGremlinInitializer(settings));
                 synchronized (lock) {
                     lock.notify();
                 }
@@ -483,11 +495,11 @@
      */
     @Test
     public void shouldReturnCorrectExceptionIfServerGoesDown() throws InterruptedException {
-        final Cluster cluster = Cluster.build("localhost").port(SimpleSocketServer.PORT)
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
                 .minConnectionPoolSize(1)
                 .maxWaitForConnection(500)
                 .connectionSetupTimeoutMillis(100)
-                .serializer(Serializers.GRAPHSON_V2D0)
+                .serializer(Serializers.GRAPHSON_V2)
                 .create();
 
         final Client.ClusteredClient client = cluster.connect();
@@ -505,4 +517,28 @@
 
         cluster.close();
     }
+
+    /**
+     * Tests that client is correctly sending all overridable per request settings (requestId, batchSize,
+     * evaluationTimeout, and userAgent) to the server.
+     */
+    @Test
+    public void shouldSendPerRequestSettingsToServer() {
+        final Cluster cluster = Cluster.build("localhost").port(settings.PORT)
+                .minConnectionPoolSize(1)
+                .maxConnectionPoolSize(1)
+                .serializer(Serializers.GRAPHSON_V2)
+                .create();
+        final Client.ClusteredClient client = cluster.connect();
+
+        // trigger the testing server to return captured request settings
+        String response = client.submit("1", RequestOptions.build()
+                .overrideRequestId(settings.PER_REQUEST_SETTINGS_REQUEST_ID)
+                .timeout(1234).userAgent("helloWorld").batchSize(12)
+                .materializeProperties("tokens").create()).one().getString();
+
+        String expectedResponse = String.format("requestId=%s evaluationTimeout=%d, batchSize=%d, userAgent=%s, materializeProperties=%s",
+                settings.PER_REQUEST_SETTINGS_REQUEST_ID, 1234, 12, "helloWorld", "tokens");
+        assertEquals(expectedResponse, response);
+    }
 }
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
deleted file mode 100644
index 3fc8a78..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.driver.message;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class ResponseStatusCodeTest {
-
-    @Test
-    public void shouldIndicateFinalMessagesStatusCodes() {
-        assertFalse(ResponseStatusCode.AUTHENTICATE.isFinalResponse());
-        assertFalse(ResponseStatusCode.PARTIAL_CONTENT.isFinalResponse());
-        assertTrue(ResponseStatusCode.SUCCESS.isFinalResponse());
-        assertTrue(ResponseStatusCode.SERVER_ERROR_TIMEOUT.isFinalResponse());
-    }
-}
\ No newline at end of file
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
index cbc0233..be58789 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
@@ -19,7 +19,7 @@
 package org.apache.tinkerpop.gremlin.driver.remote;
 
 import org.apache.tinkerpop.gremlin.driver.RequestOptions;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.junit.Test;
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0Test.java
deleted file mode 100644
index bde7816..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0Test.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class AbstractGraphSONMessageSerializerV1d0Test {
-    @Test
-    public void shouldApplyMaxTokenLengthsOnConfigure() {
-        // Initialize bare-bones AbstractGraphSONMessageSerializerV1d0
-        final AbstractGraphSONMessageSerializerV1d0 serializer = new AbstractGraphSONMessageSerializerV1d0() {
-            @Override byte[] obtainHeader() { return new byte[0]; }
-            @Override GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) { return builder;}
-            @Override public String[] mimeTypesSupported() {return new String[0]; }
-        };
-
-        final Map<String, Object> config = new HashMap<>();
-        config.put("maxNumberLength", 999);
-        config.put("maxStringLength", 12345);
-        config.put("maxNestingDepth", 55);
-
-        serializer.configure(config, null);
-
-        final StreamReadConstraints constraints = serializer.getMapper().getFactory().streamReadConstraints();
-
-        assertEquals(999, constraints.getMaxNumberLength());
-        assertEquals(12345, constraints.getMaxStringLength());
-        assertEquals(55, constraints.getMaxNestingDepth());
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0Test.java
deleted file mode 100644
index d0c825f..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0Test.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-public class AbstractGraphSONMessageSerializerV2d0Test {
-    @Test
-    public void shouldApplyMaxTokenLengthsOnConfigure() {
-        // Initialize bare-bones AbstractGraphSONMessageSerializerV1d0
-        final AbstractGraphSONMessageSerializerV2d0 serializer = new AbstractGraphSONMessageSerializerV2d0() {
-            @Override byte[] obtainHeader() { return new byte[0]; }
-            @Override GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) { return builder;}
-            @Override public String[] mimeTypesSupported() {return new String[0]; }
-        };
-
-        final Map<String, Object> config = new HashMap<>();
-        config.put("maxNumberLength", 999);
-        config.put("maxStringLength", 12345);
-        config.put("maxNestingDepth", 55);
-
-        serializer.configure(config, null);
-
-        final StreamReadConstraints constraints = serializer.getMapper().getFactory().streamReadConstraints();
-
-        assertEquals(999, constraints.getMaxNumberLength());
-        assertEquals(12345, constraints.getMaxStringLength());
-        assertEquals(55, constraints.getMaxNestingDepth());
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractRoundTripTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractRoundTripTest.java
deleted file mode 100644
index 43b092a..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractRoundTripTest.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.process.computer.Computer;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.IoTest;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
-import static org.apache.tinkerpop.gremlin.driver.MockitoHamcrestMatcherAdapter.reflectionEquals;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-
-@RunWith(Parameterized.class)
-public abstract class AbstractRoundTripTest {
-
-    protected static final GraphTraversalSource g = TinkerFactory.createModern().traversal();
-    @Parameterized.Parameters(name = "Type{0}")
-    public static Collection input() throws Exception {
-        final Bytecode bytecode = new Bytecode();
-        bytecode.addStep("V");
-        bytecode.addStep("tail", 3);
-        bytecode.addSource(TraversalSource.Symbols.withComputer, "myComputer");
-
-        final Map<String, Integer> map = new HashMap<>();
-        map.put("one", 1);
-        map.put("two", 2);
-
-        final Map<String, Map<String, Integer>> nestedMap = new HashMap<>();
-        nestedMap.put("first", map);
-
-        final List<Object> list = new ArrayList<>();
-        list.add("string 1");
-        list.add("string 1");
-        list.add(200);
-        list.add("string 2");
-
-        final List<List<Object>> nestedList = new ArrayList<>();
-        nestedList.add(list);
-
-        final Set<Object> set = new HashSet<>();
-        set.add("one");
-        set.add(2);
-
-        final Set<Set<Object>> nestedSet = new HashSet<>();
-        nestedSet.add(set);
-
-        final BulkSet<String> bulkSet = new BulkSet<>();
-        bulkSet.add("marko", 1);
-        bulkSet.add("josh", 3);
-
-        final Tree<Vertex> tree = new Tree<>();
-        final Tree<Vertex> subTree = new Tree<>();
-        final Tree<Vertex> subSubTree = new Tree<>();
-        subSubTree.put(new ReferenceVertex(1, "animal"), new Tree<>());
-        subSubTree.put(new ReferenceVertex(2, "animal"), new Tree<>());
-        subTree.put(new ReferenceVertex(100, "animal"), subSubTree);
-        tree.put(new ReferenceVertex(1000, "animal"), subTree);
-
-        final MutableMetrics metrics = new MutableMetrics("id1", "name1");
-        metrics.setDuration(123, TimeUnit.MICROSECONDS);
-        metrics.setCount("c1", 20);
-        metrics.setAnnotation("a", "b");
-        metrics.addNested(new MutableMetrics("idNested", "nameNested"));
-
-        // can't use the existing 'metrics' because traversal metrics modifies its nested metrics
-        final MutableMetrics metrics1 = metrics.clone();
-
-        final MutableMetrics metrics2 = new MutableMetrics("id2", "name2");
-        metrics2.setDuration(456, TimeUnit.MICROSECONDS);
-        metrics2.setCount("c2", 40);
-        metrics2.setAnnotation("c", "d");
-        metrics2.addNested(new MutableMetrics("idNested2", "nameNested2"));
-
-        List<MutableMetrics> nestedMetrics = Arrays.asList(metrics1, metrics2);
-        final DefaultTraversalMetrics traversalMetrics = new DefaultTraversalMetrics(666, nestedMetrics);
-        final DefaultTraversalMetrics emptyTraversalMetrics = new DefaultTraversalMetrics(444, Collections.emptyList());
-
-        return Arrays.asList(
-                new Object[] {"String", "ABC", null},
-                new Object[] {"Char", '£', null},
-
-                // numerics
-                new Object[] {"Byte", 1, null},
-                new Object[] {"Integer", 1, null},
-                new Object[] {"Float", 2f, null},
-                new Object[] {"Double", 3.1d, null},
-                new Object[] {"Double", Double.NaN, null},
-                new Object[] {"Double", Double.POSITIVE_INFINITY, null},
-                new Object[] {"Double", Double.NEGATIVE_INFINITY, null},
-                new Object[] {"Long", 10122L, null},
-                new Object[] {"IntegerZero", 0, null},
-                new Object[] {"FloatZero", 0f, null},
-                new Object[] {"IntegerMin", Integer.MIN_VALUE, null},
-                new Object[] {"IntegerMax", Integer.MAX_VALUE, null},
-                new Object[] {"LongMax", Long.MAX_VALUE, null},
-                new Object[] {"BigIntegerPos", new BigInteger("1234567890987654321"), null},
-                new Object[] {"BigIntegerNeg", new BigInteger("-1234567890987654321"), null},
-                new Object[] {"BigDecimalPos", new BigDecimal("1234567890987654321.1232132"), null},
-                new Object[] {"BigDecimalNeg", new BigDecimal("-1234567890987654321.1232132"), null},
-
-                // date+time
-                new Object[] {"Date", DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US).parse("Jan 12, 1952"), null},
-                new Object[] {"Timestamp", Timestamp.valueOf("2016-01-15 12:01:02"), null},
-                new Object[] {"Duration", Duration.ofSeconds(213123213, 400), null},
-                new Object[] {"Instant", Instant.ofEpochSecond(213123213, 400), null},
-                new Object[] {"LocalDate", LocalDate.of(2016, 10, 21), null},
-                new Object[] {"LocalTime", LocalTime.of(12, 20, 30, 300), null},
-                new Object[] {"LocalDateTime", LocalDateTime.of(2016, 10, 21, 12, 20, 30, 300), null},
-                new Object[] {"MonthDay", MonthDay.of(12, 28), null},
-                new Object[] {"OffsetDateTime", OffsetDateTime.of(2017, 11, 15, 12, 30, 45, 300, ZoneOffset.ofTotalSeconds(400)), null},
-                new Object[] {"OffsetTime", OffsetTime.of(12, 30, 45, 300, ZoneOffset.ofTotalSeconds(400)), null},
-                new Object[] {"Period", Period.of(1, 6, 15), null},
-                new Object[] {"Year", Year.of(1996), null},
-                new Object[] {"YearMonth", YearMonth.of(2016, 11), null},
-                new Object[] {"ZonedDateTime", ZonedDateTime.of(2016, 11, 15, 12, 30, 45, 300, ZoneOffset.ofTotalSeconds(200)), null},
-                new Object[] {"ZoneOffset", ZoneOffset.ofTotalSeconds(100), null},
-
-                new Object[] {"UUID", UUID.randomUUID(), null},
-                new Object[] {"Bytecode", bytecode, null},
-                new Object[] {"Binding", new Bytecode.Binding<>("x", 123), null},
-                new Object[] {"Traverser", new DefaultRemoteTraverser<>("marko", 100), null},
-                new Object[] {"Class", Bytecode.class, null},
-                new Object[] {"ByteBuffer", ByteBuffer.wrap(new byte[]{ 1, 2, 3 }), null},
-                new Object[] {"InetAddressV4", InetAddress.getByName("localhost"), null},
-                new Object[] {"InetAddressV6", InetAddress.getByName("::1"), null},
-                new Object[] {"Lambda0", Lambda.supplier("return 1"), null},
-                new Object[] {"Lambda1", Lambda.consumer("it"), null},
-                new Object[] {"Lambda2", Lambda.biFunction("x,y -> x + y"), null},
-                new Object[] {"LambdaN", new Lambda.UnknownArgLambda("x,y,z -> x + y + z", "gremlin-groovy", 3), null},
-
-                // enums
-                new Object[] {"Barrier", SackFunctions.Barrier.normSack, null},
-                new Object[] {"Cardinality", VertexProperty.Cardinality.list, null},
-                new Object[] {"Columns", Column.values, null},
-                new Object[] {"Direction", Direction.BOTH, null},
-                new Object[] {"Operator", Operator.sum, null},
-                new Object[] {"Operator", Operator.div, null},
-                new Object[] {"Order", Order.desc, null},
-                new Object[] {"Pick", Pick.any, null},
-                new Object[] {"Pop", Pop.mixed, null},
-                new Object[] {"Scope", Scope.global, null},
-                new Object[] {"T", T.label, null},
-                new Object[] {"Pgt", P.gt(0), null},
-                new Object[] {"Pgte", P.gte(0), null},
-                new Object[] {"Pbetween", P.between(0,1), null},
-                new Object[] {"Pand", P.gt(1).and(P.lt(2)), null},
-                new Object[] {"Por", P.gt(1).or(P.lt(2)), null},
-                new Object[] {"Pnot", P.not(P.lte(1)), null},
-                new Object[] {"Pwithout", P.without(1,2,3,4,null), null},
-                new Object[] {"Pinside", P.inside(0.0d, 0.6d), null},
-                new Object[] {"TextPstartingWith", TextP.startingWith("mark"), null},
-                new Object[] {"TextPregex", TextP.regex("^meh"), null},
-                new Object[] {"TextPnotRegex", TextP.notRegex("^meh"), null},
-
-                // graph
-                new Object[] {"ReferenceEdge", new ReferenceEdge(123, "person", new ReferenceVertex(123, "person"), new ReferenceVertex(321, "person")), null},
-                new Object[] {"TinkerEdge", g.E().hasLabel("knows").next(), null},
-                new Object[] {"ReferenceProperty", new ReferenceProperty<>("name", "john"), (Consumer<ReferenceProperty>) referenceProperty -> {
-                    assertEquals("name", referenceProperty.key());
-                    assertEquals("john", referenceProperty.value());
-                }},
-                new Object[] {"ReferenceVertex", new ReferenceVertex(123, "person"), null},
-                new Object[] {"TinkerVertex", g.V().hasLabel("person").next(), null},
-                new Object[] {"ReferenceVertexProperty", new ReferenceVertexProperty<>(123, "name", "john"), (Consumer<ReferenceVertexProperty>) referenceProperty -> {
-                    assertEquals("name", referenceProperty.key());
-                    assertEquals("john", referenceProperty.value());
-                    assertEquals(123, referenceProperty.id());
-                }},
-                new Object[] {"PathLabelled", g.V().as("a", "b").out().as("c").path().next(), null},
-                new Object[] {"PathNotLabelled", g.V().out().inE().values().path().next(), null},
-                new Object[] {"Graph", g.E().subgraph("k").cap("k").next(), (Consumer<Graph>) graph -> {
-                    IoTest.assertModernGraph(graph, true, false);
-                }},
-                new Object[] {"TraversalStrategyVertexProgram", new VertexProgramStrategy(Computer.compute()), (Consumer<TraversalStrategyProxy>) strategy -> {
-                    assertEquals(VertexProgramStrategy.class, strategy.getStrategyClass());
-                    assertEquals("org.apache.tinkerpop.gremlin.process.computer.GraphComputer", strategy.getConfiguration().getProperty(VertexProgramStrategy.GRAPH_COMPUTER));
-                }},
-                new Object[] {"TraversalStrategySubgraph", SubgraphStrategy.build().vertices(hasLabel("person")).create(), (Consumer<TraversalStrategyProxy>) strategy -> {
-                    assertEquals(SubgraphStrategy.class, strategy.getStrategyClass());
-                    assertEquals(hasLabel("person").asAdmin().getBytecode(), strategy.getConfiguration().getProperty(SubgraphStrategy.VERTICES));
-                }},
-                new Object[] {"BulkSet", bulkSet, null},
-                new Object[] {"Tree", tree, null},
-                new Object[] {"EmptyMetrics", new MutableMetrics("idEmpty", "nameEmpty"), (Consumer<Metrics>) m -> {
-                    assertThat(m, reflectionEquals(new MutableMetrics("idEmpty", "nameEmpty")));
-                }},
-                new Object[] {"Metrics", metrics, (Consumer<Metrics>) m -> {
-                    assertThat(m, reflectionEquals(metrics, "nested", "counts"));
-                    assertEquals(new ArrayList(metrics.getCounts().values()), new ArrayList(m.getCounts().values()));
-                    assertThat(m.getNested(), reflectionEquals(metrics.getNested()));
-                }},
-                new Object[] {"EmptyTraversalMetrics", emptyTraversalMetrics, (Consumer<TraversalMetrics>) m -> {
-                    assertThat(m, reflectionEquals(emptyTraversalMetrics));
-                }},
-                new Object[] {"TraversalMetrics", traversalMetrics, (Consumer<TraversalMetrics>) m -> {
-                    assertEquals(m.toString(), traversalMetrics.toString());
-                    assertThat(m, reflectionEquals(traversalMetrics, "stepIndexedMetrics", "positionIndexedMetrics"));
-                }},
-
-                // collections
-                new Object[] {"ListSingle", list, null},
-                new Object[] {"ListNested", nestedList, null},
-                new Object[] {"Map", map, null},
-                new Object[] {"Map", nestedMap, null},
-                new Object[] {"Set", set, null},
-                new Object[] {"SetNested", nestedSet, null});
-    }
-
-    @Parameterized.Parameter(value = 0)
-    public String name;
-
-    @Parameterized.Parameter(value = 1)
-    public Object value;
-
-    @Parameterized.Parameter(value = 2)
-    public Consumer<?> assertion;
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
deleted file mode 100644
index 8cba236..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONMessageSerializerGremlinV1d0Test {
-
-    private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
-    private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
-    private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
-    public MessageSerializer<ObjectMapper> serializer = new GraphSONMessageSerializerGremlinV1d0();
-
-    @Test
-    public void shouldSerializeIterable() throws Exception {
-        final ArrayList<Integer> list = new ArrayList<>();
-        list.add(1);
-        list.add(100);
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
-        assertEquals(2, deserializedFunList.size());
-        assertEquals(new Integer(1), deserializedFunList.get(0));
-        assertEquals(new Integer(100), deserializedFunList.get(1));
-    }
-
-    @Test
-    public void shouldSerializeIterableWithNull() throws Exception {
-        final ArrayList<Integer> list = new ArrayList<>();
-        list.add(1);
-        list.add(null);
-        list.add(100);
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
-        assertEquals(3, deserializedFunList.size());
-        assertEquals(new Integer(1), deserializedFunList.get(0));
-        assertNull(deserializedFunList.get(1));
-        assertEquals(new Integer(100), deserializedFunList.get(2));
-    }
-
-    @Test
-    public void shouldSerializeMap() throws Exception {
-        final Map<String, Object> map = new HashMap<>();
-        final Map<String, String> innerMap = new HashMap<>();
-        innerMap.put("a", "b");
-
-        map.put("x", 1);
-        map.put("y", "some");
-        map.put("z", innerMap);
-
-        final ResponseMessage response = convert(map);
-        assertCommon(response);
-
-        final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
-        assertEquals(3, deserializedMap.size());
-        assertEquals(1, deserializedMap.get("x"));
-        assertEquals("some", deserializedMap.get("y"));
-
-        final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
-        assertEquals(1, deserializedInnerMap.size());
-        assertEquals("b", deserializedInnerMap.get("a"));
-    }
-
-    @Test
-    public void shouldSerializeMapEntries() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Date d = new Date();
-
-        final Map<Object, Object> map = new HashMap<>();
-        map.put("x", 1);
-        map.put(v1, 100);
-        map.put(d, "test");
-
-        final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
-        assertCommon(response);
-
-        final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
-        assertEquals(3, deserializedEntries.size());
-        deserializedEntries.forEach(e -> {
-            if (e.containsKey("x"))
-                assertEquals(1, e.get("x"));
-            else if (e.containsKey(v1.id().toString()))
-                assertEquals(100, e.get(v1.id().toString()));
-            else if (e.containsKey(StdDateFormat.instance.format(d)))
-                assertEquals("test", e.get(StdDateFormat.instance.format(d)));
-            else
-                fail("Map entries contains a key that is not part of what was serialized");
-        });
-    }
-
-    @Test
-    public void shouldSerializeEdge() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Vertex v2 = graph.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
-
-        final ResponseMessage response = convert(iterable);
-        assertCommon(response);
-
-        final List<Map<String, Object>> edgeList = (List<Map<String, Object>>) response.getResult().getData();
-        assertEquals(1, edgeList.size());
-
-        final Map<String, Object> deserializedEdge = edgeList.get(0);
-        assertEquals(e.id(), deserializedEdge.get(GraphSONTokens.ID));
-        assertEquals(v1.id(), deserializedEdge.get(GraphSONTokens.OUT));
-        assertEquals(v2.id(), deserializedEdge.get(GraphSONTokens.IN));
-        assertEquals(v1.label(), deserializedEdge.get(GraphSONTokens.OUT_LABEL));
-        assertEquals(v2.label(), deserializedEdge.get(GraphSONTokens.IN_LABEL));
-        assertEquals(e.label(), deserializedEdge.get(GraphSONTokens.LABEL));
-        assertEquals(GraphSONTokens.EDGE, deserializedEdge.get(GraphSONTokens.TYPE));
-
-        final Map<String, Object> properties = (Map<String, Object>) deserializedEdge.get(GraphSONTokens.PROPERTIES);
-        assertNotNull(properties);
-        assertEquals(123, properties.get("abc"));
-
-    }
-
-    @Test
-    public void shouldSerializeEdgeProperty() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Vertex v2 = graph.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
-        final ResponseMessage response = convert(iterable);
-        assertCommon(response);
-
-        final List<Map<String, Object>> propertyList = (List<Map<String, Object>>) response.getResult().getData();
-        assertEquals(1, propertyList.size());
-        assertEquals(123, propertyList.get(0).get("value"));
-    }
-
-    @Test
-    public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v = graph.addVertex();
-        final Map<String, Object> map = new HashMap<>();
-        map.put("x", 500);
-        map.put("y", "some");
-
-        final ArrayList<Object> friends = new ArrayList<>();
-        friends.add("x");
-        friends.add(5);
-        friends.add(map);
-
-        v.property(VertexProperty.Cardinality.single, "friends", friends);
-
-        final List list = IteratorUtils.list(graph.vertices());
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Map<String, Object>> vertexList = (List<Map<String, Object>>) response.getResult().getData();
-        assertEquals(1, vertexList.size());
-
-        final Map<String, Object> deserializedVertex = vertexList.get(0);
-        assertEquals(v.id(), deserializedVertex.get(GraphSONTokens.ID));
-        assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.get(GraphSONTokens.LABEL));
-
-        final Map<String, Object> properties = ((Map<String, Object>) deserializedVertex.get(GraphSONTokens.PROPERTIES));
-        assertEquals(1, properties.size());
-
-        final List<Map<String,Object>> friendsProperties = (List<Map<String,Object>>) properties.get("friends");
-        assertEquals(1, friendsProperties.size());
-
-        final List<Object> deserializedInnerList = (List<Object>) friendsProperties.get(0).get(GraphSONTokens.VALUE);
-        assertEquals(3, deserializedInnerList.size());
-        assertEquals("x", deserializedInnerList.get(0));
-        assertEquals(5, deserializedInnerList.get(1));
-
-        final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
-        assertEquals(2, deserializedInnerInnerMap.size());
-        assertEquals(500, deserializedInnerInnerMap.get("x"));
-        assertEquals("some", deserializedInnerInnerMap.get("y"));
-    }
-
-    @Test
-    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map<Vertex, Integer> map = new HashMap<>();
-        map.put(g.V().has("name", "marko").next(), 1000);
-
-        final ResponseMessage response = convert(map);
-        assertCommon(response);
-
-        final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
-        assertEquals(1, deserializedMap.size());
-
-        // with no embedded types the key (which is a vertex) simply serializes out to an id
-        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
-        assertEquals(new Integer(1000), deserializedMap.get("1"));
-    }
-
-    @Test
-    public void shouldSerializeToTreeJson() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map t = g.V(1).out().properties("name").tree().next();
-
-        final ResponseMessage response = convert(t);
-        assertCommon(response);
-
-        final Map<String, Map<String, Map>> deserializedMap = (Map<String, Map<String, Map>>) response.getResult().getData();
-
-        assertEquals(1, deserializedMap.size());
-
-        //check the first object and it's properties
-        final Map<String,Object> vertex = deserializedMap.get("1").get("key");
-        final Map<String,List<Map>> vertexProperties = (Map<String, List<Map>>)vertex.get("properties");
-        assertEquals(1, (int)vertex.get("id"));
-        assertEquals("marko", vertexProperties.get("name").get(0).get("value"));
-
-        //check objects tree structure
-        //check Vertex property
-        final Map<String, Map<String, Map>> subTreeMap =  deserializedMap.get("1").get("value");
-        final Map<String, Map<String, Map>> subTreeMap2 = subTreeMap.get("2").get("value");
-        final Map<String, String> vertexPropertiesDeep = subTreeMap2.get("3").get("key");
-        assertEquals("vadas", vertexPropertiesDeep.get("value"));
-        assertEquals("name", vertexPropertiesDeep.get("label"));
-
-        // check subitem
-        final Map<String,Object> vertex2 = subTreeMap.get("3").get("key");
-        final Map<String,List<Map>> vertexProperties2 = (Map<String, List<Map>>)vertex2.get("properties");
-
-        assertEquals("lop", vertexProperties2.get("name").get(0).get("value"));
-    }
-
-    @Test
-    public void shouldSerializeFullResponseMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", "this");
-        metaData.put("one", 1);
-
-        final Map<String, Object> attributes = new HashMap<>();
-        attributes.put("test", "that");
-        attributes.put("two", 2);
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SUCCESS)
-                .result("some-result")
-                .statusAttributes(attributes)
-                .statusMessage("worked")
-                .create();
-
-        final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
-        assertEquals(id, deserialized.getRequestId());
-        assertEquals("this", deserialized.getResult().getMeta().get("test"));
-        assertEquals(1, deserialized.getResult().getMeta().get("one"));
-        assertEquals("some-result", deserialized.getResult().getData());
-        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
-        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
-        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
-        assertEquals("worked", deserialized.getStatus().getMessage());
-    }
-    
-    private void assertCommon(final ResponseMessage response) {
-        assertEquals(requestId, response.getRequestId());
-        assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
-    }
-
-    private ResponseMessage convert(final Object toSerialize) throws SerializationException {
-        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
-        return serializer.deserializeResponse(bb);
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
deleted file mode 100644
index 2c781cf..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.ResponseMessageDeserializer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONMessageSerializerGremlinV2d0Test {
-
-    private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
-    private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
-    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
-    public final MessageSerializer<ObjectMapper> serializer = new GraphSONMessageSerializerGremlinV2d0();
-
-    @Test
-    public void shouldSerializeIterable() throws Exception {
-        final ArrayList<Integer> list = new ArrayList<>();
-        list.add(1);
-        list.add(100);
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
-        assertEquals(2, deserializedFunList.size());
-        assertEquals(new Integer(1), deserializedFunList.get(0));
-        assertEquals(new Integer(100), deserializedFunList.get(1));
-    }
-
-    @Test
-    public void shouldSerializeIterableWithNull() throws Exception {
-        final ArrayList<Integer> list = new ArrayList<>();
-        list.add(1);
-        list.add(null);
-        list.add(100);
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
-        assertEquals(3, deserializedFunList.size());
-        assertEquals(new Integer(1), deserializedFunList.get(0));
-        assertNull(deserializedFunList.get(1));
-        assertEquals(new Integer(100), deserializedFunList.get(2));
-    }
-
-    @Test
-    public void shouldSerializeMap() throws Exception {
-        final Map<String, Object> map = new HashMap<>();
-        final Map<String, String> innerMap = new HashMap<>();
-        innerMap.put("a", "b");
-
-        map.put("x", 1);
-        map.put("y", "some");
-        map.put("z", innerMap);
-
-        final ResponseMessage response = convert(map);
-        assertCommon(response);
-
-        final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
-        assertEquals(3, deserializedMap.size());
-        assertEquals(1, deserializedMap.get("x"));
-        assertEquals("some", deserializedMap.get("y"));
-
-        final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
-        assertEquals(1, deserializedInnerMap.size());
-        assertEquals("b", deserializedInnerMap.get("a"));
-    }
-
-    @Test
-    public void shouldSerializeMapEntries() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Date d = new Date();
-
-        final Map<Object, Object> map = new HashMap<>();
-        map.put("x", 1);
-        map.put(v1, 100);
-        map.put(d, "test");
-
-        final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
-        assertCommon(response);
-
-        final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
-        assertEquals(3, deserializedEntries.size());
-        deserializedEntries.forEach(e -> {
-            if (e.containsKey("x"))
-                assertEquals(1, e.get("x"));
-            else if (e.containsKey(v1.id().toString()))
-                assertEquals(100, e.get(v1.id().toString()));
-            else if (e.containsKey(StdDateFormat.instance.format(d)))
-                assertEquals("test", e.get(StdDateFormat.instance.format(d)));
-            else
-                fail("Map entries contains a key that is not part of what was serialized");
-        });
-    }
-
-    @Test
-    public void shouldSerializeEdge() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Vertex v2 = graph.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
-
-        final ResponseMessage response = convert(iterable);
-        assertCommon(response);
-
-        final List<Edge> edgeList = (List<Edge>) response.getResult().getData();
-        assertEquals(1, edgeList.size());
-
-        final Edge deserializedEdge = edgeList.get(0);
-        assertEquals(e.id(), deserializedEdge.id());
-        assertEquals(v1.id(), deserializedEdge.outVertex().id());
-        assertEquals(v2.id(), deserializedEdge.inVertex().id());
-        assertEquals(v1.label(), deserializedEdge.outVertex().label());
-        assertEquals(v2.label(), deserializedEdge.inVertex().label());
-        assertEquals(e.label(), deserializedEdge.label());
-
-        final List<Property> properties = new ArrayList<>();
-        deserializedEdge.properties().forEachRemaining(properties::add);
-        assertEquals(1, properties.size());
-
-        assertNotNull(properties);
-        assertEquals("abc", properties.get(0).key());
-        assertEquals(123, properties.get(0).value());
-
-    }
-
-    @Test
-    public void shouldSerializeEdgeProperty() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Vertex v2 = graph.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
-        final ResponseMessage response = convert(iterable);
-        assertCommon(response);
-
-        final List<Property> propertyList = (List<Property>) response.getResult().getData();
-        assertEquals(1, propertyList.size());
-        assertEquals(123, propertyList.get(0).value());
-    }
-
-    @Test
-    public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v = graph.addVertex();
-        final Map<String, Object> map = new HashMap<>();
-        map.put("x", 500);
-        map.put("y", "some");
-
-        final ArrayList<Object> friends = new ArrayList<>();
-        friends.add("x");
-        friends.add(5);
-        friends.add(map);
-
-        v.property(VertexProperty.Cardinality.single, "friends", friends);
-
-        final List list = IteratorUtils.list(graph.vertices());
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Vertex> vertexList = (List<Vertex>) response.getResult().getData();
-        assertEquals(1, vertexList.size());
-
-        final Vertex deserializedVertex = vertexList.get(0);
-        assertEquals(v.id(), deserializedVertex.id());
-        assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
-
-        final List<VertexProperty> properties = new ArrayList<>();
-        deserializedVertex.properties().forEachRemaining(properties::add);
-        assertEquals(1, properties.size());
-
-        final VertexProperty friendsProperty = properties.get(0);
-        final List<Object> deserializedInnerList = (List<Object>) friendsProperty.value();
-
-        assertEquals(3, deserializedInnerList.size());
-        assertEquals("x", deserializedInnerList.get(0));
-        assertEquals(5, deserializedInnerList.get(1));
-
-        final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
-        assertEquals(2, deserializedInnerInnerMap.size());
-        assertEquals(500, deserializedInnerInnerMap.get("x"));
-        assertEquals("some", deserializedInnerInnerMap.get("y"));
-    }
-
-    @Test
-    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map<Vertex, Integer> map = new HashMap<>();
-        map.put(g.V().has("name", "marko").next(), 1000);
-
-        final ResponseMessage response = convert(map);
-        assertCommon(response);
-
-        final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
-        assertEquals(1, deserializedMap.size());
-
-        // with no embedded types the key (which is a vertex) simply serializes out to an id
-        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
-        assertEquals(new Integer(1000), deserializedMap.get("1"));
-    }
-
-    @Test
-    public void shouldSerializeToTreeJson() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map t = g.V(1).out().properties("name").tree().next();
-
-        final ResponseMessage response = convert(t);
-        assertCommon(response);
-
-        final Tree deserializedTree = (Tree)response.getResult().getData();
-
-        //check the first object and its key's properties
-        assertEquals(1, deserializedTree.size());
-        final Vertex v = ((Vertex) deserializedTree.keySet().iterator().next());
-        assertEquals(1, v.id());
-        assertEquals("marko", v.property("name").value());
-
-        final Tree firstTree = (Tree)deserializedTree.get(v);
-        assertEquals(3, firstTree.size());
-        Iterator<Vertex> vertexKeys = firstTree.keySet().iterator();
-
-        Map expectedValues = new HashMap<Integer, String>() {{
-            put(3, "vadas");
-            put(5, "lop");
-            put(7, "josh");
-        }};
-        
-        Map actualValues = new HashMap<Integer, String>();
-        for (int i = 0; i < 3; i++) {
-            Tree t2 = (Tree)firstTree.get(vertexKeys.next());
-            VertexProperty vp = (VertexProperty)t2.keySet().iterator().next();
-            actualValues.put(vp.id(), vp.value());
-        }
-
-        assertEquals(expectedValues, actualValues);
-    }
-
-    @Test
-    public void shouldSerializeFullResponseMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", "this");
-        metaData.put("one", 1);
-
-        final Map<String, Object> attributes = new HashMap<>();
-        attributes.put("test", "that");
-        attributes.put("two", 2);
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SUCCESS)
-                .result("some-result")
-                .statusAttributes(attributes)
-                .statusMessage("worked")
-                .create();
-
-        final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
-        assertEquals(id, deserialized.getRequestId());
-        assertEquals("this", deserialized.getResult().getMeta().get("test"));
-        assertEquals(1, deserialized.getResult().getMeta().get("one"));
-        assertEquals("some-result", deserialized.getResult().getData());
-        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
-        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
-        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
-        assertEquals("worked", deserialized.getStatus().getMessage());
-    }
-
-    @Test
-    public void shouldDeserializeNotPredicate() throws Exception {
-        final String requestMessageWithP = "{\"requestId\":{\"@type\":\"g:UUID\",\"@value\":\"0397b9c0-ffab-470e-a6a8-644fc80c01d6\"},\"op\":\"bytecode\",\"processor\":\"traversal\",\"args\":{\"gremlin\":{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"V\"],[\"hasLabel\",\"person\"],[\"has\",\"age\",{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"not\",\"value\":{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"lte\",\"value\":{\"@type\":\"g:Int32\",\"@value\":10}}}}}]]}},\"aliases\":{\"g\":\"gmodern\"}}}";
-        final ByteBuf bb = allocator.buffer(requestMessageWithP.length());
-        bb.writeBytes(requestMessageWithP.getBytes());
-        final RequestMessage m = serializer.deserializeRequest(bb);
-        assertEquals("bytecode", m.getOp());
-        assertNotNull(m.getArgs());
-    }
-
-    @Test
-    public void responseMessageDeserializerShouldNotFailOnCreateObjectWithNullMessage() {
-        final Map<String, Object> result = new HashMap<>();
-        result.put(SerTokens.TOKEN_DATA, null);
-        result.put(SerTokens.TOKEN_META, Collections.emptyMap());
-
-        final Map<String, Object> status = new HashMap<>();
-        status.put(SerTokens.TOKEN_MESSAGE, null);
-        status.put(SerTokens.TOKEN_CODE, 500);
-        status.put(SerTokens.TOKEN_ATTRIBUTES, Collections.emptyMap());
-
-        final Map<String, Object> data = new HashMap<>();
-        data.put(SerTokens.TOKEN_REQUEST, UUID.randomUUID().toString());
-        data.put(SerTokens.TOKEN_RESULT, result);
-        data.put(SerTokens.TOKEN_STATUS, status);
-
-        final AbstractObjectDeserializer<ResponseMessage> deserializer = new ResponseMessageDeserializer();
-        Assert.assertNotNull(deserializer.createObject(data));
-    }
-
-    private void assertCommon(final ResponseMessage response) {
-        assertEquals(requestId, response.getRequestId());
-        assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
-    }
-
-    private ResponseMessage convert(final Object toSerialize) throws SerializationException {
-        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
-        return serializer.deserializeResponse(bb);
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
deleted file mode 100644
index 001ce7e..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-/**
- * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
- * vertices, edges, annotated values, etc.) are handled in the IO packages.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONMessageSerializerV1d0Test {
-
-    public static final GraphSONMessageSerializerV1d0 SERIALIZER = new GraphSONMessageSerializerV1d0();
-    private static final RequestMessage msg = RequestMessage.build("op")
-            .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
-    private static final ObjectMapper mapper = new ObjectMapper();
-    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-
-    @Test
-    public void shouldConfigureIoRegistry() throws Exception {
-        final GraphSONMessageSerializerV1d0 serializer = new GraphSONMessageSerializerV1d0();
-        final Map<String, Object> config = new HashMap<String, Object>() {{
-            put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
-        }};
-
-        serializer.configure(config, null);
-
-        final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
-                .result(Color.RED).create();
-        final String results = serializer.serializeResponseAsString(toSerialize, allocator);
-        final JsonNode json = mapper.readTree(results);
-        assertNotNull(json);
-        assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
-    }
-
-    @Test
-    public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
-        final ResponseMessage message = ResponseMessage.build(msg).create();
-        final String results = SERIALIZER.serializeResponseAsString(message, allocator);
-        final JsonNode json = mapper.readTree(results);
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
-        assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
-    }
-
-    @Test
-    public void shouldSerializeToJsonIterable() throws Exception {
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(2, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals("y", converted.get(1).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIterator() throws Exception {
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(2, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals("y", converted.get(1).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIteratorNullElement() throws Exception {
-
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(null);
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(3, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals(NullNode.getInstance(), converted.get(1));
-        assertEquals("y", converted.get(2).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonMap() throws Exception {
-        final Map<String, Object> map = new HashMap<>();
-        final Map<String, String> innerMap = new HashMap<>();
-        innerMap.put("a", "b");
-
-        map.put("x", new FunObject("x"));
-        map.put("y", "some");
-        map.put("z", innerMap);
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(jsonObject);
-        assertEquals("some", jsonObject.get("y").asText());
-        assertEquals("x", jsonObject.get("x").asText());
-
-        final JsonNode innerJsonObject = jsonObject.get("z");
-        assertNotNull(innerJsonObject);
-        assertEquals("b", innerJsonObject.get("a").asText());
-    }
-
-    @Test
-    public void shouldShouldSerializeMapEntries() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Date d = new Date();
-
-        final Map<Object, Object> map = new HashMap<>();
-        map.put("x", 1);
-        map.put(v1, 100);
-        map.put(d, "test");
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-        jsonObject.elements().forEachRemaining(e -> {
-            if (e.has("x"))
-                assertEquals(1, e.get("x").asInt());
-            else if (e.has(v1.id().toString()))
-                assertEquals(100, e.get(v1.id().toString()).asInt());
-            else if (e.has(StdDateFormat.instance.format(d)))
-                assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
-            else
-                fail("Map entries contains a key that is not part of what was serialized");
-        });
-    }
-
-    @Test
-    public void shouldSerializeEdge() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v1 = g.addVertex();
-        final Vertex v2 = g.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode edgeAsJson = converted.get(0);
-        assertNotNull(edgeAsJson);
-
-        assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong());  // lossy
-        assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
-        assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
-        assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
-        assertEquals(GraphSONTokens.EDGE, edgeAsJson.get(GraphSONTokens.TYPE).asText());
-
-        final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
-        assertNotNull(properties);
-        assertEquals(123, properties.get("abc").asInt());
-    }
-
-    @Test
-    public void shouldSerializeEdgeProperty() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v1 = g.addVertex();
-        final Vertex v2 = g.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode propertyAsJson = converted.get(0);
-        assertNotNull(propertyAsJson);
-
-        assertEquals(123, propertyAsJson.get("value").asInt());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v = g.addVertex();
-        final Map<String, Object> map = new HashMap<>();
-        map.put("x", 500);
-        map.put("y", "some");
-
-        final ArrayList<Object> friends = new ArrayList<>();
-        friends.add("x");
-        friends.add(5);
-        friends.add(map);
-
-        v.property(VertexProperty.Cardinality.single, "friends", friends);
-
-        final Iterable iterable = IteratorUtils.list(g.vertices());
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode vertexAsJson = converted.get(0);
-        assertNotNull(vertexAsJson);
-
-        final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
-        assertNotNull(properties);
-        assertEquals(1, properties.size());
-
-        final JsonNode friendProperties = properties.get("friends");
-        assertEquals(1, friendProperties.size());
-        final JsonNode friendsProperty = friendProperties.get(0);
-        assertNotNull(friendsProperty);
-        assertEquals(3, friends.size());
-
-        final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
-        assertEquals("x", object1);
-
-        final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
-        assertEquals(5, object2);
-
-        final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
-        assertEquals(500, object3.get("x").asInt());
-        assertEquals("some", object3.get("y").asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map<Vertex, Integer> map = new HashMap<>();
-        map.put(g.V().has("name", "marko").next(), 1000);
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-
-        // with no embedded types the key (which is a vertex) simply serializes out to an id
-        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
-        assertEquals(1000, converted.get("1").asInt());
-    }
-
-    @Test
-    public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
-        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
-        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
-        assertEquals(request, m.getRequestId());
-        assertEquals("eval", m.getOp());
-        assertNotNull(m.getArgs());
-        assertEquals(0, m.getArgs().size());
-    }
-
-    @Test
-    public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
-        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
-        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
-        assertEquals(request, m.getRequestId());
-        assertEquals("eval", m.getOp());
-        assertNotNull(m.getArgs());
-        assertEquals("y", m.getArgs().get("x"));
-    }
-
-    @Test(expected = SerializationException.class)
-    public void shouldDeserializeRequestParseMessage() throws Exception {
-        SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
-    }
-
-    @Test
-    public void shouldSerializeFullResponseMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", "this");
-        metaData.put("one", 1);
-
-        final Map<String, Object> attributes = new HashMap<>();
-        attributes.put("test", "that");
-        attributes.put("two", 2);
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SUCCESS)
-                .result("some-result")
-                .statusAttributes(attributes)
-                .statusMessage("worked")
-                .create();
-
-        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
-        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-
-        assertEquals(id, deserialized.getRequestId());
-        assertEquals("this", deserialized.getResult().getMeta().get("test"));
-        assertEquals(1, deserialized.getResult().getMeta().get("one"));
-        assertEquals("some-result", deserialized.getResult().getData());
-        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
-        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
-        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
-        assertEquals("worked", deserialized.getStatus().getMessage());
-    }
-
-    @Test
-    public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", UUID.randomUUID().toString());
-        final Map<String, Object> attributes = Collections.emptyMap();
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SERVER_ERROR)
-                .result("some-result")
-                .statusAttributes(attributes)
-                // explicitly pass the null value
-                .statusMessage(null)
-                .create();
-
-        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
-        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-        Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
-                        + "with null message field", deserialized);
-    }
-
-    @Test
-    public void shouldSerializeToJsonTree() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Tree t = g.V(1).out().properties("name").tree().next();
-
-        
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-        assertNotNull(converted);
-        
-        //check the first object and it's properties
-        assertEquals(1, converted.get("1").get("key").get("id").asInt());
-        assertEquals("marko", converted.get("1").get("key").get("properties").get("name").get(0).get("value").asText());
-        
-        //check objects tree structure
-        //check Vertex property
-        assertEquals("vadas", converted.get("1")
-                                 .get("value")
-                                 .get("2")
-                                 .get("value")
-                                 .get("3").get("key").get("value").asText());
-        assertEquals("name", converted.get("1")
-                                 .get("value")
-                                 .get("2")
-                                 .get("value")
-                                 .get("3").get("key").get("label").asText());
-        
-        // check subitem
-        assertEquals("lop", converted.get("1")
-                                 .get("value")
-                                 .get("3")
-                                 .get("key")
-                                 .get("properties").get("name").get(0).get("value").asText());
-    }
-
-    private class FunObject {
-        private String val;
-
-        public FunObject(String val) {
-            this.val = val;
-        }
-
-        public String toString() {
-            return this.val;
-        }
-    }
-
-    public static class ColorIoRegistry extends AbstractIoRegistry {
-        public ColorIoRegistry() {
-            register(GraphSONIo.class, null, new ColorSimpleModule());
-        }
-    }
-
-    public static class ColorSimpleModule extends SimpleModule {
-        public ColorSimpleModule() {
-            super("color-fun");
-            addSerializer(Color.class, new ColorSerializer());
-
-        }
-    }
-
-    public static class ColorSerializer extends StdSerializer<Color> {
-        public ColorSerializer() {
-            super(Color.class);
-        }
-
-        @Override
-        public void serialize(final Color color, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-            jsonGenerator.writeBoolean(color.equals(Color.RED));
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
deleted file mode 100644
index 9a2d073..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Test;
-
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
- * vertices, edges, annotated values, etc.) are handled in the IO packages.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@SuppressWarnings("unchecked")
-public class GraphSONMessageSerializerV2d0Test {
-
-    public static final GraphSONMessageSerializerV2d0 SERIALIZER = new GraphSONMessageSerializerV2d0();
-    private static final RequestMessage msg = RequestMessage.build("op")
-            .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
-    private static final ObjectMapper mapper = new ObjectMapper();
-
-    private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
-    private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
-    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
-    @Test
-    public void shouldConfigureIoRegistry() throws Exception {
-        final GraphSONMessageSerializerV2d0 serializer = new GraphSONMessageSerializerV2d0();
-        final Map<String, Object> config = new HashMap<String, Object>() {{
-            put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
-        }};
-
-        serializer.configure(config, null);
-
-        final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
-                .result(Color.RED).create();
-        final String results = serializer.serializeResponseAsString(toSerialize, allocator);
-        final JsonNode json = mapper.readTree(results);
-        assertNotNull(json);
-        assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUEPROP).booleanValue(), is(true));
-        assertEquals("java:color", json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUETYPE).textValue());
-    }
-
-    @Test
-    public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
-        final ResponseMessage message = ResponseMessage.build(msg).create();
-        final String results = SERIALIZER.serializeResponseAsString(message, allocator);
-        final JsonNode json = mapper.readTree(results);
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
-        assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
-    }
-
-    @Test
-    public void shouldSerializeToJsonIterable() throws Exception {
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(2, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals("y", converted.get(1).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIterator() throws Exception {
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(2, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals("y", converted.get(1).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIteratorNullElement() throws Exception {
-
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(null);
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(3, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals(NullNode.getInstance(), converted.get(1));
-        assertEquals("y", converted.get(2).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonMap() throws Exception {
-        final Map<String, Object> map = new HashMap<>();
-        final Map<String, String> innerMap = new HashMap<>();
-        innerMap.put("a", "b");
-
-        map.put("x", new FunObject("x"));
-        map.put("y", "some");
-        map.put("z", innerMap);
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(jsonObject);
-        assertEquals("some", jsonObject.get("y").asText());
-        assertEquals("x", jsonObject.get("x").asText());
-
-        final JsonNode innerJsonObject = jsonObject.get("z");
-        assertNotNull(innerJsonObject);
-        assertEquals("b", innerJsonObject.get("a").asText());
-    }
-
-    @Test
-    public void shouldShouldSerializeMapEntries() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Date d = new Date();
-
-        final Map<Object, Object> map = new HashMap<>();
-        map.put("x", 1);
-        map.put(v1, 100);
-        map.put(d, "test");
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-        jsonObject.elements().forEachRemaining(e -> {
-            if (e.has("x"))
-                assertEquals(1, e.get("x").get(GraphSONTokens.VALUEPROP).asInt());
-            else if (e.has(v1.id().toString()))
-                assertEquals(100, e.get(v1.id().toString()).get(GraphSONTokens.VALUEPROP).asInt());
-            else if (e.has(StdDateFormat.instance.format(d)))
-                assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
-            else
-                fail("Map entries contains a key that is not part of what was serialized");
-        });
-    }
-
-    @Test
-    public void shouldSerializeEdge() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v1 = g.addVertex();
-        final Vertex v2 = g.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode edgeAsJson = converted.get(0).get(GraphSONTokens.VALUEPROP);
-        assertNotNull(edgeAsJson);
-
-        assertEquals(((Long) e.id()).longValue(), edgeAsJson.get(GraphSONTokens.ID).get(GraphSONTokens.VALUEPROP).asLong());
-        assertEquals(((Long) v1.id()).longValue(), edgeAsJson.get(GraphSONTokens.OUT).get(GraphSONTokens.VALUEPROP).asLong());
-        assertEquals(((Long) v2.id()).longValue(), edgeAsJson.get(GraphSONTokens.IN).get(GraphSONTokens.VALUEPROP).asLong());
-        assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
-
-        final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
-        assertNotNull(properties);
-        assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUEPROP).get("value").get(GraphSONTokens.VALUEPROP).asInt());
-    }
-
-    @Test
-    public void shouldSerializeEdgeProperty() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v1 = g.addVertex();
-        final Vertex v2 = g.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode propertyAsJson = converted.get(0);
-        assertNotNull(propertyAsJson);
-
-        assertEquals(123, propertyAsJson.get(GraphSONTokens.VALUEPROP).get("value").get(GraphSONTokens.VALUEPROP).asInt());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v = g.addVertex();
-        final Map<String, Object> map = new HashMap<>();
-        map.put("x", 500);
-        map.put("y", "some");
-
-        final ArrayList<Object> friends = new ArrayList<>();
-        friends.add("x");
-        friends.add(5);
-        friends.add(map);
-
-        v.property(VertexProperty.Cardinality.single, "friends", friends);
-
-        final Iterable iterable = IteratorUtils.list(g.vertices());
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode vertexAsJson = converted.get(0).get(GraphSONTokens.VALUEPROP);
-        assertNotNull(vertexAsJson);
-
-        final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
-        assertNotNull(properties);
-        assertEquals(1, properties.size());
-
-        final JsonNode friendProperties = properties.get("friends");
-        assertEquals(1, friendProperties.size());
-        final JsonNode friendsProperty = friendProperties.get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE);
-        assertNotNull(friendsProperty);
-        assertEquals(3, friendsProperty.size());
-
-        final String object1 = friendsProperty.get(0).asText();
-        assertEquals("x", object1);
-
-        final int object2 = friendsProperty.get(1).get(GraphSONTokens.VALUEPROP).asInt();
-        assertEquals(5, object2);
-
-        final JsonNode object3 = friendsProperty.get(2);
-        assertEquals(500, object3.get("x").get(GraphSONTokens.VALUEPROP).asInt());
-        assertEquals("some", object3.get("y").asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map<Vertex, Integer> map = new HashMap<>();
-        map.put(g.V().has("name", "marko").next(), 1000);
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-
-        // with no embedded types the key (which is a vertex) simply serializes out to an id
-        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
-        assertEquals(1000, converted.get("1").get(GraphSONTokens.VALUEPROP).asInt());
-    }
-
-    @Test
-    public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
-        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
-        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
-        assertEquals(request, m.getRequestId());
-        assertEquals("eval", m.getOp());
-        assertNotNull(m.getArgs());
-        assertEquals(0, m.getArgs().size());
-    }
-
-    @Test
-    public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
-        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
-        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
-        assertEquals(request, m.getRequestId());
-        assertEquals("eval", m.getOp());
-        assertNotNull(m.getArgs());
-        assertEquals("y", m.getArgs().get("x"));
-    }
-
-    @Test(expected = SerializationException.class)
-    public void shouldDeserializeRequestParseMessage() throws Exception {
-        SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
-    }
-
-    @Test
-    public void shouldSerializeFullResponseMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", "this");
-        metaData.put("one", 1);
-
-        final Map<String, Object> attributes = new HashMap<>();
-        attributes.put("test", "that");
-        attributes.put("two", 2);
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SUCCESS)
-                .result("some-result")
-                .statusAttributes(attributes)
-                .statusMessage("worked")
-                .create();
-
-        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
-        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-
-        assertEquals(id, deserialized.getRequestId());
-        assertEquals("this", deserialized.getResult().getMeta().get("test"));
-        assertEquals(1, deserialized.getResult().getMeta().get("one"));
-        assertEquals("some-result", deserialized.getResult().getData());
-        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
-        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
-        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
-        assertEquals("worked", deserialized.getStatus().getMessage());
-    }
-    
-    @Test
-    public void shouldSerializeToTreeJson() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Tree t = g.V(1).out().properties("name").tree().next();
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-        assertNotNull(converted);
-
-        //result is: tree{v1=>tree{vp['name'->'vadas']=>null, vp['name'->'lop']=>null, vp['name'->'josh']=>null}}
-        
-        //check the first object and it's properties
-        assertEquals(1, converted.get(GraphSONTokens.VALUEPROP)
-                .get(0)
-                .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
-                .get(GraphSONTokens.ID).get(GraphSONTokens.VALUEPROP).asInt());
-
-        assertEquals("marko", converted.get(GraphSONTokens.VALUEPROP)
-                .get(0)
-                .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
-                .get(GraphSONTokens.PROPERTIES)
-                .get("name")
-                .get(0)
-                .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
-
-        //check the leafs
-        Set expectedValues = new HashSet<String>() {{
-            add("vadas");
-            add("lop");
-            add("josh");
-        }};
-        
-        Set actualValues = new HashSet<String>();
-        for (int i = 0; i < 3; i++) {
-            actualValues.add(converted.get(GraphSONTokens.VALUEPROP)
-                .get(0)
-                .get(GraphSONTokens.VALUE).get(GraphSONTokens.VALUEPROP)
-                .get(i)
-                .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
-                .get(GraphSONTokens.PROPERTIES)
-                .get("name")
-                .get(0)
-                .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
-        }
-
-        assertEquals(expectedValues, actualValues);
-    }
-
-    @Test
-    public void shouldToStringUnknownObjects() {
-        GraphSONMapper gm20 = GraphSONMapper.build().version(GraphSONVersion.V2_0).create();
-        GraphSONMapper gm10 = GraphSONMapper.build().version(GraphSONVersion.V1_0).create();
-
-        GraphWriter writer = GraphSONWriter.build().mapper(gm20).create();
-        // subsequent creations of GraphWriters and GraphSONMappers should not affect
-        // each other.
-        GraphWriter writer2 = GraphSONWriter.build().mapper(gm10).create();
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try {
-            writer.writeObject(baos, new FunObject("value"));
-            assertEquals(baos.toString(), "\"value\"");
-        } catch (Exception e) {
-            fail("should have succeeded serializing the unknown object to a string");
-        }
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeRequestMessageFromObjectMapper() throws IOException {
-        final ObjectMapper om = GraphSONMapper.build().version(GraphSONVersion.V2_0)
-                .addCustomModule(new GraphSONMessageSerializerGremlinV2d0.GremlinServerModule())
-                .create().createMapper();
-
-        final Map<String, Object> requestBindings = new HashMap<>();
-        requestBindings.put("x", 1);
-
-        final Map<String, Object> requestAliases = new HashMap<>();
-        requestAliases.put("g", "social");
-
-        final RequestMessage requestMessage = RequestMessage.build("eval").processor("session").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create();
-
-        final String json = om.writeValueAsString(requestMessage);
-        final RequestMessage readRequestMessage = om.readValue(json, RequestMessage.class);
-
-        assertEquals(requestMessage.getOp(), readRequestMessage.getOp());
-        assertEquals(requestMessage.getProcessor(), readRequestMessage.getProcessor());
-        assertEquals(requestMessage.getRequestId(), readRequestMessage.getRequestId());
-        assertEquals(requestMessage.getArgs(), readRequestMessage.getArgs());
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeResponseMessageFromObjectMapper() throws IOException {
-        final ObjectMapper om = GraphSONMapper.build().version(GraphSONVersion.V2_0)
-                .addCustomModule(new GraphSONMessageSerializerGremlinV2d0.GremlinServerModule())
-                .create().createMapper();
-        final Graph graph = TinkerFactory.createModern();
-
-        final ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-                result(Collections.singletonList(graph.vertices().next())).create();
-
-        final String respJson = om.writeValueAsString(responseMessage);
-        final ResponseMessage responseMessageRead = om.readValue(respJson, ResponseMessage.class);
-
-        assertEquals(responseMessage.getRequestId(), responseMessageRead.getRequestId());
-        assertEquals(responseMessage.getResult().getMeta(), responseMessageRead.getResult().getMeta());
-        assertEquals(responseMessage.getResult().getData(), responseMessageRead.getResult().getData());
-        assertEquals(responseMessage.getStatus().getAttributes(), responseMessageRead.getStatus().getAttributes());
-        assertEquals(responseMessage.getStatus().getCode().getValue(), responseMessageRead.getStatus().getCode().getValue());
-        assertEquals(responseMessage.getStatus().getCode().isSuccess(), responseMessageRead.getStatus().getCode().isSuccess());
-        assertEquals(responseMessage.getStatus().getMessage(), responseMessageRead.getStatus().getMessage());
-    }
-
-    @Test
-    public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws SerializationException {
-        GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV2d0.build().create(false));
-        GraphSONMessageSerializerV2d0 graphSONMessageSerializerV2d0 = new GraphSONMessageSerializerV2d0(builder);
-
-        ResponseMessage rm = convert("hello", graphSONMessageSerializerV2d0);
-        assertEquals(rm.getRequestId(), requestId);
-        assertEquals(rm.getResult().getData(), "hello");
-    }
-
-
-    @Test
-    @SuppressWarnings("deprecation")
-    public void shouldFailOnMessageSerializerWithMapperIfNoGremlinServerModule() {
-        final GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV2d0.build().create(false));
-        final GraphSONMessageSerializerV2d0 graphSONMessageSerializerV2d0 = new GraphSONMessageSerializerV2d0(builder.create());
-
-        try {
-            convert("hello", graphSONMessageSerializerV2d0);
-            fail("Serialization should have failed since no GremlinServerModule registered.");
-        } catch (SerializationException e) {
-            assertTrue(e.getMessage().contains("Could not find a type identifier for the class"));
-            assertTrue(e.getCause() instanceof JsonMappingException);
-            assertTrue(e.getCause().getCause() instanceof IllegalArgumentException);
-        }
-    }
-
-    private ResponseMessage convert(final Object toSerialize, MessageSerializer<?> serializer) throws SerializationException {
-        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
-        return serializer.deserializeResponse(bb);
-    }
-
-    private class FunObject {
-        private String val;
-
-        public FunObject(String val) {
-            this.val = val;
-        }
-
-        public String toString() {
-            return this.val;
-        }
-    }
-
-    public static class ColorIoRegistry extends AbstractIoRegistry {
-        public ColorIoRegistry() {
-            register(GraphSONIo.class, null, new ColorSimpleModule());
-        }
-    }
-
-    public static class ColorSimpleModule extends TinkerPopJacksonModule {
-        public ColorSimpleModule() {
-            super("color-fun");
-            addSerializer(Color.class, new ColorSerializer());
-        }
-
-        @Override
-        public Map<Class, String> getTypeDefinitions() {
-            return new HashMap<Class, String>(){{
-                put(Color.class, "color");
-            }};
-        }
-
-        @Override
-        public String getTypeNamespace() {
-            return "java";
-        }
-    }
-
-    public static class ColorSerializer extends StdScalarSerializer<Color> {
-        public ColorSerializer() {
-            super(Color.class);
-        }
-
-        @Override
-        public void serialize(final Color color, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-            jsonGenerator.writeBoolean(color.equals(Color.RED));
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0RoundTripTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0RoundTripTest.java
deleted file mode 100644
index e0760fc..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0RoundTripTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertEquals;
-
-public class GraphSONMessageSerializerV3d0RoundTripTest extends AbstractRoundTripTest {
-
-    private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
-    private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
-    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
-    public final GraphSONMessageSerializerV3d0 serializer = new GraphSONMessageSerializerV3d0();
-
-    private static List<String> skippedTests
-            = Arrays.asList("ReferenceVertex", "ReferenceVertexProperty", "ReferenceProperty", "Graph");
-
-    @Test
-    public void shouldWriteAndRead() throws Exception {
-        // some tests are not valid for json
-        if (skippedTests.contains(name)) return;
-
-        for (int i = 0; i < 5; i++) {
-
-            final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(value).create(), allocator);
-            final Object result = serializer.deserializeResponse(bb).getResult().getData();
-
-            Optional.ofNullable(assertion).orElse((Consumer) r -> assertEquals(value, r)).accept(result);
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
deleted file mode 100644
index d6d0232..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3d0;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException;
-import org.junit.Test;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.apache.tinkerpop.gremlin.driver.MockitoHamcrestMatcherAdapter.reflectionEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@SuppressWarnings("unchecked")
-public class GraphSONMessageSerializerV3d0Test {
-
-    private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
-    private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
-    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
-    public final GraphSONMessageSerializerV3d0 serializer = new GraphSONMessageSerializerV3d0();
-
-    @Test
-    public void shouldSerializeIterable() throws Exception {
-        final ArrayList<Integer> list = new ArrayList<>();
-        list.add(1);
-        list.add(100);
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
-        assertEquals(2, deserializedFunList.size());
-        assertEquals(Integer.valueOf(1), deserializedFunList.get(0));
-        assertEquals(Integer.valueOf(100), deserializedFunList.get(1));
-    }
-
-    @Test
-    public void shouldSerializeIterableWithNull() throws Exception {
-        final ArrayList<Integer> list = new ArrayList<>();
-        list.add(1);
-        list.add(null);
-        list.add(100);
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
-        assertEquals(3, deserializedFunList.size());
-        assertEquals(Integer.valueOf(1), deserializedFunList.get(0));
-        assertNull(deserializedFunList.get(1));
-        assertEquals(Integer.valueOf(100), deserializedFunList.get(2));
-    }
-
-    @Test
-    public void shouldSerializeMap() throws Exception {
-        final Map<String, Object> map = new HashMap<>();
-        final Map<String, String> innerMap = new HashMap<>();
-        innerMap.put("a", "b");
-
-        map.put("w", true);
-        map.put("x", 1);
-        map.put("y", "some");
-        map.put("z", innerMap);
-
-        final ResponseMessage response = convert(map);
-        assertCommon(response);
-
-        final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
-        assertEquals(4, deserializedMap.size());
-        assertEquals(true, deserializedMap.get("w"));
-        assertEquals(1, deserializedMap.get("x"));
-        assertEquals("some", deserializedMap.get("y"));
-
-        final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
-        assertEquals(1, deserializedInnerMap.size());
-        assertEquals("b", deserializedInnerMap.get("a"));
-    }
-
-    @Test
-    public void shouldSerializeMapEntries() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Date d = new Date();
-
-        final Map<Object, Object> map = new HashMap<>();
-        map.put("x", 1);
-        map.put(v1, 100);
-        map.put(d, "test");
-
-        final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
-        assertCommon(response);
-
-        final List<Map<Object, Object>> deserializedEntries = (List<Map<Object, Object>>) response.getResult().getData();
-        assertEquals(3, deserializedEntries.size());
-        deserializedEntries.forEach(m -> {
-            final Map.Entry<Object,Object> e = m.entrySet().iterator().next();
-            if (e.getKey().equals("x"))
-                assertEquals(1, e.getValue());
-            else if (e.getKey() instanceof Vertex && e.getKey().equals(v1))
-                assertEquals(100, e.getValue());
-            else if (e.getKey() instanceof Date)
-                assertEquals("test", e.getValue());
-            else
-                fail("Map entries contains a key that is not part of what was serialized");
-        });
-    }
-
-    @Test
-    public void shouldSerializeEdge() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Vertex v2 = graph.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
-
-        final ResponseMessage response = convert(iterable);
-        assertCommon(response);
-
-        final List<Edge> edgeList = (List<Edge>) response.getResult().getData();
-        assertEquals(1, edgeList.size());
-
-        final Edge deserializedEdge = edgeList.get(0);
-        assertEquals(e.id(), deserializedEdge.id());
-        assertEquals(v1.id(), deserializedEdge.outVertex().id());
-        assertEquals(v2.id(), deserializedEdge.inVertex().id());
-        assertEquals(v1.label(), deserializedEdge.outVertex().label());
-        assertEquals(v2.label(), deserializedEdge.inVertex().label());
-        assertEquals(e.label(), deserializedEdge.label());
-
-        final List<Property> properties = new ArrayList<>();
-        deserializedEdge.properties().forEachRemaining(properties::add);
-        assertEquals(1, properties.size());
-
-        assertNotNull(properties);
-        assertEquals("abc", properties.get(0).key());
-        assertEquals(123, properties.get(0).value());
-
-    }
-
-    @Test
-    public void shouldSerializeEdgeProperty() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Vertex v2 = graph.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
-        final ResponseMessage response = convert(iterable);
-        assertCommon(response);
-
-        final List<Property> propertyList = (List<Property>) response.getResult().getData();
-        assertEquals(1, propertyList.size());
-        assertEquals(123, propertyList.get(0).value());
-    }
-
-    @Test
-    public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v = graph.addVertex();
-        final Map<String, Object> map = new HashMap<>();
-        map.put("x", 500);
-        map.put("y", "some");
-
-        final ArrayList<Object> friends = new ArrayList<>();
-        friends.add("x");
-        friends.add(5);
-        friends.add(map);
-
-        v.property(VertexProperty.Cardinality.single, "friends", friends);
-
-        final List<Vertex> list = IteratorUtils.list(graph.vertices());
-
-        final ResponseMessage response = convert(list);
-        assertCommon(response);
-
-        final List<Vertex> vertexList = (List<Vertex>) response.getResult().getData();
-        assertEquals(1, vertexList.size());
-
-        final Vertex deserializedVertex = vertexList.get(0);
-        assertEquals(v.id(), deserializedVertex.id());
-        assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
-
-        final List<VertexProperty> properties = new ArrayList<>();
-        deserializedVertex.properties().forEachRemaining(properties::add);
-        assertEquals(1, properties.size());
-
-        final VertexProperty friendsProperty = properties.get(0);
-        final List<Object> deserializedInnerList = (List<Object>) friendsProperty.value();
-
-        assertEquals(3, deserializedInnerList.size());
-        assertEquals("x", deserializedInnerList.get(0));
-        assertEquals(5, deserializedInnerList.get(1));
-
-        final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
-        assertEquals(2, deserializedInnerInnerMap.size());
-        assertEquals(500, deserializedInnerInnerMap.get("x"));
-        assertEquals("some", deserializedInnerInnerMap.get("y"));
-    }
-
-    @Test
-    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map<Vertex, Integer> map = new HashMap<>();
-        final Vertex v1 = g.V().has("name", "marko").next();
-        map.put(v1, 1000);
-
-        final ResponseMessage response = convert(map);
-        assertCommon(response);
-
-        final Map<Vertex, Integer> deserializedMap = (Map<Vertex, Integer>) response.getResult().getData();
-        assertEquals(1, deserializedMap.size());
-        assertEquals(Integer.valueOf(1000), deserializedMap.get(v1));
-    }
-
-    @Test
-    public void shouldSerializeToTreeJson() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Tree t = g.V(1).out().properties("name").tree().next();
-
-        final ResponseMessage response = convert(t);
-        assertCommon(response);
-
-        final Tree deserializedTree = (Tree)response.getResult().getData();
-
-        //check the first object and its key's properties
-        assertEquals(1, deserializedTree.size());
-        final Vertex v = ((Vertex) deserializedTree.keySet().iterator().next());
-        assertEquals(1, v.id());
-        assertEquals("marko", v.property("name").value());
-
-        final Tree firstTree = (Tree)deserializedTree.get(v);
-        assertEquals(3, firstTree.size());
-        Iterator<Vertex> vertexKeys = firstTree.keySet().iterator();
-
-        Map expectedValues = new HashMap<Integer, String>() {{
-            put(3, "vadas");
-            put(5, "lop");
-            put(7, "josh");
-        }};
-        
-        Map actualValues = new HashMap<Integer, String>();
-        for (int i = 0; i < 3; i++) {
-            Tree t2 = (Tree)firstTree.get(vertexKeys.next());
-            VertexProperty vp = (VertexProperty)t2.keySet().iterator().next();
-            actualValues.put(vp.id(), vp.value());
-        }
-
-        assertEquals(expectedValues, actualValues);
-    }
-
-    @Test
-    public void shouldSerializeFullResponseMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", "this");
-        metaData.put("one", 1);
-
-        final Map<String, Object> attributes = new HashMap<>();
-        attributes.put("test", "that");
-        attributes.put("two", 2);
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SUCCESS)
-                .result("some-result")
-                .statusAttributes(attributes)
-                .statusMessage("worked")
-                .create();
-
-        final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
-        assertEquals(id, deserialized.getRequestId());
-        assertEquals("this", deserialized.getResult().getMeta().get("test"));
-        assertEquals(1, deserialized.getResult().getMeta().get("one"));
-        assertEquals("some-result", deserialized.getResult().getData());
-        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
-        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
-        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
-        assertEquals("worked", deserialized.getStatus().getMessage());
-    }
-
-    @Test
-    public void shouldDeserializeNotPredicate() throws Exception {
-        final String requestMessageWithP = "{\"requestId\":{\"@type\":\"g:UUID\",\"@value\":\"0397b9c0-ffab-470e-a6a8-644fc80c01d6\"},\"op\":\"bytecode\",\"processor\":\"traversal\",\"args\":{\"gremlin\":{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"V\"],[\"hasLabel\",\"person\"],[\"has\",\"age\",{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"not\",\"value\":{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"lte\",\"value\":{\"@type\":\"g:Int32\",\"@value\":10}}}}}]]}},\"aliases\":{\"g\":\"gmodern\"}}}";
-        final ByteBuf bb = allocator.buffer(requestMessageWithP.length());
-        bb.writeBytes(requestMessageWithP.getBytes());
-        final RequestMessage m = serializer.deserializeRequest(bb);
-        assertEquals("bytecode", m.getOp());
-        assertNotNull(m.getArgs());
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeRequest() throws Exception {
-        final GraphTraversalSource g = EmptyGraph.instance().traversal();
-        final Traversal.Admin t = g.V().hasLabel("person").out().asAdmin();
-
-        final Map<String, String> aliases = new HashMap<>();
-        aliases.put("g","g");
-
-        final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
-                .processor("traversal")
-                .overrideRequestId(UUID.randomUUID())
-                .addArg(Tokens.ARGS_GREMLIN, t.getBytecode())
-                .addArg(Tokens.ARGS_ALIASES, aliases)
-                .create();
-
-        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
-        final int mimeLen = buffer.readByte();
-        final byte[] bytes = new byte[mimeLen];
-        buffer.readBytes(bytes);
-        final String mimeType = new String(bytes, StandardCharsets.UTF_8);
-
-        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
-        assertThat(request, reflectionEquals(deserialized));
-        assertThat(serializer.mimeTypesSupported(), hasItemInArray(mimeType));
-    }
-
-    @Test
-    public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws SerializationException {
-        GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV3d0.build().create(false));
-        GraphSONMessageSerializerV3d0 graphSONMessageSerializerV3d0 = new GraphSONMessageSerializerV3d0(builder);
-
-        ResponseMessage rm = convert("hello", graphSONMessageSerializerV3d0);
-        assertEquals(rm.getRequestId(), requestId);
-        assertEquals(rm.getResult().getData(), "hello");
-    }
-
-    @Test
-    public void shouldFailOnMessageSerializerWithMapperIfNoGremlinServerModule() {
-        final GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV3d0.build().create(false));
-        final GraphSONMessageSerializerV3d0 graphSONMessageSerializerV3d0 = new GraphSONMessageSerializerV3d0(builder.create());
-
-        try {
-            convert("hello", graphSONMessageSerializerV3d0);
-            fail("Serialization should have failed since no GremlinServerModule registered.");
-        } catch (SerializationException e) {
-            assertTrue(e.getMessage().contains("Could not find a type identifier for the class"));
-            assertTrue(e.getCause() instanceof JsonMappingException);
-            assertTrue(e.getCause().getCause() instanceof IllegalArgumentException);
-        }
-    }
-
-    private void assertCommon(final ResponseMessage response) {
-        assertEquals(requestId, response.getRequestId());
-        assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
-    }
-
-    private ResponseMessage convert(final Object toSerialize, MessageSerializer<?> serializer) throws SerializationException {
-        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
-        return serializer.deserializeResponse(bb);
-    }
-
-    private ResponseMessage convert(final Object toSerialize) throws SerializationException {
-        return convert(toSerialize, this.serializer);
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV1d0Test.java
deleted file mode 100644
index 0affec6..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONUntypedMessageSerializerV1d0Test.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.awt.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-/**
- * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
- * vertices, edges, annotated values, etc.) are handled in the IO packages.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONUntypedMessageSerializerV1d0Test {
-
-    public static final GraphSONUntypedMessageSerializerV1d0 SERIALIZER = new GraphSONUntypedMessageSerializerV1d0();
-    private static final RequestMessage msg = RequestMessage.build("op")
-            .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
-    private static final ObjectMapper mapper = new ObjectMapper();
-    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-
-    @Test
-    public void shouldConfigureIoRegistry() throws Exception {
-        final GraphSONUntypedMessageSerializerV1d0 serializer = new GraphSONUntypedMessageSerializerV1d0();
-        final Map<String, Object> config = new HashMap<String, Object>() {{
-            put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
-        }};
-
-        serializer.configure(config, null);
-
-        final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
-                .result(Color.RED).create();
-        final String results = serializer.serializeResponseAsString(toSerialize, allocator);
-        final JsonNode json = mapper.readTree(results);
-        assertNotNull(json);
-        assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
-    }
-
-    @Test
-    public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
-        final ResponseMessage message = ResponseMessage.build(msg).create();
-        final String results = SERIALIZER.serializeResponseAsString(message, allocator);
-        final JsonNode json = mapper.readTree(results);
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
-        assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
-    }
-
-    @Test
-    public void shouldSerializeToJsonIterable() throws Exception {
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(2, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals("y", converted.get(1).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIterator() throws Exception {
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(2, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals("y", converted.get(1).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIteratorNullElement() throws Exception {
-
-        final ArrayList<FunObject> funList = new ArrayList<>();
-        funList.add(new FunObject("x"));
-        funList.add(null);
-        funList.add(new FunObject("y"));
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertEquals(3, converted.size());
-
-        assertEquals("x", converted.get(0).asText());
-        assertEquals(NullNode.getInstance(), converted.get(1));
-        assertEquals("y", converted.get(2).asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonMap() throws Exception {
-        final Map<String, Object> map = new HashMap<>();
-        final Map<String, String> innerMap = new HashMap<>();
-        innerMap.put("a", "b");
-
-        map.put("x", new FunObject("x"));
-        map.put("y", "some");
-        map.put("z", innerMap);
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(jsonObject);
-        assertEquals("some", jsonObject.get("y").asText());
-        assertEquals("x", jsonObject.get("x").asText());
-
-        final JsonNode innerJsonObject = jsonObject.get("z");
-        assertNotNull(innerJsonObject);
-        assertEquals("b", innerJsonObject.get("a").asText());
-    }
-
-    @Test
-    public void shouldShouldSerializeMapEntries() throws Exception {
-        final Graph graph = TinkerGraph.open();
-        final Vertex v1 = graph.addVertex();
-        final Date d = new Date();
-
-        final Map<Object, Object> map = new HashMap<>();
-        map.put("x", 1);
-        map.put(v1, 100);
-        map.put(d, "test");
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-        jsonObject.elements().forEachRemaining(e -> {
-            if (e.has("x"))
-                assertEquals(1, e.get("x").asInt());
-            else if (e.has(v1.id().toString()))
-                assertEquals(100, e.get(v1.id().toString()).asInt());
-            else if (e.has(StdDateFormat.instance.format(d)))
-                assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
-            else
-                fail("Map entries contains a key that is not part of what was serialized");
-        });
-    }
-
-    @Test
-    public void shouldSerializeEdge() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v1 = g.addVertex();
-        final Vertex v2 = g.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode edgeAsJson = converted.get(0);
-        assertNotNull(edgeAsJson);
-
-        assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong());  // lossy
-        assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
-        assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
-        assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
-        assertEquals(GraphSONTokens.EDGE, edgeAsJson.get(GraphSONTokens.TYPE).asText());
-
-        final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
-        assertNotNull(properties);
-        assertEquals(123, properties.get("abc").asInt());
-    }
-
-    @Test
-    public void shouldSerializeEdgeProperty() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v1 = g.addVertex();
-        final Vertex v2 = g.addVertex();
-        final Edge e = v1.addEdge("test", v2);
-        e.property("abc", 123);
-
-        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode propertyAsJson = converted.get(0);
-        assertNotNull(propertyAsJson);
-
-        assertEquals(123, propertyAsJson.get("value").asInt());
-    }
-
-    @Test
-    public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
-        final Graph g = TinkerGraph.open();
-        final Vertex v = g.addVertex();
-        final Map<String, Object> map = new HashMap<>();
-        map.put("x", 500);
-        map.put("y", "some");
-
-        final ArrayList<Object> friends = new ArrayList<>();
-        friends.add("x");
-        friends.add(5);
-        friends.add(map);
-
-        v.property(VertexProperty.Cardinality.single, "friends", friends);
-
-        final Iterable iterable = IteratorUtils.list(g.vertices());
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-        assertEquals(1, converted.size());
-
-        final JsonNode vertexAsJson = converted.get(0);
-        assertNotNull(vertexAsJson);
-
-        final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
-        assertNotNull(properties);
-        assertEquals(1, properties.size());
-
-        final JsonNode friendProperties = properties.get("friends");
-        assertEquals(1, friendProperties.size());
-        final JsonNode friendsProperty = friendProperties.get(0);
-        assertNotNull(friendsProperty);
-        assertEquals(3, friends.size());
-
-        final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
-        assertEquals("x", object1);
-
-        final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
-        assertEquals(5, object2);
-
-        final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
-        assertEquals(500, object3.get("x").asInt());
-        assertEquals("some", object3.get("y").asText());
-    }
-
-    @Test
-    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Map<Vertex, Integer> map = new HashMap<>();
-        map.put(g.V().has("name", "marko").next(), 1000);
-
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-
-        assertNotNull(converted);
-
-        // with no embedded types the key (which is a vertex) simply serializes out to an id
-        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
-        assertEquals(1000, converted.get("1").asInt());
-    }
-
-    @Test
-    public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
-        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
-        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
-        assertEquals(request, m.getRequestId());
-        assertEquals("eval", m.getOp());
-        assertNotNull(m.getArgs());
-        assertEquals(0, m.getArgs().size());
-    }
-
-    @Test
-    public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
-        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
-        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
-        assertEquals(request, m.getRequestId());
-        assertEquals("eval", m.getOp());
-        assertNotNull(m.getArgs());
-        assertEquals("y", m.getArgs().get("x"));
-    }
-
-    @Test(expected = SerializationException.class)
-    public void shouldDeserializeRequestParseMessage() throws Exception {
-        SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
-    }
-
-    @Test
-    public void shouldSerializeFullResponseMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", "this");
-        metaData.put("one", 1);
-
-        final Map<String, Object> attributes = new HashMap<>();
-        attributes.put("test", "that");
-        attributes.put("two", 2);
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SUCCESS)
-                .result("some-result")
-                .statusAttributes(attributes)
-                .statusMessage("worked")
-                .create();
-
-        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
-        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-
-        assertEquals(id, deserialized.getRequestId());
-        assertEquals("this", deserialized.getResult().getMeta().get("test"));
-        assertEquals(1, deserialized.getResult().getMeta().get("one"));
-        assertEquals("some-result", deserialized.getResult().getData());
-        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
-        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
-        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
-        assertEquals("worked", deserialized.getStatus().getMessage());
-    }
-
-    @Test
-    public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
-        final UUID id = UUID.randomUUID();
-
-        final Map<String, Object> metaData = new HashMap<>();
-        metaData.put("test", UUID.randomUUID().toString());
-        final Map<String, Object> attributes = Collections.emptyMap();
-
-        final ResponseMessage response = ResponseMessage.build(id)
-                .responseMetaData(metaData)
-                .code(ResponseStatusCode.SERVER_ERROR)
-                .result("some-result")
-                .statusAttributes(attributes)
-                // explicitly pass the null value
-                .statusMessage(null)
-                .create();
-
-        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
-        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
-        Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
-                        + "with null message field", deserialized);
-    }
-
-    @Test
-    public void shouldSerializeToJsonTree() throws Exception {
-        final TinkerGraph graph = TinkerFactory.createClassic();
-        final GraphTraversalSource g = graph.traversal();
-        final Tree t = g.V(1).out().properties("name").tree().next();
-
-        
-        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create(), allocator);
-
-        final JsonNode json = mapper.readTree(results);
-
-        assertNotNull(json);
-        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
-        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
-        assertNotNull(converted);
-        
-        //check the first object and it's properties
-        assertEquals(1, converted.get("1").get("key").get("id").asInt());
-        assertEquals("marko", converted.get("1").get("key").get("properties").get("name").get(0).get("value").asText());
-        
-        //check objects tree structure
-        //check Vertex property
-        assertEquals("vadas", converted.get("1")
-                                 .get("value")
-                                 .get("2")
-                                 .get("value")
-                                 .get("3").get("key").get("value").asText());
-        assertEquals("name", converted.get("1")
-                                 .get("value")
-                                 .get("2")
-                                 .get("value")
-                                 .get("3").get("key").get("label").asText());
-        
-        // check subitem
-        assertEquals("lop", converted.get("1")
-                                 .get("value")
-                                 .get("3")
-                                 .get("key")
-                                 .get("properties").get("name").get(0).get("value").asText());
-    }
-
-    private class FunObject {
-        private String val;
-
-        public FunObject(String val) {
-            this.val = val;
-        }
-
-        public String toString() {
-            return this.val;
-        }
-    }
-
-    public static class ColorIoRegistry extends AbstractIoRegistry {
-        public ColorIoRegistry() {
-            register(GraphSONIo.class, null, new ColorSimpleModule());
-        }
-    }
-
-    public static class ColorSimpleModule extends SimpleModule {
-        public ColorSimpleModule() {
-            super("color-fun");
-            addSerializer(Color.class, new ColorSerializer());
-
-        }
-    }
-
-    public static class ColorSerializer extends StdSerializer<Color> {
-        public ColorSerializer() {
-            super(Color.class);
-        }
-
-        @Override
-        public void serialize(final Color color, final JsonGenerator jsonGenerator,
-                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
-            jsonGenerator.writeBoolean(color.equals(Color.RED));
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBufferFactoryTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBufferFactoryTest.java
deleted file mode 100644
index 223b289..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/NettyBufferFactoryTest.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import io.netty.util.ReferenceCounted;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.junit.AfterClass;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-public class NettyBufferFactoryTest {
-    public static final NettyBufferFactory factory = new NettyBufferFactory();
-    private static final ByteBufAllocator allocator = new UnpooledByteBufAllocator(false);
-    private static final List<ByteBuf> rawInstances = new ArrayList<>();
-
-    @AfterClass
-    public static void tearDown() {
-        rawInstances.forEach(ReferenceCounted::release);
-    }
-
-    private static ByteBuf getRaw() {
-        final ByteBuf raw = allocator.buffer(256);
-        rawInstances.add(raw);
-        return raw;
-    }
-
-    @Test
-    public void shouldReturnAWrapper() {
-        final ByteBuf raw = getRaw();
-        final Buffer buffer = factory.create(raw);
-        assertEquals(raw.refCnt(), buffer.referenceCount());
-    }
-
-    @Test
-    public void shouldAdvanceWriterAndReaderIndex() {
-        final ByteBuf raw = getRaw();
-        final Buffer buffer = factory.create(raw);
-
-        final int intValue = 100;
-        final long longValue = 2019L;
-        final float floatValue = 10.9F;
-
-        assertEquals(0, buffer.writerIndex());
-        assertEquals(0, buffer.readerIndex());
-
-        buffer.writeBoolean(true);
-        buffer.writeInt(intValue);
-        buffer.writeLong(longValue);
-        buffer.writeFloat(floatValue);
-
-        assertEquals(17, buffer.writerIndex());
-        assertEquals(0, buffer.readerIndex());
-
-        assertTrue(buffer.readBoolean());
-        assertEquals(intValue, buffer.readInt());
-        assertEquals(longValue, buffer.readLong());
-        assertEquals(floatValue, buffer.readFloat(), 0f);
-
-        assertEquals(17, buffer.writerIndex());
-        assertEquals(17, buffer.readerIndex());
-    }
-
-    @Test
-    public void readRawShouldAdvanceReaderIndexAndReleaseIt() {
-        final int intValue = 5;
-        final FakeBuffer fakeBuffer = new FakeBuffer();
-        fakeBuffer.writeInt(intValue);
-        assertEquals(4, fakeBuffer.writerIndex());
-        assertEquals(0, fakeBuffer.readerIndex());
-        final ByteBuf[] captured = new ByteBuf[1];
-
-        NettyBufferFactory.readRaw(fakeBuffer, byteBuf -> {
-            assertEquals(intValue, byteBuf.readInt());
-            assertNotSame(byteBuf, fakeBuffer.getUnderlyingRaw());
-            assertEquals(1, byteBuf.refCnt());
-            captured[0] = byteBuf;
-        });
-
-        assertEquals(4, fakeBuffer.writerIndex());
-
-        // The reader index advanced
-        assertEquals(4, fakeBuffer.readerIndex());
-
-        // Should be released afterwards
-        assertEquals(0, captured[0].refCnt());
-    }
-
-    @Test
-    public void writeRawShouldAdvanceWriterIndexAndReleaseIt() {
-        final int intValue1 = 314;
-        final int intValue2 = 314;
-        final FakeBuffer fakeBuffer = new FakeBuffer();
-
-        fakeBuffer.writeInt(intValue1);
-        assertEquals(4, fakeBuffer.writerIndex());
-        assertEquals(0, fakeBuffer.readerIndex());
-        final ByteBuf[] captured = new ByteBuf[1];
-
-        NettyBufferFactory.writeRaw(fakeBuffer, byteBuf -> {
-            byteBuf.writeInt(intValue2);
-            assertNotSame(byteBuf, fakeBuffer.getUnderlyingRaw());
-            assertEquals(1, byteBuf.refCnt());
-            captured[0] = byteBuf;
-        });
-
-        // The writer index advanced
-        assertEquals(8, fakeBuffer.writerIndex());
-        assertEquals(0, fakeBuffer.readerIndex());
-
-        // Should have painted the underlying bytes
-        assertEquals(intValue1, fakeBuffer.readInt());
-        assertEquals(intValue2, fakeBuffer.readInt());
-
-        // Should be released afterwards
-        assertEquals(0, captured[0].refCnt());
-    }
-
-    @Test
-    public void readRawShouldUseTheSameBufferWhenNettyBuffer() {
-        final NettyBuffer wrapperBuffer = new NettyBuffer(allocator.buffer());
-
-        NettyBufferFactory.readRaw(wrapperBuffer, byteBuf -> {
-            assertSame(byteBuf, wrapperBuffer.getUnderlyingBuffer());
-            assertEquals(1, byteBuf.refCnt());
-        });
-
-        // It shouldn't have released it
-        assertEquals(1, wrapperBuffer.referenceCount());
-    }
-
-    @Test
-    public void writeRawShouldUseTheSameBufferWhenNettyBuffer() {
-        final NettyBuffer wrapperBuffer = new NettyBuffer(allocator.buffer());
-
-        NettyBufferFactory.writeRaw(wrapperBuffer, byteBuf -> {
-            assertSame(byteBuf, wrapperBuffer.getUnderlyingBuffer());
-            assertEquals(1, byteBuf.refCnt());
-        });
-
-        // It shouldn't have released it
-        assertEquals(1, wrapperBuffer.referenceCount());
-    }
-
-    /** An incomplete implementation that allows testing */
-    class FakeBuffer implements Buffer {
-        private final ByteBuf buffer = getRaw();
-
-        FakeBuffer() {
-
-        }
-
-        ByteBuf getUnderlyingRaw() {
-            return buffer;
-        }
-
-        @Override
-        public int readableBytes() {
-            return buffer.readableBytes();
-        }
-
-        @Override
-        public int readerIndex() {
-            return buffer.readerIndex();
-        }
-
-        @Override
-        public Buffer readerIndex(int readerIndex) {
-            buffer.readerIndex(readerIndex);
-            return this;
-        }
-
-        @Override
-        public int writerIndex() {
-            return buffer.writerIndex();
-        }
-
-        @Override
-        public Buffer writerIndex(int writerIndex) {
-            buffer.writerIndex(writerIndex);
-            return this;
-        }
-
-        @Override
-        public Buffer markWriterIndex() {
-            return null;
-        }
-
-        @Override
-        public Buffer resetWriterIndex() {
-            return null;
-        }
-
-        @Override
-        public int capacity() {
-            return buffer.capacity();
-        }
-
-        @Override
-        public boolean isDirect() {
-            return false;
-        }
-
-        @Override
-        public boolean readBoolean() {
-            return false;
-        }
-
-        @Override
-        public byte readByte() {
-            return 0;
-        }
-
-        @Override
-        public short readShort() {
-            return 0;
-        }
-
-        @Override
-        public int readInt() {
-            return buffer.readInt();
-        }
-
-        @Override
-        public long readLong() {
-            return 0;
-        }
-
-        @Override
-        public float readFloat() {
-            return 0;
-        }
-
-        @Override
-        public double readDouble() {
-            return 0;
-        }
-
-        @Override
-        public Buffer readBytes(byte[] destination) {
-            return null;
-        }
-
-        @Override
-        public Buffer readBytes(byte[] destination, int dstIndex, int length) {
-            return null;
-        }
-
-        @Override
-        public Buffer readBytes(ByteBuffer dst) {
-            return null;
-        }
-
-        @Override
-        public Buffer readBytes(OutputStream out, int length) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeBoolean(boolean value) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeByte(int value) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeShort(int value) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeInt(int value) {
-            buffer.writeInt(value);
-            return this;
-        }
-
-        @Override
-        public Buffer writeLong(long value) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeFloat(float value) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeDouble(double value) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeBytes(byte[] src) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeBytes(ByteBuffer src) {
-            return null;
-        }
-
-        @Override
-        public Buffer writeBytes(byte[] src, int srcIndex, int length) {
-            return null;
-        }
-
-        @Override
-        public boolean release() {
-            return buffer.release();
-        }
-
-        @Override
-        public Buffer retain() {
-            buffer.retain();
-            return this;
-        }
-
-        @Override
-        public int referenceCount() {
-            return buffer.refCnt();
-        }
-
-        @Override
-        public int nioBufferCount() {
-            return buffer.nioBufferCount();
-        }
-
-        @Override
-        public ByteBuffer[] nioBuffers() {
-            return buffer.nioBuffers();
-        }
-
-        @Override
-        public ByteBuffer[] nioBuffers(int index, int length) {
-            return buffer.nioBuffers(index, length);
-        }
-
-        @Override
-        public ByteBuffer nioBuffer() {
-            return buffer.nioBuffer();
-        }
-
-        @Override
-        public ByteBuffer nioBuffer(int index, int length) {
-            return buffer.nioBuffer(index, length);
-        }
-
-        @Override
-        public Buffer getBytes(int index, byte[] dst) {
-            return null;
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryMessageSerializerV1Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryMessageSerializerV1Test.java
deleted file mode 100644
index dd9af34..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryMessageSerializerV1Test.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.junit.Test;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.apache.tinkerpop.gremlin.driver.MockitoHamcrestMatcherAdapter.reflectionEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.junit.Assert.assertEquals;
-
-public class GraphBinaryMessageSerializerV1Test {
-    private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-    private final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-
-    @Test
-    public void shouldSerializeAndDeserializeRequest() throws SerializationException {
-        final GraphTraversalSource g = EmptyGraph.instance().traversal();
-        final Traversal.Admin t = g.V().hasLabel("person").out().asAdmin();
-
-        final Map<String, String> aliases = new HashMap<>();
-        aliases.put("g","g");
-
-        final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
-                .processor("traversal")
-                .overrideRequestId(UUID.randomUUID())
-                .addArg(Tokens.ARGS_GREMLIN, t.getBytecode())
-                .addArg(Tokens.ARGS_ALIASES, aliases)
-                .create();
-
-        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
-        final int mimeLen = buffer.readByte();
-        final byte[] bytes = new byte[mimeLen];
-        buffer.readBytes(bytes);
-        final String mimeType = new String(bytes, StandardCharsets.UTF_8);
-
-        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
-        assertThat(request, reflectionEquals(deserialized));
-        assertThat(serializer.mimeTypesSupported(), hasItemInArray(mimeType));
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeRequestOverText() throws SerializationException {
-        final RequestMessage request = RequestMessage.build("op1")
-                .processor("proc1")
-                .overrideRequestId(UUID.randomUUID())
-                .addArg("arg1", "value1")
-                .create();
-
-        final String base64 = serializer.serializeRequestAsString(request, allocator);
-        final RequestMessage deserialized = serializer.deserializeRequest(base64);
-        assertThat(request, reflectionEquals(deserialized));
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeRequestWithoutArgs() throws SerializationException {
-        final RequestMessage request = RequestMessage.build("op1")
-                .processor("proc1")
-                .overrideRequestId(UUID.randomUUID())
-                .create();
-
-        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
-        final int mimeLen = buffer.readByte();
-        buffer.readBytes(new byte[mimeLen]);
-        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
-        assertThat(request, reflectionEquals(deserialized));
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeRequestWithUnsetProcessor() throws SerializationException {
-        final RequestMessage request = RequestMessage.build("op1")
-                .overrideRequestId(UUID.randomUUID())
-                .addArg("k", 1)
-                .create();
-
-        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
-        final int mimeLen = buffer.readByte();
-        buffer.readBytes(new byte[mimeLen]);
-        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
-        assertThat(request, reflectionEquals(deserialized));
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeResponse() throws SerializationException {
-        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
-                .code(ResponseStatusCode.SUCCESS)
-                .statusMessage("Found")
-                .statusAttribute("k1", 1)
-                .result("This is a fine message with a string")
-                .create();
-
-        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
-        assertResponseEquals(response, deserialized);
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeResponseOverText() throws SerializationException {
-        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
-                .code(ResponseStatusCode.SUCCESS)
-                .statusMessage("Found")
-                .statusAttribute("k1", 1)
-                .result("This is a fine message with a string")
-                .create();
-
-        final String base64 = serializer.serializeResponseAsString(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(base64);
-        assertResponseEquals(response, deserialized);
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeResponseWithoutStatusMessage() throws SerializationException {
-        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
-                .code(ResponseStatusCode.SUCCESS)
-                .statusAttribute("k1", 1)
-                .result(123.3)
-                .create();
-
-        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
-        assertResponseEquals(response, deserialized);
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeResponseWithoutStatusAttributes() throws SerializationException {
-        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
-                .code(ResponseStatusCode.SUCCESS)
-                .result(123.3)
-                .create();
-
-        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
-        assertResponseEquals(response, deserialized);
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeResponseWithoutResult() throws SerializationException {
-        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
-                .code(ResponseStatusCode.SERVER_ERROR)
-                .statusMessage("Something happened on the server")
-                .create();
-
-        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
-        assertResponseEquals(response, deserialized);
-    }
-
-    @Test
-    public void shouldSupportConfigurationOfRegistryBuilder() {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-        final Map<String, Object> config = new HashMap<>();
-        int counter = SampleTypeSerializerRegistryBuilder.createCounter.get();
-
-        config.put(GraphBinaryMessageSerializerV1.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.driver.ser.binary.GraphBinaryMessageSerializerV1Test$SampleTypeSerializerRegistryBuilder");
-        serializer.configure(config, null);
-
-        counter = SampleTypeSerializerRegistryBuilder.createCounter.get() - counter;
-        // There should be a call to `create()`
-        assertEquals(1, counter);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void shouldThrowWhenConfigurationOfRegistryBuilderFails() {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-        final Map<String, Object> config = new HashMap<>();
-        config.put(GraphBinaryMessageSerializerV1.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.driver.ser.binary.NonExistentClass");
-
-        serializer.configure(config, null);
-    }
-
-    @Test
-    public void shouldToStringSerialize() throws SerializationException {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-        final Map<String,Object> conf = new HashMap<String,Object>() {{
-            put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
-        }};
-        serializer.configure(conf, Collections.emptyMap());
-
-        final ResponseMessage messageWithUnexpectedType = ResponseMessage.build(UUID.randomUUID()).
-                result(java.awt.Color.RED).create();
-        final ByteBuf buffer = serializer.serializeResponseAsBinary(messageWithUnexpectedType, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
-
-        assertEquals(java.awt.Color.RED.toString(), deserialized.getResult().getData());
-    }
-
-    @Test
-    public void shouldToStringSerializeAsText() throws SerializationException {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-        final Map<String,Object> conf = new HashMap<String,Object>() {{
-            put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
-        }};
-        serializer.configure(conf, Collections.emptyMap());
-
-        final ResponseMessage messageWithUnexpectedType = ResponseMessage.build(UUID.randomUUID()).
-                result(java.awt.Color.RED).create();
-        final String base64 = serializer.serializeResponseAsString(messageWithUnexpectedType, allocator);
-        final ResponseMessage deserialized = serializer.deserializeResponse(base64);
-
-        assertEquals(java.awt.Color.RED.toString(), deserialized.getResult().getData());
-    }
-
-    @Test
-    public void shouldSerializeAndDeserializeRequestAsText() throws SerializationException {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-        final Map<String,Object> conf = new HashMap<String,Object>() {{
-            put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
-        }};
-        serializer.configure(conf, Collections.emptyMap());
-
-        final RequestMessage request = RequestMessage.build("op1")
-                .processor("proc1")
-                .overrideRequestId(UUID.randomUUID())
-                .addArg("arg1", "value1")
-                .create();
-
-        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
-        final int mimeLen = buffer.readByte();
-        buffer.readBytes(new byte[mimeLen]);
-        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
-        assertThat(request, reflectionEquals(deserialized));
-    }
-
-    private static void assertResponseEquals(ResponseMessage expected, ResponseMessage actual) {
-        assertEquals(expected.getRequestId(), actual.getRequestId());
-        // Status
-        assertEquals(expected.getStatus().getCode(), actual.getStatus().getCode());
-        assertEquals(expected.getStatus().getMessage(), actual.getStatus().getMessage());
-        assertEquals(expected.getStatus().getAttributes(), actual.getStatus().getAttributes());
-        // Result
-        assertEquals(expected.getResult().getData(), actual.getResult().getData());
-        assertEquals(expected.getResult().getMeta(), actual.getResult().getMeta());
-    }
-
-    public static class SampleTypeSerializerRegistryBuilder extends TypeSerializerRegistry.Builder {
-        public static AtomicInteger createCounter = new AtomicInteger();
-
-        @Override
-        public TypeSerializerRegistry create() {
-            createCounter.incrementAndGet();
-            return super.create();
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
deleted file mode 100644
index d18fc10..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.ser.AbstractRoundTripTest;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.junit.Test;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertEquals;
-
-public class GraphBinaryReaderWriterRoundTripTest extends AbstractRoundTripTest {
-    private final GraphBinaryWriter writer = new GraphBinaryWriter();
-    private final GraphBinaryReader reader = new GraphBinaryReader();
-    private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
-    @Test
-    public void shouldWriteAndRead() throws Exception {
-        // Test it multiple times as the type registry might change its internal state
-        for (int i = 0; i < 5; i++) {
-            final Buffer buffer = bufferFactory.create(allocator.buffer());
-            writer.write(value, buffer);
-            buffer.readerIndex(0);
-            final Object result = reader.read(buffer);
-
-            Optional.ofNullable(assertion).orElse((Consumer) r -> assertEquals(value, r)).accept(result);
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerFailureTests.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerFailureTests.java
deleted file mode 100644
index 2268bf1..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerFailureTests.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.driver.ser.binary;
-
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferencePath;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-@RunWith(Parameterized.class)
-public class TypeSerializerFailureTests {
-
-    private final GraphBinaryWriter writer = new GraphBinaryWriter();
-    private final UnpooledByteBufAllocator allocator = new UnpooledByteBufAllocator(false);
-    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
-    @Parameterized.Parameters(name = "Value={0}")
-    public static Collection input() {
-        final Bytecode.Binding b = new Bytecode.Binding(null, "b");
-
-        final ReferenceVertex vertex = new ReferenceVertex("a vertex", null);
-
-        final Bytecode bytecode = new Bytecode();
-        bytecode.addStep(null);
-
-        final BulkSet<Object> bulkSet = new BulkSet<>();
-        bulkSet.add(vertex, 1L);
-
-        final MutableMetrics metrics = new MutableMetrics("a metric", null);
-
-        final Tree<Vertex> tree = new Tree<>();
-        tree.put(vertex, null);
-
-        // Provide instances that are malformed for serialization to fail
-        return Arrays.asList(
-                b,
-                vertex,
-                Collections.singletonMap("one", b),
-                bulkSet,
-                bytecode,
-                Collections.singletonList(vertex),
-                new ReferenceEdge("an edge", null, vertex, vertex),
-                Lambda.supplier(null),
-                metrics,
-                new DefaultTraversalMetrics(1L, Collections.singletonList(metrics)),
-                new DefaultRemoteTraverser<>(new Object(), 1L),
-                tree,
-                new ReferenceVertexProperty<>("a prop", null, "value"),
-                new InvalidPath()
-        );
-    }
-
-    @Parameterized.Parameter(value = 0)
-    public Object value;
-
-    @Test
-    public void shouldReleaseMemoryWhenFails() {
-        final Buffer buffer = bufferFactory.create(allocator.buffer());
-        try {
-            writer.write(value, buffer);
-            fail("Should throw exception");
-        } catch (IOException | RuntimeException e) {
-            // We are the owner of the buffer, we should release it
-            buffer.release();
-        }
-
-        // Make sure all allocations where released
-        assertEquals(0, allocator.metric().usedHeapMemory());
-    }
-
-    public static class InvalidPath extends ReferencePath {
-        public InvalidPath() {
-            super(EmptyPath.instance());
-        }
-
-        @Override
-        public List<Object> objects() {
-            return Collections.singletonList(new Object());
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerRegistryTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerRegistryTest.java
deleted file mode 100644
index a40285b..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerRegistryTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary;
-
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.sample.SamplePerson;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.sample.SamplePersonSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.UUID;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertSame;
-
-public class TypeSerializerRegistryTest {
-
-    @Test
-    public void shouldResolveToUserProvidedForInterfaces_1() throws IOException {
-        final TypeSerializer<VertexProperty> expected = new TestVertexPropertySerializer();
-        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
-                .add(VertexProperty.class, expected).create();
-
-        assertSame(expected, registry.getSerializer(VertexProperty.class));
-        assertSame(expected, registry.getSerializer(DataType.VERTEXPROPERTY));
-    }
-
-    @Test
-    public void shouldResolveToUserProvidedForInterfaces_2() throws IOException {
-        final TypeSerializer<Property> expected = new TestPropertySerializer();
-        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
-                .add(Property.class, expected).create();
-
-        assertSame(expected, registry.getSerializer(Property.class));
-        assertSame(expected, registry.getSerializer(DataType.PROPERTY));
-    }
-
-    @Test
-    public void shouldResolveToUserProvidedForClasses() throws Exception {
-        final TypeSerializer<UUID> expected = new TestUUIDSerializer();
-        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
-                .add(UUID.class, expected).create();
-
-        assertSame(expected, registry.getSerializer(UUID.class));
-        assertSame(expected, registry.getSerializer(DataType.UUID));
-    }
-
-    @Test
-    public void shouldResolveToTheFirstSerializerForInterfaces() throws IOException {
-        final TypeSerializer<VertexProperty> expectedForVertexProperty = new TestVertexPropertySerializer();
-        final TypeSerializer<Property> expectedForProperty = new TestPropertySerializer();
-        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
-                .add(VertexProperty.class, expectedForVertexProperty)
-                .add(Property.class, expectedForProperty).create();
-
-        assertSame(expectedForVertexProperty, registry.getSerializer(VertexProperty.class));
-        assertSame(expectedForProperty, registry.getSerializer(Property.class));
-        assertSame(expectedForVertexProperty, registry.getSerializer(DataType.VERTEXPROPERTY));
-        assertSame(expectedForProperty, registry.getSerializer(DataType.PROPERTY));
-    }
-
-    @Test
-    public void shouldUseFallbackResolverWhenThereIsNoMatch() {
-        final int[] called = {0};
-        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
-                .withFallbackResolver(t -> {
-                    called[0]++;
-                    return null;
-                }).create();
-
-        String message = null;
-        try {
-            registry.getSerializer(SamplePerson.class);
-        } catch (IOException ex) {
-            message = ex.getMessage();
-        }
-
-        assertEquals("Serializer for type org.apache.tinkerpop.gremlin.driver.ser.binary.types.sample.SamplePerson not found", message);
-        assertEquals(1, called[0]);
-    }
-
-    @Test
-    public void shouldUseFallbackResolverReturnValue() throws IOException {
-        TypeSerializer expected = new SamplePersonSerializer();
-        final int[] called = {0};
-        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
-                .withFallbackResolver(t -> {
-                    called[0]++;
-                    return expected;
-                }).create();
-
-        TypeSerializer<SamplePerson> serializer = registry.getSerializer(SamplePerson.class);
-        assertEquals(1, called[0]);
-        assertSame(expected, serializer);
-    }
-
-    private static class TestVertexPropertySerializer extends TestBaseTypeSerializer<VertexProperty> {
-
-        @Override
-        public DataType getDataType() {
-            return DataType.VERTEXPROPERTY;
-        }
-    }
-
-    private static class TestPropertySerializer extends TestBaseTypeSerializer<Property> {
-
-        @Override
-        public DataType getDataType() {
-            return DataType.PROPERTY;
-        }
-    }
-
-    private static class TestUUIDSerializer extends TestBaseTypeSerializer<UUID> {
-
-        @Override
-        public DataType getDataType() {
-            return DataType.UUID;
-        }
-    }
-
-    private static abstract class TestBaseTypeSerializer<T> implements TypeSerializer<T> {
-        @Override
-        public T read(Buffer buffer, GraphBinaryReader context) {
-            return null;
-        }
-
-        @Override
-        public T readValue(Buffer buffer, GraphBinaryReader context, boolean nullable) {
-            return null;
-        }
-
-        @Override
-        public void write(T value, Buffer buffer, GraphBinaryWriter context) {
-
-        }
-
-        @Override
-        public void writeValue(T value, Buffer buffer, GraphBinaryWriter context, boolean nullable) {
-
-        }
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/CharSerializerTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/CharSerializerTest.java
deleted file mode 100644
index 4d38c99..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/CharSerializerTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary.types;
-
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.Unpooled;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(Parameterized.class)
-public class CharSerializerTest {
-    private final ByteBufAllocator allocator = new UnpooledByteBufAllocator(false);
-    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
-    private static final GraphBinaryReader reader = new GraphBinaryReader();
-    private static final GraphBinaryWriter writer = new GraphBinaryWriter();
-
-    @Parameterized.Parameters(name = "Character={0}")
-    public static Collection input() {
-        return Arrays.asList(
-                new Object[] {'a', new byte[]{ 0x61 }},
-                new Object[] {'b', new byte[]{ 0x62 }},
-                new Object[] {'$', new byte[]{ 0x24 }},
-                new Object[] {'¢', new byte[]{ (byte)0xc2, (byte)0xa2 }},
-                new Object[] {'€', new byte[]{ (byte)0xe2, (byte)0x82, (byte)0xac }},
-                new Object[] {'ह', new byte[]{ (byte)0xe0, (byte)0xa4, (byte)0xb9 }});
-    }
-
-    @Parameterized.Parameter(value = 0)
-    public char charValue;
-
-    @Parameterized.Parameter(value = 1)
-    public byte[] byteArray;
-
-    @Test
-    public void readValueTest() throws IOException {
-        final Character actual = reader.readValue(
-                bufferFactory.create(Unpooled.wrappedBuffer(byteArray)),Character.class, false);
-        assertEquals(charValue, actual.charValue());
-    }
-
-    @Test
-    public void writeValueTest() throws IOException {
-        final Buffer actual = bufferFactory.create(allocator.buffer());
-        writer.writeValue(charValue, actual, false);
-        final byte[] actualBytes = new byte[byteArray.length];
-        actual.readBytes(actualBytes);
-        assertTrue(Arrays.deepEquals(new byte[][]{byteArray}, new byte[][]{actualBytes}));
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePerson.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePerson.java
deleted file mode 100644
index fd4d05a..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePerson.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary.types.sample;
-
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * A sample custom data type containing few properties.
- */
-public class SamplePerson {
-    private final String name;
-    private final Date birthDate;
-
-    SamplePerson(final String name, final Date birthDate) {
-        Objects.requireNonNull(name);
-        Objects.requireNonNull(birthDate);
-
-        this.name = name;
-        this.birthDate = birthDate;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Date getBirthDate() {
-        return birthDate;
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializer.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializer.java
deleted file mode 100644
index ad9e5db..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializer.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary.types.sample;
-
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-
-/**
- * A sample custom type serializer.
- */
-public final class SamplePersonSerializer implements CustomTypeSerializer<SamplePerson> {
-    private final byte[] typeInfoBuffer = new byte[] { 0, 0, 0, 0 };
-
-    @Override
-    public String getTypeName() {
-        return "sampleProvider.SamplePerson";
-    }
-
-    @Override
-    public DataType getDataType() {
-        return DataType.CUSTOM;
-    }
-
-    @Override
-    public SamplePerson read(final Buffer buffer, final GraphBinaryReader context) throws IOException {
-        // {custom type info}, {value_flag} and {value}
-        // No custom_type_info
-        if (buffer.readInt() != 0) {
-            throw new SerializationException("{custom_type_info} should not be provided for this custom type");
-        }
-
-        return readValue(buffer, context, true);
-    }
-
-    @Override
-    public SamplePerson readValue(final Buffer buffer, final GraphBinaryReader context, final boolean nullable) throws IOException {
-        if (nullable) {
-            final byte valueFlag = buffer.readByte();
-            if ((valueFlag & 1) == 1) {
-                return null;
-            }
-        }
-
-        // Read the byte length of the value bytes
-        final int valueLength = buffer.readInt();
-
-        if (valueLength <= 0) {
-            throw new SerializationException(String.format("Unexpected value length: %d", valueLength));
-        }
-
-        if (valueLength > buffer.readableBytes()) {
-            throw new SerializationException(
-                String.format("Not enough readable bytes: %d (expected %d)", valueLength, buffer.readableBytes()));
-        }
-
-        final String name = context.readValue(buffer, String.class, false);
-        final Date birthDate = context.readValue(buffer, Date.class, false);
-
-        return new SamplePerson(name, birthDate);
-    }
-
-    @Override
-    public void write(final SamplePerson value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
-        // Write {custom type info}, {value_flag} and {value}
-        buffer.writeBytes(typeInfoBuffer);
-
-        writeValue(value, buffer, context, true);
-    }
-
-    @Override
-    public void writeValue(final SamplePerson value, final Buffer buffer, final GraphBinaryWriter context, final boolean nullable) throws IOException {
-        if (value == null) {
-            if (!nullable) {
-                throw new SerializationException("Unexpected null value when nullable is false");
-            }
-
-            context.writeValueFlagNull(buffer);
-            return;
-        }
-
-        if (nullable) {
-            context.writeValueFlagNone(buffer);
-        }
-
-        final String name = value.getName();
-
-        // value_length = name_byte_length + name_bytes + long
-        buffer.writeInt(4 + name.getBytes(StandardCharsets.UTF_8).length + 8);
-
-        context.writeValue(name, buffer, false);
-        context.writeValue(value.getBirthDate(), buffer, false);
-    }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializerTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializerTest.java
deleted file mode 100644
index 7ff130e..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/sample/SamplePersonSerializerTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser.binary.types.sample;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryIo;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.apache.tinkerpop.gremlin.driver.MockitoHamcrestMatcherAdapter.reflectionEquals;
-import static org.apache.tinkerpop.gremlin.driver.ser.AbstractMessageSerializer.TOKEN_IO_REGISTRIES;
-import static org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1.TOKEN_CUSTOM;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class SamplePersonSerializerTest {
-
-    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
-    @Test
-    public void shouldCustomSerializationWithPerson() throws IOException {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1(
-                TypeSerializerRegistry.build().addCustomType(SamplePerson.class, new SamplePersonSerializer()).create());
-        assertPerson(serializer);
-    }
-
-    @Test
-    public void shouldSerializePersonViaIoRegistry() throws IOException {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-        final Map<String,Object> config = new HashMap<>();
-        config.put(TOKEN_IO_REGISTRIES, Collections.singletonList(CustomIoRegistry.class.getName()));
-        serializer.configure(config, Collections.emptyMap());
-
-        assertPerson(serializer);
-    }
-
-    @Test
-    public void shouldSerializePersonViaCustom() throws IOException {
-        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
-        final Map<String,Object> config = new HashMap<>();
-        config.put(TOKEN_CUSTOM, Collections.singletonList(String.format("%s;%s",
-                SamplePerson.class.getCanonicalName(), SamplePersonSerializer.class.getCanonicalName())));
-        serializer.configure(config, Collections.emptyMap());
-
-        assertPerson(serializer);
-    }
-
-    @Test
-    public void readValueAndWriteValueShouldBeSymmetric() throws IOException {
-        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
-                .addCustomType(SamplePerson.class, new SamplePersonSerializer()).create();
-        final GraphBinaryReader reader = new GraphBinaryReader(registry);
-        final GraphBinaryWriter writer = new GraphBinaryWriter(registry);
-
-        final SamplePerson person = new SamplePerson("Matias",
-                Date.from(LocalDateTime.of(2005, 8, 5, 1, 0).toInstant(ZoneOffset.UTC)));
-
-        for (boolean nullable: new boolean[] { true, false }) {
-            final Buffer buffer = bufferFactory.create(allocator.buffer());
-            writer.writeValue(person, buffer, nullable);
-            final SamplePerson actual = reader.readValue(buffer, SamplePerson.class, nullable);
-
-            assertThat(actual, reflectionEquals(person));
-            buffer.release();
-        }
-    }
-
-    private void assertPerson(final GraphBinaryMessageSerializerV1 serializer) throws IOException {
-        final Date birthDate = Date.from(LocalDateTime.of(2010, 4, 29, 5, 30).toInstant(ZoneOffset.UTC));
-        final SamplePerson person = new SamplePerson("Olivia", birthDate);
-
-        final ByteBuf serialized = serializer.serializeResponseAsBinary(
-                ResponseMessage.build(UUID.randomUUID()).result(person).create(), allocator);
-
-        final ResponseMessage deserialized = serializer.deserializeResponse(serialized);
-
-        final SamplePerson actual = (SamplePerson) deserialized.getResult().getData();
-        assertThat(actual, reflectionEquals(person));
-    }
-
-    public static class CustomIoRegistry extends AbstractIoRegistry {
-        private static final CustomIoRegistry ioreg = new CustomIoRegistry();
-
-        private CustomIoRegistry() {
-            register(GraphBinaryIo.class, SamplePerson.class, new SamplePersonSerializer());
-        }
-
-        public static CustomIoRegistry instance() {
-            return ioreg;
-        }
-    }
-}
diff --git a/gremlin-go/build/generate.groovy b/gremlin-go/build/generate.groovy
index 7adb39c..b6ca147 100644
--- a/gremlin-go/build/generate.groovy
+++ b/gremlin-go/build/generate.groovy
@@ -92,6 +92,7 @@
         '\n' +
         'import (\n' +
         '\t \"errors\"\n' +
+        '\t \"time\"\n' +
         '\t \"math\"\n' +
         '\t \"github.com/apache/tinkerpop/gremlin-go/v3/driver\"\n' +
         ')\n'
diff --git a/gremlin-go/docker-compose.yml b/gremlin-go/docker-compose.yml
index 7839ed8..a12e4f2 100644
--- a/gremlin-go/docker-compose.yml
+++ b/gremlin-go/docker-compose.yml
@@ -42,6 +42,8 @@
       timeout: 10s
       retries: 30
       start_period: 30s
+    depends_on:
+      - gremlin-socket-server
 
   gremlin-go-integration-tests:
     container_name: gremlin-go-integration-tests
@@ -50,6 +52,7 @@
       - .:/go_app
       - ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features:/gremlin-test
       - ../docker/gremlin-test-server:/go_app/gremlin-test-server
+      - ../gremlin-tools/gremlin-socket-server/conf:/go_app/gremlin-socket-server/conf/
     environment:
       - CUCUMBER_FEATURE_FOLDER=/gremlin-test
       - GREMLIN_SERVER_URL=ws://gremlin-server-test:45940/gremlin
@@ -57,7 +60,8 @@
       - RUN_INTEGRATION_TESTS=true
       - RUN_INTEGRATION_WITH_ALIAS_TESTS=true
       - RUN_BASIC_AUTH_INTEGRATION_TESTS=true
-      - TEST_TRANSACTIONS=true
+      - GREMLIN_SOCKET_SERVER_URL=ws://gremlin-socket-server-go
+      - GREMLIN_SOCKET_SERVER_CONFIG_PATH=/go_app/gremlin-socket-server/conf/test-ws-gremlin.yaml
     working_dir: /go_app
     command: >
       bash -c "go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
@@ -65,3 +69,9 @@
     depends_on:
       gremlin-server-test:
         condition: service_healthy
+
+  gremlin-socket-server:
+    container_name: gremlin-socket-server-go
+    image: tinkerpop/gremlin-socket-server:${GREMLIN_SERVER}
+    ports:
+      - "45943:45943"
diff --git a/gremlin-go/driver/anonymousTraversal.go b/gremlin-go/driver/anonymousTraversal.go
index a9475c6..eaefc55 100644
--- a/gremlin-go/driver/anonymousTraversal.go
+++ b/gremlin-go/driver/anonymousTraversal.go
@@ -45,6 +45,8 @@
 type AnonymousTraversal interface {
 	// T__ creates an empty GraphTraversal.
 	T__(args ...interface{}) *GraphTraversal
+	// E adds the e step to the GraphTraversal.
+	E(args ...interface{}) *GraphTraversal
 	// V adds the v step to the GraphTraversal.
 	V(args ...interface{}) *GraphTraversal
 	// AddE adds the addE step to the GraphTraversal.
@@ -53,10 +55,16 @@
 	AddV(args ...interface{}) *GraphTraversal
 	// Aggregate adds the aggregate step to the GraphTraversal.
 	Aggregate(args ...interface{}) *GraphTraversal
+	// All adds the all step to the GraphTraversal.
+	All(args ...interface{}) *GraphTraversal
 	// And adds the and step to the GraphTraversal.
 	And(args ...interface{}) *GraphTraversal
+	// Any adds the any step to the GraphTraversal.
+	Any(args ...interface{}) *GraphTraversal
 	// As adds the as step to the GraphTraversal.
 	As(args ...interface{}) *GraphTraversal
+	// AsString adds the asString step to the GraphTraversal.
+	AsString(args ...interface{}) *GraphTraversal
 	// Barrier adds the barrier step to the GraphTraversal.
 	Barrier(args ...interface{}) *GraphTraversal
 	// Both adds the both step to the GraphTraversal.
@@ -79,6 +87,12 @@
 	Coalesce(args ...interface{}) *GraphTraversal
 	// Coin adds the coin step to the GraphTraversal.
 	Coin(args ...interface{}) *GraphTraversal
+	// Combine adds the combine step to the GraphTraversal.
+	Combine(args ...interface{}) *GraphTraversal
+	// Concat adds the Concat step to the GraphTraversal.
+	Concat(args ...interface{}) *GraphTraversal
+	// Conjoin adds the Conjoin step to the GraphTraversal.
+	Conjoin(args ...interface{}) *GraphTraversal
 	// ConnectedComponent adds the connectedComponent step to the GraphTraversal.
 	ConnectedComponent(args ...interface{}) *GraphTraversal
 	// Constant adds the constant step to the GraphTraversal.
@@ -89,6 +103,10 @@
 	CyclicPath(args ...interface{}) *GraphTraversal
 	// Dedup adds the dedup step to the GraphTraversal.
 	Dedup(args ...interface{}) *GraphTraversal
+	// Difference adds the difference step to the GraphTraversal.
+	Difference(args ...interface{}) *GraphTraversal
+	// Disjunct adds the disjunct step to the GraphTraversal.
+	Disjunct(args ...interface{}) *GraphTraversal
 	// Drop adds the drop step to the GraphTraversal.
 	Drop(args ...interface{}) *GraphTraversal
 	// Element adds the element step to the GraphTraversal.
@@ -105,6 +123,8 @@
 	FlatMap(args ...interface{}) *GraphTraversal
 	// Fold adds the fold step to the GraphTraversal.
 	Fold(args ...interface{}) *GraphTraversal
+	// Format adds the format step to the GraphTraversal.
+	Format(args ...interface{}) *GraphTraversal
 	// From adds the from step to the GraphTraversal.
 	From(args ...interface{}) *GraphTraversal
 	// Group adds the group step to the GraphTraversal.
@@ -137,18 +157,24 @@
 	Index(args ...interface{}) *GraphTraversal
 	// Inject adds the inject step to the GraphTraversal.
 	Inject(args ...interface{}) *GraphTraversal
+	// Intersect adds the intersect step to the GraphTraversal.
+	Intersect(args ...interface{}) *GraphTraversal
 	// Is adds the is step to the GraphTraversal.
 	Is(args ...interface{}) *GraphTraversal
 	// Key adds the key step to the GraphTraversal.
 	Key(args ...interface{}) *GraphTraversal
 	// Label adds the label step to the GraphTraversal.
 	Label(args ...interface{}) *GraphTraversal
+	// Length adds the length step to the GraphTraversal.
+	Length(args ...interface{}) *GraphTraversal
 	// Limit adds the limit step to the GraphTraversal.
 	Limit(args ...interface{}) *GraphTraversal
 	// Local adds the local step to the GraphTraversal.
 	Local(args ...interface{}) *GraphTraversal
 	// Loops adds the loops step to the GraphTraversal.
 	Loops(args ...interface{}) *GraphTraversal
+	// LTrim adds the lTrim step to the GraphTraversal.
+	LTrim(args ...interface{}) *GraphTraversal
 	// Map adds the map step to the GraphTraversal.
 	Map(args ...interface{}) *GraphTraversal
 	// Match adds the match step to the GraphTraversal.
@@ -159,6 +185,8 @@
 	Max(args ...interface{}) *GraphTraversal
 	// Mean adds the mean step to the GraphTraversal.
 	Mean(args ...interface{}) *GraphTraversal
+	// Merge adds the merge step to the GraphTraversal.
+	Merge(args ...interface{}) *GraphTraversal
 	// MergeE adds the mergeE step to the GraphTraversal.
 	MergeE(args ...interface{}) *GraphTraversal
 	// MergeV adds the mergeV step to the GraphTraversal.
@@ -191,6 +219,8 @@
 	Path(args ...interface{}) *GraphTraversal
 	// PeerPressure adds the peerPressure step to the GraphTraversal.
 	PeerPressure(args ...interface{}) *GraphTraversal
+	// Product adds the product step to the GraphTraversal.
+	Product(args ...interface{}) *GraphTraversal
 	// Profile adds the profile step to the GraphTraversal.
 	Profile(args ...interface{}) *GraphTraversal
 	// Program adds the program step to the GraphTraversal.
@@ -209,6 +239,12 @@
 	Read(args ...interface{}) *GraphTraversal
 	// Repeat adds the repeat step to the GraphTraversal.
 	Repeat(args ...interface{}) *GraphTraversal
+	// Replace adds the replace step to the GraphTraversal.
+	Replace(args ...interface{}) *GraphTraversal
+	// Reverse adds the reverse step to the GraphTraversal.
+	Reverse(args ...interface{}) *GraphTraversal
+	// RTrim adds the rTrim step to the GraphTraversal.
+	RTrim(args ...interface{}) *GraphTraversal
 	// Sack adds the sack step to the GraphTraversal.
 	Sack(args ...interface{}) *GraphTraversal
 	// Sample adds the sample step to the GraphTraversal.
@@ -223,10 +259,14 @@
 	SimplePath(args ...interface{}) *GraphTraversal
 	// Skip adds the skip step to the GraphTraversal.
 	Skip(args ...interface{}) *GraphTraversal
+	// Split adds the split step to the GraphTraversal.
+	Split(args ...interface{}) *GraphTraversal
 	// Store adds the store step to the GraphTraversal.
 	Store(args ...interface{}) *GraphTraversal
 	// Subgraph adds the subgraph step to the GraphTraversal.
 	Subgraph(args ...interface{}) *GraphTraversal
+	// Substring adds the substring step to the GraphTraversal.
+	Substring(args ...interface{}) *GraphTraversal
 	// Sum adds the sum step to the GraphTraversal.
 	Sum(args ...interface{}) *GraphTraversal
 	// Tail adds the tail step to the GraphTraversal.
@@ -239,10 +279,16 @@
 	To(args ...interface{}) *GraphTraversal
 	// ToE adds the toE step to the GraphTraversal.
 	ToE(args ...interface{}) *GraphTraversal
+	// ToLower adds the toLower step to the GraphTraversal.
+	ToLower(args ...interface{}) *GraphTraversal
+	// ToUpper adds the toUpper step to the GraphTraversal.
+	ToUpper(args ...interface{}) *GraphTraversal
 	// ToV adds the toV step to the GraphTraversal.
 	ToV(args ...interface{}) *GraphTraversal
 	// Tree adds the tree step to the GraphTraversal.
 	Tree(args ...interface{}) *GraphTraversal
+	// Trim adds the trim step to the GraphTraversal.
+	Trim(args ...interface{}) *GraphTraversal
 	// Unfold adds the unfold step to the GraphTraversal.
 	Unfold(args ...interface{}) *GraphTraversal
 	// Union adds the union step to the GraphTraversal.
@@ -278,6 +324,11 @@
 	return anonymousTraversal.Inject(args...)
 }
 
+// E adds the e step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) E(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().E(args...)
+}
+
 // V adds the v step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) V(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().V(args...)
@@ -298,16 +349,36 @@
 	return anonymousTraversal.graphTraversal().Aggregate(args...)
 }
 
+// All adds the all step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) All(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().All(args...)
+}
+
 // And adds the and step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) And(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().And(args...)
 }
 
+// Any adds the any step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Any(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Any(args...)
+}
+
 // As adds the as step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) As(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().As(args...)
 }
 
+// AsDate adds the AsDate step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) AsDate(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().AsDate(args...)
+}
+
+// AsString adds the asString step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) AsString(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().AsString(args...)
+}
+
 // Barrier adds the barrier step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Barrier(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Barrier(args...)
@@ -363,6 +434,21 @@
 	return anonymousTraversal.graphTraversal().Coin(args...)
 }
 
+// Combine adds the combine step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Combine(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Combine(args...)
+}
+
+// Concat adds the Concat step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Concat(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Concat(args...)
+}
+
+// Conjoin adds the conjoin step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Conjoin(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Conjoin(args...)
+}
+
 // ConnectedComponent adds the connectedComponent step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) ConnectedComponent(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().ConnectedComponent(args...)
@@ -383,11 +469,31 @@
 	return anonymousTraversal.graphTraversal().CyclicPath(args...)
 }
 
+// DateAdd adds the DateAdd step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) DateAdd(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().DateAdd(args...)
+}
+
+// DateDiff adds the DateDiff step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) DateDiff(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().DateDiff(args...)
+}
+
 // Dedup adds the dedup step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Dedup(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Dedup(args...)
 }
 
+// Difference adds the difference step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Difference(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Difference(args...)
+}
+
+// Disjunct adds the disjunct step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Disjunct(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Disjunct(args...)
+}
+
 // Drop adds the drop step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Drop(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Drop(args...)
@@ -428,6 +534,11 @@
 	return anonymousTraversal.graphTraversal().Fold(args...)
 }
 
+// Format adds the format step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Format(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Format(args...)
+}
+
 // From adds the from step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) From(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().From(args...)
@@ -508,6 +619,11 @@
 	return anonymousTraversal.graphTraversal().Inject(args...)
 }
 
+// Intersect adds the intersect step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Intersect(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Intersect(args...)
+}
+
 // Is adds the is step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Is(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Is(args...)
@@ -523,6 +639,11 @@
 	return anonymousTraversal.graphTraversal().Label(args...)
 }
 
+// Length adds the length step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Length(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Length(args...)
+}
+
 // Limit adds the limit step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Limit(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Limit(args...)
@@ -538,6 +659,11 @@
 	return anonymousTraversal.graphTraversal().Loops(args...)
 }
 
+// LTrim adds the lTrim step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) LTrim(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().LTrim(args...)
+}
+
 // Map adds the map step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Map(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Map(args...)
@@ -563,6 +689,11 @@
 	return anonymousTraversal.graphTraversal().Mean(args...)
 }
 
+// Merge adds the merge step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Merge(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Merge(args...)
+}
+
 // MergeE adds the mergeE step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) MergeE(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().MergeE(args...)
@@ -643,6 +774,11 @@
 	return anonymousTraversal.graphTraversal().PeerPressure(args...)
 }
 
+// Product adds the product step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Product(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Product(args...)
+}
+
 // Profile adds the profile step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Profile(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Profile(args...)
@@ -688,6 +824,21 @@
 	return anonymousTraversal.graphTraversal().Repeat(args...)
 }
 
+// Replace adds the replace step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Replace(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Replace(args...)
+}
+
+// Reverse adds the reverse step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Reverse(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Reverse(args...)
+}
+
+// RTrim adds the rTrim step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) RTrim(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().RTrim(args...)
+}
+
 // Sack adds the sack step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Sack(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Sack(args...)
@@ -723,6 +874,11 @@
 	return anonymousTraversal.graphTraversal().Skip(args...)
 }
 
+// Split adds the split step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Split(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Split(args...)
+}
+
 // Store adds the store step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Store(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Store(args...)
@@ -733,6 +889,11 @@
 	return anonymousTraversal.graphTraversal().Subgraph(args...)
 }
 
+// Substring adds the subgraph step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Substring(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Substring(args...)
+}
+
 // Sum adds the sum step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Sum(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Sum(args...)
@@ -763,6 +924,16 @@
 	return anonymousTraversal.graphTraversal().ToE(args...)
 }
 
+// ToLower adds the toLower step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) ToLower(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().ToLower(args...)
+}
+
+// ToUpper adds the toUpper step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) ToUpper(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().ToUpper(args...)
+}
+
 // ToV adds the toV step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) ToV(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().ToV(args...)
@@ -773,6 +944,11 @@
 	return anonymousTraversal.graphTraversal().Tree(args...)
 }
 
+// Trim adds the tree step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Trim(args ...interface{}) *GraphTraversal {
+	return anonymousTraversal.graphTraversal().Trim(args...)
+}
+
 // Unfold adds the unfold step to the GraphTraversal.
 func (anonymousTraversal *anonymousTraversal) Unfold(args ...interface{}) *GraphTraversal {
 	return anonymousTraversal.graphTraversal().Unfold(args...)
diff --git a/gremlin-go/driver/client_test.go b/gremlin-go/driver/client_test.go
index 7413bf5..52a9bde 100644
--- a/gremlin-go/driver/client_test.go
+++ b/gremlin-go/driver/client_test.go
@@ -21,9 +21,14 @@
 
 import (
 	"crypto/tls"
+	"fmt"
+	"log"
+	"os"
 	"testing"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
+	"gopkg.in/yaml.v3"
 )
 
 func TestClient(t *testing.T) {
@@ -33,25 +38,6 @@
 	testNoAuthAuthInfo := &AuthInfo{}
 	testNoAuthTlsConfig := &tls.Config{}
 
-	t.Run("Test client.Submit()", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
-		client, err := NewClient(testNoAuthUrl,
-			func(settings *ClientSettings) {
-				settings.TlsConfig = testNoAuthTlsConfig
-				settings.AuthInfo = testNoAuthAuthInfo
-			})
-		defer client.Close()
-		assert.NoError(t, err)
-		assert.NotNil(t, client)
-		resultSet, err := client.Submit("g.V().count()")
-		assert.NoError(t, err)
-		assert.NotNil(t, resultSet)
-		result, ok, err := resultSet.One()
-		assert.NoError(t, err)
-		assert.True(t, ok)
-		assert.NotNil(t, result)
-	})
-
 	t.Run("Test client.SubmitWithOptions()", func(t *testing.T) {
 		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
 		client, err := NewClient(testNoAuthUrl,
@@ -59,9 +45,10 @@
 				settings.TlsConfig = testNoAuthTlsConfig
 				settings.AuthInfo = testNoAuthAuthInfo
 			})
-		defer client.Close()
 		assert.NoError(t, err)
 		assert.NotNil(t, client)
+		defer client.Close()
+
 		resultSet, err := client.SubmitWithOptions("g.V().count()", *new(RequestOptions))
 		assert.NoError(t, err)
 		assert.NotNil(t, resultSet)
@@ -90,4 +77,331 @@
 		assert.True(t, pool.isClosed)
 		assert.Equal(t, closed, pool.connections[0].state)
 	})
+
+	t.Run("Test client.Submit()", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testNoAuthUrl,
+			func(settings *ClientSettings) {
+				settings.TlsConfig = testNoAuthTlsConfig
+				settings.AuthInfo = testNoAuthAuthInfo
+				settings.TraversalSource = testServerModernGraphAlias
+			})
+		assert.NoError(t, err)
+		assert.NotNil(t, client)
+		defer client.Close()
+
+		resultSet, err := client.Submit("g.V(1)")
+		assert.NoError(t, err)
+		assert.NotNil(t, resultSet)
+
+		result, ok, err := resultSet.One()
+		assert.NoError(t, err)
+		assert.True(t, ok)
+
+		AssertMarkoVertexWithProperties(t, result)
+	})
+
+	t.Run("Test client.submit() with materializeProperties", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testNoAuthUrl,
+			func(settings *ClientSettings) {
+				settings.TlsConfig = testNoAuthTlsConfig
+				settings.AuthInfo = testNoAuthAuthInfo
+				settings.TraversalSource = testServerModernGraphAlias
+			})
+
+		assert.NoError(t, err)
+		assert.NotNil(t, client)
+		defer client.Close()
+
+		resultSet, err := client.Submit("g.with('materializeProperties', 'tokens').V(1)")
+		assert.NoError(t, err)
+		assert.NotNil(t, resultSet)
+		result, ok, err := resultSet.One()
+		assert.NoError(t, err)
+		assert.True(t, ok)
+
+		AssertMarkoVertexWithoutProperties(t, result)
+	})
+
+	t.Run("Test deserialization of VertexProperty with properties", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testNoAuthUrl,
+			func(settings *ClientSettings) {
+				settings.TlsConfig = testNoAuthTlsConfig
+				settings.AuthInfo = testNoAuthAuthInfo
+				settings.TraversalSource = testServerCrewGraphAlias
+			})
+
+		assert.NoError(t, err)
+		assert.NotNil(t, client)
+		defer client.Close()
+
+		resultSet, err := client.Submit("g.V(7)")
+		assert.NoError(t, err)
+		assert.NotNil(t, resultSet)
+		result, ok, err := resultSet.One()
+		assert.NoError(t, err)
+		assert.True(t, ok)
+
+		AssertVertexPropertiesWithProperties(t, result)
+	})
+}
+
+func AssertVertexPropertiesWithProperties(t *testing.T, result *Result) {
+	assert.NotNil(t, result)
+
+	vertex, err := result.GetVertex()
+	assert.NoError(t, err)
+	assert.NotNil(t, vertex)
+
+	properties, ok := vertex.Properties.([]interface{})
+	assert.True(t, ok)
+	assert.Equal(t, 4, len(properties))
+
+	property, ok := properties[1].(*VertexProperty)
+	assert.True(t, ok)
+	assert.NotNil(t, property)
+	assert.Equal(t, "centreville", property.Value)
+	vertexPropertyProperties := property.Properties.([]interface{})
+	assert.Equal(t, 2, len(vertexPropertyProperties))
+	assert.Equal(t, "startTime", (vertexPropertyProperties[0].(*Property)).Key)
+	assert.Equal(t, int32(1990), (vertexPropertyProperties[0].(*Property)).Value)
+	assert.Equal(t, "endTime", (vertexPropertyProperties[1].(*Property)).Key)
+	assert.Equal(t, int32(2000), (vertexPropertyProperties[1].(*Property)).Value)
+}
+
+func AssertMarkoVertexWithProperties(t *testing.T, result *Result) {
+	assert.NotNil(t, result)
+
+	vertex, err := result.GetVertex()
+	assert.NoError(t, err)
+	assert.NotNil(t, vertex)
+
+	properties, ok := vertex.Properties.([]interface{})
+	assert.True(t, ok)
+	assert.Equal(t, 2, len(properties))
+
+	property, ok := properties[0].(*VertexProperty)
+	assert.True(t, ok)
+	assert.NotNil(t, property)
+	assert.Equal(t, "name", property.Label)
+	assert.Equal(t, "marko", property.Value)
+
+	property, ok = properties[1].(*VertexProperty)
+	assert.True(t, ok)
+	assert.NotNil(t, property)
+	assert.Equal(t, "age", property.Label)
+	assert.Equal(t, int32(29), property.Value)
+}
+
+func AssertMarkoVertexWithoutProperties(t *testing.T, result *Result) {
+	assert.NotNil(t, result)
+
+	vertex, err := result.GetVertex()
+	assert.NoError(t, err)
+	assert.NotNil(t, vertex)
+
+	properties, ok := vertex.Properties.([]interface{})
+	assert.True(t, ok)
+	assert.Equal(t, 0, len(properties))
+}
+
+// Client is used to connect and interact with a Gremlin-supported server.
+type SocketServerSettings struct {
+	PORT int `yaml:"PORT"`
+	/**
+	 * Configures which serializer will be used. Ex: "GraphBinaryV1" or "GraphSONV2"
+	 */
+	SERIALIZER string `yaml:"SERIALIZER"`
+	/**
+	 * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
+	 * graph.
+	 */
+	SINGLE_VERTEX_REQUEST_ID uuid.UUID `yaml:"SINGLE_VERTEX_REQUEST_ID"`
+	/**
+	 * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
+	 * graph. After a 2 second delay, server sends a Close WebSocket frame on the same connection.
+	 */
+	SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID uuid.UUID `yaml:"SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID"`
+	/**
+	 * Server waits for 1 second, then responds with a 500 error status code
+	 */
+	FAILED_AFTER_DELAY_REQUEST_ID uuid.UUID `yaml:"FAILED_AFTER_DELAY_REQUEST_ID"`
+	/**
+	 * Server waits for 1 second then responds with a close web socket frame
+	 */
+	CLOSE_CONNECTION_REQUEST_ID uuid.UUID `yaml:"CLOSE_CONNECTION_REQUEST_ID"`
+	/**
+	 * Same as CLOSE_CONNECTION_REQUEST_ID
+	 */
+	CLOSE_CONNECTION_REQUEST_ID_2 uuid.UUID `yaml:"CLOSE_CONNECTION_REQUEST_ID_2"`
+	/**
+	 * If a request with this ID comes to the server, the server responds with the user agent (if any) that was captured
+	 * during the web socket handshake.
+	 */
+	USER_AGENT_REQUEST_ID uuid.UUID `yaml:"USER_AGENT_REQUEST_ID"`
+	/**
+	 * If a request with this ID comes to the server, the server responds with a string containing all overridden
+	 * per request settings from the request message. String will be of the form
+	 * "requestId=19436d9e-f8fc-4b67-8a76-deec60918424 evaluationTimeout=1234, batchSize=12, userAgent=testUserAgent"
+	 */
+	PER_REQUEST_SETTINGS_REQUEST_ID uuid.UUID `yaml:"PER_REQUEST_SETTINGS_REQUEST_ID"`
+}
+
+func FromYaml(path string) *SocketServerSettings {
+	socketServerSettings := new(SocketServerSettings)
+	f, err := os.ReadFile(path)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if err := yaml.Unmarshal(f, socketServerSettings); err != nil {
+		log.Fatal(err)
+	}
+	return socketServerSettings
+}
+
+func TestClientAgainstSocketServer(t *testing.T) {
+	// Integration test variables.
+	testNoAuthEnable := getEnvOrDefaultBool("RUN_INTEGRATION_TESTS", true)
+	settings := FromYaml(getEnvOrDefaultString("GREMLIN_SOCKET_SERVER_CONFIG_PATH", "../../gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml"))
+	testSocketServerUrl := getEnvOrDefaultString("GREMLIN_SOCKET_SERVER_URL", "ws://localhost")
+	testSocketServerUrl = fmt.Sprintf("%s:%v/gremlin", testSocketServerUrl, settings.PORT)
+
+	/**
+	 * Note: This test does not demonstrate anything useful other than the ability to connect to and
+	 * use gremlin-socket-server. Currently, implementing more useful tests are blocked by TINKERPOP-2845.
+	 * This test can be safely removed once more interesting tests have been added which utilize
+	 * gremlin-socket-server.
+	 */
+	t.Run("Should get single vertex response from gremlin socket server", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testSocketServerUrl)
+		assert.Nil(t, err)
+		assert.NotNil(t, client)
+		defer client.Close()
+		resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+			SetRequestId(settings.SINGLE_VERTEX_REQUEST_ID).Create())
+		assert.Nil(t, err)
+		assert.NotNil(t, resultSet)
+		result, ok, err := resultSet.One()
+		assert.Nil(t, err)
+		assert.True(t, ok)
+		assert.NotNil(t, result)
+	})
+
+	/**
+	 * Tests that client is correctly sending user agent during web socket handshake by having the server return
+	 * the captured user agent.
+	 */
+	t.Run("Should include user agent in handshake request", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testSocketServerUrl)
+		assert.Nil(t, err)
+		assert.NotNil(t, client)
+		defer client.Close()
+
+		resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+			SetRequestId(settings.USER_AGENT_REQUEST_ID).Create())
+		assert.Nil(t, err)
+		assert.NotNil(t, resultSet)
+
+		result, ok, err := resultSet.One()
+		assert.Nil(t, err)
+		assert.True(t, ok)
+		assert.NotNil(t, result)
+
+		userAgentResponse := result.GetString()
+		assert.Equal(t, userAgent, userAgentResponse)
+	})
+
+	/**
+	 * Tests that no user agent (other than the default one provided by gorilla) is sent to server when
+	 * that behaviour is disabled.
+	 */
+	t.Run("Should not include user agent in handshake request if disabled", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testSocketServerUrl,
+			func(settings *ClientSettings) {
+				settings.EnableUserAgentOnConnect = false
+			})
+		assert.Nil(t, err)
+		assert.NotNil(t, client)
+		defer client.Close()
+
+		resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+			SetRequestId(settings.USER_AGENT_REQUEST_ID).Create())
+		assert.Nil(t, err)
+		assert.NotNil(t, resultSet)
+
+		result, ok, err := resultSet.One()
+		assert.Nil(t, err)
+		assert.True(t, ok)
+		assert.NotNil(t, result)
+
+		userAgentResponse := result.GetString()
+		//If the gremlin user agent is disabled, the underlying web socket library reverts to sending its default user agent
+		//during connection requests.
+		assert.Contains(t, userAgentResponse, "Go-http-client/")
+	})
+
+	/**
+	 * Tests that client is correctly sending all overridable per request settings (requestId, batchSize,
+	 * evaluationTimeout, and userAgent) to the server.
+	 */
+	t.Run("Should Send Per Request Settings To Server", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+		client, err := NewClient(testSocketServerUrl)
+		assert.Nil(t, err)
+		assert.NotNil(t, client)
+		defer client.Close()
+
+		resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+			SetRequestId(settings.PER_REQUEST_SETTINGS_REQUEST_ID).
+			SetEvaluationTimeout(1234).
+			SetBatchSize(12).
+			SetUserAgent("helloWorld").
+			SetMaterializeProperties("tokens").
+			Create())
+		assert.Nil(t, err)
+		assert.NotNil(t, resultSet)
+		result, ok, err := resultSet.One()
+		assert.Nil(t, err)
+		assert.True(t, ok)
+		expectedResult := fmt.Sprintf("requestId=%v evaluationTimeout=%v, batchSize=%v, userAgent=%v, materializeProperties=%v",
+			settings.PER_REQUEST_SETTINGS_REQUEST_ID, 1234, 12, "helloWorld", "tokens")
+		assert.Equal(t, expectedResult, result.Data)
+	})
+
+	/**
+	 * Note: This test currently fails due to race condition check in go test and is only included for demonstration
+	 * purposes. See https://issues.apache.org/jira/browse/TINKERPOP-2845.
+	 * This test should be uncommented with the resolution of TINKERPOP-2845
+	 */
+	/*
+		t.Run("Should try create new connection if closed by server", func(t *testing.T) {
+			skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+			client, err := NewClient(testSocketServerUrl)
+			defer client.Close()
+			assert.Nil(t, err)
+			assert.NotNil(t, client)
+			resultSet, err := client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+				SetRequestId(settings.CLOSE_CONNECTION_REQUEST_ID).Create())
+			assert.Nil(t, err)
+			assert.NotNil(t, resultSet)
+
+			result, ok, err := resultSet.One()
+
+			assert.EqualError(t, err, "websocket: close 1005 (no status)")
+
+			resultSet, err = client.SubmitWithOptions("1", new(RequestOptionsBuilder).
+				SetRequestId(settings.SINGLE_VERTEX_REQUEST_ID).Create())
+			assert.Nil(t, err)
+			assert.NotNil(t, resultSet)
+			result, ok, err = resultSet.One()
+			assert.Nil(t, err)
+			assert.True(t, ok)
+			assert.NotNil(t, result)
+		})
+	*/
 }
diff --git a/gremlin-go/driver/connection_test.go b/gremlin-go/driver/connection_test.go
index 0e3fb2d..92dce79 100644
--- a/gremlin-go/driver/connection_test.go
+++ b/gremlin-go/driver/connection_test.go
@@ -45,6 +45,7 @@
 const invalidHostValidPortValidPath = "ws://invalidhost:8182/gremlin"
 const testServerModernGraphAlias = "gmodern"
 const testServerGraphAlias = "gimmutable"
+const testServerCrewGraphAlias = "gcrew"
 const manualTestSuiteName = "manual"
 const nonRoutableIPForConnectionTimeout = "ws://10.255.255.1/"
 
@@ -1191,4 +1192,42 @@
 			assert.Equal(t, <-gotErrs[i] == nil, tt.nilErr, tt.msg)
 		}
 	})
+
+	t.Run("Get all properties when materializeProperties is all", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+
+		g := getModernGraph(t, testNoAuthUrl, &AuthInfo{}, &tls.Config{})
+		defer g.remoteConnection.Close()
+
+		// vertex contains 2 properties, name and age
+		r, err := g.With("materializeProperties", MaterializeProperties.All).V().Has("person", "name", "marko").Next()
+		assert.Nil(t, err)
+
+		AssertMarkoVertexWithProperties(t, r)
+	})
+
+	t.Run("Skip properties when materializeProperties is tokens", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+
+		g := getModernGraph(t, testNoAuthUrl, &AuthInfo{}, &tls.Config{})
+		defer g.remoteConnection.Close()
+
+		// vertex contains 2 properties, name and age
+		r, err := g.With("materializeProperties", MaterializeProperties.Tokens).V().Has("person", "name", "marko").Next()
+		assert.Nil(t, err)
+
+		AssertMarkoVertexWithoutProperties(t, r)
+	})
+
+	t.Run("Get all properties when no materializeProperties", func(t *testing.T) {
+		skipTestsIfNotEnabled(t, integrationTestSuiteName, testNoAuthEnable)
+
+		g := getModernGraph(t, testNoAuthUrl, &AuthInfo{}, &tls.Config{})
+		defer g.remoteConnection.Close()
+
+		r, err := g.V().Has("person", "name", "marko").Next()
+		assert.Nil(t, err)
+
+		AssertMarkoVertexWithProperties(t, r)
+	})
 }
diff --git a/gremlin-go/driver/cucumber/cucumberSteps_test.go b/gremlin-go/driver/cucumber/cucumberSteps_test.go
index 00653ea..ac0c3e6 100644
--- a/gremlin-go/driver/cucumber/cucumberSteps_test.go
+++ b/gremlin-go/driver/cucumber/cucumberSteps_test.go
@@ -32,6 +32,7 @@
 	"strings"
 	"sync"
 	"testing"
+	"time"
 
 	gremlingo "github.com/apache/tinkerpop/gremlin-go/v3/driver"
 	"github.com/cucumber/godog"
@@ -43,10 +44,11 @@
 }
 
 var parsers map[*regexp.Regexp]func(string, string) interface{}
-var toListLock sync.Mutex
 
 func init() {
 	parsers = map[*regexp.Regexp]func(string, string) interface{}{
+		regexp.MustCompile(`^str\[(.*)]$`): func(stringVal, graphName string) interface{} { return stringVal }, //returns the string value as is
+		regexp.MustCompile(`^dt\[(.*)]$`):           toDateTime,
 		regexp.MustCompile(`^d\[(.*)]\.[bslfdmn]$`): toNumeric,
 		regexp.MustCompile(`^d\[(.*)]\.[i]$`):       toInt32,
 		regexp.MustCompile(`^vp\[(.+)]$`):           toVertexProperty,
@@ -104,6 +106,15 @@
 	}
 }
 
+// Parse dateTime.
+func toDateTime(stringVal, graphName string) interface{} {
+	val, err := time.Parse(time.RFC3339, stringVal)
+	if err != nil {
+		return nil
+	}
+	return val
+}
+
 // Parse numeric.
 func toNumeric(stringVal, graphName string) interface{} {
 	if strings.Contains(stringVal, ".") {
@@ -642,6 +653,9 @@
 	if fmt.Sprint(expected) == fmt.Sprint(actual) {
 		return true
 	}
+	if len(expected) != len(actual) {
+		return false
+	}
 	expectedCopy := make([]interface{}, len(expected))
 	copy(expectedCopy, expected)
 	for _, a := range actual {
diff --git a/gremlin-go/driver/cucumber/gremlin.go b/gremlin-go/driver/cucumber/gremlin.go
index 4895826..677a4dd 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -26,6 +26,7 @@
 
 import (
 	 "errors"
+	 "time"
 	 "math"
 	 "github.com/apache/tinkerpop/gremlin-go/v3/driver"
 )
@@ -86,6 +87,15 @@
     "g_VX1X_repeatXrepeatXunionXout_uses_out_traversesXX_whereXloops_isX0X_timesX1X_timeX2X_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Repeat(gremlingo.T__.Repeat(gremlingo.T__.Union(gremlingo.T__.Out("uses"), gremlingo.T__.Out("traverses")).Where(gremlingo.T__.Loops().Is(0))).Times(1)).Times(2).Values("name")}}, 
     "g_V_repeatXa_outXknows_repeatXb_outXcreatedX_filterXloops_isX0XX_emit_lang": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Repeat("a", gremlingo.T__.Out("knows").Repeat("b", gremlingo.T__.Out("created").Filter(gremlingo.T__.Loops("a").Is(0))).Emit()).Emit().Values("lang")}}, 
     "g_VX6X_repeatXa_bothXcreatedX_simplePathX_emitXrepeatXb_bothXknowsXX_untilXloopsXbX_asXb_whereXloopsXaX_asXbX_hasXname_vadasXX_dedup_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid6"]).Repeat("a", gremlingo.T__.Both("created").SimplePath()).Emit(gremlingo.T__.Repeat("b", gremlingo.T__.Both("knows")).Until(gremlingo.T__.Loops("b").As("b").Where(gremlingo.T__.Loops("a").As("b"))).Has("name", "vadas")).Dedup().Values("name")}}, 
+    "g_unionXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union()}}, 
+    "g_unionXV_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.V().Values("name"))}}, 
+    "g_unionXVXv1X_VX4XX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.V(p["v1"]), gremlingo.T__.V(p["v4"])).Values("name")}}, 
+    "g_unionXV_hasLabelXsoftwareX_V_hasLabelXpersonXX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.V().HasLabel("software"), gremlingo.T__.V().HasLabel("person")).Values("name")}}, 
+    "g_unionXV_out_out_V_hasLabelXsoftwareXX_path": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.V().Out().Out(), gremlingo.T__.V().HasLabel("software")).Path()}}, 
+    "g_unionXV_out_out_V_hasLabelXsoftwareXX_path_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.V().Out().Out(), gremlingo.T__.V().HasLabel("software")).Path().By("name")}}, 
+    "g_unionXunionXV_out_outX_V_hasLabelXsoftwareXX_path_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.Union(gremlingo.T__.V().Out().Out()), gremlingo.T__.V().HasLabel("software")).Path().By("name")}}, 
+    "g_unionXinjectX1X_injectX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.Inject(1), gremlingo.T__.Inject(2))}}, 
+    "g_V_unionXconstantX1X_constantX2X_constantX3XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["v2"]).Union(gremlingo.T__.Constant(p["xx1"]), gremlingo.T__.Constant(p["xx2"]), gremlingo.T__.Constant(p["xx3"]))}}, 
     "g_V_unionXout__inX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Union(gremlingo.T__.Out(), gremlingo.T__.In()).Values("name")}}, 
     "g_VX1X_unionXrepeatXoutX_timesX2X__outX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Union(gremlingo.T__.Repeat(gremlingo.T__.Out()).Times(2), gremlingo.T__.Out()).Values("name")}}, 
     "g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Choose(gremlingo.T__.Label().Is("person"), gremlingo.T__.Union(gremlingo.T__.Out().Values("lang"), gremlingo.T__.Out().Values("name")), gremlingo.T__.In().Label())}}, 
@@ -94,11 +104,36 @@
     "g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"], p["vid2"]).Union(gremlingo.T__.OutE().Count(), gremlingo.T__.InE().Count(), gremlingo.T__.OutE().Values("weight").Sum())}}, 
     "g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"], p["vid2"]).Local(gremlingo.T__.Union(gremlingo.T__.OutE().Count(), gremlingo.T__.InE().Count(), gremlingo.T__.OutE().Values("weight").Sum()))}}, 
     "g_VX1_2X_localXunionXcountXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"], p["vid2"]).Local(gremlingo.T__.Union(gremlingo.T__.Count()))}}, 
+    "g_unionXaddVXpersonX_propertyXname_aliceX_addVXpersonX_propertyXname_bobX_addVXpersonX_propertyXname_chrisX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Union(gremlingo.T__.AddV("person").Property("name", "alice"), gremlingo.T__.AddV("person").Property("name", "bob"), gremlingo.T__.AddV("person").Property("name", "chris")).Values("name")}}, 
+    "g_V_valuesXageX_allXgtX32XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").All(gremlingo.P.Gt(32))}}, 
+    "g_V_valuesXageX_whereXisXP_gtX33XXX_fold_allXgtX33XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Where(gremlingo.T__.Is(gremlingo.P.Gt(33))).Fold().All(gremlingo.P.Gt(33))}}, 
+    "g_V_valuesXageX_order_byXdescX_fold_allXgtX10XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Desc).Fold().All(gremlingo.P.Gt(10))}}, 
+    "g_V_valuesXageX_order_byXdescX_fold_allXgtX30XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Desc).Fold().All(gremlingo.P.Gt(30))}}, 
+    "g_injectXabc_bcdX_allXeqXbcdXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject([]interface{}{"abc", "bcd"}).All(gremlingo.P.Eq("bcd"))}}, 
+    "g_injectXbcd_bcdX_allXeqXbcdXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).All(gremlingo.P.Eq("bcd"))}}, 
+    "g_injectXnull_abcX_allXTextP_startingWithXaXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).All(gremlingo.TextP.StartingWith("a"))}}, 
+    "g_injectX5_8_10_10_7X_allXgteX7XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx2"]).All(gremlingo.P.Gte(7))}}, 
+    "g_injectXnullX_allXeqXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).All(gremlingo.P.Eq(nil))}}, 
+    "g_injectX7X_allXeqX7XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(7).All(gremlingo.P.Eq(7))}}, 
+    "g_injectXnull_nullX_allXeqXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).All(gremlingo.P.Eq(nil))}}, 
+    "g_injectX3_threeX_allXeqX3XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).All(gremlingo.P.Eq(3))}}, 
     "g_V_andXhasXage_gt_27X__outE_count_gte_2X_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().And(gremlingo.T__.Has("age", gremlingo.P.Gt(27)), gremlingo.T__.OutE().Count().Is(gremlingo.P.Gte(2))).Values("name")}}, 
     "g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().And(gremlingo.T__.OutE(), gremlingo.T__.Has(gremlingo.T.Label, "person").And().Has("age", gremlingo.P.Gte(32))).Values("name")}}, 
     "g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("a").Out("knows").And().Out("created").In("created").As("a").Values("name")}}, 
     "g_V_asXaX_andXselectXaX_selectXaXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("a").And(gremlingo.T__.Select("a"), gremlingo.T__.Select("a"))}}, 
     "g_V_hasXname_markoX_and_hasXname_markoX_and_hasXname_markoX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "marko").And().Has("name", "marko").And().Has("name", "marko")}}, 
+    "g_V_valuesXageX_anyXgtX32XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Any(gremlingo.P.Gt(32))}}, 
+    "g_V_valuesXageX_order_byXdescX_fold_anyXeqX29XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Desc).Fold().Any(gremlingo.P.Eq(29))}}, 
+    "g_V_valuesXageX_order_byXdescX_fold_anyXgtX10XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Desc).Fold().Any(gremlingo.P.Gt(10))}}, 
+    "g_V_valuesXageX_order_byXdescX_fold_anyXgtX42XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Desc).Fold().Any(gremlingo.P.Gt(42))}}, 
+    "g_injectXabc_cdeX_anyXeqXbcdXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject([]interface{}{"abc", "cde"}).Any(gremlingo.P.Eq("bcd"))}}, 
+    "g_injectXabc_bcdX_anyXeqXbcdXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Any(gremlingo.P.Eq("bcd"))}}, 
+    "g_injectXnull_abcX_anyXTextP_startingWithXaXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Any(gremlingo.TextP.StartingWith("a"))}}, 
+    "g_injectX5_8_10_10_7X_anyXeqX7XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx2"]).Any(gremlingo.P.Eq(7))}}, 
+    "g_injectXnullX_anyXeqXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Any(gremlingo.P.Eq(nil))}}, 
+    "g_injectX7X_anyXeqX7XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(7).Any(gremlingo.P.Eq(7))}}, 
+    "g_injectXnull_nullX_anyXeqXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Any(gremlingo.P.Eq(nil))}}, 
+    "g_injectX3_threeX_anyXeqX3XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Any(gremlingo.P.Eq(3))}}, 
     "g_V_coinX1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Coin(1.0)}}, 
     "g_V_coinX0X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Coin(0.0)}}, 
     "g_withStrategiesXSeedStrategyX_V_order_byXnameX_coinX50X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SeedStrategy(gremlingo.SeedStrategyConfig{Seed: 999999})).V().Order().By("name").Coin(0.5)}}, 
@@ -133,6 +168,8 @@
     "g_V_both_dedup_age_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Both().Dedup().By("age").Values("name")}}, 
     "g_VX1X_asXaX_both_asXbX_both_asXcX_dedupXa_bX_age_selectXa_b_cX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).As("a").Both().As("b").Both().As("c").Dedup("a", "b").By("age").Select("a", "b", "c").By("name")}}, 
     "g_VX1X_valuesXageX_dedupXlocalX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Values("age").Dedup(gremlingo.Scope.Local).Unfold()}}, 
+    "g_V_properties_dedup_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "josh").AddV("person").Property("name", "josh").AddV("person").Property("name", "josh")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties("name").Dedup().Count()}}, 
+    "g_V_properties_dedup_byXvalueX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "josh").AddV("person").Property("name", "josh").AddV("person").Property("name", "josh")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties("name").Dedup().By(gremlingo.T.Value).Count()}}, 
     "g_V_drop": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().As("a").AddV().As("b").AddE("knows").To("a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Drop()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}}, 
     "g_V_outE_drop": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().As("a").AddV().As("b").AddE("knows").To("a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().OutE().Drop()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}}, 
     "g_V_properties_drop": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().Property("name", "bob").AddV().Property("name", "alice")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties().Drop()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties()}}, 
@@ -327,23 +364,24 @@
     "g_withStrategiesXProductiveByStrategyX_VX3X_asXaX_in_out_asXbX_whereXa_eqXbXX_byXageX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.ProductiveByStrategy(gremlingo.ProductiveByStrategyConfig{ProductiveKeys: []string{}})).V(p["vid3"]).As("a").In().Out().As("b").Where("a", gremlingo.P.Eq("b")).By("age").Values("name")}}, 
     "g_V_asXnX_whereXorXhasLabelXsoftwareX_hasLabelXpersonXXX_selectXnX_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("n").Where(gremlingo.T__.Or(gremlingo.T__.HasLabel("software"), gremlingo.T__.HasLabel("person"))).Select("n").By("name")}}, 
     "g_V_asXnX_whereXorXselectXnX_hasLabelXsoftwareX_selectXnX_hasLabelXpersonXXX_selectXnX_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("n").Where(gremlingo.T__.Or(gremlingo.T__.Select("n").HasLabel("software"), gremlingo.T__.Select("n").HasLabel("person"))).Select("n").By("name")}}, 
+    "g_V_hasLabelXpersonX_asXxX_whereXinEXknowsX_count_isXgteX1XXX_selectXxX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").As("x").Where(gremlingo.T__.InE("knows").Count().Is(gremlingo.P.Gte(1))).Select("x")}}, 
     "g_V_coworker": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Filter(gremlingo.T__.OutE("created")).Aggregate("p").As("p1").Values("name").As("p1n").Select("p").Unfold().Where(gremlingo.P.Neq("p1")).As("p2").Values("name").As("p2n").Select("p2").Out("created").Choose(gremlingo.T__.In("created").Where(gremlingo.P.Eq("p1")), gremlingo.T__.Values("name"), gremlingo.T__.Constant(p["xx1"])).Group().By(gremlingo.T__.Select("p1n")).By(gremlingo.T__.Group().By(gremlingo.T__.Select("p2n")).By(gremlingo.T__.Unfold().Fold().Project("numCoCreated", "coCreated").By(gremlingo.T__.Count(gremlingo.Scope.Local)).By())).Unfold()}}, 
     "g_V_coworker_with_midV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Filter(gremlingo.T__.OutE("created")).As("p1").V().HasLabel("person").Where(gremlingo.P.Neq("p1")).Filter(gremlingo.T__.OutE("created")).As("p2").Map(gremlingo.T__.Out("created").Where(gremlingo.T__.In("created").As("p1")).Values("name").Fold()).Group().By(gremlingo.T__.Select("p1").By("name")).By(gremlingo.T__.Group().By(gremlingo.T__.Select("p2").By("name")).By(gremlingo.T__.Project("numCoCreated", "coCreated").By(gremlingo.T__.Count(gremlingo.Scope.Local)).By())).Unfold()}}, 
     "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "b").Property("name", "bob")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).V().Values("name")}}, 
     "g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "b").Property("name", "bob")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a", "b"), WritePartition: "a"})).V().Values("name")}}, 
     "g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").AddV("person").Property("_partition", "b").Property("name", "bob")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("c"), WritePartition: "a"})).V().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).V().BothE().Values("weight")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("b"), WritePartition: "a"})).V().BothE().Values("weight")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a", "b"), WritePartition: "a"})).V().BothE().Dedup().Values("weight")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("c"), WritePartition: "a"})).V().BothE().Values("weight")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).V().Both().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("b"), WritePartition: "a"})).V().Both().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a", "b"), WritePartition: "a"})).V().Both().Dedup().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("c"), WritePartition: "a"})).V().Both().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).V().Out().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("b"), WritePartition: "a"})).V().In().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a", "b"), WritePartition: "a"})).V().Out().Values("name")}}, 
-    "g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("c"), WritePartition: "a"})).V().Out().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).V().BothE().Values("weight")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("b"), WritePartition: "a"})).V().BothE().Values("weight")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a", "b"), WritePartition: "a"})).V().BothE().Dedup().Values("weight")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("c"), WritePartition: "a"})).V().BothE().Values("weight")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).V().Both().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("b"), WritePartition: "a"})).V().Both().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a", "b"), WritePartition: "a"})).V().Both().Dedup().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("c"), WritePartition: "a"})).V().Both().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).V().Out().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("b"), WritePartition: "a"})).V().In().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a", "b"), WritePartition: "a"})).V().Out().Values("name")}}, 
+    "g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("_partition", "a").Property("name", "alice").As("a").AddV("person").Property("_partition", "b").Property("name", "bob").As("b").AddE("knows").From("a").To("b").Property("_partition", "a").Property("weight", 1.0).AddE("knows").From("b").To("a").Property("_partition", "b").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("c"), WritePartition: "a"})).V().Out().Values("name")}}, 
     "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_addVXpersonX_propertyXname_aliceX_addXselfX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).AddV("person").Property("name", "alice").AddE("self")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("_partition", "a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Has("_partition", "a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}}, 
     "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectXzeroX_addVXpersonX_propertyXname_aliceX_addXselfX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).Inject(0).AddV("person").Property("name", "alice").AddE("self")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("_partition", "a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Has("_partition", "a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}}, 
     "g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.PartitionStrategy(gremlingo.PartitionStrategyConfig{IncludeMetaProperties: false, PartitionKey: "_partition", ReadPartitions: gremlingo.NewSimpleSet("a"), WritePartition: "a"})).MergeV(p["xx1"])}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("_partition", "a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}}, 
@@ -411,6 +449,7 @@
     "g_withStrategiesXSubgraphStrategyXedges_hasLabelXusesX_hasXskill_5XXX_V_outE_valueMap_selectXvaluesX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: true, Edges: gremlingo.T__.HasLabel("uses").Has("skill", 5)})).V().OutE().ValueMap().Select(gremlingo.Column.Values).Unfold()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_V": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).V()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_E": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E()}}, 
+    "g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_E": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: true, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_outE": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).V(p["vid4"]).OutE()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_inE": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).V(p["vid4"]).InE()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_out": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).V(p["vid4"]).Out()}}, 
@@ -421,6 +460,7 @@
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX11X_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E(p["eid11"]).BothV()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E(p["eid12"]).BothV()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E(p["eid9"]).BothV()}}, 
+    "g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: true, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within([]interface{}{"josh", "lop", "ripple"})), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E(p["eid9"]).BothV()}}, 
     "g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29).As("marko").AddV("person").Property("name", "vadas").Property("age", 27).As("vadas").AddV("software").Property("name", "lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh").Property("age", 32).As("josh").AddV("software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).As("a").Out("created").AddE("createdBy").To("a")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).InE()}}, 
     "g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29).As("marko").AddV("person").Property("name", "vadas").Property("age", 27).As("vadas").AddV("software").Property("name", "lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh").Property("age", 32).As("josh").AddV("software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).As("a").Out("created").AddE("createdBy").To("a").Property("weight", 2.0)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).BothE()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).InE().Has("weight", 2.0)}}, 
     "g_V_outE_propertyXweight_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29).As("marko").AddV("person").Property("name", "vadas").Property("age", 27).As("vadas").AddV("software").Property("name", "lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh").Property("age", 32).As("josh").AddV("software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().OutE().Property("weight", nil)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties("weight")}}, 
@@ -452,6 +492,8 @@
     "g_addV_propertyXlabel_personX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().Property(gremlingo.T.Label, "person")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person")}}, 
     "g_addV_propertyXmapX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().Property("name", "foo").Property("age", 42)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "foo")}}, 
     "g_addV_propertyXsingle_mapX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().Property(gremlingo.Cardinality.Single, "name", "foo").Property(gremlingo.Cardinality.Single, "age", 42)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "foo")}}, 
+    "g_V_hasXname_fooX_propertyXname_setXbarX_age_43X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().Property(gremlingo.Cardinality.Single, "name", "foo").Property("age", 42)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "foo").Property(gremlingo.Cardinality.Set, "name", "bar").Property("age", 43)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "foo")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "bar")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("age", 43)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("age", 42)}}, 
+    "g_V_hasXname_fooX_propertyXset_name_bar_age_singleX43XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV().Property(gremlingo.Cardinality.Single, "name", "foo").Property("age", 42)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "foo").Property(gremlingo.Cardinality.Set, "name", "bar").Property(gremlingo.Cardinality.Single, "age", 43)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "foo")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "bar")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("age", 43)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("age", 42)}}, 
     "g_addV_propertyXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values()}}, 
     "g_addV_propertyXemptyX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values()}}, 
     "g_addV_propertyXset_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("foo")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("foo").Values()}}, 
@@ -459,6 +501,28 @@
     "g_addVXpersonX_propertyXname_joshX_propertyXage_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "josh").Property("age", nil)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "age", nil)}}, 
     "g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("friendWeight", nil, "acl", nil)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("friendWeight", nil)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Properties("friendWeight").Has("acl", nil)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Properties("friendWeight").Count()}}, 
     "g_V_hasXperson_name_aliceX_propertyXsingle_age_unionXage_constantX1XX_sumX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "alice").Property(gremlingo.Cardinality.Single, "age", 50)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Property("age", gremlingo.T__.Union(gremlingo.T__.Values("age"), gremlingo.T__.Constant(1)).Sum())}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "age", 50)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "age", 51)}}, 
+    "g_V_limitX3X_addVXsoftwareX_aggregateXa1X_byXlabelX_aggregateXa2X_byXlabelX_capXa1_a2X_selectXa_bX_byXunfoldX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29).As("marko").AddV("person").Property("name", "vadas").Property("age", 27).As("vadas").AddV("software").Property("name", "lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh").Property("age", 32).As("josh").AddV("software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Limit(3).AddV("software").Aggregate("a1").By(gremlingo.T.Label).Aggregate("a2").By(gremlingo.T.Label).Cap("a1", "a2").Select("a1", "a2").By(gremlingo.T__.Unfold().Fold())}}, 
+    "g_injectXstrX_asDate": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("2023-08-02T00:00:00Z").AsDate()}}, 
+    "g_injectX1694017707000X_asDate": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(1694017707000).AsDate()}}, 
+    "g_injectX1694017708000LX_asDate": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).AsDate()}}, 
+    "g_injectX1694017709000dX_asDate": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).AsDate()}}, 
+    "g_injectX1_2X_asDate": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).AsDate()}}, 
+    "g_injectXnullX_asDate": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).AsDate()}}, 
+    "g_injectXinvalidstrX_asDate": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("This String is not an ISO 8601 Date").AsDate()}}, 
+    "g_injectX1_2X_asString": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx2"]).AsString()}}, 
+    "g_injectX1_2X_asStringXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx2"]).AsString(gremlingo.Scope.Local)}}, 
+    "g_injectXlist_1_2X_asStringXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).AsString(gremlingo.Scope.Local)}}, 
+    "g_injectX1_nullX_asString": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil, p["xx1"]).AsString()}}, 
+    "g_injectX1_nullX_asStringXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).AsString(gremlingo.Scope.Local)}}, 
+    "g_V_valueMapXnameX_asString": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("name").AsString()}}, 
+    "g_V_valueMapXnameX_order_fold_asStringXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("name").Order().Fold().AsString(gremlingo.Scope.Local)}}, 
+    "g_V_asString": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().AsString()}}, 
+    "g_V_fold_asStringXlocalX_orderXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().AsString(gremlingo.Scope.Local).Order(gremlingo.Scope.Local)}}, 
+    "g_E_asString": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().AsString()}}, 
+    "g_V_properties": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties().AsString()}}, 
+    "g_V_hasLabelXpersonX_valuesXageX_asString": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("age").AsString()}}, 
+    "g_V_hasLabelXpersonX_valuesXageX_order_fold_asStringXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("age").Order().Fold().AsString(gremlingo.Scope.Local)}}, 
+    "g_V_hasLabelXpersonX_valuesXageX_asString_concatX_years_oldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("age").AsString().Concat(" years old")}}, 
     "g_call": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Call()}}, 
     "g_callXlistX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Call("--list")}}, 
     "g_callXlistX_withXstring_stringX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Call("--list").With("service", "tinker.search")}}, 
@@ -485,6 +549,50 @@
     "g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Coalesce(gremlingo.T__.Out("likes"), gremlingo.T__.Out("knows"), gremlingo.T__.Out("created")).GroupCount().By("name")}}, 
     "g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Coalesce(gremlingo.T__.OutE("knows"), gremlingo.T__.OutE("created")).OtherV().Path().By("name").By(gremlingo.T.Label)}}, 
     "g_V_outXcreatedX_order_byXnameX_coalesceXname_constantXxXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out("created").Order().By("name").Coalesce(gremlingo.T__.Values("name"), gremlingo.T__.Constant("x"))}}, 
+    "g_injectXnullX_combineXinjectX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Combine(gremlingo.T__.Inject(1))}}, 
+    "g_V_valuesXnameX_combineXV_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Combine(gremlingo.T__.V().Fold())}}, 
+    "g_V_fold_combineXconstantXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Combine(gremlingo.T__.Constant(nil))}}, 
+    "g_V_fold_combineXVX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Combine(gremlingo.T__.V())}}, 
+    "g_V_valuesXnameX_fold_combineX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Combine(2)}}, 
+    "g_V_valuesXnameX_fold_combineXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Combine(nil)}}, 
+    "g_V_valuesXnonexistantX_fold_combineXV_valuesXnameX_foldX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Combine(gremlingo.T__.V().Values("name").Fold()).Unfold()}}, 
+    "g_V_valuesXnameX_fold_combineXV_valuesXnonexistantX_foldX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Combine(gremlingo.T__.V().Values("nonexistant").Fold()).Unfold()}}, 
+    "g_V_valuesXageX_order_byXdescX_fold_combineXV_valuesXageX_order_byXdescX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Desc).Fold().Combine(gremlingo.T__.V().Values("age").Order().By(gremlingo.Order.Desc).Fold())}}, 
+    "g_V_out_path_byXvaluesXnameX_toUpperX_combineXMARKOX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Combine(p["xx1"])}}, 
+    "g_injectXxx1X_combineXV_valuesXnameX_foldX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Combine(gremlingo.T__.V().Values("name").Fold()).Unfold()}}, 
+    "g_V_valueMapXlocationX_selectXvaluesX_unfold_combineXseattle_vancouverX_orderXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Combine(p["xx1"]).Order(gremlingo.Scope.Local)}}, 
+    "g_V_out_out_path_byXnameX_combineXempty_listX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Combine(p["xx1"])}}, 
+    "g_V_valuesXageX_order_fold_combineXconstantX27X_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().Fold().Combine(gremlingo.T__.Constant(27).Fold())}}, 
+    "g_V_out_out_path_byXnameX_combineXdave_kelvinX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Combine(p["xx1"])}}, 
+    "g_injectXa_null_bX_combineXa_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Combine(p["xx2"])}}, 
+    "g_injectXa_null_bX_combineXa_null_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Combine(p["xx2"])}}, 
+    "g_injectX3_threeX_combineXfive_three_7X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Combine(p["xx2"])}}, 
+    "g_injectXa_bX_concat": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("a", "b").Concat()}}, 
+    "g_injectXa_bX_concat_XcX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("a", "b").Concat("c")}}, 
+    "g_injectXa_bX_concat_Xc_dX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("a", "b").Concat("c", "d")}}, 
+    "g_injectXa_bX_concat_Xinject_c_dX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("a", "b").Concat(gremlingo.T__.Inject("c"))}}, 
+    "g_injectXaX_concat_Xinject_List_b_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("a").Concat(gremlingo.T__.Inject(p["xx1"]))}}, 
+    "g_injectXListXa_bXcX_concat_XdX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], "c").Concat("d")}}, 
+    "g_injectXnullX_concat_XinjectX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Concat()}}, 
+    "g_injectXnull_aX_concat_Xnull_bX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil, "a").Concat(nil, "b")}}, 
+    "g_injectXhello_hiX_concat_XV_valuesXnameXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("hello", "hi").Concat(gremlingo.T__.V().Order().By(gremlingo.T.Id).Values("name"))}}, 
+    "g_V_hasLabel_value_concat_X_X_concat_XpersonX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("name").Concat(" ").Concat("person")}}, 
+    "g_hasLabelXpersonX_valuesXnameX_asXaX_constantXMrX_concatXselectXaX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("name").As("a").Constant("Mr.").Concat(gremlingo.T__.Select("a"))}}, 
+    "g_hasLabelXsoftwareX_asXaX_valuesXnameX_concatXunsesX_concatXselectXaXvaluesXlangX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").As("a").Values("name").Concat(" uses ").Concat(gremlingo.T__.Select("a").Values("lang"))}}, 
+    "g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_labelX_concatXselectXaX_inV_valuesXnameXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).OutE().As("a").V(p["vid1"]).Values("name").Concat(gremlingo.T__.Select("a").Label()).Concat(gremlingo.T__.Select("a").InV().Values("name"))}}, 
+    "g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_label_selectXaX_inV_valuesXnameXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).OutE().As("a").V(p["vid1"]).Values("name").Concat(gremlingo.T__.Select("a").Label(), gremlingo.T__.Select("a").InV().Values("name"))}}, 
+    "g_addVXconstantXprefix_X_concatXVX1X_labelX_label": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29).As("marko").AddV("person").Property("name", "vadas").Property("age", 27).As("vadas").AddV("software").Property("name", "lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh").Property("age", 32).As("josh").AddV("software").Property("name", "ripple").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV(gremlingo.T__.Constant("prefix_").Concat(gremlingo.T__.V(p["vid1"]).Label())).Label()}}, 
+    "g_injectXnullX_conjoinX1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Conjoin("1")}}, 
+    "g_V_valuesXnameX_conjoinX1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Conjoin("1")}}, 
+    "g_V_valuesXnonexistantX_fold_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Conjoin(";")}}, 
+    "g_V_valuesXnameX_order_fold_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().Conjoin("_")}}, 
+    "g_V_valuesXageX_order_fold_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().Fold().Conjoin(";")}}, 
+    "g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Conjoin("MARKO")}}, 
+    "g_injectXmarkoX_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Conjoin("-")}}, 
+    "g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Order(gremlingo.Scope.Local).Conjoin("1")}}, 
+    "g_V_out_out_path_byXnameX_conjoinXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Conjoin("")}}, 
+    "g_injectXa_null_bX_conjoinXxyzX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Conjoin("xyz")}}, 
+    "g_injectX3_threeX_conjoinX_X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Conjoin(";")}}, 
     "g_V_connectedComponent_hasXcomponentX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ConnectedComponent().Has("gremlin.connectedComponentVertexProgram.component")}}, 
     "g_V_dedup_connectedComponent_hasXcomponentX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Dedup().ConnectedComponent().Has("gremlin.connectedComponentVertexProgram.component")}}, 
     "g_V_hasLabelXsoftwareX_connectedComponent_project_byXnameX_byXcomponentX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").ConnectedComponent().Project("name", "component").By("name").By("gremlin.connectedComponentVertexProgram.component")}}, 
@@ -505,6 +613,59 @@
     "g_E_sampleX1X_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Sample(1).Count()}}, 
     "g_V_sampleX1X_byXageX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Sample(1).By("age").Count()}}, 
     "g_V_order_byXnoX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Order().By("no").Count()}}, 
+    "g_V_group_byXlabelX_count": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Group().By(gremlingo.T.Label).Count()}}, 
+    "g_V_group_byXlabelX_countXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Group().By(gremlingo.T.Label).Count(gremlingo.Scope.Local)}}, 
+    "g_injectXdatetimeXstrXX_dateAddXDT_hour_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1690934400000)).DateAdd(gremlingo.DT.Hour, 2)}}, 
+    "g_injectXdatetimeXstrXX_dateAddXhour_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1690934400000)).DateAdd(gremlingo.DT.Hour, 2)}}, 
+    "g_injectXdatetimeXstrXX_dateAddXhour_1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1690934400000)).DateAdd(gremlingo.DT.Hour, -1)}}, 
+    "g_injectXdatetimeXstrXX_dateAddXminute_10X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1690934400000)).DateAdd(gremlingo.DT.Minute, 10)}}, 
+    "g_injectXdatetimeXstrXX_dateAddXsecond_20X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1690934400000)).DateAdd(gremlingo.DT.Second, 20)}}, 
+    "g_injectXdatetimeXstrXX_dateAddXday_11X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1693958400000)).DateAdd(gremlingo.DT.Day, 11)}}, 
+    "g_injectXdatetimeXstr1XX_dateDiffXdatetimeXstr2XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1690934400000)).DateDiff(time.UnixMilli(1691539200000))}}, 
+    "g_injectXdatetimeXstr1XX_dateDiffXconstantXdatetimeXstr2XXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1691452800000)).DateDiff(gremlingo.T__.Constant(time.UnixMilli(1690848000000)))}}, 
+    "g_injectXdatetimeXstr1XX_dateDiffXinjectXdatetimeXstr2XXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(time.UnixMilli(1691452800000)).DateDiff(gremlingo.T__.Inject(time.UnixMilli(1696982400000)))}}, 
+    "g_injectXnullX_differenceXinjectX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Difference(gremlingo.T__.Inject(1))}}, 
+    "g_V_valuesXnameX_differenceXV_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Difference(gremlingo.T__.V().Fold())}}, 
+    "g_V_fold_differenceXconstantXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Difference(gremlingo.T__.Constant(nil))}}, 
+    "g_V_fold_differenceXVX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Difference(gremlingo.T__.V())}}, 
+    "g_V_valuesXnameX_fold_differenceX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Difference(2)}}, 
+    "g_V_valuesXnameX_fold_differenceXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Difference(nil)}}, 
+    "g_V_valuesXnonexistantX_fold_differenceXV_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Difference(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valuesXnameX_fold_differenceXV_valuesXnonexistantX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Difference(gremlingo.T__.V().Values("nonexistant").Fold())}}, 
+    "g_V_valuesXageX_fold_differenceXV_valuesXageX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Difference(gremlingo.T__.V().Values("age").Fold())}}, 
+    "g_V_out_path_byXvaluesXnameX_toUpperX_differenceXMARKOX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Difference(p["xx1"])}}, 
+    "g_injectXmarkoX_differenceXV_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Difference(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valueMapXlocationX_selectXvaluesX_unfold_differenceXseattle_vancouverX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Difference(p["xx1"])}}, 
+    "g_V_out_out_path_byXnameX_differenceXrippleX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Difference(p["xx1"])}}, 
+    "g_V_out_out_path_byXnameX_differenceXempty_listX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Difference(p["xx1"])}}, 
+    "g_V_valuesXageX_fold_differenceXconstantX27X_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Difference(gremlingo.T__.Constant(27).Fold())}}, 
+    "g_V_out_out_path_byXnameX_differenceXdave_kelvinX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Difference(p["xx1"])}}, 
+    "g_injectXa_null_bX_differenceXa_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Difference(p["xx2"])}}, 
+    "g_injectXa_null_bX_differenceXa_null_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Difference(p["xx2"])}}, 
+    "g_injectX3_threeX_differenceXfive_three_7X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Difference(p["xx2"])}}, 
+    "g_injectXnullX_disjunctXinjectX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Disjunct(gremlingo.T__.Inject(1))}}, 
+    "g_V_valuesXnameX_disjunctXV_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Disjunct(gremlingo.T__.V().Fold())}}, 
+    "g_V_fold_disjunctXconstantXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Disjunct(gremlingo.T__.Constant(nil))}}, 
+    "g_V_fold_disjunctXVX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Disjunct(gremlingo.T__.V())}}, 
+    "g_V_valuesXnameX_fold_disjunctX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Disjunct(2)}}, 
+    "g_V_valuesXnameX_fold_disjunctXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Disjunct(nil)}}, 
+    "g_V_valuesXnonexistantX_fold_disjunctXV_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Disjunct(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valuesXnameX_fold_disjunctXV_valuesXnonexistantX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Disjunct(gremlingo.T__.V().Values("nonexistant").Fold())}}, 
+    "g_V_valuesXageX_fold_disjunctXV_valuesXageX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Disjunct(gremlingo.T__.V().Values("age").Fold())}}, 
+    "g_V_out_path_byXvaluesXnameX_toUpperX_disjunctXMARKOX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Disjunct(p["xx1"])}}, 
+    "g_V_valueMapXlocationX_selectXvaluesX_unfold_disjunctXseattle_vancouverX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Disjunct(p["xx1"])}}, 
+    "g_V_out_out_path_byXnameX_disjunctXmarkoX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Disjunct(p["xx1"])}}, 
+    "g_V_out_out_path_byXnameX_disjunctXstephen_markoX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Disjunct(p["xx1"])}}, 
+    "g_V_out_out_path_byXnameX_disjunctXdave_kelvinX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Disjunct(p["xx1"])}}, 
+    "g_injectXa_null_bX_disjunctXa_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Disjunct(p["xx2"])}}, 
+    "g_injectXa_null_bX_disjunctXa_null_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Disjunct(p["xx2"])}}, 
+    "g_injectX3_threeX_disjunctXfive_three_7X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Disjunct(p["xx2"])}}, 
+    "g_V_EX11X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().E(p["eid11"])}}, 
+    "g_EX11X_E": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E(p["eid11"]).E()}}, 
+    "g_V_EXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().E(nil)}}, 
+    "g_V_EXlistXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().E(p["xx1"])}}, 
+    "g_injectX1X_EX11_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(1).E(p["eid11"], nil)}}, 
+    "g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "josh").AddV("person").Property("name", "vadas")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(1).Coalesce(gremlingo.T__.E().HasLabel("tests"), gremlingo.T__.AddE("tests").From(gremlingo.T__.V().Has("name", "josh")).To(gremlingo.T__.V().Has("name", "vadas")))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("tests")}}, 
     "g_VX1X_properties_element": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["v2"]).Properties().Element().Limit(1)}}, 
     "g_V_properties_element": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties().Element()}}, 
     "g_V_propertiesXageX_element": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties("age").Element()}}, 
@@ -522,6 +683,17 @@
     "g_V_age_foldX0_plusX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold(0, gremlingo.Operator.Sum)}}, 
     "g_injectXa1_b2X_foldXm_addAllX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(map[interface{}]interface{}{"a": 1}, map[interface{}]interface{}{"b": 2}).Fold(map[interface{}]interface{}{}, gremlingo.Operator.AddAll)}}, 
     "g_injectXa1_b2_b4X_foldXm_addAllX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(map[interface{}]interface{}{"a": 1}, map[interface{}]interface{}{"b": 2}, map[interface{}]interface{}{"b": 4}).Fold(map[interface{}]interface{}{}, gremlingo.Operator.AddAll)}}, 
+    "g_VX1X_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "marko").Format("Hello world")}}, 
+    "g_V_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Format("%{name} is %{age} years old")}}, 
+    "g_injectX1X_asXageX_V_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(1).As("age").V().Format("%{name} is %{age} years old")}}, 
+    "g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Format("%{_} is %{_} years old").By(gremlingo.T__.Values("name")).By(gremlingo.T__.Values("age"))}}, 
+    "g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Format("%{_} %{_} %{_}").By(gremlingo.T__.Constant("hello")).By(gremlingo.T__.Values("name"))}}, 
+    "g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Format("%{_}").By(gremlingo.T__.Constant("hello")).By(gremlingo.T__.Values("name"))}}, 
+    "g_V_formatXstrX_byXbothE_countX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Format("%{name} has %{_} connections").By(gremlingo.T__.BothE().Count())}}, 
+    "g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Project("name", "count").By(gremlingo.T__.Values("name")).By(gremlingo.T__.BothE().Count()).Format("%{name} has %{count} connections")}}, 
+    "g_V_elementMap_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ElementMap().Format("%{name} is %{age} years old")}}, 
+    "g_V_hasLabelXpersonX_asXaX_valuesXnameX_asXp1X_selectXaX_inXknowsX_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").As("a").Values("name").As("p1").Select("a").In("knows").Format("%{p1} knows %{name}")}}, 
+    "g_V_asXsX_label_asXsubjectX_selectXsX_outE_asXpX_label_asXpredicateX_selectXpX_inV_label_asXobjectX_formatXstrX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("s").Label().As("subject").Select("s").OutE().As("p").Label().As("predicate").Select("p").InV().Label().As("object").Format("%{subject} %{predicate} %{object}")}}, 
     "g_VX1X_V_valuesXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).V().Values("name")}}, 
     "g_V_outXknowsX_V_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out("knows").V().Values("name")}}, 
     "g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("artist", "name", "Garcia").In("sungBy").As("song").V().Has("artist", "name", "Willie_Dixon").In("writtenBy").Where(gremlingo.P.Eq("song")).Values("name")}}, 
@@ -531,6 +703,34 @@
     "g_V_hasLabelXsoftwareX_name_fold_orderXlocalX_index_unfold_order_byXtailXlocal_1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Fold().Order(gremlingo.Scope.Local).Index().Unfold().Order().By(gremlingo.T__.Tail(gremlingo.Scope.Local, 1))}}, 
     "g_V_hasLabelXpersonX_name_fold_orderXlocalX_index_withXmapX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("name").Fold().Order(gremlingo.Scope.Local).Index().With("~tinkerpop.index.indexer", 1)}}, 
     "g_VX1X_valuesXageX_index_unfold_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Values("age").Index().Unfold().Unfold()}}, 
+    "g_injectXnullX_intersectXinjectX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Intersect(gremlingo.T__.Inject(1))}}, 
+    "g_V_valuesXnameX_intersectXV_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Intersect(gremlingo.T__.V().Fold())}}, 
+    "g_V_fold_intersectXconstantXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Intersect(gremlingo.T__.Constant(nil))}}, 
+    "g_V_fold_intersectXVX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Intersect(gremlingo.T__.V())}}, 
+    "g_V_valuesXnameX_fold_intersectX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Intersect(2)}}, 
+    "g_V_valuesXnameX_fold_intersectXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Intersect(nil)}}, 
+    "g_V_valuesXnonexistantX_fold_intersectXV_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Intersect(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valuesXnameX_fold_intersectXV_valuesXnonexistantX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Intersect(gremlingo.T__.V().Values("nonexistant").Fold())}}, 
+    "g_V_valuesXageX_fold_intersectXV_valuesXageX_foldX_order_local": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Intersect(gremlingo.T__.V().Values("age").Fold()).Order(gremlingo.Scope.Local)}}, 
+    "g_V_out_path_byXvaluesXnameX_toUpperX_intersectXMARKOX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Intersect(p["xx1"])}}, 
+    "g_injectXmarkoX_intersectX___V_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Intersect(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valueMapXlocationX_selectXvaluesX_unfold_intersectXseattle_vancouverX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Intersect(p["xx1"])}}, 
+    "g_V_valuesXageX_fold_intersectX___constantX27X_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Intersect(gremlingo.T__.Constant(27).Fold())}}, 
+    "g_V_out_out_path_byXnameX_intersectXdave_kelvinX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Intersect(p["xx1"])}}, 
+    "g_injectXa_null_bX_intersectXa_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Intersect(p["xx2"])}}, 
+    "g_injectXa_null_bX_intersectXa_null_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Intersect(p["xx2"])}}, 
+    "g_injectX3_threeX_intersectXfive_three_7X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Intersect(p["xx2"])}}, 
+    "g_injectX__feature___test__nullX_lTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("  feature", " one test", nil, "", " ").LTrim()}}, 
+    "g_injectX__feature__X_lTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("  feature  ").LTrim()}}, 
+    "g_injectXListXa_bXX_lTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).LTrim()}}, 
+    "g_injectXListX1_2XX_lTrimXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).LTrim(gremlingo.Scope.Local)}}, 
+    "g_V_valuesXnameX_lTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", " marko ").Property("age", 29).As("marko").AddV("person").Property("name", "  vadas  ").Property("age", 27).As("vadas").AddV("software").Property("name", "  lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh  ").Property("age", 32).As("josh").AddV("software").Property("name", "   ripple   ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").LTrim()}}, 
+    "g_V_valuesXnameX_order_fold_lTrimXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", " marko ").Property("age", 29).As("marko").AddV("person").Property("name", "  vadas  ").Property("age", 27).As("vadas").AddV("software").Property("name", "  lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh  ").Property("age", 32).As("josh").AddV("software").Property("name", "   ripple   ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().LTrim(gremlingo.Scope.Local)}}, 
+    "g_injectXfeature_test_nullX_length": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("feature", "test", nil).Length()}}, 
+    "g_injectXfeature_test_nullX_lengthXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("feature", "test", nil).Length(gremlingo.Scope.Local)}}, 
+    "g_injectXListXa_bXX_length": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Length()}}, 
+    "g_V_valuesXnameX_length": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Length()}}, 
+    "g_V_valuesXnameX_order_fold_lengthXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().Length(gremlingo.Scope.Local)}}, 
     "g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Repeat(gremlingo.T__.Both().SimplePath()).Until(gremlingo.T__.Has("name", "peter").Or().Loops().Is(3)).Has("name", "peter").Path().By("name")}}, 
     "g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Repeat(gremlingo.T__.Both().SimplePath()).Until(gremlingo.T__.Has("name", "peter").Or().Loops().Is(2)).Has("name", "peter").Path().By("name")}}, 
     "g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Repeat(gremlingo.T__.Both().SimplePath()).Until(gremlingo.T__.Has("name", "peter").And().Loops().Is(3)).Has("name", "peter").Path().By("name")}}, 
@@ -621,6 +821,29 @@
     "g_injectXnull_10_20_nullX_mean": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil, p["xx1"], p["xx2"], nil).Mean()}}, 
     "g_injectXlistXnull_10_20_nullXX_meanXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Mean(gremlingo.Scope.Local)}}, 
     "g_VX1X_valuesXageX_meanXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Values("age").Mean(gremlingo.Scope.Local)}}, 
+    "g_injectXnullX_mergeXinjectX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Merge(gremlingo.T__.Inject(1))}}, 
+    "g_V_valuesXnameX_mergeXV_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Merge(gremlingo.T__.V().Fold())}}, 
+    "g_V_fold_mergeXconstantXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Merge(gremlingo.T__.Constant(nil))}}, 
+    "g_V_fold_mergeXVX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Merge(gremlingo.T__.V())}}, 
+    "g_V_elementMap_mergeXconstantXaXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ElementMap().Merge(gremlingo.T__.Constant("a"))}}, 
+    "g_V_fold_mergeXV_asXaX_projectXaX_byXnameXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Merge(gremlingo.T__.V().As("a").Project("a").By("name"))}}, 
+    "g_V_fold_mergeXk_vX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Merge(p["xx1"])}}, 
+    "g_V_valuesXnameX_fold_mergeX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Merge(2)}}, 
+    "g_V_valuesXnameX_fold_mergeXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Merge(nil)}}, 
+    "g_V_valuesXnonexistantX_fold_mergeXV_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Merge(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valuesXnameX_fold_mergeXV_valuesXnonexistantX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Merge(gremlingo.T__.V().Values("nonexistant").Fold())}}, 
+    "g_V_valuesXageX_fold_mergeXV_valuesXageX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Merge(gremlingo.T__.V().Values("age").Fold())}}, 
+    "g_V_out_path_byXvaluesXnameX_toUpperX_mergeXMARKOX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Merge(p["xx1"])}}, 
+    "g_injectXmarkoX_mergeXV_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Merge(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valueMapXlocationX_selectXvaluesX_unfold_mergeXseattle_vancouverX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Merge(p["xx1"])}}, 
+    "g_V_out_out_path_byXnameX_mergeXempty_listX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Merge(p["xx1"])}}, 
+    "g_V_valuesXageX_fold_mergeXconstantX27X_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Merge(gremlingo.T__.Constant(27).Fold())}}, 
+    "g_V_out_out_path_byXnameX_mergeXdave_kelvinX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Merge(p["xx1"])}}, 
+    "g_injectXa_null_bX_mergeXa_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Merge(p["xx2"])}}, 
+    "g_injectXa_null_bX_mergeXa_null_cX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Merge(p["xx2"])}}, 
+    "g_injectX3_threeX_mergeXfive_three_7X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Merge(p["xx2"])}}, 
+    "g_V_asXnameX_projectXnameX_byXnameX_mergeXother_blueprintX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("name").Project("name").By("name").Merge(p["xx1"])}}, 
+    "g_V_hasXname_markoX_elementMap_mergeXV_hasXname_lopX_elementMapX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "marko").ElementMap().Merge(gremlingo.T__.V().Has("name", "lop").ElementMap())}}, 
     "g_V_mergeEXlabel_selfX_optionXonMatch_emptyX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29).AddE("self")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().MergeE(p["xx1"]).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{})}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}}, 
     "g_V_mergeEXlabel_selfX_optionXonMatch_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29).AddE("self")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().MergeE(p["xx1"]).Option(gremlingo.Merge.OnMatch, nil)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().Properties()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}}, 
     "g_V_mergeEXemptyX_optionXonCreate_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("v").MergeE(p["xx1"]).Option(gremlingo.Merge.OnCreate, nil).Option(gremlingo.Merge.OutV, gremlingo.T__.Select("v")).Option(gremlingo.Merge.InV, gremlingo.T__.Select("v"))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}}, 
@@ -648,7 +871,7 @@
     "g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithSideEffect("c", p["xx2"]).WithSideEffect("m", p["xx3"]).MergeE(p["xx1"]).Option(gremlingo.Merge.OnCreate, gremlingo.T__.Select("c")).Option(gremlingo.Merge.OnMatch, gremlingo.T__.Select("m"))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("created", "Y")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("created", "N")}}, 
     "g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeE(p["xx1"])}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}}, 
     "g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx2"]).MergeE()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Out("knows").Has("person", "name", "vadas")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "vadas").Out("self").Has("person", "name", "vadas")}}, 
-    "g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").Property("weight", 1).From("a").To("b")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithSideEffect("c", p["xx2"]).WithSideEffect("m", p["xx3"]).MergeE(p["xx1"]).Option(gremlingo.Merge.OnCreate, gremlingo.T__.Select("c")).Option(gremlingo.Merge.OnMatch, gremlingo.T__.SideEffect(gremlingo.T__.Properties("weight").Drop()).Select("m"))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("created", "Y")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("created", "N")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("weight")}}, 
+    "g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").As("a").AddV("person").Property("name", "vadas").As("b").AddE("knows").Property("weight", 1.0).From("a").To("b")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithSideEffect("c", p["xx2"]).WithSideEffect("m", p["xx3"]).MergeE(p["xx1"]).Option(gremlingo.Merge.OnCreate, gremlingo.T__.Select("c")).Option(gremlingo.Merge.OnMatch, gremlingo.T__.SideEffect(gremlingo.T__.Properties("weight").Drop()).Select("m"))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("created", "Y")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("created", "N")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E().HasLabel("knows").Has("weight")}}, 
     "g_mergeE_with_outVinV_options_map": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeE(p["xx1"]).Option(gremlingo.Merge.OutV, p["xx2"]).Option(gremlingo.Merge.InV, p["xx3"])}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}}, 
     "g_mergeE_with_outVinV_options_select": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE(p["xx1"]).Option(gremlingo.Merge.OutV, gremlingo.T__.Select("x")).Option(gremlingo.Merge.InV, gremlingo.T__.Select("y"))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}}, 
     "g_mergeE_with_eid_specified_and_inheritance_1": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").AddV("person").Property("name", "vadas")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeE(p["xx1"]).Option(gremlingo.Merge.OnCreate, p["xx2"])}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E()}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.E("201")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "marko").Out("knows").Has("name", "vadas")}}, 
@@ -712,6 +935,16 @@
     "g_mergeV_hidden_label_value_onCreate_prohibited": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{}).Option(gremlingo.Merge.OnCreate, p["xx1"])}}, 
     "g_mergeV_hidden_id_key_onMatch_matched_prohibited": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("vertex")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{}).Option(gremlingo.Merge.OnMatch, p["xx1"])}}, 
     "g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("vertex")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{}).Option(gremlingo.Merge.OnMatch, p["xx1"])}}, 
+    "g_mergeVXname_markoX_optionXonMatch_age_listX33XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property(gremlingo.Cardinality.List, "age", 29).Property(gremlingo.Cardinality.List, "age", 31).Property(gremlingo.Cardinality.List, "age", 32)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "marko"}).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{"age": gremlingo.CardinalityValue.List(33)})}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age", 33)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Properties("age")}}, 
+    "g_mergeVXname_markoX_optionXonMatch_age_setX33XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property(gremlingo.Cardinality.List, "age", 29).Property(gremlingo.Cardinality.List, "age", 31).Property(gremlingo.Cardinality.List, "age", 32)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "marko"}).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{"age": gremlingo.CardinalityValue.Set(33)})}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age", 33)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Properties("age")}}, 
+    "g_mergeVXname_markoX_optionXonMatch_age_setX31XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property(gremlingo.Cardinality.List, "age", 29).Property(gremlingo.Cardinality.List, "age", 31).Property(gremlingo.Cardinality.List, "age", 32)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "marko"}).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{"age": gremlingo.CardinalityValue.Set(31)})}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age", 31)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Properties("age")}}, 
+    "g_mergeVXname_markoX_optionXonMatch_age_singleX33XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property(gremlingo.Cardinality.List, "age", 29).Property(gremlingo.Cardinality.List, "age", 31).Property(gremlingo.Cardinality.List, "age", 32)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "marko"}).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{"age": gremlingo.CardinalityValue.Single(33)})}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age", 33)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Properties("age")}}, 
+    "g_mergeVXname_markoX_optionXonMatch_age_33_singleX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property(gremlingo.Cardinality.List, "age", 29).Property(gremlingo.Cardinality.List, "age", 31).Property(gremlingo.Cardinality.List, "age", 32)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "marko"}).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{"age": 33}, gremlingo.Cardinality.Single)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age", 33)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Properties("age")}}, 
+    "g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property(gremlingo.Cardinality.List, "age", 29).Property(gremlingo.Cardinality.List, "age", 31).Property(gremlingo.Cardinality.List, "age", 32)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "marko"}).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{"name": "allen", "age": gremlingo.CardinalityValue.Set(31)}, gremlingo.Cardinality.Single)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "allen").Has("age", 31)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "allen").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "allen").Properties("age")}}, 
+    "g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property(gremlingo.Cardinality.List, "age", 29).Property(gremlingo.Cardinality.List, "age", 31).Property(gremlingo.Cardinality.List, "age", 32)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "marko"}).Option(gremlingo.Merge.OnMatch, map[interface{}]interface{}{"name": "allen", "age": gremlingo.CardinalityValue.Single(31)}, gremlingo.Cardinality.Single)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "allen").Has("age", 33)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "allen").Has("age", 31)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "allen").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "allen").Properties("age")}}, 
+    "g_mergeVXname_aliceX_optionXonCreate_age_singleX81XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "alice", gremlingo.T.Label: "person"}).Option(gremlingo.Merge.OnCreate, map[interface{}]interface{}{"age": gremlingo.CardinalityValue.Single(81)})}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("age", 81)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Properties("age")}}, 
+    "g_mergeVXname_aliceX_optionXonCreate_age_setX81XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "alice", gremlingo.T.Label: "person"}).Option(gremlingo.Merge.OnCreate, map[interface{}]interface{}{"age": gremlingo.CardinalityValue.Set(81)})}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("age", 81)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Properties("age")}}, 
+    "g_mergeVXname_aliceX_optionXonCreate_age_singleX81X_age_81_setX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{"name": "alice", gremlingo.T.Label: "person"}).Option(gremlingo.Merge.OnCreate, map[interface{}]interface{}{"age": 81}, gremlingo.Cardinality.Set)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("age", 81)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Has("age")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "alice").Properties("age")}}, 
     "g_mergeV_hidden_label_key_onMatch_matched_prohibited": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.MergeV(map[interface{}]interface{}{}).Option(gremlingo.Merge.OnMatch, p["xx1"])}}, 
     "g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_match": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx1"], p["xx2"]).Fold().MergeV(gremlingo.T__.Limit(gremlingo.Scope.Local, 1)).Option(gremlingo.Merge.OnCreate, gremlingo.T__.Range(gremlingo.Scope.Local, 1, 2)).Option(gremlingo.Merge.OnMatch, gremlingo.T__.Tail(gremlingo.Scope.Local))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "marko").Has("created", "N")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}}, 
     "g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_create": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "marko").Property("age", 29)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx1"], p["xx2"]).Fold().MergeV(gremlingo.T__.Limit(gremlingo.Scope.Local, 1)).Option(gremlingo.Merge.OnCreate, gremlingo.T__.Range(gremlingo.Scope.Local, 1, 2)).Option(gremlingo.Merge.OnMatch, gremlingo.T__.Tail(gremlingo.Scope.Local))}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("person", "name", "stephen").HasNot("created")}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V()}}, 
@@ -786,6 +1019,23 @@
     "g_V_peerPressure_hasXclusterX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().PeerPressure().Has("gremlin.peerPressureVertexProgram.cluster")}}, 
     "g_V_peerPressure_withXpropertyName_clusterX_withXedges_outEXknowsXX_pageRankX1X_byXrankX_withXedges_outEXknowsX_withXtimes_2X_group_byXclusterX_byXrank_sumX_limitX100X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().PeerPressure().With("~tinkerpop.peerPressure.propertyName", "cluster").With("~tinkerpop.peerPressure.edges", gremlingo.T__.OutE("knows")).PageRank(1.0).With("~tinkerpop.pageRank.propertyName", "rank").With("~tinkerpop.pageRank.edges", gremlingo.T__.OutE("knows")).With("~tinkerpop.pageRank.times", 1).Group().By("cluster").By(gremlingo.T__.Values("rank").Sum()).Limit(100)}}, 
     "g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXedges_outEX_withyXpropertyName_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "ripple").In("created").PeerPressure().With("~tinkerpop.peerPressure.edges", gremlingo.T__.OutE()).With("~tinkerpop.peerPressure.propertyName", "cluster").Repeat(gremlingo.T__.Union(gremlingo.T__.Identity(), gremlingo.T__.Both())).Times(2).Dedup().ValueMap("name", "cluster")}}, 
+    "g_injectXnullX_productXinjectX1XX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Product(gremlingo.T__.Inject(1))}}, 
+    "g_V_valuesXnameX_productXV_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Product(gremlingo.T__.V().Fold())}}, 
+    "g_V_fold_productXconstantXnullXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Product(gremlingo.T__.Constant(nil))}}, 
+    "g_V_fold_productXVX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fold().Product(gremlingo.T__.V())}}, 
+    "g_V_valuesXnameX_fold_productX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Product(2)}}, 
+    "g_V_valuesXnameX_fold_productXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Product(nil)}}, 
+    "g_V_valuesXnonexistantX_fold_productXV_valuesXnameX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("nonexistant").Fold().Product(gremlingo.T__.V().Values("name").Fold())}}, 
+    "g_V_valuesXnameX_fold_productXV_valuesXnonexistantX_foldX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Product(gremlingo.T__.V().Values("nonexistant").Fold())}}, 
+    "g_V_valuesXageX_order_byXdescX_limitX3X_fold_productXV_valuesXageX_order_byXascX_limitX2X_foldX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Desc).Limit(3).Fold().Product(gremlingo.T__.V().Values("age").Order().By(gremlingo.Order.Asc).Limit(2).Fold()).Unfold()}}, 
+    "g_V_out_path_byXvaluesXnameX_toUpperX_productXMARKOX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By(gremlingo.T__.Values("name").ToUpper()).Product(p["xx1"]).Unfold()}}, 
+    "g_injectXmarkoX_productXV_valuesXnameX_order_foldX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Product(gremlingo.T__.V().Values("name").Order().Fold()).Unfold()}}, 
+    "g_V_valueMapXlocationX_selectXvaluesX_unfold_productXdulles_seattle_vancouverX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap("location").Select(gremlingo.Column.Values).Unfold().Product(p["xx1"]).Unfold()}}, 
+    "g_V_valuesXageX_order_byXascX_fold_productXconstantX27X_foldX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Order().By(gremlingo.Order.Asc).Fold().Product(gremlingo.T__.Constant(27).Fold()).Unfold()}}, 
+    "g_V_out_out_path_byXnameX_productXdave_kelvinX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Product(p["xx1"]).Unfold()}}, 
+    "g_injectXa_null_bX_productXa_cX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Product(p["xx2"]).Unfold()}}, 
+    "g_injectXa_null_bX_productXa_null_cX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Product(p["xx2"]).Unfold()}}, 
+    "g_injectX3_threeX_productXfive_three_7X_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Product(p["xx2"]).Unfold()}}, 
     "g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Project("a", "b").By(gremlingo.T__.OutE().Count()).By("age")}}, 
     "g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out("created").Project("a", "b").By("name").By(gremlingo.T__.In("created").Count()).Order().By(gremlingo.T__.Select("b"), gremlingo.Order.Desc).Select("a")}}, 
     "g_V_valueMap_projectXxX_byXselectXnameXX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap().Project("x").By(gremlingo.T__.Select("name"))}}, 
@@ -796,6 +1046,28 @@
     "g_V_hasXageX_propertiesXage_nameX_value": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("age").Properties("age", "name").Value()}}, 
     "g_V_propertiesXname_age_nullX_value": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Properties("name", "age", nil).Value()}}, 
     "g_V_valuesXname_age_nullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name", "age", nil)}}, 
+    "g_injectX__feature___test__nullX_rTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("feature  ", "one test ", nil, "", " ").RTrim()}}, 
+    "g_injectX__feature__X_rTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("  feature  ").RTrim()}}, 
+    "g_injectXListXa_bXX_rTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).RTrim()}}, 
+    "g_injectXListX1_2XX_rTrimXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).RTrim(gremlingo.Scope.Local)}}, 
+    "g_V_valuesXnameX_rTrim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", " marko ").Property("age", 29).As("marko").AddV("person").Property("name", "  vadas  ").Property("age", 27).As("vadas").AddV("software").Property("name", "  lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh  ").Property("age", 32).As("josh").AddV("software").Property("name", "   ripple   ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").RTrim()}}, 
+    "g_V_valuesXnameX_order_fold_rTrimXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", " marko ").Property("age", 29).As("marko").AddV("person").Property("name", "  vadas  ").Property("age", 27).As("vadas").AddV("software").Property("name", "  lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh  ").Property("age", 32).As("josh").AddV("software").Property("name", "   ripple   ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().RTrim(gremlingo.Scope.Local)}}, 
+    "g_injectXthat_this_test_nullX_replaceXh_jX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("that", "this", "test", nil).Replace("h", "j")}}, 
+    "g_injectXthat_this_test_nullX_fold_replaceXlocal_h_jX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("that", "this", "test", nil).Fold().Replace(gremlingo.Scope.Local, "h", "j")}}, 
+    "g_injectXListXa_bXcX_replaceXa_bX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Replace("a", "b")}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_replaceXnull_iX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Replace(nil, "g")}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_replaceXa_iX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Replace("p", "g")}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_order_fold_replaceXloacl_a_iX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Order().Fold().Replace(gremlingo.Scope.Local, "p", "g")}}, 
+    "g_injectXfeature_test_nullX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("feature", "test one", nil).Reverse()}}, 
+    "g_V_valuesXnameX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Reverse()}}, 
+    "g_V_valuesXageX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Reverse()}}, 
+    "g_V_out_path_byXnameX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Path().By("name").Reverse()}}, 
+    "g_V_out_out_path_byXnameX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Out().Out().Path().By("name").Reverse()}}, 
+    "g_V_valuesXageX_fold_orderXlocalX_byXdescX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Order(gremlingo.Scope.Local).By(gremlingo.Order.Desc).Reverse()}}, 
+    "g_V_valuesXnameX_fold_orderXlocalX_by_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Fold().Order(gremlingo.Scope.Local).By().Reverse()}}, 
+    "g_injectXnullX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).Reverse()}}, 
+    "g_injectXbX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("b").Reverse()}}, 
+    "g_injectX3_threeX_reverse": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Reverse()}}, 
     "g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).As("a").Out("knows").As("b").Select("a", "b")}}, 
     "g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX_byXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).As("a").Out("knows").As("b").Select("a", "b").By("name")}}, 
     "g_VX1X_asXaX_outXknowsX_asXbX_selectXaX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).As("a").Out("knows").As("b").Select("a")}}, 
@@ -879,6 +1151,22 @@
     "g_V_hasXsong_name_MIGHT_AS_WELLX_shortestPath_targetXhasXsong_name_MAYBE_YOU_KNOW_HOW_I_FEELXX_edgesXoutEXfollowedByXX_distanceXweightX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("song", "name", "MIGHT AS WELL").ShortestPath().With("~tinkerpop.shortestPath.target", gremlingo.T__.Has("song", "name", "MAYBE YOU KNOW HOW I FEEL")).With("~tinkerpop.shortestPath.edges", gremlingo.T__.OutE("followedBy")).With("~tinkerpop.shortestPath.distance", "weight")}}, 
     "g_V_hasXname_markoX_shortestPath_maxDistanceX1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "marko").ShortestPath().With("~tinkerpop.shortestPath.maxDistance", 1)}}, 
     "g_V_hasXname_vadasX_shortestPath_distanceXweightX_maxDistanceX1_3X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Has("name", "vadas").ShortestPath().With("~tinkerpop.shortestPath.distance", "weight").With("~tinkerpop.shortestPath.maxDistance", 1.3)}}, 
+    "g_injectXthat_this_testX_spiltXhX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("that", "this", "test", nil).Split("h")}}, 
+    "g_injectXhello_worldX_spiltXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("hello world").Split(nil)}}, 
+    "g_injectXListXa_bXcX_splitXa_bX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Split("a")}}, 
+    "g_V_hasLabelXpersonX_valueXnameX_splitXnullX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("name").Split(nil)}}, 
+    "g_V_hasLabelXpersonX_valueXnameX_order_fold_splitXlocal_aX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("name").Order().Fold().Split(gremlingo.Scope.Local, "a").Unfold()}}, 
+    "g_injectXthat_this_testX_substringX1_8X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("test", "hello world", nil).Substring(1, 8)}}, 
+    "g_injectXListXa_bXcX_substringX1_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Substring(1, 2)}}, 
+    "g_V_hasLabelXpersonX_valueXnameX_substringX2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Substring(2)}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_substringX1_4X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Substring(1, 4)}}, 
+    "g_V_hasLabelXpersonX_valueXnameX_order_fold_substringXlocal_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Order().Fold().Substring(gremlingo.Scope.Local, 2)}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_order_fold_substringXlocal_1_4X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Order().Fold().Substring(gremlingo.Scope.Local, 1, 4)}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_substringX1_0X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Substring(1, 0)}}, 
+    "g_V_hasLabelXpersonX_valueXnameX_substringXneg3X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("person").Values("name").Substring(-3)}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_substringX1_neg1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Substring(1, -1)}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_substringXneg4_2X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Substring(-4, 2)}}, 
+    "g_V_hasLabelXsoftwareX_valueXnameX_substringXneg3_neg1X": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().HasLabel("software").Values("name").Substring(-3, -1)}}, 
     "g_V_age_sum": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Sum()}}, 
     "g_V_foo_sum": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("foo").Sum()}}, 
     "g_V_age_fold_sumXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").Fold().Sum(gremlingo.Scope.Local)}}, 
@@ -895,6 +1183,24 @@
     "g_injectXnull_10_5_nullX_sum": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil, p["xx1"], p["xx2"], nil).Sum()}}, 
     "g_injectXlistXnull_10_5_nullXX_sumXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Sum(gremlingo.Scope.Local)}}, 
     "g_VX1X_valuesXageX_sumXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Values("age").Sum(gremlingo.Scope.Local)}}, 
+    "g_injectXfeature_test_nullX_toLower": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("FEATURE", "tESt", nil).ToLower()}}, 
+    "g_injectXfeature_test_nullX_toLowerXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).ToLower(gremlingo.Scope.Local)}}, 
+    "g_injectXListXa_bXX_toLower": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).ToLower()}}, 
+    "g_V_valuesXnameX_toLower": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "MARKO").Property("age", 29).As("marko").AddV("person").Property("name", "VADAS").Property("age", 27).As("vadas").AddV("software").Property("name", "LOP").Property("lang", "java").As("lop").AddV("person").Property("name", "JOSH").Property("age", 32).As("josh").AddV("software").Property("name", "RIPPLE").Property("lang", "java").As("ripple").AddV("person").Property("name", "PETER").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").ToLower()}}, 
+    "g_V_valuesXnameX_toLowerXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "MARKO").Property("age", 29).As("marko").AddV("person").Property("name", "VADAS").Property("age", 27).As("vadas").AddV("software").Property("name", "LOP").Property("lang", "java").As("lop").AddV("person").Property("name", "JOSH").Property("age", 32).As("josh").AddV("software").Property("name", "RIPPLE").Property("lang", "java").As("ripple").AddV("person").Property("name", "PETER").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").ToLower(gremlingo.Scope.Local)}}, 
+    "g_V_valuesXnameX_order_fold_toLowerXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", "MARKO").Property("age", 29).As("marko").AddV("person").Property("name", "VADAS").Property("age", 27).As("vadas").AddV("software").Property("name", "LOP").Property("lang", "java").As("lop").AddV("person").Property("name", "JOSH").Property("age", 32).As("josh").AddV("software").Property("name", "RIPPLE").Property("lang", "java").As("ripple").AddV("person").Property("name", "PETER").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().ToLower(gremlingo.Scope.Local)}}, 
+    "g_injectXfeature_test_nullX_toUpper": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("feature", "tESt", nil).ToUpper()}}, 
+    "g_injectXfeature_test_nullX_toUpperXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).ToUpper(gremlingo.Scope.Local)}}, 
+    "g_injectXfeature_test_nullX_asString_toUpper": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("feature", "tESt", nil).AsString().ToUpper()}}, 
+    "g_injectXListXa_bXX_toUpper": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).ToUpper()}}, 
+    "g_V_valuesXnameX_toUpper": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").ToUpper()}}, 
+    "g_V_valuesXnameX_toUpperXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").ToUpper(gremlingo.Scope.Local)}}, 
+    "g_V_valuesXnameX_order_fold_toUpperXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().ToUpper(gremlingo.Scope.Local)}}, 
+    "g_injectX__feature___test__nullX_trim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject("  feature  ", " one test ", nil, "", " ").Trim()}}, 
+    "g_injectXListXa_bXX_trim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Trim()}}, 
+    "g_injectXListX1_2XX_trimXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(p["xx1"]).Trim(gremlingo.Scope.Local)}}, 
+    "g_V_valuesXnameX_trim": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", " marko ").Property("age", 29).As("marko").AddV("person").Property("name", "  vadas  ").Property("age", 27).As("vadas").AddV("software").Property("name", "  lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh  ").Property("age", 32).As("josh").AddV("software").Property("name", "   ripple   ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Trim()}}, 
+    "g_V_valuesXnameX_order_fold_trimXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.AddV("person").Property("name", " marko ").Property("age", 29).As("marko").AddV("person").Property("name", "  vadas  ").Property("age", 27).As("vadas").AddV("software").Property("name", "  lop").Property("lang", "java").As("lop").AddV("person").Property("name", "josh  ").Property("age", 32).As("josh").AddV("software").Property("name", "   ripple   ").Property("lang", "java").As("ripple").AddV("person").Property("name", "peter").Property("age", 35).As("peter").AddE("knows").From("marko").To("vadas").Property("weight", 0.5).AddE("knows").From("marko").To("josh").Property("weight", 1.0).AddE("created").From("marko").To("lop").Property("weight", 0.4).AddE("created").From("josh").To("ripple").Property("weight", 1.0).AddE("created").From("josh").To("lop").Property("weight", 0.4).AddE("created").From("peter").To("lop").Property("weight", 0.2)}, func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("name").Order().Fold().Trim(gremlingo.Scope.Local)}}, 
     "g_V_localXoutE_foldX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Local(gremlingo.T__.OutE().Fold()).Unfold()}}, 
     "g_V_valueMap_unfold_mapXkeyX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().ValueMap().Unfold().Map(p["l1"])}}, 
     "g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V(p["vid1"]).Repeat(gremlingo.T__.Both().SimplePath()).Until(gremlingo.T__.HasId(p["vid6"])).Path().By("name").Unfold()}}, 
@@ -1091,6 +1397,7 @@
     "g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXvaluesXageX_isXgtX29XXX_capXxX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.ProductiveByStrategy(gremlingo.ProductiveByStrategyConfig{ProductiveKeys: []string{}})).V().Aggregate("x").By(gremlingo.T__.Values("age").Is(gremlingo.P.Gt(29))).Cap("x")}}, 
     "g_V_aggregateXxX_byXout_order_byXnameXX_capXxX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Aggregate("x").By(gremlingo.T__.Out().Order().By("name")).Cap("x")}}, 
     "g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXout_order_byXnameXX_capXxX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.ProductiveByStrategy(gremlingo.ProductiveByStrategyConfig{ProductiveKeys: []string{}})).V().Aggregate("x").By(gremlingo.T__.Out().Order().By("name")).Cap("x")}}, 
+    "g_V_aggregateXaX_hasXperson_age_gteX30XXX_capXaX_unfold_valuesXnameX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Aggregate("a").Has("person", "age", gremlingo.P.Gte(30)).Cap("a").Unfold().Values("name")}}, 
     "g_V_fail": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fail()}}, 
     "g_V_failXmsgX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Fail("msg")}}, 
     "g_V_unionXout_failX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Union(gremlingo.T__.Out(), gremlingo.T__.Fail())}}, 
diff --git a/gremlin-go/driver/graph.go b/gremlin-go/driver/graph.go
index 5fe7125..3f79102 100644
--- a/gremlin-go/driver/graph.go
+++ b/gremlin-go/driver/graph.go
@@ -32,8 +32,9 @@
 // Element is the base structure for both Vertex and Edge.
 // The inherited identifier must be unique to the inheriting classes.
 type Element struct {
-	Id    interface{}
-	Label string
+	Id         interface{}
+	Label      string
+	Properties interface{}
 }
 
 // Vertex contains a single Vertex which has a Label and an Id.
@@ -74,12 +75,12 @@
 
 // String returns the string representation of the vertex.
 func (v *Vertex) String() string {
-	return fmt.Sprintf("v[%s]", v.Id)
+	return fmt.Sprintf("v[%v]", v.Id)
 }
 
 // String returns the string representation of the edge.
 func (e *Edge) String() string {
-	return fmt.Sprintf("e[%s][%s-%s->%s]", e.Id, e.OutV.Id, e.Label, e.InV.Id)
+	return fmt.Sprintf("e[%v][%v-%s->%v]", e.Id, e.OutV.Id, e.Label, e.InV.Id)
 }
 
 // String returns the string representation of the vertex property.
diff --git a/gremlin-go/driver/graphBinary.go b/gremlin-go/driver/graphBinary.go
index 2d1cddd..f9eb548 100644
--- a/gremlin-go/driver/graphBinary.go
+++ b/gremlin-go/driver/graphBinary.go
@@ -23,11 +23,12 @@
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/google/uuid"
 	"math"
 	"math/big"
 	"reflect"
 	"time"
+
+	"github.com/google/uuid"
 )
 
 // Version 1.0
@@ -80,6 +81,7 @@
 	traversalStrategyType dataType = 0x29
 	bulkSetType           dataType = 0x2a
 	mergeType             dataType = 0x2e
+	dtType                dataType = 0x2f
 	metricsType           dataType = 0x2c
 	traversalMetricsType  dataType = 0x2d
 	durationType          dataType = 0x81
@@ -435,7 +437,7 @@
 	return buffer.Bytes(), nil
 }
 
-//Format: {Key}{Value}{parent}
+// Format: {Key}{Value}{parent}
 func propertyWriter(value interface{}, buffer *bytes.Buffer, typeSerializer *graphBinaryTypeSerializer) ([]byte, error) {
 	v := value.(*Property)
 
@@ -454,7 +456,7 @@
 	return buffer.Bytes(), nil
 }
 
-//Format: {Id}{Label}{Value}{parent}{properties}
+// Format: {Id}{Label}{Value}{parent}{properties}
 func vertexPropertyWriter(value interface{}, buffer *bytes.Buffer, typeSerializer *graphBinaryTypeSerializer) ([]byte, error) {
 	vp := value.(*VertexProperty)
 	_, err := typeSerializer.write(vp.Id, buffer)
@@ -477,7 +479,7 @@
 	return buffer.Bytes(), nil
 }
 
-//Format: {Labels}{Objects}
+// Format: {Labels}{Objects}
 func pathWriter(value interface{}, buffer *bytes.Buffer, typeSerializer *graphBinaryTypeSerializer) ([]byte, error) {
 	p := value.(*Path)
 	_, err := typeSerializer.write(p.Labels, buffer)
@@ -710,6 +712,8 @@
 		return scopeType, nil
 	case merge:
 		return mergeType, nil
+	case dt:
+		return dtType, nil
 	case p, Predicate:
 		return pType, nil
 	case textP, TextPredicate:
@@ -989,13 +993,10 @@
 			switch reflect.TypeOf(k).Kind() {
 			case reflect.Map:
 				mapData[&k] = v
-				break
 			case reflect.Slice:
 				mapData[fmt.Sprint(k)] = v
-				break
 			default:
 				mapData[k] = v
-				break
 			}
 		}
 	}
@@ -1051,11 +1052,11 @@
 
 // {fully qualified id}{unqualified label}
 func vertexReader(data *[]byte, i *int) (interface{}, error) {
-	return vertexReaderNullByte(data, i, true)
+	return vertexReaderReadingProperties(data, i, true)
 }
 
-// {fully qualified id}{unqualified label}{[unused null byte]}
-func vertexReaderNullByte(data *[]byte, i *int, unusedByte bool) (interface{}, error) {
+// {fully qualified id}{unqualified label}{fully qualified properties}
+func vertexReaderReadingProperties(data *[]byte, i *int, readProperties bool) (interface{}, error) {
 	var err error
 	v := new(Vertex)
 	v.Id, err = readFullyQualifiedNullable(data, i, true)
@@ -1067,33 +1068,43 @@
 		return nil, err
 	}
 	v.Label = label.(string)
-	if unusedByte {
-		*i += 2
+	if readProperties {
+		v.Properties, err = readFullyQualifiedNullable(data, i, true)
+		if err != nil {
+			return nil, err
+		}
 	}
 	return v, nil
 }
 
-// {fully qualified id}{unqualified label}{in vertex w/o null byte}{out vertex}{unused null byte}{unused null byte}
+// {fully qualified id}{unqualified label}{in vertex w/o null byte}{out vertex}{unused null byte}{fully qualified properties}
 func edgeReader(data *[]byte, i *int) (interface{}, error) {
 	var err error
 	e := new(Edge)
 	e.Id, err = readFullyQualifiedNullable(data, i, true)
+	if err != nil {
+		return nil, err
+	}
 	label, err := readUnqualified(data, i, stringType, false)
 	if err != nil {
 		return nil, err
 	}
 	e.Label = label.(string)
-	v, err := vertexReaderNullByte(data, i, false)
+	v, err := vertexReaderReadingProperties(data, i, false)
 	if err != nil {
 		return nil, err
 	}
 	e.InV = *v.(*Vertex)
-	v, err = vertexReaderNullByte(data, i, false)
+	v, err = vertexReaderReadingProperties(data, i, false)
 	if err != nil {
 		return nil, err
 	}
 	e.OutV = *v.(*Vertex)
-	*i += 4
+	*i += 2
+	e.Properties, err = readFullyQualifiedNullable(data, i, true)
+	if err != nil {
+		return nil, err
+	}
 	return e, nil
 }
 
@@ -1131,7 +1142,15 @@
 		return nil, err
 	}
 
-	*i += 4
+	*i += 2
+
+	props, err := readFullyQualifiedNullable(data, i, true)
+	if err != nil {
+		return nil, err
+	}
+
+	vp.Properties = props
+
 	return vp, nil
 }
 
diff --git a/gremlin-go/driver/graphTraversal.go b/gremlin-go/driver/graphTraversal.go
index 796e4dc..c3f7fca 100644
--- a/gremlin-go/driver/graphTraversal.go
+++ b/gremlin-go/driver/graphTraversal.go
@@ -58,6 +58,12 @@
 	return g
 }
 
+// E adds the e step to the GraphTraversal.
+func (g *GraphTraversal) E(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("E", args...)
+	return g
+}
+
 // AddE adds the addE step to the GraphTraversal.
 func (g *GraphTraversal) AddE(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("addE", args...)
@@ -76,18 +82,42 @@
 	return g
 }
 
+// All adds the all step to the GraphTraversal.
+func (g *GraphTraversal) All(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("all", args...)
+	return g
+}
+
 // And adds the and step to the GraphTraversal.
 func (g *GraphTraversal) And(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("and", args...)
 	return g
 }
 
+// Any adds the any step to the GraphTraversal.
+func (g *GraphTraversal) Any(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("any", args...)
+	return g
+}
+
 // As adds the as step to the GraphTraversal.
 func (g *GraphTraversal) As(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("as", args...)
 	return g
 }
 
+// AsDate adds the asDate step to the GraphTraversal.
+func (g *GraphTraversal) AsDate(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("asDate", args...)
+	return g
+}
+
+// AsString adds the asString step to the GraphTraversal.
+func (g *GraphTraversal) AsString(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("asString", args...)
+	return g
+}
+
 // Barrier adds the barrier step to the GraphTraversal.
 func (g *GraphTraversal) Barrier(args ...interface{}) *GraphTraversal {
 	// Force int32 serialization for valid number values for server compatibility
@@ -155,6 +185,24 @@
 	return g
 }
 
+// Combine adds the combine step to the GraphTraversal.
+func (g *GraphTraversal) Combine(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("combine", args...)
+	return g
+}
+
+// Concat adds the concat step to the GraphTraversal.
+func (g *GraphTraversal) Concat(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("concat", args...)
+	return g
+}
+
+// Conjoin adds the conjoin step to the GraphTraversal.
+func (g *GraphTraversal) Conjoin(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("conjoin", args...)
+	return g
+}
+
 // ConnectedComponent adds the connectedComponent step to the GraphTraversal.
 func (g *GraphTraversal) ConnectedComponent(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("connectedComponent", args...)
@@ -180,12 +228,36 @@
 	return g
 }
 
+// DateAdd adds the dateAdd step to the GraphTraversal.
+func (g *GraphTraversal) DateAdd(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("dateAdd", int32Args(args)...)
+	return g
+}
+
+// DateDiff adds the dateDiff step to the GraphTraversal.
+func (g *GraphTraversal) DateDiff(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("dateDiff", args...)
+	return g
+}
+
 // Dedup adds the dedup step to the GraphTraversal.
 func (g *GraphTraversal) Dedup(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("dedup", args...)
 	return g
 }
 
+// Difference adds the difference step to the GraphTraversal.
+func (g *GraphTraversal) Difference(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("difference", args...)
+	return g
+}
+
+// Disjunct adds the disjunct step to the GraphTraversal.
+func (g *GraphTraversal) Disjunct(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("disjunct", args...)
+	return g
+}
+
 // Drop adds the drop step to the GraphTraversal.
 func (g *GraphTraversal) Drop(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("drop", args...)
@@ -234,6 +306,12 @@
 	return g
 }
 
+// Format adds the format step to the GraphTraversal.
+func (g *GraphTraversal) Format(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("format", args...)
+	return g
+}
+
 // From adds the from step to the GraphTraversal.
 func (g *GraphTraversal) From(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("from", args...)
@@ -331,6 +409,13 @@
 	return g
 }
 
+// Intersect adds the intersect step to the GraphTraversal.
+func (g *GraphTraversal) Intersect(args ...interface{}) *GraphTraversal {
+	// Force int32 serialization for valid number values for server compatibility
+	g.Bytecode.AddStep("intersect", args...)
+	return g
+}
+
 // Is adds the is step to the GraphTraversal.
 func (g *GraphTraversal) Is(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("is", args...)
@@ -349,6 +434,12 @@
 	return g
 }
 
+// Length adds the length step to the GraphTraversal.
+func (g *GraphTraversal) Length(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("length", args...)
+	return g
+}
+
 // Limit adds the limit step to the GraphTraversal.
 func (g *GraphTraversal) Limit(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("limit", args...)
@@ -367,6 +458,12 @@
 	return g
 }
 
+// LTrim adds the lTrim step to the GraphTraversal.
+func (g *GraphTraversal) LTrim(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("lTrim", args...)
+	return g
+}
+
 // Map adds the map step to the GraphTraversal.
 func (g *GraphTraversal) Map(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("map", args...)
@@ -397,6 +494,12 @@
 	return g
 }
 
+// Merge adds the merge step to the GraphTraversal.
+func (g *GraphTraversal) Merge(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("merge", args...)
+	return g
+}
+
 // MergeE adds the mergeE step to the GraphTraversal.
 func (g *GraphTraversal) MergeE(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("mergeE", args...)
@@ -493,6 +596,12 @@
 	return g
 }
 
+// Product adds the product step to the GraphTraversal.
+func (g *GraphTraversal) Product(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("product", args...)
+	return g
+}
+
 // Profile adds the profile step to the GraphTraversal.
 func (g *GraphTraversal) Profile(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("profile", args...)
@@ -547,6 +656,24 @@
 	return g
 }
 
+// Replace adds the replace step to the GraphTraversal.
+func (g *GraphTraversal) Replace(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("replace", args...)
+	return g
+}
+
+// Reverse adds the reverse step to the GraphTraversal.
+func (g *GraphTraversal) Reverse(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("reverse", args...)
+	return g
+}
+
+// RTrim adds the repeat step to the GraphTraversal.
+func (g *GraphTraversal) RTrim(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("rTrim", args...)
+	return g
+}
+
 // Sack adds the sack step to the GraphTraversal.
 func (g *GraphTraversal) Sack(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("sack", args...)
@@ -590,6 +717,12 @@
 	return g
 }
 
+// Split adds the split step to the GraphTraversal.
+func (g *GraphTraversal) Split(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("split", args...)
+	return g
+}
+
 // Store adds the store step to the GraphTraversal.
 func (g *GraphTraversal) Store(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("store", args...)
@@ -602,6 +735,12 @@
 	return g
 }
 
+// Substring adds the substring step to the GraphTraversal.
+func (g *GraphTraversal) Substring(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("substring", int32Args(args)...)
+	return g
+}
+
 // Sum adds the sum step to the GraphTraversal.
 func (g *GraphTraversal) Sum(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("sum", args...)
@@ -639,6 +778,18 @@
 	return g
 }
 
+// ToLower adds the toLower step to the GraphTraversal.
+func (g *GraphTraversal) ToLower(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("toLower", args...)
+	return g
+}
+
+// ToUpper adds the toUpper step to the GraphTraversal.
+func (g *GraphTraversal) ToUpper(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("toUpper", args...)
+	return g
+}
+
 // ToV adds the toV step to the GraphTraversal.
 func (g *GraphTraversal) ToV(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("toV", args...)
@@ -651,6 +802,12 @@
 	return g
 }
 
+// Trim adds the tree step to the GraphTraversal.
+func (g *GraphTraversal) Trim(args ...interface{}) *GraphTraversal {
+	g.Bytecode.AddStep("trim", args...)
+	return g
+}
+
 // Unfold adds the unfold step to the GraphTraversal.
 func (g *GraphTraversal) Unfold(args ...interface{}) *GraphTraversal {
 	g.Bytecode.AddStep("unfold", args...)
diff --git a/gremlin-go/driver/graphTraversalSource.go b/gremlin-go/driver/graphTraversalSource.go
index b8f8660..31ee2d4 100644
--- a/gremlin-go/driver/graphTraversalSource.go
+++ b/gremlin-go/driver/graphTraversalSource.go
@@ -215,6 +215,13 @@
 	return traversal
 }
 
+// Union allows for a multi-branched start to a traversal.
+func (gts *GraphTraversalSource) Union(args ...interface{}) *GraphTraversal {
+	traversal := gts.GetGraphTraversal()
+	traversal.Bytecode.AddStep("union", args...)
+	return traversal
+}
+
 func (gts *GraphTraversalSource) Tx() *Transaction {
 	return &Transaction{g: gts, remoteConnection: gts.remoteConnection}
 }
diff --git a/gremlin-go/driver/graphTraversalSource_test.go b/gremlin-go/driver/graphTraversalSource_test.go
index ce1ad9a..f33c432 100644
--- a/gremlin-go/driver/graphTraversalSource_test.go
+++ b/gremlin-go/driver/graphTraversalSource_test.go
@@ -27,7 +27,7 @@
 func TestGraphTraversalSource(t *testing.T) {
 
 	t.Run("GraphTraversalSource.With tests", func(t *testing.T) {
-		t.Run("Test for single param", func(t *testing.T) {
+		t.Run("Test for single property", func(t *testing.T) {
 			g := &GraphTraversalSource{graph: &Graph{}, bytecode: NewBytecode(nil), remoteConnection: nil}
 			traversal := g.With("foo", "bar")
 			assert.NotNil(t, traversal)
@@ -40,7 +40,7 @@
 			assert.Equal(t, map[string]interface{}{"foo": "bar"}, config)
 		})
 
-		t.Run("Test for multiple param", func(t *testing.T) {
+		t.Run("Test for multiple property", func(t *testing.T) {
 			g := &GraphTraversalSource{graph: &Graph{}, bytecode: NewBytecode(nil), remoteConnection: nil}
 			traversal := g.With("foo", "bar").With("foo2", "bar2")
 			assert.NotNil(t, traversal)
@@ -53,7 +53,7 @@
 			assert.Equal(t, map[string]interface{}{"foo": "bar", "foo2": "bar2"}, config)
 		})
 
-		t.Run("Test for param replacement", func(t *testing.T) {
+		t.Run("Test for property replacement", func(t *testing.T) {
 			g := &GraphTraversalSource{graph: &Graph{}, bytecode: NewBytecode(nil), remoteConnection: nil}
 			traversal := g.With("foo", "bar").With("foo", "not bar")
 			assert.NotNil(t, traversal)
diff --git a/gremlin-go/driver/graph_test.go b/gremlin-go/driver/graph_test.go
index 1b66b2c..89fb0a2 100644
--- a/gremlin-go/driver/graph_test.go
+++ b/gremlin-go/driver/graph_test.go
@@ -30,7 +30,7 @@
 func TestGraphStructureFunctions(t *testing.T) {
 	t.Run("Test Vertex.String()", func(t *testing.T) {
 		uid, _ := uuid.NewUUID()
-		v := Vertex{Element{uid, "Vertex-Label"}}
+		v := Vertex{Element{uid, "Vertex-Label", nil}}
 		assert.Equal(t, fmt.Sprintf("v[%s]", uid.String()), v.String())
 	})
 
@@ -38,21 +38,21 @@
 		uidEdge, _ := uuid.NewUUID()
 		uidIn, _ := uuid.NewUUID()
 		uidOut, _ := uuid.NewUUID()
-		v := Edge{Element{uidEdge, "edge_label"}, Vertex{Element{uidOut, "vertex_out"}}, Vertex{Element{uidIn, "vertex_in"}}}
+		v := Edge{Element{uidEdge, "edge_label", nil}, Vertex{Element{uidOut, "vertex_out", nil}}, Vertex{Element{uidIn, "vertex_in", nil}}}
 		assert.Equal(t, fmt.Sprintf("e[%s][%s-edge_label->%s]", uidEdge.String(), uidOut.String(), uidIn.String()), v.String())
 	})
 
 	t.Run("Test VertexProperty.String()", func(t *testing.T) {
 		uidVProp, _ := uuid.NewUUID()
 		uidV, _ := uuid.NewUUID()
-		v := VertexProperty{Element{uidVProp, "Vertex-prop"}, "Vertex", []uint32{0, 1}, Vertex{Element{uidV, "Vertex"}}}
+		v := VertexProperty{Element{uidVProp, "Vertex-prop", nil}, "Vertex", []uint32{0, 1}, Vertex{Element{uidV, "Vertex", nil}}}
 		assert.Equal(t, "vp[Vertex-prop->[0 1]]", v.String())
 	})
 
 	t.Run("Test Property.String()", func(t *testing.T) {
 		uidElement, _ := uuid.NewUUID()
 		data := []uint32{0, 1}
-		p := Property{"property-Key", data, Element{uidElement, "prop"}}
+		p := Property{"property-Key", data, Element{uidElement, "prop", nil}}
 		assert.Equal(t, "p[property-Key->[0 1]]", p.String())
 	})
 
diff --git a/gremlin-go/driver/request.go b/gremlin-go/driver/request.go
index d1cd8a9..31a57ef 100644
--- a/gremlin-go/driver/request.go
+++ b/gremlin-go/driver/request.go
@@ -71,6 +71,10 @@
 		newArgs["userAgent"] = requestOptions.userAgent
 	}
 
+	if requestOptions.materializeProperties != "" {
+		newArgs["materializeProperties"] = requestOptions.materializeProperties
+	}
+
 	return request{
 		requestID: requestId,
 		op:        stringOp,
@@ -112,10 +116,11 @@
 // allowedReqArgs contains the arguments that will be extracted from the
 // bytecode and sent with the request.
 var allowedReqArgs = map[string]bool{
-	"evaluationTimeout": true,
-	"batchSize":         true,
-	"requestId":         true,
-	"userAgent":         true,
+	"evaluationTimeout":     true,
+	"batchSize":             true,
+	"requestId":             true,
+	"userAgent":             true,
+	"materializeProperties": true,
 }
 
 // extractReqArgs extracts request arguments from the provided bytecode.
diff --git a/gremlin-go/driver/requestOptions.go b/gremlin-go/driver/requestOptions.go
index 4153eb1..8543864 100644
--- a/gremlin-go/driver/requestOptions.go
+++ b/gremlin-go/driver/requestOptions.go
@@ -24,19 +24,21 @@
 )
 
 type RequestOptions struct {
-	requestID         uuid.UUID
-	evaluationTimeout int
-	batchSize         int
-	userAgent         string
-	bindings          map[string]interface{}
+	requestID             uuid.UUID
+	evaluationTimeout     int
+	batchSize             int
+	userAgent             string
+	bindings              map[string]interface{}
+	materializeProperties string
 }
 
 type RequestOptionsBuilder struct {
-	requestID         uuid.UUID
-	evaluationTimeout int
-	batchSize         int
-	userAgent         string
-	bindings          map[string]interface{}
+	requestID             uuid.UUID
+	evaluationTimeout     int
+	batchSize             int
+	userAgent             string
+	bindings              map[string]interface{}
+	materializeProperties string
 }
 
 func (builder *RequestOptionsBuilder) SetRequestId(requestId uuid.UUID) *RequestOptionsBuilder {
@@ -64,6 +66,11 @@
 	return builder
 }
 
+func (builder *RequestOptionsBuilder) SetMaterializeProperties(materializeProperties string) *RequestOptionsBuilder {
+	builder.materializeProperties = materializeProperties
+	return builder
+}
+
 func (builder *RequestOptionsBuilder) AddBinding(key string, binding interface{}) *RequestOptionsBuilder {
 	if builder.bindings == nil {
 		builder.bindings = make(map[string]interface{})
@@ -80,6 +87,7 @@
 	requestOptions.batchSize = builder.batchSize
 	requestOptions.userAgent = builder.userAgent
 	requestOptions.bindings = builder.bindings
+	requestOptions.materializeProperties = builder.materializeProperties
 
 	return *requestOptions
 }
diff --git a/gremlin-go/driver/requestOptions_test.go b/gremlin-go/driver/requestOptions_test.go
index 6eb6259..972f067 100644
--- a/gremlin-go/driver/requestOptions_test.go
+++ b/gremlin-go/driver/requestOptions_test.go
@@ -44,6 +44,10 @@
 		r := new(RequestOptionsBuilder).SetUserAgent("TestUserAgent").Create()
 		assert.Equal(t, "TestUserAgent", r.userAgent)
 	})
+	t.Run("Test RequestOptionsBuilder with custom materializeProperties", func(t *testing.T) {
+		r := new(RequestOptionsBuilder).SetMaterializeProperties("TestMaterializeProperties").Create()
+		assert.Equal(t, "TestMaterializeProperties", r.materializeProperties)
+	})
 	t.Run("Test RequestOptionsBuilder with custom bindings", func(t *testing.T) {
 		bindings := map[string]interface{}{"x": 2, "y": 5}
 		r := new(RequestOptionsBuilder).SetBindings(bindings).Create()
diff --git a/gremlin-go/driver/result_test.go b/gremlin-go/driver/result_test.go
index 0ef6291..79ec16a 100644
--- a/gremlin-go/driver/result_test.go
+++ b/gremlin-go/driver/result_test.go
@@ -343,7 +343,7 @@
 		element := Element{}
 		r := Result{&element}
 		res := r.String()
-		assert.Equal(t, "result{object=&{<nil> } class=*gremlingo.Element}", res)
+		assert.Equal(t, "result{object=&{<nil>  <nil>} class=*gremlingo.Element}", res)
 	})
 
 	t.Run("Test Result.GetType() simple type", func(t *testing.T) {
diff --git a/gremlin-go/driver/serializer.go b/gremlin-go/driver/serializer.go
index c565469..04a7e46 100644
--- a/gremlin-go/driver/serializer.go
+++ b/gremlin-go/driver/serializer.go
@@ -268,6 +268,7 @@
 		cardinalityType:       enumWriter,
 		columnType:            enumWriter,
 		directionType:         enumWriter,
+		dtType:                enumWriter,
 		operatorType:          enumWriter,
 		orderType:             enumWriter,
 		pickType:              enumWriter,
@@ -323,6 +324,7 @@
 		bulkSetType:        bulkSetReader,
 		tType:              enumReader,
 		directionType:      enumReader,
+		dtType:             enumReader,
 		bindingType:        bindingReader,
 
 		// Metrics
diff --git a/gremlin-go/driver/strategies.go b/gremlin-go/driver/strategies.go
index 7c7a5f3..756d3c3 100644
--- a/gremlin-go/driver/strategies.go
+++ b/gremlin-go/driver/strategies.go
@@ -307,9 +307,10 @@
 // IncidentToAdjacentStrategy looks for .OutE().InV(), .InE().OutV() and .BothE().OtherV()
 // and replaces these step sequences with .Out(), .In() or .Both() respectively.
 // The strategy won't modify the traversal if:
-//   the Edge step is labeled
-//   the traversal contains a Path step
-//   the traversal contains a Lambda step
+//
+//	the Edge step is labeled
+//	the traversal contains a Path step
+//	the traversal contains a Lambda step
 func IncidentToAdjacentStrategy() TraversalStrategy {
 	return &traversalStrategy{name: optimizationNamespace + "IncidentToAdjacentStrategy"}
 }
@@ -379,9 +380,10 @@
 // RepeatUnrollStrategy is an OLTP-only strategy that unrolls any RepeatStep if it uses a constant
 // number of loops (Times(x)) and doesn't emit intermittent elements. If any of the following 3 steps appears
 // within the Repeat-traversal, the strategy will not be applied:
-//   DedupGlobalStep
-//   LoopsStep
-//   LambdaHolder
+//
+//	DedupGlobalStep
+//	LoopsStep
+//	LambdaHolder
 func RepeatUnrollStrategy() TraversalStrategy {
 	return &traversalStrategy{name: optimizationNamespace + "RepeatUnrollStrategy"}
 }
diff --git a/gremlin-go/driver/traversal.go b/gremlin-go/driver/traversal.go
index 2de6f84..ce07501 100644
--- a/gremlin-go/driver/traversal.go
+++ b/gremlin-go/driver/traversal.go
@@ -155,6 +155,36 @@
 	Set:    "set",
 }
 
+type cv struct {
+	Bytecode *Bytecode
+}
+
+type CardValue interface {
+	Single(val interface{}) Bytecode
+	Set(val interface{}) Bytecode
+	List(val interface{}) Bytecode
+}
+
+var CardinalityValue CardValue = &cv{}
+
+func (*cv) Single(val interface{}) Bytecode {
+	bc := Bytecode{}
+	bc.AddSource("CardinalityValueTraversal", Cardinality.Single, val)
+	return bc
+}
+
+func (*cv) Set(val interface{}) Bytecode {
+	bc := Bytecode{}
+	bc.AddSource("CardinalityValueTraversal", Cardinality.Set, val)
+	return bc
+}
+
+func (*cv) List(val interface{}) Bytecode {
+	bc := Bytecode{}
+	bc.AddSource("CardinalityValueTraversal", Cardinality.List, val)
+	return bc
+}
+
 type column string
 
 type columns struct {
@@ -271,6 +301,38 @@
 	Value: "value",
 }
 
+type materializeProperties struct {
+	All    string
+	Tokens string
+}
+
+// MaterializeProperties is string symbols.
+var MaterializeProperties = materializeProperties{
+	All:    "all",
+	Tokens: "tokens",
+}
+
+type dt string
+
+type dts struct {
+	// time period second
+	Second dt
+	// time period minute
+	Minute dt
+	// time period hour
+	Hour dt
+	// time period day
+	Day dt
+}
+
+// Merge is a set of operations for Vertex and Edge merging.
+var DT = dts{
+	Second: "second",
+	Minute: "minute",
+	Hour:   "hour",
+	Day:    "day",
+}
+
 type merge string
 
 type merges struct {
diff --git a/gremlin-go/driver/traversal_test.go b/gremlin-go/driver/traversal_test.go
index 3f4493a..4427884 100644
--- a/gremlin-go/driver/traversal_test.go
+++ b/gremlin-go/driver/traversal_test.go
@@ -29,7 +29,6 @@
 )
 
 func TestTraversal(t *testing.T) {
-	testTransactionEnable := getEnvOrDefaultBool("TEST_TRANSACTIONS", true)
 
 	t.Run("Test clone traversal", func(t *testing.T) {
 		g := cloneGraphTraversalSource(&Graph{}, NewBytecode(nil), nil)
@@ -76,7 +75,6 @@
 	})
 
 	t.Run("Test Transaction commit", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -106,7 +104,6 @@
 	})
 
 	t.Run("Test Transaction rollback", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -136,7 +133,6 @@
 	})
 
 	t.Run("Test Transaction flows", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -183,7 +179,6 @@
 	})
 
 	t.Run("Test multi commit Transaction", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -218,7 +213,6 @@
 	})
 
 	t.Run("Test multi rollback Transaction", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -253,7 +247,6 @@
 	})
 
 	t.Run("Test multi commit and rollback Transaction", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -288,7 +281,6 @@
 	})
 
 	t.Run("Test Transaction close", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -324,7 +316,6 @@
 	})
 
 	t.Run("Test Transaction close tx from parent", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a transaction traversal.
 		remote := newConnection(t)
 		g := Traversal_().WithRemote(remote)
@@ -362,7 +353,6 @@
 	})
 
 	t.Run("Test commit if no transaction started", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a traversal.
 		g := newWithOptionsConnection(t)
 
@@ -375,7 +365,6 @@
 	})
 
 	t.Run("Test rollback if no transaction started", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a traversal.
 		g := newWithOptionsConnection(t)
 
@@ -388,7 +377,6 @@
 	})
 
 	t.Run("Test commit if no transaction support for Graph", func(t *testing.T) {
-		skipTestsIfNotEnabled(t, integrationTestSuiteName, testTransactionEnable)
 		// Start a traversal.
 		g := newWithOptionsConnection(t)
 
diff --git a/gremlin-go/driver/user_agent.go b/gremlin-go/driver/user_agent.go
index a9a06fe..80461f9 100644
--- a/gremlin-go/driver/user_agent.go
+++ b/gremlin-go/driver/user_agent.go
@@ -37,7 +37,7 @@
 
 const userAgentHeader = "User-Agent"
 
-const gremlinVersion = "3.6.8-SNAPSHOT" // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+const gremlinVersion = "3.7.3-SNAPSHOT" // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
 func init() {
 	applicationName := "NotAvailable"
diff --git a/gremlin-go/examples/go.mod b/gremlin-go/examples/go.mod
index be7ba3f..4ac0524 100644
--- a/gremlin-go/examples/go.mod
+++ b/gremlin-go/examples/go.mod
@@ -19,7 +19,7 @@
 
 go 1.21
 
-require github.com/apache/tinkerpop/gremlin-go/v3 v3.6.6
+require github.com/apache/tinkerpop/gremlin-go/v3 v3.7.1
 
 require (
 	github.com/google/uuid v1.3.0 // indirect
diff --git a/gremlin-go/examples/go.sum b/gremlin-go/examples/go.sum
index 2e48c0a..5aa72a5 100644
--- a/gremlin-go/examples/go.sum
+++ b/gremlin-go/examples/go.sum
@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
 github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/apache/tinkerpop/gremlin-go/v3 v3.6.5 h1:JafEkhoITZ+0W9/U6uow7zWTqfdZwgFNPPzxM+53C+E=
-github.com/apache/tinkerpop/gremlin-go/v3 v3.6.5/go.mod h1:yGalCq736URRMAzVMI6hrMMzaW/fsg4cwXfLRI7uhMw=
+github.com/apache/tinkerpop/gremlin-go/v3 v3.7.0 h1:WSHdJ/UKSSYZj8E2QzEdUsaV54rWAoNlQSPm4x/o/sY=
+github.com/apache/tinkerpop/gremlin-go/v3 v3.7.0/go.mod h1:3cydTAyTJzOEI4RWqbNHtsbtnUuYmBR8ZeAxNs+yRcw=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
diff --git a/gremlin-go/go.mod b/gremlin-go/go.mod
index fe48f54..49cc26d 100644
--- a/gremlin-go/go.mod
+++ b/gremlin-go/go.mod
@@ -26,6 +26,7 @@
 	github.com/nicksnyder/go-i18n/v2 v2.4.0
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/text v0.14.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
diff --git a/gremlin-go/pom.xml b/gremlin-go/pom.xml
index eab020f..aaf75d0 100644
--- a/gremlin-go/pom.xml
+++ b/gremlin-go/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-go</artifactId>
     <name>Apache TinkerPop :: Gremlin Go</name>
@@ -29,7 +29,6 @@
         <!-- provides a way to convert maven.test.skip value to skipTests for use in skipping go tests -->
         <maven.test.skip>false</maven.test.skip>
         <skipTests>${maven.test.skip}</skipTests>
-        <TEST_TRANSACTIONS>false</TEST_TRANSACTIONS>
         <gremlin.server.dir>${project.parent.basedir}/gremlin-server</gremlin.server.dir>
     </properties>
     <build>
@@ -178,12 +177,7 @@
                                 <version>${project.version}</version>
                             </dependency>
                             <dependency>
-                                <groupId>org.apache.tinkerpop</groupId>
-                                <artifactId>neo4j-gremlin</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
+                                <groupId>org.apache.groovy</groupId>
                                 <artifactId>groovy-all</artifactId>
                                 <version>${groovy.version}</version>
                                 <type>pom</type>
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 5bf20fa..95b28e0 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-groovy</artifactId>
     <name>Apache TinkerPop :: Gremlin Groovy</name>
@@ -43,49 +43,30 @@
             <version>2.5.1</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
             <version>${groovy.version}</version>
-            <classifier>indy</classifier>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-groovysh</artifactId>
             <version>${groovy.version}</version>
-            <classifier>indy</classifier>
             <exclusions>
-                <!-- exclude non-indy type -->
                 <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>groovy</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-util</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-json</artifactId>
             <version>${groovy.version}</version>
-            <classifier>indy</classifier>
-            <exclusions>
-                <!-- exclude non-indy type -->
-                <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>groovy</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
             <version>${groovy.version}</version>
-            <classifier>indy</classifier>
-            <exclusions>
-                <!-- exclude non-indy type -->
-                <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>groovy</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -181,7 +162,7 @@
         <profile>
             <id>jdk11</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[11,18)</jdk>
             </activation>
             <build>
                 <plugins>
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy
index a9a2c56..3f76143 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/VarAsBindingASTTransformation.groovy
@@ -20,13 +20,12 @@
 package org.apache.tinkerpop.gremlin.groovy.jsr223.ast
 
 import org.apache.tinkerpop.gremlin.process.traversal.Order
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 import org.apache.tinkerpop.gremlin.process.traversal.Translator
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode
 import org.apache.tinkerpop.gremlin.process.traversal.Bindings
-import org.apache.tinkerpop.gremlin.util.tools.CollectionFactory
+import org.apache.tinkerpop.gremlin.util.CollectionUtil
 import org.codehaus.groovy.ast.ASTNode
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.CodeVisitorSupport
@@ -123,7 +122,7 @@
                                 case GraphTraversal.Symbols.mergeE:
                                 case GraphTraversal.Symbols.mergeV:
                                     bindingValue = new MethodCallExpression(
-                                        new ClassExpression(new ClassNode(CollectionFactory)), "asMap",
+                                        new ClassExpression(new ClassNode(CollectionUtil)), "asMap",
                                         new TupleExpression(new ConstantExpression(UUID.randomUUID().toString()),
                                                             new ConstantExpression(UUID.randomUUID().toString())))
                                     break
@@ -131,7 +130,7 @@
                                 case GraphTraversal.Symbols.option:
                                     if (i == 1)
                                         bindingValue = new MethodCallExpression(
-                                            new ClassExpression(new ClassNode(CollectionFactory)), "asMap",
+                                            new ClassExpression(new ClassNode(CollectionUtil)), "asMap",
                                             new TupleExpression(new ConstantExpression(UUID.randomUUID().toString()),
                                                                 new ConstantExpression(UUID.randomUUID().toString())))
                                     break
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
index 50e1aec..a316428 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
@@ -356,14 +356,14 @@
                 .afterTimeout((b) -> timeOutCount.countDown()).create();
         try {
             final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
-                    .evaluationTimeoutOverride(250L).create();
-            gremlinExecutor.eval("Thread.sleep(1000);10", "gremlin-groovy", new SimpleBindings(), lifeCycle).get();
+                    .evaluationTimeoutOverride(100L).create();
+            gremlinExecutor.eval("Thread.sleep(9000);10", "gremlin-groovy", new SimpleBindings(), lifeCycle).get();
             fail("This script should have timed out with an exception");
         } catch (Exception ex) {
             assertEquals(TimeoutException.class, ex.getCause().getClass());
         }
 
-        assertTrue(timeOutCount.await(2000, TimeUnit.MILLISECONDS));
+        assertTrue(timeOutCount.await(10000, TimeUnit.MILLISECONDS));
 
         assertFalse(successCalled.get());
         assertFalse(failureCalled.get());
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index c319541..2b9761e 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@ -126,7 +126,6 @@
     public void shouldPromoteDefinedVarsInInterpreterModeWithNoBindings() throws Exception {
         final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine(new InterpreterModeGroovyCustomizer());
         engine.eval("def addItUp = { x, y -> x + y }");
-        engine.eval("def class A { def sub(int x, int y) {x - y}}");
         assertEquals(3, engine.eval("int xxx = 1 + 2"));
         assertEquals(4, engine.eval("yyy = xxx + 1"));
         assertEquals(7, engine.eval("def zzz = yyy + xxx"));
@@ -142,7 +141,6 @@
             assertThat(root, instanceOf(MissingPropertyException.class));
         }
 
-        assertEquals(9, engine.eval("new A().sub(10, 1)"));
         assertEquals(10, engine.eval("addItUp(zzz,xxx)"));
     }
 
diff --git a/gremlin-javascript/build/generate.groovy b/gremlin-javascript/build/generate.groovy
index deb9687..55656ba 100644
--- a/gremlin-javascript/build/generate.groovy
+++ b/gremlin-javascript/build/generate.groovy
@@ -95,6 +95,7 @@
                     'const __ = graphTraversalModule.statics;\n' +
                     'const Barrier = traversalModule.barrier\n' +
                     'const Cardinality = traversalModule.cardinality\n' +
+                    'const CardinalityValue = graphTraversalModule.CardinalityValue;\n' +
                     'const Column = traversalModule.column\n' +
                     'const Direction = {\n' +
                     '    BOTH: traversalModule.direction.both,\n' +
@@ -103,6 +104,7 @@
                     '    from_: traversalModule.direction.out,\n' +
                     '    to: traversalModule.direction.in\n' +
                     '};\n' +
+                    'const DT = traversalModule.dt;\n' +
                     'const Merge = traversalModule.merge;\n' +
                     'const P = traversalModule.P;\n' +
                     'const Pick = traversalModule.pick\n' +
diff --git a/gremlin-javascript/examples/browser/.gitignore b/gremlin-javascript/examples/browser/.gitignore
new file mode 100644
index 0000000..1839250
--- /dev/null
+++ b/gremlin-javascript/examples/browser/.gitignore
@@ -0,0 +1,32 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/gremlin-javascript/examples/browser/.yarnrc.yml b/gremlin-javascript/examples/browser/.yarnrc.yml
new file mode 100644
index 0000000..3186f3f
--- /dev/null
+++ b/gremlin-javascript/examples/browser/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/gremlin-javascript/examples/browser/index.css b/gremlin-javascript/examples/browser/index.css
new file mode 100644
index 0000000..4090ba4
--- /dev/null
+++ b/gremlin-javascript/examples/browser/index.css
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+body {
+  margin: 0;
+  background-color: rgb(27, 30, 34);
+  background-image: radial-gradient(rgb(51, 64, 76) 1px, transparent 0);
+  background-size: 35px 35px;
+}
+
+#graph {
+  min-width: 100dvw;
+  min-height: 100dvh;
+}
diff --git a/gremlin-javascript/examples/browser/index.html b/gremlin-javascript/examples/browser/index.html
new file mode 100644
index 0000000..fa9ca83
--- /dev/null
+++ b/gremlin-javascript/examples/browser/index.html
@@ -0,0 +1,32 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Gremlin JavaScript</title>
+    <link rel="stylesheet" href="index.css" />
+  </head>
+  <body>
+    <main id="graph"></main>
+    <script type="module" src="index.js"></script>
+  </body>
+</html>
diff --git a/gremlin-javascript/examples/browser/index.js b/gremlin-javascript/examples/browser/index.js
new file mode 100644
index 0000000..7af7084
--- /dev/null
+++ b/gremlin-javascript/examples/browser/index.js
@@ -0,0 +1,92 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+import Color from "colorjs.io";
+import cytoscape from "cytoscape";
+import gremlin from "gremlin";
+import { createRandomColorGenerator } from "./utils";
+
+const randomColor = createRandomColorGenerator();
+
+const g = gremlin.process.AnonymousTraversalSource.traversal().withRemote(
+  new gremlin.driver.DriverRemoteConnection("ws://localhost:8182/gremlin")
+);
+
+const [vertices, edges] = await Promise.all([
+  await g.V().toList(),
+  await g.E().toList(),
+]);
+
+cytoscape({
+  container: globalThis.document.getElementById("graph"),
+  elements: [
+    ...vertices.map((vertex) => ({
+      data: {
+        id: vertex.id,
+      },
+      style: {
+        label: `${vertex.label}\n${vertex.id}`,
+        "background-color": randomColor(vertex.label),
+        "border-color": new Color(randomColor(vertex.label)).darken().toString({
+          format: "hex",
+        }),
+      },
+    })),
+    ...edges.map((edge) => ({
+      data: {
+        id: edge.id,
+        label: edge.label,
+        source: edge.inV.id,
+        target: edge.outV.id,
+      },
+    })),
+  ],
+  style: [
+    {
+      selector: "node",
+      style: {
+        color: "white",
+        "text-valign": "center",
+        "text-halign": "center",
+        "border-width": 4,
+        width: "80px",
+        height: "80px",
+        "text-max-width": "80px",
+        "text-wrap": "wrap",
+      },
+    },
+
+    {
+      selector: "edge",
+      style: {
+        label: "data(label)",
+        color: "white",
+        "text-outline-color": "black",
+        "text-outline-width": "2px",
+        "text-margin-y": "-6px",
+        "text-rotation": "autorotate",
+        "target-arrow-shape": "triangle",
+        "curve-style": "bezier",
+      },
+    },
+  ],
+  layout: {
+    name: "cose",
+  },
+});
diff --git a/gremlin-javascript/examples/browser/package.json b/gremlin-javascript/examples/browser/package.json
new file mode 100644
index 0000000..74d197f
--- /dev/null
+++ b/gremlin-javascript/examples/browser/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "browser",
+  "version": "0.0.0",
+  "description": "GLV example for JavaScript in the browser",
+  "author": "Apache TinkerPop team",
+  "license": "Apache-2.0",
+  "type": "module",
+  "packageManager": "yarn@4.1.0",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "colorjs.io": "^0.5.0",
+    "cytoscape": "^3.28.1",
+    "gremlin": "file:../../src/main/javascript/gremlin-javascript"
+  },
+  "devDependencies": {
+    "vite": "^5.1.4"
+  }
+}
diff --git a/gremlin-javascript/examples/browser/utils.js b/gremlin-javascript/examples/browser/utils.js
new file mode 100644
index 0000000..ec76f70
--- /dev/null
+++ b/gremlin-javascript/examples/browser/utils.js
@@ -0,0 +1,74 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+function shuffle(array) {
+  const length = array == null ? 0 : array.length;
+  if (!length) {
+    return [];
+  }
+  let index = -1;
+  const lastIndex = length - 1;
+  while (++index < length) {
+    const rand = index + Math.floor(Math.random() * (lastIndex - index + 1));
+    const value = array[rand];
+    array[rand] = array[index];
+    array[index] = value;
+  }
+  return array;
+}
+
+export const createRandomColorGenerator = () => {
+  const colors = [
+    "#C62828",
+    "#AD1457",
+    "#6A1B9A",
+    "#4527A0",
+    "#283593",
+    "#1565C0",
+    "#0277BD",
+    "#00838F",
+    "#00695C",
+    "#2E7D32",
+    "#558B2F",
+    "#9E9D24",
+    "#F9A825",
+    "#FF8F00",
+    "#EF6C00",
+    "#D84315",
+    "#4E342E",
+    "#424242",
+    "#37474F",
+  ];
+
+  const colorMap = new Map();
+
+  return (key) => {
+    const storedColor = colorMap.get(key);
+
+    if (storedColor !== undefined) {
+      return storedColor;
+    }
+
+    const color = shuffle(colors).pop();
+
+    colorMap.set(key, color);
+
+    return color;
+  };
+};
diff --git a/gremlin-javascript/examples/browser/yarn.lock b/gremlin-javascript/examples/browser/yarn.lock
new file mode 100644
index 0000000..256cf44
--- /dev/null
+++ b/gremlin-javascript/examples/browser/yarn.lock
@@ -0,0 +1,1498 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"@esbuild/aix-ppc64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/aix-ppc64@npm:0.19.12"
+  conditions: os=aix & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/android-arm64@npm:0.19.12"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/android-arm@npm:0.19.12"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/android-x64@npm:0.19.12"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-arm64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/darwin-arm64@npm:0.19.12"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/darwin-x64@npm:0.19.12"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-arm64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/freebsd-arm64@npm:0.19.12"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/freebsd-x64@npm:0.19.12"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-arm64@npm:0.19.12"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-arm@npm:0.19.12"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ia32@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-ia32@npm:0.19.12"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-loong64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-loong64@npm:0.19.12"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-mips64el@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-mips64el@npm:0.19.12"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ppc64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-ppc64@npm:0.19.12"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-riscv64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-riscv64@npm:0.19.12"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-s390x@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-s390x@npm:0.19.12"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/linux-x64@npm:0.19.12"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/netbsd-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/netbsd-x64@npm:0.19.12"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/openbsd-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/openbsd-x64@npm:0.19.12"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/sunos-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/sunos-x64@npm:0.19.12"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-arm64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/win32-arm64@npm:0.19.12"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-ia32@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/win32-ia32@npm:0.19.12"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-x64@npm:0.19.12":
+  version: 0.19.12
+  resolution: "@esbuild/win32-x64@npm:0.19.12"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
+  dependencies:
+    string-width: "npm:^5.1.2"
+    string-width-cjs: "npm:string-width@^4.2.0"
+    strip-ansi: "npm:^7.0.1"
+    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
+    wrap-ansi: "npm:^8.1.0"
+    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
+  checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e
+  languageName: node
+  linkType: hard
+
+"@npmcli/agent@npm:^2.0.0":
+  version: 2.2.1
+  resolution: "@npmcli/agent@npm:2.2.1"
+  dependencies:
+    agent-base: "npm:^7.1.0"
+    http-proxy-agent: "npm:^7.0.0"
+    https-proxy-agent: "npm:^7.0.1"
+    lru-cache: "npm:^10.0.1"
+    socks-proxy-agent: "npm:^8.0.1"
+  checksum: 10c0/38ee5cbe8f3cde13be916e717bfc54fd1a7605c07af056369ff894e244c221e0b56b08ca5213457477f9bc15bca9e729d51a4788829b5c3cf296b3c996147f76
+  languageName: node
+  linkType: hard
+
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@npmcli/fs@npm:3.1.0"
+  dependencies:
+    semver: "npm:^7.3.5"
+  checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
+  languageName: node
+  linkType: hard
+
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm-eabi@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.12.0"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm64@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-android-arm64@npm:4.12.0"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-arm64@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.12.0"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-x64@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-darwin-x64@npm:4.12.0"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.12.0"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-gnu@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.12.0"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-musl@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.12.0"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-riscv64-gnu@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.12.0"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-gnu@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.12.0"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-musl@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.12.0"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-arm64-msvc@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.12.0"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-ia32-msvc@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.12.0"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-x64-msvc@npm:4.12.0":
+  version: 4.12.0
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.12.0"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:1.0.5":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
+  languageName: node
+  linkType: hard
+
+"abbrev@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "abbrev@npm:2.0.0"
+  checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
+  languageName: node
+  linkType: hard
+
+"abort-controller@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "abort-controller@npm:3.0.0"
+  dependencies:
+    event-target-shim: "npm:^5.0.0"
+  checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5
+  languageName: node
+  linkType: hard
+
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "agent-base@npm:7.1.0"
+  dependencies:
+    debug: "npm:^4.3.4"
+  checksum: 10c0/fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce
+  languageName: node
+  linkType: hard
+
+"aggregate-error@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "aggregate-error@npm:3.1.0"
+  dependencies:
+    clean-stack: "npm:^2.0.0"
+    indent-string: "npm:^4.0.0"
+  checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "ansi-regex@npm:5.0.1"
+  checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "ansi-regex@npm:6.0.1"
+  checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^4.0.0":
+  version: 4.3.0
+  resolution: "ansi-styles@npm:4.3.0"
+  dependencies:
+    color-convert: "npm:^2.0.1"
+  checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
+  languageName: node
+  linkType: hard
+
+"balanced-match@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "balanced-match@npm:1.0.2"
+  checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee
+  languageName: node
+  linkType: hard
+
+"base64-js@npm:^1.3.1":
+  version: 1.5.1
+  resolution: "base64-js@npm:1.5.1"
+  checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
+  languageName: node
+  linkType: hard
+
+"brace-expansion@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "brace-expansion@npm:2.0.1"
+  dependencies:
+    balanced-match: "npm:^1.0.0"
+  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
+  languageName: node
+  linkType: hard
+
+"browser@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "browser@workspace:."
+  dependencies:
+    colorjs.io: "npm:^0.5.0"
+    cytoscape: "npm:^3.28.1"
+    gremlin: "file:../../src/main/javascript/gremlin-javascript"
+    vite: "npm:^5.1.4"
+  languageName: unknown
+  linkType: soft
+
+"buffer@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "buffer@npm:6.0.3"
+  dependencies:
+    base64-js: "npm:^1.3.1"
+    ieee754: "npm:^1.2.1"
+  checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^18.0.0":
+  version: 18.0.2
+  resolution: "cacache@npm:18.0.2"
+  dependencies:
+    "@npmcli/fs": "npm:^3.1.0"
+    fs-minipass: "npm:^3.0.0"
+    glob: "npm:^10.2.2"
+    lru-cache: "npm:^10.0.1"
+    minipass: "npm:^7.0.3"
+    minipass-collect: "npm:^2.0.1"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    p-map: "npm:^4.0.0"
+    ssri: "npm:^10.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^3.0.0"
+  checksum: 10c0/7992665305cc251a984f4fdbab1449d50e88c635bc43bf2785530c61d239c61b349e5734461baa461caaee65f040ab14e2d58e694f479c0810cffd181ba5eabc
+  languageName: node
+  linkType: hard
+
+"chownr@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "chownr@npm:2.0.0"
+  checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
+  languageName: node
+  linkType: hard
+
+"clean-stack@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "clean-stack@npm:2.2.0"
+  checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "color-convert@npm:2.0.1"
+  dependencies:
+    color-name: "npm:~1.1.4"
+  checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
+  languageName: node
+  linkType: hard
+
+"color-name@npm:~1.1.4":
+  version: 1.1.4
+  resolution: "color-name@npm:1.1.4"
+  checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
+  languageName: node
+  linkType: hard
+
+"colorjs.io@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "colorjs.io@npm:0.5.0"
+  checksum: 10c0/3fa5ed32f2bc62ea133d8df9b267a2bd2e33d3acb8f86bf057b125967f4b7ac607179df15fe4371e4f883760ea939a93a234d6b655fac605166d68e98a55a24d
+  languageName: node
+  linkType: hard
+
+"cross-spawn@npm:^7.0.0":
+  version: 7.0.3
+  resolution: "cross-spawn@npm:7.0.3"
+  dependencies:
+    path-key: "npm:^3.1.0"
+    shebang-command: "npm:^2.0.0"
+    which: "npm:^2.0.1"
+  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
+  languageName: node
+  linkType: hard
+
+"cytoscape@npm:^3.28.1":
+  version: 3.28.1
+  resolution: "cytoscape@npm:3.28.1"
+  dependencies:
+    heap: "npm:^0.2.6"
+    lodash: "npm:^4.17.21"
+  checksum: 10c0/eefe6c3f0253ffdca46f9857e06eba947cb863df0583eaf5bb112bc640425608b983847ee3a5b864f9833b80a9bc41a8dc5d675555b107a3321006edfff504ef
+  languageName: node
+  linkType: hard
+
+"debug@npm:4, debug@npm:^4.3.4":
+  version: 4.3.4
+  resolution: "debug@npm:4.3.4"
+  dependencies:
+    ms: "npm:2.1.2"
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
+  languageName: node
+  linkType: hard
+
+"eastasianwidth@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "eastasianwidth@npm:0.2.0"
+  checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "emoji-regex@npm:8.0.0"
+  checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^9.2.2":
+  version: 9.2.2
+  resolution: "emoji-regex@npm:9.2.2"
+  checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639
+  languageName: node
+  linkType: hard
+
+"encoding@npm:^0.1.13":
+  version: 0.1.13
+  resolution: "encoding@npm:0.1.13"
+  dependencies:
+    iconv-lite: "npm:^0.6.2"
+  checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
+  languageName: node
+  linkType: hard
+
+"env-paths@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "env-paths@npm:2.2.1"
+  checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
+  languageName: node
+  linkType: hard
+
+"err-code@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "err-code@npm:2.0.3"
+  checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.19.3":
+  version: 0.19.12
+  resolution: "esbuild@npm:0.19.12"
+  dependencies:
+    "@esbuild/aix-ppc64": "npm:0.19.12"
+    "@esbuild/android-arm": "npm:0.19.12"
+    "@esbuild/android-arm64": "npm:0.19.12"
+    "@esbuild/android-x64": "npm:0.19.12"
+    "@esbuild/darwin-arm64": "npm:0.19.12"
+    "@esbuild/darwin-x64": "npm:0.19.12"
+    "@esbuild/freebsd-arm64": "npm:0.19.12"
+    "@esbuild/freebsd-x64": "npm:0.19.12"
+    "@esbuild/linux-arm": "npm:0.19.12"
+    "@esbuild/linux-arm64": "npm:0.19.12"
+    "@esbuild/linux-ia32": "npm:0.19.12"
+    "@esbuild/linux-loong64": "npm:0.19.12"
+    "@esbuild/linux-mips64el": "npm:0.19.12"
+    "@esbuild/linux-ppc64": "npm:0.19.12"
+    "@esbuild/linux-riscv64": "npm:0.19.12"
+    "@esbuild/linux-s390x": "npm:0.19.12"
+    "@esbuild/linux-x64": "npm:0.19.12"
+    "@esbuild/netbsd-x64": "npm:0.19.12"
+    "@esbuild/openbsd-x64": "npm:0.19.12"
+    "@esbuild/sunos-x64": "npm:0.19.12"
+    "@esbuild/win32-arm64": "npm:0.19.12"
+    "@esbuild/win32-ia32": "npm:0.19.12"
+    "@esbuild/win32-x64": "npm:0.19.12"
+  dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 10c0/0f2d21ffe24ebead64843f87c3aebe2e703a5ed9feb086a0728b24907fac2eb9923e4a79857d3df9059c915739bd7a870dd667972eae325c67f478b592b8582d
+  languageName: node
+  linkType: hard
+
+"event-target-shim@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "event-target-shim@npm:5.0.1"
+  checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b
+  languageName: node
+  linkType: hard
+
+"eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 10c0/4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814
+  languageName: node
+  linkType: hard
+
+"events@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "events@npm:3.3.0"
+  checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
+  languageName: node
+  linkType: hard
+
+"exponential-backoff@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "exponential-backoff@npm:3.1.1"
+  checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
+  languageName: node
+  linkType: hard
+
+"foreground-child@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "foreground-child@npm:3.1.1"
+  dependencies:
+    cross-spawn: "npm:^7.0.0"
+    signal-exit: "npm:^4.0.1"
+  checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
+  languageName: node
+  linkType: hard
+
+"fs-minipass@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "fs-minipass@npm:2.1.0"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
+  languageName: node
+  linkType: hard
+
+"fs-minipass@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94
+  languageName: node
+  linkType: hard
+
+"fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
+  dependencies:
+    node-gyp: "npm:latest"
+  checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
+  dependencies:
+    node-gyp: "npm:latest"
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"glob@npm:^10.2.2, glob@npm:^10.3.10":
+  version: 10.3.10
+  resolution: "glob@npm:10.3.10"
+  dependencies:
+    foreground-child: "npm:^3.1.0"
+    jackspeak: "npm:^2.3.5"
+    minimatch: "npm:^9.0.1"
+    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry: "npm:^1.10.1"
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 10c0/13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d
+  languageName: node
+  linkType: hard
+
+"graceful-fs@npm:^4.2.6":
+  version: 4.2.11
+  resolution: "graceful-fs@npm:4.2.11"
+  checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
+  languageName: node
+  linkType: hard
+
+"gremlin@file:../../src/main/javascript/gremlin-javascript::locator=browser%40workspace%3A.":
+  version: 3.7.2-alpha1
+  resolution: "gremlin@file:../../src/main/javascript/gremlin-javascript#../../src/main/javascript/gremlin-javascript::hash=4bd845&locator=browser%40workspace%3A."
+  dependencies:
+    buffer: "npm:^6.0.3"
+    eventemitter3: "npm:^5.0.1"
+    readable-stream: "npm:^4.5.2"
+    uuid: "npm:^9.0.1"
+    ws: "npm:^8.16.0"
+  checksum: 10c0/1a8172b44851cb71eb11f5aee438034912762351d941684fae942a142d9d757e3be72bd136a5cc43dd81dd00594a17c36009d46ef06e0ba4120f7644aefa675e
+  languageName: node
+  linkType: hard
+
+"heap@npm:^0.2.6":
+  version: 0.2.7
+  resolution: "heap@npm:0.2.7"
+  checksum: 10c0/341c5d51ae13dc8346c371a8a69c57c972fcb9a3233090d3dd5ba29d483d6b5b4e75492443cbfeacd46608bb30e6680f646ffb7a6205900221735587d07a79b6
+  languageName: node
+  linkType: hard
+
+"http-cache-semantics@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
+  languageName: node
+  linkType: hard
+
+"http-proxy-agent@npm:^7.0.0":
+  version: 7.0.2
+  resolution: "http-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: "npm:^7.1.0"
+    debug: "npm:^4.3.4"
+  checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921
+  languageName: node
+  linkType: hard
+
+"https-proxy-agent@npm:^7.0.1":
+  version: 7.0.4
+  resolution: "https-proxy-agent@npm:7.0.4"
+  dependencies:
+    agent-base: "npm:^7.0.2"
+    debug: "npm:4"
+  checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b
+  languageName: node
+  linkType: hard
+
+"iconv-lite@npm:^0.6.2":
+  version: 0.6.3
+  resolution: "iconv-lite@npm:0.6.3"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
+  checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
+  languageName: node
+  linkType: hard
+
+"ieee754@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "ieee754@npm:1.2.1"
+  checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
+  languageName: node
+  linkType: hard
+
+"imurmurhash@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "imurmurhash@npm:0.1.4"
+  checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6
+  languageName: node
+  linkType: hard
+
+"indent-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "indent-string@npm:4.0.0"
+  checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
+  languageName: node
+  linkType: hard
+
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: "npm:1.1.0"
+    sprintf-js: "npm:^1.1.3"
+  checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc
+  languageName: node
+  linkType: hard
+
+"is-fullwidth-code-point@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-fullwidth-code-point@npm:3.0.0"
+  checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc
+  languageName: node
+  linkType: hard
+
+"is-lambda@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-lambda@npm:1.0.1"
+  checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "isexe@npm:2.0.0"
+  checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "isexe@npm:3.1.1"
+  checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7
+  languageName: node
+  linkType: hard
+
+"jackspeak@npm:^2.3.5":
+  version: 2.3.6
+  resolution: "jackspeak@npm:2.3.6"
+  dependencies:
+    "@isaacs/cliui": "npm:^8.0.2"
+    "@pkgjs/parseargs": "npm:^0.11.0"
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
+  languageName: node
+  linkType: hard
+
+"jsbn@npm:1.1.0":
+  version: 1.1.0
+  resolution: "jsbn@npm:1.1.0"
+  checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96
+  languageName: node
+  linkType: hard
+
+"lodash@npm:^4.17.21":
+  version: 4.17.21
+  resolution: "lodash@npm:4.17.21"
+  checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
+  version: 10.2.0
+  resolution: "lru-cache@npm:10.2.0"
+  checksum: 10c0/c9847612aa2daaef102d30542a8d6d9b2c2bb36581c1bf0dc3ebf5e5f3352c772a749e604afae2e46873b930a9e9523743faac4e5b937c576ab29196774712ee
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "lru-cache@npm:6.0.0"
+  dependencies:
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
+  languageName: node
+  linkType: hard
+
+"make-fetch-happen@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "make-fetch-happen@npm:13.0.0"
+  dependencies:
+    "@npmcli/agent": "npm:^2.0.0"
+    cacache: "npm:^18.0.0"
+    http-cache-semantics: "npm:^4.1.1"
+    is-lambda: "npm:^1.0.1"
+    minipass: "npm:^7.0.2"
+    minipass-fetch: "npm:^3.0.0"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.3"
+    promise-retry: "npm:^2.0.1"
+    ssri: "npm:^10.0.0"
+  checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:^9.0.1":
+  version: 9.0.3
+  resolution: "minimatch@npm:9.0.3"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
+  languageName: node
+  linkType: hard
+
+"minipass-collect@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "minipass-collect@npm:2.0.1"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e
+  languageName: node
+  linkType: hard
+
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "minipass-fetch@npm:3.0.4"
+  dependencies:
+    encoding: "npm:^0.1.13"
+    minipass: "npm:^7.0.3"
+    minipass-sized: "npm:^1.0.3"
+    minizlib: "npm:^2.1.2"
+  dependenciesMeta:
+    encoding:
+      optional: true
+  checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
+  languageName: node
+  linkType: hard
+
+"minipass-flush@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "minipass-flush@npm:1.0.5"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd
+  languageName: node
+  linkType: hard
+
+"minipass-pipeline@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "minipass-pipeline@npm:1.2.4"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2
+  languageName: node
+  linkType: hard
+
+"minipass-sized@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "minipass-sized@npm:1.0.3"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^3.0.0":
+  version: 3.3.6
+  resolution: "minipass@npm:3.3.6"
+  dependencies:
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
+  version: 7.0.4
+  resolution: "minipass@npm:7.0.4"
+  checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
+  languageName: node
+  linkType: hard
+
+"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "minizlib@npm:2.1.2"
+  dependencies:
+    minipass: "npm:^3.0.0"
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
+  languageName: node
+  linkType: hard
+
+"mkdirp@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "mkdirp@npm:1.0.4"
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
+  languageName: node
+  linkType: hard
+
+"ms@npm:2.1.2":
+  version: 2.1.2
+  resolution: "ms@npm:2.1.2"
+  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
+  languageName: node
+  linkType: hard
+
+"nanoid@npm:^3.3.7":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
+  languageName: node
+  linkType: hard
+
+"negotiator@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "negotiator@npm:0.6.3"
+  checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
+  languageName: node
+  linkType: hard
+
+"node-gyp@npm:latest":
+  version: 10.0.1
+  resolution: "node-gyp@npm:10.0.1"
+  dependencies:
+    env-paths: "npm:^2.2.0"
+    exponential-backoff: "npm:^3.1.1"
+    glob: "npm:^10.3.10"
+    graceful-fs: "npm:^4.2.6"
+    make-fetch-happen: "npm:^13.0.0"
+    nopt: "npm:^7.0.0"
+    proc-log: "npm:^3.0.0"
+    semver: "npm:^7.3.5"
+    tar: "npm:^6.1.2"
+    which: "npm:^4.0.0"
+  bin:
+    node-gyp: bin/node-gyp.js
+  checksum: 10c0/abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa
+  languageName: node
+  linkType: hard
+
+"nopt@npm:^7.0.0":
+  version: 7.2.0
+  resolution: "nopt@npm:7.2.0"
+  dependencies:
+    abbrev: "npm:^2.0.0"
+  bin:
+    nopt: bin/nopt.js
+  checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
+  languageName: node
+  linkType: hard
+
+"p-map@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "p-map@npm:4.0.0"
+  dependencies:
+    aggregate-error: "npm:^3.0.0"
+  checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
+  languageName: node
+  linkType: hard
+
+"path-key@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "path-key@npm:3.1.1"
+  checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
+  languageName: node
+  linkType: hard
+
+"path-scurry@npm:^1.10.1":
+  version: 1.10.1
+  resolution: "path-scurry@npm:1.10.1"
+  dependencies:
+    lru-cache: "npm:^9.1.1 || ^10.0.0"
+    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
+  checksum: 10c0/e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e
+  languageName: node
+  linkType: hard
+
+"picocolors@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "picocolors@npm:1.0.0"
+  checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
+  languageName: node
+  linkType: hard
+
+"postcss@npm:^8.4.35":
+  version: 8.4.35
+  resolution: "postcss@npm:8.4.35"
+  dependencies:
+    nanoid: "npm:^3.3.7"
+    picocolors: "npm:^1.0.0"
+    source-map-js: "npm:^1.0.2"
+  checksum: 10c0/e8dd04e48001eb5857abc9475365bf08f4e508ddf9bc0b8525449a95d190f10d025acebc5b56ac2e94b3c7146790e4ae78989bb9633cb7ee20d1cc9b7dc909b2
+  languageName: node
+  linkType: hard
+
+"proc-log@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "proc-log@npm:3.0.0"
+  checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
+  languageName: node
+  linkType: hard
+
+"process@npm:^0.11.10":
+  version: 0.11.10
+  resolution: "process@npm:0.11.10"
+  checksum: 10c0/40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3
+  languageName: node
+  linkType: hard
+
+"promise-retry@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "promise-retry@npm:2.0.1"
+  dependencies:
+    err-code: "npm:^2.0.2"
+    retry: "npm:^0.12.0"
+  checksum: 10c0/9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96
+  languageName: node
+  linkType: hard
+
+"readable-stream@npm:^4.5.2":
+  version: 4.5.2
+  resolution: "readable-stream@npm:4.5.2"
+  dependencies:
+    abort-controller: "npm:^3.0.0"
+    buffer: "npm:^6.0.3"
+    events: "npm:^3.3.0"
+    process: "npm:^0.11.10"
+    string_decoder: "npm:^1.3.0"
+  checksum: 10c0/a2c80e0e53aabd91d7df0330929e32d0a73219f9477dbbb18472f6fdd6a11a699fc5d172a1beff98d50eae4f1496c950ffa85b7cc2c4c196963f289a5f39275d
+  languageName: node
+  linkType: hard
+
+"retry@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "retry@npm:0.12.0"
+  checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe
+  languageName: node
+  linkType: hard
+
+"rollup@npm:^4.2.0":
+  version: 4.12.0
+  resolution: "rollup@npm:4.12.0"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": "npm:4.12.0"
+    "@rollup/rollup-android-arm64": "npm:4.12.0"
+    "@rollup/rollup-darwin-arm64": "npm:4.12.0"
+    "@rollup/rollup-darwin-x64": "npm:4.12.0"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.12.0"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.12.0"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.12.0"
+    "@rollup/rollup-linux-riscv64-gnu": "npm:4.12.0"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.12.0"
+    "@rollup/rollup-linux-x64-musl": "npm:4.12.0"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.12.0"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.12.0"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.12.0"
+    "@types/estree": "npm:1.0.5"
+    fsevents: "npm:~2.3.2"
+  dependenciesMeta:
+    "@rollup/rollup-android-arm-eabi":
+      optional: true
+    "@rollup/rollup-android-arm64":
+      optional: true
+    "@rollup/rollup-darwin-arm64":
+      optional: true
+    "@rollup/rollup-darwin-x64":
+      optional: true
+    "@rollup/rollup-linux-arm-gnueabihf":
+      optional: true
+    "@rollup/rollup-linux-arm64-gnu":
+      optional: true
+    "@rollup/rollup-linux-arm64-musl":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-musl":
+      optional: true
+    "@rollup/rollup-win32-arm64-msvc":
+      optional: true
+    "@rollup/rollup-win32-ia32-msvc":
+      optional: true
+    "@rollup/rollup-win32-x64-msvc":
+      optional: true
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 10c0/1650168231ae8e2bd6fb4d82cc232e53b5c0fe67895188fa683370c9bd3f1febaa28e45c6b100cea333e54f8f5fae6f4d0eea7d86256ec2cc3e38212c55796d6
+  languageName: node
+  linkType: hard
+
+"safe-buffer@npm:~5.2.0":
+  version: 5.2.1
+  resolution: "safe-buffer@npm:5.2.1"
+  checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3
+  languageName: node
+  linkType: hard
+
+"safer-buffer@npm:>= 2.1.2 < 3.0.0":
+  version: 2.1.2
+  resolution: "safer-buffer@npm:2.1.2"
+  checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4
+  languageName: node
+  linkType: hard
+
+"semver@npm:^7.3.5":
+  version: 7.6.0
+  resolution: "semver@npm:7.6.0"
+  dependencies:
+    lru-cache: "npm:^6.0.0"
+  bin:
+    semver: bin/semver.js
+  checksum: 10c0/fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53
+  languageName: node
+  linkType: hard
+
+"shebang-command@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "shebang-command@npm:2.0.0"
+  dependencies:
+    shebang-regex: "npm:^3.0.0"
+  checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e
+  languageName: node
+  linkType: hard
+
+"shebang-regex@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "shebang-regex@npm:3.0.0"
+  checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690
+  languageName: node
+  linkType: hard
+
+"signal-exit@npm:^4.0.1":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83
+  languageName: node
+  linkType: hard
+
+"smart-buffer@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "smart-buffer@npm:4.2.0"
+  checksum: 10c0/a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539
+  languageName: node
+  linkType: hard
+
+"socks-proxy-agent@npm:^8.0.1":
+  version: 8.0.2
+  resolution: "socks-proxy-agent@npm:8.0.2"
+  dependencies:
+    agent-base: "npm:^7.0.2"
+    debug: "npm:^4.3.4"
+    socks: "npm:^2.7.1"
+  checksum: 10c0/a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7
+  languageName: node
+  linkType: hard
+
+"socks@npm:^2.7.1":
+  version: 2.8.1
+  resolution: "socks@npm:2.8.1"
+  dependencies:
+    ip-address: "npm:^9.0.5"
+    smart-buffer: "npm:^4.2.0"
+  checksum: 10c0/ac77b515c260473cc7c4452f09b20939e22510ce3ae48385c516d1d5784374d5cc75be3cb18ff66cc985a7f4f2ef8fef84e984c5ec70aad58355ed59241f40a8
+  languageName: node
+  linkType: hard
+
+"source-map-js@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "source-map-js@npm:1.0.2"
+  checksum: 10c0/32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8
+  languageName: node
+  linkType: hard
+
+"sprintf-js@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "sprintf-js@npm:1.1.3"
+  checksum: 10c0/09270dc4f30d479e666aee820eacd9e464215cdff53848b443964202bf4051490538e5dd1b42e1a65cf7296916ca17640aebf63dae9812749c7542ee5f288dec
+  languageName: node
+  linkType: hard
+
+"ssri@npm:^10.0.0":
+  version: 10.0.5
+  resolution: "ssri@npm:10.0.5"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10c0/b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8
+  languageName: node
+  linkType: hard
+
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0":
+  version: 4.2.3
+  resolution: "string-width@npm:4.2.3"
+  dependencies:
+    emoji-regex: "npm:^8.0.0"
+    is-fullwidth-code-point: "npm:^3.0.0"
+    strip-ansi: "npm:^6.0.1"
+  checksum: 10c0/1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b
+  languageName: node
+  linkType: hard
+
+"string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
+  dependencies:
+    eastasianwidth: "npm:^0.2.0"
+    emoji-regex: "npm:^9.2.2"
+    strip-ansi: "npm:^7.0.1"
+  checksum: 10c0/ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca
+  languageName: node
+  linkType: hard
+
+"string_decoder@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "string_decoder@npm:1.3.0"
+  dependencies:
+    safe-buffer: "npm:~5.2.0"
+  checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d
+  languageName: node
+  linkType: hard
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "strip-ansi@npm:6.0.1"
+  dependencies:
+    ansi-regex: "npm:^5.0.1"
+  checksum: 10c0/1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952
+  languageName: node
+  linkType: hard
+
+"strip-ansi@npm:^7.0.1":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
+  dependencies:
+    ansi-regex: "npm:^6.0.1"
+  checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4
+  languageName: node
+  linkType: hard
+
+"tar@npm:^6.1.11, tar@npm:^6.1.2":
+  version: 6.2.0
+  resolution: "tar@npm:6.2.0"
+  dependencies:
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.0.0"
+    minipass: "npm:^5.0.0"
+    minizlib: "npm:^2.1.1"
+    mkdirp: "npm:^1.0.3"
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8
+  languageName: node
+  linkType: hard
+
+"unique-filename@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-filename@npm:3.0.0"
+  dependencies:
+    unique-slug: "npm:^4.0.0"
+  checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f
+  languageName: node
+  linkType: hard
+
+"unique-slug@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unique-slug@npm:4.0.0"
+  dependencies:
+    imurmurhash: "npm:^0.1.4"
+  checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635
+  languageName: node
+  linkType: hard
+
+"uuid@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "uuid@npm:9.0.1"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 10c0/1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b
+  languageName: node
+  linkType: hard
+
+"vite@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "vite@npm:5.1.4"
+  dependencies:
+    esbuild: "npm:^0.19.3"
+    fsevents: "npm:~2.3.3"
+    postcss: "npm:^8.4.35"
+    rollup: "npm:^4.2.0"
+  peerDependencies:
+    "@types/node": ^18.0.0 || >=20.0.0
+    less: "*"
+    lightningcss: ^1.21.0
+    sass: "*"
+    stylus: "*"
+    sugarss: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+    less:
+      optional: true
+    lightningcss:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: 10c0/8f04c8bed33f266bde27f432412456a3b893b51fe1857f0b8cd259100b376c1393a7927db1dd6344a4376baed72ed179ec5b0428aef2ae8508f1f28f95acb908
+  languageName: node
+  linkType: hard
+
+"which@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "which@npm:2.0.2"
+  dependencies:
+    isexe: "npm:^2.0.0"
+  bin:
+    node-which: ./bin/node-which
+  checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f
+  languageName: node
+  linkType: hard
+
+"which@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "which@npm:4.0.0"
+  dependencies:
+    isexe: "npm:^3.1.1"
+  bin:
+    node-which: bin/which.js
+  checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a
+  languageName: node
+  linkType: hard
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version: 7.0.0
+  resolution: "wrap-ansi@npm:7.0.0"
+  dependencies:
+    ansi-styles: "npm:^4.0.0"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10c0/d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da
+  languageName: node
+  linkType: hard
+
+"wrap-ansi@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "wrap-ansi@npm:8.1.0"
+  dependencies:
+    ansi-styles: "npm:^6.1.0"
+    string-width: "npm:^5.0.1"
+    strip-ansi: "npm:^7.0.1"
+  checksum: 10c0/138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60
+  languageName: node
+  linkType: hard
+
+"ws@npm:^8.16.0":
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 10c0/a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
+  languageName: node
+  linkType: hard
+
+"yallist@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "yallist@npm:4.0.0"
+  checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
+  languageName: node
+  linkType: hard
diff --git a/gremlin-javascript/examples/.gitignore b/gremlin-javascript/examples/node/.gitignore
similarity index 100%
rename from gremlin-javascript/examples/.gitignore
rename to gremlin-javascript/examples/node/.gitignore
diff --git a/gremlin-javascript/examples/basic-gremlin.js b/gremlin-javascript/examples/node/basic-gremlin.js
similarity index 100%
rename from gremlin-javascript/examples/basic-gremlin.js
rename to gremlin-javascript/examples/node/basic-gremlin.js
diff --git a/gremlin-javascript/examples/connections.js b/gremlin-javascript/examples/node/connections.js
similarity index 100%
rename from gremlin-javascript/examples/connections.js
rename to gremlin-javascript/examples/node/connections.js
diff --git a/gremlin-javascript/examples/modern-traversals.js b/gremlin-javascript/examples/node/modern-traversals.js
similarity index 100%
rename from gremlin-javascript/examples/modern-traversals.js
rename to gremlin-javascript/examples/node/modern-traversals.js
diff --git a/gremlin-javascript/examples/package-lock.json b/gremlin-javascript/examples/node/package-lock.json
similarity index 100%
rename from gremlin-javascript/examples/package-lock.json
rename to gremlin-javascript/examples/node/package-lock.json
diff --git a/gremlin-javascript/examples/package.json b/gremlin-javascript/examples/node/package.json
similarity index 100%
rename from gremlin-javascript/examples/package.json
rename to gremlin-javascript/examples/node/package.json
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 3b5d067..d2af8f0 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-javascript</artifactId>
     <name>Apache TinkerPop :: Gremlin Javascript</name>
@@ -63,11 +63,6 @@
                         <version>${project.version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>org.apache.tinkerpop</groupId>
-                        <artifactId>neo4j-gremlin</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                    <dependency>
                         <groupId>commons-io</groupId>
                         <artifactId>commons-io</artifactId>
                         <version>${commons.io.version}</version>
@@ -79,7 +74,7 @@
 						<scope>runtime</scope>
 					</dependency>
                     <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
+                        <groupId>org.apache.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
                         <version>${groovy.version}</version>
                         <type>pom</type>
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.js
index cf781e2..97675b5 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/.eslintrc.js
@@ -22,18 +22,17 @@
 module.exports = {
   env: {
     commonjs: true,
-    es6: true,
+    es2022: true,
     node: true,
   },
   parserOptions: {
-    ecmaVersion: 2021,
+    ecmaVersion: 2022,
   },
   ignorePatterns: ['test/**/*.js', 'doc/**/*.js'],
   extends: ['eslint:recommended', 'prettier'],
   plugins: ['prettier'],
   rules: {
     'prettier/prettier': ['error', { endOfLine: 'auto' }],
-    indent: ['error', 2, { SwitchCase: 1 }],
     'linebreak-style': 0,
     quotes: ['error', 'single'],
     semi: ['error', 'always'],
@@ -128,7 +127,7 @@
     'require-atomic-updates': 'off',
   },
   globals: {
-    Buffer: false,
+    Buffer: 'off',
     Promise: true,
     Symbol: false,
     Uint16Array: false,
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/.nvmrc b/gremlin-javascript/src/main/javascript/gremlin-javascript/.nvmrc
new file mode 100644
index 0000000..3c03207
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/.nvmrc
@@ -0,0 +1 @@
+18
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE b/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE
index 7a4a3ea..1a1a07d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/LICENSE
@@ -199,4 +199,12 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
+   limitations under the License.
+
+   ========================================================================
+   MIT Licenses
+   ========================================================================
+
+   The Apache TinkerPop project bundles the following components under the MIT License:
+
+        chai 5.0.0 (https://www.chaijs.com/) - for details, see licenses/chai
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md b/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
index 068352d..65400f0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
@@ -26,7 +26,7 @@
 data-flow language that enables users to succinctly express complex traversals on (or queries of) their application's
 property graph.
 
-Gremlin-Javascript implements Gremlin within the JavaScript language and can be used on Node.js.
+Gremlin-Javascript implements Gremlin within the JavaScript language and can be used on Node.js and has experimental support for Web APIs compatible runtimes.
 
 ```bash
 npm install gremlin
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/docker-compose.yml b/gremlin-javascript/src/main/javascript/gremlin-javascript/docker-compose.yml
index f5b4302..65fc675 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/docker-compose.yml
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/docker-compose.yml
@@ -50,9 +50,9 @@
       - .:/js_app
       - ../../../../../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features:/gremlin-test
       - ../../../../../docker/gremlin-test-server:/js_app/gremlin-test-server
+      - ../../../../../gremlin-tools/gremlin-socket-server/conf:/js_app/gremlin-socket-server/conf/
     environment:
       - DOCKER_ENVIRONMENT=true
-      - TEST_TRANSACTIONS=true
     working_dir: /js_app
     command: >
       bash -c "npm config set cache /tmp --global
@@ -60,3 +60,8 @@
     depends_on:
       gremlin-server-test-js:
         condition: service_healthy
+  gremlin-socket-server:
+    container_name: gremlin-socket-server-js
+    image: tinkerpop/gremlin-socket-server:${GREMLIN_SERVER}
+    ports:
+      - "45943:45943"
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
index 524bfe1..3b8a80b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
@@ -67,6 +67,7 @@
     cardinality: t.cardinality,
     column: t.column,
     direction: t.direction,
+    dt: t.dt,
     merge: t.merge,
     operator: t.operator,
     order: t.order,
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.js
index e1601b2..e13945a 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/auth/mechanisms/sasl-mechanism-plain.js
@@ -18,6 +18,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const SaslMechanismBase = require('./sasl-mechanism-base');
 
 class SaslMechanismPlain extends SaslMechanismBase {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.js
index 4f64f7e..acd71b5 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/client.js
@@ -43,9 +43,7 @@
    * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
    * @param {String} [options.processor] The name of the opProcessor to use, leave it undefined or set 'session' when session mode.
    * @param {String} [options.session] The sessionId of Client in session mode. Defaults to null means session-less Client.
-   * @param {Boolean} [options.pingEnabled] Setup ping interval. Defaults to: true.
-   * @param {Number} [options.pingInterval] Ping request interval in ms if ping enabled. Defaults to: 60000.
-   * @param {Number} [options.pongTimeout] Timeout of pong response in ms after sending a ping. Defaults to: 30000.
+   * @param {http.Agent} [options.agent] The http.Agent implementation to use.
    * @constructor
    */
   constructor(url, options = {}) {
@@ -84,6 +82,7 @@
    * @property {Number} batchSize - Indicates whether the Power component is present.
    * @property {String} userAgent - The size in which the result of a request is to be 'batched' back to the client
    * @property {Number} evaluationTimeout - The timeout for the evaluation of the request.
+   * @property {String} materializeProperties - Indicates whether element properties should be returned or not.
    */
 
   /**
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.js
index 8f104e5..0bf8214 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/connection.js
@@ -22,11 +22,11 @@
  */
 'use strict';
 
-const EventEmitter = require('events');
-const Stream = require('stream');
-const WebSocket = require('ws');
-const util = require('util');
+const { Buffer } = require('buffer');
+const EventEmitter = require('eventemitter3');
+const Stream = require('readable-stream');
 const utils = require('../utils');
+const { DeferredPromise } = utils;
 const serializer = require('../structure/io/graph-serializer');
 const { graphBinaryReader, graphBinaryWriter } = require('../structure/io/binary/GraphBinary');
 const ResultSet = require('./result-set');
@@ -43,9 +43,6 @@
 const graphSON2MimeType = 'application/vnd.gremlin-v2.0+json';
 const graphBinaryMimeType = 'application/vnd.graphbinary-v1.0';
 
-const pingIntervalDelay = 60 * 1000;
-const pongTimeoutDelay = 30 * 1000;
-
 const uuidPattern = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
 
 /**
@@ -67,10 +64,7 @@
    * @param {Authenticator} [options.authenticator] The authentication handler to use.
    * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
    * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
-   * @param {Boolean} [options.pingEnabled] Setup ping interval. Defaults to: true.
-   * @param {Number} [options.pingInterval] Ping request interval in ms if ping enabled. Defaults to: 60000.
-   * @param {Number} [options.pongTimeout] Timeout of pong response in ms after sending a ping. Defaults to: 30000.
-   * @param {Boolean} [options.connectOnStartup] Deprecated and non-functional. Open websocket on startup.
+   * @param {http.Agent} [options.agent] The http.Agent implementation to use.
    * @constructor
    */
   constructor(url, options) {
@@ -87,14 +81,12 @@
 
     // A map containing the request id and the handler. The id should be in lower case to prevent string comparison issues.
     this._responseHandlers = {};
-    this._reader = options.reader || this._getDefaultReader(this.mimeType);
-    this._writer = options.writer || this._getDefaultWriter(this.mimeType);
+    this._reader = options.reader || this.#getDefaultReader(this.mimeType);
+    this._writer = options.writer || this.#getDefaultWriter(this.mimeType);
     this._openPromise = null;
     this._openCallback = null;
     this._closePromise = null;
     this._closeCallback = null;
-    this._pingInterval = null;
-    this._pongTimeout = null;
 
     this._header = String.fromCharCode(this.mimeType.length) + this.mimeType; // TODO: what if mimeType.length > 255
     this._header_buf = Buffer.from(this._header);
@@ -102,75 +94,61 @@
     this.traversalSource = options.traversalSource || 'g';
     this._authenticator = options.authenticator;
     this._enableUserAgentOnConnect = options.enableUserAgentOnConnect !== false;
-
-    this._pingEnabled = this.options.pingEnabled === false ? false : true;
-    this._pingIntervalDelay = this.options.pingInterval || pingIntervalDelay;
-    this._pongTimeoutDelay = this.options.pongTimeout || pongTimeoutDelay;
-
-    if (this.options.connectOnStartup) {
-      console.warn(
-        'connectOnStartup is now deprecated and non-functional. To open a connection, please call open() after instantiating connection object.',
-      );
-    }
   }
 
   /**
    * Opens the connection, if its not already opened.
    * @returns {Promise}
    */
-  open() {
+  async open() {
     if (this.isOpen) {
-      return Promise.resolve();
+      return;
     }
     if (this._openPromise) {
       return this._openPromise;
     }
 
+    this._openPromise = DeferredPromise();
+
     this.emit('log', 'ws open');
     let headers = this.options.headers;
     if (this._enableUserAgentOnConnect) {
       if (!headers) {
         headers = [];
       }
-      headers[utils.getUserAgentHeader()] = utils.getUserAgent();
+
+      const userAgent = await utils.getUserAgent();
+      if (userAgent !== undefined) {
+        headers[utils.getUserAgentHeader()] = await utils.getUserAgent();
+      }
     }
 
-    this._ws = new WebSocket(this.url, {
-      headers: headers,
-      ca: this.options.ca,
-      cert: this.options.cert,
-      pfx: this.options.pfx,
-      rejectUnauthorized: this.options.rejectUnauthorized,
-    });
+    const WebSocket = globalThis.WebSocket ?? (await import('ws')).default;
 
-    this._ws.on('message', (data) => this._handleMessage(data));
-    this._ws.on('close', (code, message) => this._handleClose(code, message));
+    this._ws = new WebSocket(
+      this.url,
+      globalThis.WebSocket === undefined
+        ? {
+            headers: headers,
+            ca: this.options.ca,
+            cert: this.options.cert,
+            pfx: this.options.pfx,
+            rejectUnauthorized: this.options.rejectUnauthorized,
+            agent: this.options.agent,
+          }
+        : undefined,
+    );
 
-    this._ws.on('pong', () => {
-      this.emit('log', 'ws pong received');
-      if (this._pongTimeout) {
-        clearTimeout(this._pongTimeout);
-        this._pongTimeout = null;
-      }
-    });
-    this._ws.on('ping', () => {
-      this.emit('log', 'ws ping received');
-      this._ws.pong();
-    });
+    if ('binaryType' in this._ws) {
+      this._ws.binaryType = 'arraybuffer';
+    }
 
-    return (this._openPromise = new Promise((resolve, reject) => {
-      this._ws.on('open', () => {
-        this.isOpen = true;
-        if (this._pingEnabled) {
-          this._pingHeartbeat();
-        }
-        resolve();
-      });
-      this._ws.on('error', (err) => {
-        this._handleError(err);
-        reject(err);
-      });
-    }));
+    this._ws.addEventListener('open', this.#handleOpen);
+    this._ws.addEventListener('error', this.#handleError);
+    this._ws.addEventListener('message', this.#handleMessage);
+    this._ws.addEventListener('close', this.#handleClose);
+
+    return await this._openPromise;
   }
 
   /** @override */
@@ -200,7 +178,7 @@
           };
 
           const request_buf = this._writer.writeRequest(request);
-          const message = Buffer.concat([this._header_buf, request_buf]);
+          const message = utils.toArrayBuffer(Buffer.concat([this._header_buf, request_buf]));
           this._ws.send(message);
         }),
     );
@@ -235,7 +213,7 @@
         };
 
         const request_buf = this._writer.writeRequest(request);
-        const message = Buffer.concat([this._header_buf, request_buf]);
+        const message = utils.toArrayBuffer(Buffer.concat([this._header_buf, request_buf]));
         this._ws.send(message);
       })
       .catch((err) => readableStream.destroy(err));
@@ -243,7 +221,7 @@
     return readableStream;
   }
 
-  _getDefaultReader(mimeType) {
+  #getDefaultReader(mimeType) {
     if (mimeType === graphBinaryMimeType) {
       return graphBinaryReader;
     }
@@ -251,7 +229,7 @@
     return mimeType === graphSON2MimeType ? new serializer.GraphSON2Reader() : new serializer.GraphSONReader();
   }
 
-  _getDefaultWriter(mimeType) {
+  #getDefaultWriter(mimeType) {
     if (mimeType === graphBinaryMimeType) {
       return graphBinaryWriter;
     }
@@ -259,68 +237,58 @@
     return mimeType === graphSON2MimeType ? new serializer.GraphSON2Writer() : new serializer.GraphSONWriter();
   }
 
-  _pingHeartbeat() {
-    if (this._pingInterval) {
-      clearInterval(this._pingInterval);
-      this._pingInterval = null;
-    }
+  #handleOpen = () => {
+    this._openPromise.resolve();
+    this.isOpen = true;
+  };
 
-    this._pingInterval = setInterval(() => {
-      if (this.isOpen === false) {
-        // in case of if not open..
-        if (this._pingInterval) {
-          clearInterval(this._pingInterval);
-          this._pingInterval = null;
-        }
-      }
+  /**
+   * @param {Event} event
+   */
+  #handleError = ({ error }) => {
+    this._openPromise.reject(error);
+    this.emit('log', `ws error ${error}`);
+    this.#cleanupWebsocket(error);
+    this.emit('socketError', error);
+  };
 
-      this._pongTimeout = setTimeout(() => {
-        this._ws.terminate();
-      }, this._pongTimeoutDelay);
-
-      this._ws.ping();
-    }, this._pingIntervalDelay);
-  }
-
-  _handleError(err) {
-    this.emit('log', `ws error ${err}`);
-    this._cleanupWebsocket(err);
-    this.emit('socketError', err);
-  }
-
-  _handleClose(code, message) {
+  /**
+   * @param {CloseEvent} event
+   */
+  #handleClose = ({ code, message }) => {
     this.emit('log', `ws close code=${code} message=${message}`);
-    this._cleanupWebsocket();
+    this.#cleanupWebsocket();
     if (this._closeCallback) {
       this._closeCallback();
     }
     this.emit('close', code, message);
-  }
+  };
 
-  _handleMessage(data) {
+  /**
+   * @param {MessageEvent<any>} event
+   */
+  #handleMessage = ({ data: _data }) => {
+    const data = _data instanceof ArrayBuffer ? Buffer.from(_data) : _data;
+
     const response = this._reader.readResponse(data);
     if (response.requestId === null || response.requestId === undefined) {
       // There was a serialization issue on the server that prevented the parsing of the request id
       // We invoke any of the pending handlers with an error
       Object.keys(this._responseHandlers).forEach((requestId) => {
         const handler = this._responseHandlers[requestId];
-        this._clearHandler(requestId);
+        this.#clearHandler(requestId);
         if (response.status !== undefined && response.status.message) {
           return handler.callback(
             // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
             new ResponseError(
-              util.format(
-                'Server error (no request information): %s (%d)',
-                response.status.message,
-                response.status.code,
-              ),
+              `Server error (no request information): ${response.status.message} (${response.status.code})`,
               response.status,
             ),
           );
         }
         // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
         return handler.callback(
-          new ResponseError(util.format('Server error (no request information): %j', response), response.status),
+          new ResponseError(`Server error (no request information): ${JSON.stringify(response)}`, response.status),
         );
       });
       return;
@@ -347,10 +315,7 @@
       // callback in error
       return handler.callback(
         // TINKERPOP-2285: keep the old server error message in case folks are parsing that - fix in a future breaking version
-        new ResponseError(
-          util.format('Server error: %s (%d)', response.status.message, response.status.code),
-          response.status,
-        ),
+        new ResponseError(`Server error: ${response.status.message} (${response.status.code})`, response.status),
       );
     }
 
@@ -358,7 +323,7 @@
 
     switch (response.status.code) {
       case responseStatusCode.noContent:
-        this._clearHandler(response.requestId);
+        this.#clearHandler(response.requestId);
         if (isStreamingResponse) {
           handler.result.push(new ResultSet(utils.emptyArray, response.status.attributes));
           return handler.callback(null);
@@ -382,24 +347,15 @@
         } else {
           handler.result = response.result.data;
         }
-        this._clearHandler(response.requestId);
+        this.#clearHandler(response.requestId);
         return handler.callback(null, new ResultSet(handler.result, response.status.attributes));
     }
-  }
+  };
 
   /**
    * clean websocket context
    */
-  _cleanupWebsocket(err) {
-    if (this._pingInterval) {
-      clearInterval(this._pingInterval);
-    }
-    this._pingInterval = null;
-    if (this._pongTimeout) {
-      clearTimeout(this._pongTimeout);
-    }
-    this._pongTimeout = null;
-
+  #cleanupWebsocket(err) {
     // Invoke waiting callbacks to complete Promises when closing the websocket
     Object.keys(this._responseHandlers).forEach((requestId) => {
       const handler = this._responseHandlers[requestId];
@@ -411,7 +367,10 @@
         handler.callback(cause);
       }
     });
-    this._ws.removeAllListeners();
+    this._ws.removeEventListener('open', this.#handleOpen);
+    this._ws.removeEventListener('error', this.#handleError);
+    this._ws.removeEventListener('message', this.#handleMessage);
+    this._ws.removeEventListener('close', this.#handleClose);
     this._openPromise = null;
     this._closePromise = null;
     this.isOpen = false;
@@ -422,7 +381,7 @@
    * @param requestId
    * @private
    */
-  _clearHandler(requestId) {
+  #clearHandler(requestId) {
     delete this._responseHandlers[requestId];
   }
 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
index 869d621..25c7cf0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
@@ -49,9 +49,7 @@
    * @param {Authenticator} [options.authenticator] The authentication handler to use.
    * @param {Object} [options.headers] An associative array containing the additional header key/values for the initial request.
    * @param {Boolean} [options.enableUserAgentOnConnect] Determines if a user agent will be sent during connection handshake. Defaults to: true
-   * @param {Boolean} [options.pingEnabled] Setup ping interval. Defaults to: true.
-   * @param {Number} [options.pingInterval] Ping request interval in ms if ping enabled. Defaults to: 60000.
-   * @param {Number} [options.pongTimeout] Timeout of pong response in ms after sending a ping. Defaults to: 30000.
+   * @param {http.Agent} [options.agent] The http.Agent implementation to use.
    * @constructor
    */
   constructor(url, options = {}) {
@@ -74,7 +72,14 @@
     const optionsStrategy = bytecode.sourceInstructions.find(
       (i) => i[0] === 'withStrategies' && i[1] instanceof OptionsStrategy,
     );
-    const allowedKeys = ['evaluationTimeout', 'scriptEvaluationTimeout', 'batchSize', 'requestId', 'userAgent'];
+    const allowedKeys = [
+      'evaluationTimeout',
+      'scriptEvaluationTimeout',
+      'batchSize',
+      'requestId',
+      'userAgent',
+      'materializeProperties',
+    ];
 
     let requestOptions = undefined;
     if (optionsStrategy !== undefined) {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.js
index c2dda58..8a7e401 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/result-set.js
@@ -22,8 +22,6 @@
  */
 'use strict';
 
-const util = require('util');
-const inspect = util.inspect.custom || 'inspect';
 const utils = require('../utils');
 const emptyMap = Object.freeze(new utils.ImmutableMap());
 
@@ -65,13 +63,6 @@
   }
 
   /**
-   * Provides a representation useful for debug and tracing.
-   */
-  [inspect]() {
-    return this._items;
-  }
-
-  /**
    * Gets an array of result items.
    * @returns {Array}
    */
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
index 292439e..1838f66 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
@@ -22,7 +22,7 @@
  */
 'use strict';
 
-const { Traversal } = require('./traversal');
+const { Traversal, cardinality } = require('./traversal');
 const { Transaction } = require('./transaction');
 const remote = require('../driver/remote-connection');
 const Bytecode = require('./bytecode');
@@ -337,6 +337,16 @@
     const b = new Bytecode(this.bytecode).addStep('call', args);
     return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
   }
+
+  /**
+   * union GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  union(...args) {
+    const b = new Bytecode(this.bytecode).addStep('union', args);
+    return new this.graphTraversalClass(this.graph, new TraversalStrategies(this.traversalStrategies), b);
+  }
 }
 
 /**
@@ -365,6 +375,16 @@
   }
 
   /**
+   * Graph traversal E method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  E(...args) {
+    this.bytecode.addStep('E', args);
+    return this;
+  }
+
+  /**
    * Graph traversal addE method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -395,6 +415,16 @@
   }
 
   /**
+   * Graph traversal all method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  all(...args) {
+    this.bytecode.addStep('all', args);
+    return this;
+  }
+
+  /**
    * Graph traversal and method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -405,6 +435,16 @@
   }
 
   /**
+   * Graph traversal any method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  any(...args) {
+    this.bytecode.addStep('any', args);
+    return this;
+  }
+
+  /**
    * Graph traversal as method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -415,6 +455,26 @@
   }
 
   /**
+   * Graph traversal asDate method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  asDate(...args) {
+    this.bytecode.addStep('asDate', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal asString method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  asString(...args) {
+    this.bytecode.addStep('asString', args);
+    return this;
+  }
+
+  /**
    * Graph traversal barrier method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -524,6 +584,36 @@
   }
 
   /**
+   * Graph traversal combine method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  combine(...args) {
+    this.bytecode.addStep('combine', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal concat method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  concat(...args) {
+    this.bytecode.addStep('concat', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal conjoin method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  conjoin(...args) {
+    this.bytecode.addStep('conjoin', args);
+    return this;
+  }
+
+  /**
    * Graph traversal connectedComponent method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -564,6 +654,26 @@
   }
 
   /**
+   * Graph traversal dateAdd method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  dateAdd(...args) {
+    this.bytecode.addStep('dateAdd', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal dateDiff method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  dateDiff(...args) {
+    this.bytecode.addStep('dateDiff', args);
+    return this;
+  }
+
+  /**
    * Graph traversal dedup method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -574,6 +684,26 @@
   }
 
   /**
+   * Graph traversal difference method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  difference(...args) {
+    this.bytecode.addStep('difference', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal disjunct method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  disjunct(...args) {
+    this.bytecode.addStep('disjunct', args);
+    return this;
+  }
+
+  /**
    * Graph traversal drop method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -653,6 +783,16 @@
   }
 
   /**
+   * Graph traversal format method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  format(...args) {
+    this.bytecode.addStep('format', args);
+    return this;
+  }
+
+  /**
    * Graph traversal from method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -813,6 +953,16 @@
   }
 
   /**
+   * Graph traversal intersect method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  intersect(...args) {
+    this.bytecode.addStep('intersect', args);
+    return this;
+  }
+
+  /**
    * Graph traversal is method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -843,6 +993,16 @@
   }
 
   /**
+   * Graph traversal length method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  length(...args) {
+    this.bytecode.addStep('length', args);
+    return this;
+  }
+
+  /**
    * Graph traversal limit method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -873,6 +1033,16 @@
   }
 
   /**
+   * Graph traversal lTrim method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  lTrim(...args) {
+    this.bytecode.addStep('lTrim', args);
+    return this;
+  }
+
+  /**
    * Graph traversal map method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -923,6 +1093,16 @@
   }
 
   /**
+   * Graph traversal merge method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  merge(...args) {
+    this.bytecode.addStep('merge', args);
+    return this;
+  }
+
+  /**
    * Graph traversal mergeE method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -1083,6 +1263,16 @@
   }
 
   /**
+   * Graph traversal product method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  product(...args) {
+    this.bytecode.addStep('product', args);
+    return this;
+  }
+
+  /**
    * Graph traversal profile method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -1173,6 +1363,36 @@
   }
 
   /**
+   * Graph traversal replace method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  replace(...args) {
+    this.bytecode.addStep('replace', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal reverse method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  reverse(...args) {
+    this.bytecode.addStep('reverse', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal rTrim method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  rTrim(...args) {
+    this.bytecode.addStep('rTrim', args);
+    return this;
+  }
+
+  /**
    * Graph traversal sack method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -1243,6 +1463,16 @@
   }
 
   /**
+   * Graph traversal split method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  split(...args) {
+    this.bytecode.addStep('split', args);
+    return this;
+  }
+
+  /**
    * Graph traversal store method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -1263,6 +1493,16 @@
   }
 
   /**
+   * Graph traversal subgraph method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  substring(...args) {
+    this.bytecode.addStep('substring', args);
+    return this;
+  }
+
+  /**
    * Graph traversal sum method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -1323,6 +1563,26 @@
   }
 
   /**
+   * Graph traversal toLower method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  toLower(...args) {
+    this.bytecode.addStep('toLower', args);
+    return this;
+  }
+
+  /**
+   * Graph traversal toUpper method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  toUpper(...args) {
+    this.bytecode.addStep('toUpper', args);
+    return this;
+  }
+
+  /**
    * Graph traversal toV method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -1343,6 +1603,16 @@
   }
 
   /**
+   * Graph traversal trim method.
+   * @param {...Object} args
+   * @returns {GraphTraversal}
+   */
+  trim(...args) {
+    this.bytecode.addStep('trim', args);
+    return this;
+  }
+
+  /**
    * Graph traversal unfold method.
    * @param {...Object} args
    * @returns {GraphTraversal}
@@ -1433,6 +1703,45 @@
   }
 }
 
+class CardinalityValue extends Bytecode {
+  /**
+   * Creates a new instance of {@link CardinalityValue}.
+   * @param {String} card
+   * @param {Object} value
+   */
+  constructor(card, value) {
+    super();
+    this.addSource('CardinalityValueTraversal', [card, value]);
+  }
+
+  /**
+   * Create a value with single cardinality.
+   * @param {Array} value
+   * @returns {CardinalityValue}
+   */
+  static single(value) {
+    return new CardinalityValue(cardinality.single, value);
+  }
+
+  /**
+   * Create a value with list cardinality.
+   * @param {Array} value
+   * @returns {CardinalityValue}
+   */
+  static list(value) {
+    return new CardinalityValue(cardinality.list, value);
+  }
+
+  /**
+   * Create a value with set cardinality.
+   * @param {Array} value
+   * @returns {CardinalityValue}
+   */
+  static set(value) {
+    return new CardinalityValue(cardinality.set, value);
+  }
+}
+
 function callOnEmptyTraversal(fnName, args) {
   const g = new GraphTraversal(null, null, new Bytecode());
   return g[fnName].apply(g, args);
@@ -1443,12 +1752,17 @@
  * @type {Object}
  */
 const statics = {
+  E: (...args) => callOnEmptyTraversal('E', args),
   V: (...args) => callOnEmptyTraversal('V', args),
   addE: (...args) => callOnEmptyTraversal('addE', args),
   addV: (...args) => callOnEmptyTraversal('addV', args),
   aggregate: (...args) => callOnEmptyTraversal('aggregate', args),
+  all: (...args) => callOnEmptyTraversal('all', args),
   and: (...args) => callOnEmptyTraversal('and', args),
+  any: (...args) => callOnEmptyTraversal('any', args),
   as: (...args) => callOnEmptyTraversal('as', args),
+  asDate: (...args) => callOnEmptyTraversal('asDate', args),
+  asString: (...args) => callOnEmptyTraversal('asString', args),
   barrier: (...args) => callOnEmptyTraversal('barrier', args),
   both: (...args) => callOnEmptyTraversal('both', args),
   bothE: (...args) => callOnEmptyTraversal('bothE', args),
@@ -1459,9 +1773,12 @@
   choose: (...args) => callOnEmptyTraversal('choose', args),
   coalesce: (...args) => callOnEmptyTraversal('coalesce', args),
   coin: (...args) => callOnEmptyTraversal('coin', args),
+  concat: (...args) => callOnEmptyTraversal('concat', args),
   constant: (...args) => callOnEmptyTraversal('constant', args),
   count: (...args) => callOnEmptyTraversal('count', args),
   cyclicPath: (...args) => callOnEmptyTraversal('cyclicPath', args),
+  dateAdd: (...args) => callOnEmptyTraversal('dateAdd', args),
+  dateDiff: (...args) => callOnEmptyTraversal('dateDiff', args),
   dedup: (...args) => callOnEmptyTraversal('dedup', args),
   drop: (...args) => callOnEmptyTraversal('drop', args),
   element: (...args) => callOnEmptyTraversal('element', args),
@@ -1471,6 +1788,7 @@
   filter: (...args) => callOnEmptyTraversal('filter', args),
   flatMap: (...args) => callOnEmptyTraversal('flatMap', args),
   fold: (...args) => callOnEmptyTraversal('fold', args),
+  format: (...args) => callOnEmptyTraversal('format', args),
   group: (...args) => callOnEmptyTraversal('group', args),
   groupCount: (...args) => callOnEmptyTraversal('groupCount', args),
   has: (...args) => callOnEmptyTraversal('has', args),
@@ -1489,9 +1807,11 @@
   is: (...args) => callOnEmptyTraversal('is', args),
   key: (...args) => callOnEmptyTraversal('key', args),
   label: (...args) => callOnEmptyTraversal('label', args),
+  length: (...args) => callOnEmptyTraversal('length', args),
   limit: (...args) => callOnEmptyTraversal('limit', args),
   local: (...args) => callOnEmptyTraversal('local', args),
   loops: (...args) => callOnEmptyTraversal('loops', args),
+  lTrim: (...args) => callOnEmptyTraversal('lTrim', args),
   map: (...args) => callOnEmptyTraversal('map', args),
   match: (...args) => callOnEmptyTraversal('match', args),
   math: (...args) => callOnEmptyTraversal('math', args),
@@ -1515,22 +1835,30 @@
   propertyMap: (...args) => callOnEmptyTraversal('propertyMap', args),
   range: (...args) => callOnEmptyTraversal('range', args),
   repeat: (...args) => callOnEmptyTraversal('repeat', args),
+  replace: (...args) => callOnEmptyTraversal('replace', args),
+  reverse: (...args) => callOnEmptyTraversal('reverse', args),
+  rTrim: (...args) => callOnEmptyTraversal('rTrim', args),
   sack: (...args) => callOnEmptyTraversal('sack', args),
   sample: (...args) => callOnEmptyTraversal('sample', args),
   select: (...args) => callOnEmptyTraversal('select', args),
   sideEffect: (...args) => callOnEmptyTraversal('sideEffect', args),
   simplePath: (...args) => callOnEmptyTraversal('simplePath', args),
   skip: (...args) => callOnEmptyTraversal('skip', args),
+  split: (...args) => callOnEmptyTraversal('split', args),
   store: (...args) => callOnEmptyTraversal('store', args),
   subgraph: (...args) => callOnEmptyTraversal('subgraph', args),
+  substring: (...args) => callOnEmptyTraversal('substring', args),
   sum: (...args) => callOnEmptyTraversal('sum', args),
   tail: (...args) => callOnEmptyTraversal('tail', args),
   timeLimit: (...args) => callOnEmptyTraversal('timeLimit', args),
   times: (...args) => callOnEmptyTraversal('times', args),
   to: (...args) => callOnEmptyTraversal('to', args),
   toE: (...args) => callOnEmptyTraversal('toE', args),
+  toLower: (...args) => callOnEmptyTraversal('toLower', args),
+  toUpper: (...args) => callOnEmptyTraversal('toUpper', args),
   toV: (...args) => callOnEmptyTraversal('toV', args),
   tree: (...args) => callOnEmptyTraversal('tree', args),
+  trim: (...args) => callOnEmptyTraversal('trim', args),
   unfold: (...args) => callOnEmptyTraversal('unfold', args),
   union: (...args) => callOnEmptyTraversal('union', args),
   until: (...args) => callOnEmptyTraversal('until', args),
@@ -1543,5 +1871,6 @@
 module.exports = {
   GraphTraversal,
   GraphTraversalSource,
+  CardinalityValue,
   statics,
 };
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
index db100ef..a1ff931 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
@@ -511,6 +511,7 @@
   cardinality: toEnum('Cardinality', 'list set single'),
   column: toEnum('Column', 'keys values'),
   direction: toDirectionEnum('Direction', 'BOTH IN OUT from_ to'),
+  dt: toEnum('DT', 'second minute hour day'),
   graphSONVersion: toEnum('GraphSONVersion', 'V1_0 V2_0 V3_0'),
   gryoVersion: toEnum('GryoVersion', 'V1_0 V3_0'),
   merge: toEnum('Merge', 'onCreate onMatch outV inV'),
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js
index 5606bae..0b0e2d0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/AnySerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class AnySerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js
index d38fc7b..77aabd4 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ArraySerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class ArraySerializer {
   constructor(ioc, ID) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js
index 446cd92..48e6e8c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BigIntegerSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 // TODO: it has room for performance improvements
 module.exports = class BigIntegerSerializer {
   constructor(ioc) {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js
index 697585f..bbdf9fc 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BooleanSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class BooleanSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js
index 708b2c5..518caa2 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BulkSetSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class BulkSetSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js
index fb4d9d1..080edef 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteBufferSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class ByteBufferSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js
index 5b82137..ed5e622 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ByteSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class ByteSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js
index 4746378..e458f55 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/BytecodeSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const Bytecode = require('../../../../process/bytecode');
 const t = require('../../../../process/traversal');
 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js
index 511cb51..272a848 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DataType.js
@@ -74,6 +74,7 @@
   METRICS: 0x2c,
   TRAVERSALMETRICS: 0x2d,
   MERGE: 0x2e,
+  DT: 0x2f,
 
   CHAR: 0x80,
   DURATION: 0x81,
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js
index 0c6bb0b..a7f3dc8 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DateSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class DateSerializer {
   constructor(ioc, ID) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js
index 869d232..bd0c65c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/DoubleSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class DoubleSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
index 79fd5e4..f755f1d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EdgeSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const g = require('../../../graph');
 
 module.exports = class EdgeSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js
index 837636c..0362777 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/EnumSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const t = require('../../../../process/traversal');
 
 module.exports = class EnumSerializer {
@@ -41,6 +42,7 @@
       { name: 'Cardinality', code: DT.CARDINALITY, enum: to_orig_enum(t.cardinality) },
       { name: 'Column', code: DT.COLUMN, enum: to_orig_enum(t.column) },
       { name: 'Direction', code: DT.DIRECTION, enum: to_orig_enum(t.direction) },
+      { name: 'DT', code: DT.DT, enum: to_orig_enum(t.dt) },
       { name: 'Merge', code: DT.MERGE, enum: to_orig_enum(t.merge) },
       { name: 'Operator', code: DT.OPERATOR, enum: to_orig_enum(t.operator) },
       { name: 'Order', code: DT.ORDER, enum: to_orig_enum(t.order) },
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js
index ee0aea3..c0febcb 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/FloatSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class FloatSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js
index 1ea18fb..21d9f2b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryReader.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 /**
  * GraphBinary reader.
  */
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js
index 9c307b9..7440ba0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/GraphBinaryWriter.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 /**
  * GraphBinary writer.
  */
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js
index 89fd433..ddd32f4 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/IntSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class IntSerializer {
   get INT32_MIN() {
     return -2147483648;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js
index e0e6db4..292b7ef 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LambdaSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const { valueKey, LambdaSerializer: GraphsonLambdaSerializer } = require('../../type-serializers');
 
 module.exports = class LambdaSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js
index 60f88b9..c5f45fe 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class LongSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js
index 95f4421..e23fe5b 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/LongSerializerNg.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 // TODO: it's based on BigInt native JavaScript type to completely support
 // 64 bits integers, but for backward compatibility with current GraphSON
 // implementation we do not use this for now. Consider its removal.
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js
index d64429d..62e952c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/MapSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class MapSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js
index 485856e..046f034 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const t = require('../../../../process/traversal');
 
 module.exports = class PSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js
index 7bd427a..8b3aeff 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PathSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const g = require('../../../graph');
 
 module.exports = class PathSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js
index 08f38c5..9738d85 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/PropertySerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const g = require('../../../graph');
 
 module.exports = class PropertySerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js
index 0048764..f5dda2f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/ShortSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class ShortSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js
index 6c34b32..17ea06d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/StringSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class StringSerializer {
   constructor(ioc, ID) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js
index 6d78df7..a78c1ab 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TextPSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const t = require('../../../../process/traversal');
 
 module.exports = class TextPSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js
index cd7bc5d..3eb750c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraversalStrategySerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 const { TraversalStrategySerializer: GraphsonTraversalStrategySerializer } = require('../../type-serializers');
 
 module.exports = class TraversalStrategySerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js
index 819adb6..3d15553 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/TraverserSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const t = require('../../../../process/traversal');
 
 module.exports = class TraverserSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js
index 7b803a6..5fa1fc7 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UnspecifiedNullSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class UnspecifiedNullSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js
index 9ec8a39..cb050de 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/UuidSerializer.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 module.exports = class UuidSerializer {
   constructor(ioc) {
     this.ioc = ioc;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js
index 4e38180..b1cfc6d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexPropertySerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const g = require('../../../graph');
 
 module.exports = class VertexPropertySerializer {
@@ -154,7 +155,7 @@
       // {properties} is a fully qualified typed value composed of {type_code}{type_info}{value_flag}{value} which contains properties. Note that as TinkerPop currently send "references" only, this value will always be null.
       let properties, properties_len;
       try {
-        ({ v: properties, len: properties_len } = this.ioc.unspecifiedNullSerializer.deserialize(cursor));
+        ({ v: properties, len: properties_len } = this.ioc.anySerializer.deserialize(cursor));
         len += properties_len;
       } catch (err) {
         err.message = '{properties}: ' + err.message;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js
index b5362f8..3d050c5 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/VertexSerializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const g = require('../../../graph');
 
 module.exports = class VertexSerializer {
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js
index 76380f4..bab8fdc 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/binary/internals/utils.js
@@ -22,6 +22,8 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
+
 /*
  * Deserialization error general constructor.
  */
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
index 48ad40b..71b1ba2 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
@@ -22,6 +22,7 @@
  */
 'use strict';
 
+const { Buffer } = require('buffer');
 const typeSerializers = require('./type-serializers');
 const Bytecode = require('../../process/bytecode');
 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
index bf371c6..f5013d1 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/utils.js
@@ -23,10 +23,9 @@
  */
 'use strict';
 
-const crypto = require('crypto');
-const os = require('os');
+const uuid = require('uuid');
 
-const gremlinVersion = '3.6.8-SNAPSHOT'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+const gremlinVersion = '3.7.3-SNAPSHOT'; // DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
 exports.toLong = function toLong(value) {
   return new Long(value);
@@ -40,27 +39,8 @@
 });
 
 exports.getUuid = function getUuid() {
-  const buffer = crypto.randomBytes(16);
-  //clear the version
-  buffer[6] &= 0x0f;
-  //set the version 4
-  buffer[6] |= 0x40;
-  //clear the variant
-  buffer[8] &= 0x3f;
-  //set the IETF variant
-  buffer[8] |= 0x80;
-  const hex = buffer.toString('hex');
-  return (
-    hex.substr(0, 8) +
-    '-' +
-    hex.substr(8, 4) +
-    '-' +
-    hex.substr(12, 4) +
-    '-' +
-    hex.substr(16, 4) +
-    '-' +
-    hex.substr(20, 12)
-  );
+  // TODO: replace with `globalThis.crypto.randomUUID` once supported Node version is bump to >=19
+  return uuid.v4();
 };
 
 exports.emptyArray = Object.freeze([]);
@@ -83,8 +63,10 @@
 
 exports.ImmutableMap = ImmutableMap;
 
-function generateUserAgent() {
-  const applicationName = (process.env.npm_package_name || 'NotAvailable').replace('_', ' ');
+async function generateNodeUserAgent() {
+  const os = await import('node:os');
+
+  const applicationName = (process?.env.npm_package_name ?? 'NotAvailable').replace('_', ' ');
   let runtimeVersion;
   let osName;
   let osVersion;
@@ -98,6 +80,7 @@
       cpuArch = process.arch.replace(' ', '_');
     }
   }
+
   if (os != null) {
     osName = os.platform().replace(' ', '_');
     osVersion = os.release().replace(' ', '_');
@@ -112,8 +95,36 @@
   return 'User-Agent';
 };
 
-const userAgent = generateUserAgent();
+exports.getUserAgent = async () => {
+  if ('navigator' in globalThis) {
+    return globalThis.navigator.userAgent;
+  }
 
-exports.getUserAgent = function getUserAgent() {
-  return userAgent;
+  if (process?.versions?.node !== undefined) {
+    return await generateNodeUserAgent();
+  }
+
+  return undefined;
 };
+
+/**
+ * @param {Buffer} buffer
+ * @returns {ArrayBuffer}
+ */
+const toArrayBuffer = (buffer) => buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+
+exports.toArrayBuffer = toArrayBuffer;
+
+const DeferredPromise = () => {
+  let resolve = (value) => {};
+  let reject = (reason) => {};
+
+  const promise = new Promise((_resolve, _reject) => {
+    resolve = _resolve;
+    reject = _reject;
+  });
+
+  return Object.assign(promise, { resolve, reject });
+};
+
+module.exports.DeferredPromise = DeferredPromise;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/licenses/chai b/gremlin-javascript/src/main/javascript/gremlin-javascript/licenses/chai
new file mode 100644
index 0000000..eedbe23
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/licenses/chai
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Chai.js Assertion Library
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
index ebfdee5..f6df076 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package-lock.json
@@ -1,15 +1,19 @@
 {
   "name": "gremlin",
-  "version": "3.6.8-alpha1",
+  "version": "3.7.3-alpha1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "gremlin",
-      "version": "3.6.8-alpha1",
+      "version": "3.7.3-alpha1",
       "license": "Apache-2.0",
       "dependencies": {
-        "ws": "^8.11.0"
+        "buffer": "^6.0.3",
+        "eventemitter3": "^5.0.1",
+        "readable-stream": "^4.5.2",
+        "uuid": "^9.0.1",
+        "ws": "^8.16.0"
       },
       "devDependencies": {
         "chai": "~4.4.1",
@@ -252,6 +256,17 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
@@ -415,6 +430,25 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/becke-ch--regex--s0-0-v1--base--pl--lib": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz",
@@ -464,6 +498,29 @@
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -1282,12 +1339,33 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/eventemitter2": {
       "version": "0.4.14",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
       "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==",
       "dev": true
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
     "node_modules/exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -1944,6 +2022,25 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/ignore": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
@@ -3178,6 +3275,14 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -3225,6 +3330,21 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "node_modules/readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -3357,7 +3477,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3484,6 +3603,14 @@
         "stacktrace-gps": "^3.0.4"
       }
     },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "node_modules/string-argv": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
@@ -3711,6 +3838,18 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/v8flags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -4071,6 +4210,14 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
     "acorn": {
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
@@ -4197,6 +4344,11 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
     "becke-ch--regex--s0-0-v1--base--pl--lib": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz",
@@ -4240,6 +4392,15 @@
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -4838,12 +4999,27 @@
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+    },
     "eventemitter2": {
       "version": "0.4.14",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
       "integrity": "sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==",
       "dev": true
     },
+    "eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
+    },
     "exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -5346,6 +5522,11 @@
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
     },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
     "ignore": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
@@ -6283,6 +6464,11 @@
         "fast-diff": "^1.1.2"
       }
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
+    },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -6310,6 +6496,18 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "readable-stream": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+      "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+      "requires": {
+        "abort-controller": "^3.0.0",
+        "buffer": "^6.0.3",
+        "events": "^3.3.0",
+        "process": "^0.11.10",
+        "string_decoder": "^1.3.0"
+      }
+    },
     "readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -6399,8 +6597,7 @@
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "safer-buffer": {
       "version": "2.1.2",
@@ -6501,6 +6698,14 @@
         "stacktrace-gps": "^3.0.4"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "string-argv": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
@@ -6683,6 +6888,11 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
+    "uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
+    },
     "v8flags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index dc4ea22..fd92b58 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gremlin",
-  "version": "3.6.8-alpha1",
+  "version": "3.7.3-alpha1",
   "description": "JavaScript Gremlin Language Variant",
   "author": "Apache TinkerPop team",
   "keywords": [
@@ -14,7 +14,11 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "ws": "^8.11.0"
+    "buffer": "^6.0.3",
+    "eventemitter3": "^5.0.1",
+    "readable-stream": "^4.5.2",
+    "uuid": "^9.0.1",
+    "ws": "^8.16.0"
   },
   "devDependencies": {
     "chai": "~4.4.1",
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js
new file mode 100644
index 0000000..7f60f47
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/element-comparison.js
@@ -0,0 +1,123 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/*
+ * Portions of this code are based on the Chai Assertion Library
+ * at https://www.chaijs.com/, which is licensed under the MIT License.
+ * The functions deepMembersById, flag, and isSubsetOf are adapted from
+ * Chai's source code.
+ * See licenses/chai for full license.
+ */
+
+const chai = require('chai');
+const deepEqual = require('deep-eql');
+const { Edge, Vertex, VertexProperty } = require('../../lib/structure/graph');
+
+function isElement(obj) {
+    return obj instanceof Edge || obj instanceof Vertex || obj instanceof VertexProperty;
+}
+
+const opt = {comparator: compareElements};
+
+function isSubsetOf(subset, superset, cmp, contains, ordered) {
+    if (!contains) {
+        if (subset.length !== superset.length) return false;
+        superset = superset.slice();
+    }
+
+    return subset.every(function(elem, idx) {
+        if (ordered) return cmp ? cmp(elem, superset[idx], opt) : elem === superset[idx];
+
+        if (!cmp) {
+            var matchIdx = superset.indexOf(elem);
+            if (matchIdx === -1) return false;
+
+            // Remove match from superset so not counted twice if duplicate in subset.
+            if (!contains) superset.splice(matchIdx, 1);
+            return true;
+        }
+
+        return superset.some(function(elem2, matchIdx) {
+            if (!cmp(elem, elem2, opt)) return false;
+
+            // Remove match from superset so not counted twice if duplicate in subset.
+            if (!contains) superset.splice(matchIdx, 1);
+            return true;
+        });
+    });
+}
+
+function flag(obj, key, value) {
+    var flags = obj.__flags || (obj.__flags = Object.create(null));
+    if (arguments.length === 3) {
+        flags[key] = value;
+    } else {
+        return flags[key];
+    }
+};
+
+function deepMembersById (subset, msg) {
+    if (msg) flag(this, 'message', msg);
+    var obj = flag(this, 'object')
+        , flagMsg = flag(this, 'message')
+        , ssfi = flag(this, 'ssfi');
+
+    new chai.Assertion(obj, flagMsg, ssfi, true).to.be.an('array');
+    new chai.Assertion(subset, flagMsg, ssfi, true).to.be.an('array');
+
+    var contains = flag(this, 'contains');
+    var ordered = flag(this, 'ordered');
+
+    var subject, failMsg, failNegateMsg;
+
+    if (contains) {
+        subject = ordered ? 'an ordered superset' : 'a superset';
+        failMsg = 'expected #{this} to be ' + subject + ' of #{exp}';
+        failNegateMsg = 'expected #{this} to not be ' + subject + ' of #{exp}';
+    } else {
+        subject = ordered ? 'ordered members' : 'members';
+        failMsg = 'expected #{this} to have the same ' + subject + ' as #{exp}';
+        failNegateMsg = 'expected #{this} to not have the same ' + subject + ' as #{exp}';
+    }
+
+    var cmp = flag(this, 'deep') ? deepEqual : undefined;
+
+    this.assert(
+        isSubsetOf(subset, obj, cmp, contains, ordered)
+        , failMsg
+        , failNegateMsg
+        , subset
+        , obj
+        , true
+    );
+}
+
+function compareElements(a, b) {
+    if (!isElement(a) || !isElement(b)) {
+        return null;
+    } else {
+        return a.constructor === b.constructor && a.id === b.id;
+    }
+}
+
+module.exports = {
+    deepMembersById,
+    compareElements,
+    opt
+}
\ No newline at end of file
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index 9e25f18..3e6ed1e 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -41,9 +41,11 @@
 const P = traversalModule.P;
 const direction = traversalModule.direction;
 const merge = traversalModule.merge;
-
+const deepMembersById = require('./element-comparison').deepMembersById;
 const parsers = [
+  [ 'str\\[(.*)\\]', (stringValue) => stringValue ], //returns the string value as is
   [ 'vp\\[(.+)\\]', toVertexProperty ],
+  [ 'dt\\[(.+)\\]', toDateTime ],
   [ 'd\\[(.*)\\]\\.[bsilfdmn]', toNumeric ],
   [ 'v\\[(.+)\\]', toVertex ],
   [ 'v\\[(.+)\\]\\.id', toVertexId ],
@@ -62,6 +64,12 @@
   [ 'M\\[(.+)\\]', toMerge ]
 ].map(x => [ new RegExp('^' + x[0] + '$'), x[1] ]);
 
+chai.use(function (chai, chaiUtils) {
+  chai.Assertion.overwriteMethod('members', function (_super) {
+    return deepMembersById;
+  });
+});
+
 const ignoreReason = {
   nullKeysInMapNotSupportedWell: "Javascript does not nicely support 'null' as a key in Map instances",
   setNotSupported: "There is no Set support in gremlin-javascript",
@@ -73,6 +81,52 @@
   'g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX': new IgnoreError(ignoreReason.setNotSupported),
   'g_withSideEffectXa_setX_V_both_name_aggregateXlocal_aX_capXaX': new IgnoreError(ignoreReason.setNotSupported),
   'g_V_out_in_valuesXnameX_fold_dedupXlocalX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnonexistantX_fold_differenceXV_valuesXnameX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnameX_fold_differenceXV_valuesXnonexistantX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXageX_fold_differenceXV_valuesXageX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_path_byXvaluesXnameX_toUpperX_differenceXMARKOX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXmarkoX_differenceXV_valuesXnameX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valueMapXlocationX_selectXvaluesX_unfold_differenceXseattle_vancouverX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_differenceXrippleX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_differenceXempty_listX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXageX_fold_differenceXconstantX27X_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_differenceXdave_kelvinX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_differenceXa_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_differenceXa_null_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectX3_threeX_differenceXfive_three_7X': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnonexistantX_fold_disjunctXV_valuesXnameX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnameX_fold_disjunctXV_valuesXnonexistantX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXageX_fold_disjunctXV_valuesXageX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_path_byXvaluesXnameX_toUpperX_disjunctXMARKOX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valueMapXlocationX_selectXvaluesX_unfold_disjunctXseattle_vancouverX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_disjunctXmarkoX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_disjunctXstephen_markoX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_disjunctXdave_kelvinX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_disjunctXa_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_disjunctXa_null_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectX3_threeX_disjunctXfive_three_7X': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnonexistantX_fold_intersectXV_valuesXnameX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnameX_fold_intersectXV_valuesXnonexistantX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_path_byXvaluesXnameX_toUpperX_intersectXMARKOX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXmarkoX_intersectX___V_valuesXnameX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valueMapXlocationX_selectXvaluesX_unfold_intersectXseattle_vancouverX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXageX_fold_intersectX___constantX27X_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_intersectXdave_kelvinX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_intersectXa_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_intersectXa_null_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectX3_threeX_intersectXfive_three_7X': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnonexistantX_fold_mergeXV_valuesXnameX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXnameX_fold_mergeXV_valuesXnonexistantX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXageX_fold_mergeXV_valuesXageX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_path_byXvaluesXnameX_toUpperX_mergeXMARKOX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXmarkoX_mergeXV_valuesXnameX_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valueMapXlocationX_selectXvaluesX_unfold_mergeXseattle_vancouverX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_mergeXempty_listX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_valuesXageX_fold_mergeXconstantX27X_foldX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_V_out_out_path_byXnameX_mergeXdave_kelvinX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_mergeXa_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectXa_null_bX_mergeXa_null_cX': new IgnoreError(ignoreReason.setNotSupported),
+  'g_injectX3_threeX_mergeXfive_three_7X': new IgnoreError(ignoreReason.setNotSupported),
   'g_withStrategiesXProductiveByStrategyX_V_groupCount_byXageX': new IgnoreError(ignoreReason.nullKeysInMapNotSupportedWell),
   'g_V_shortestPath_edgesIncluded': new IgnoreError(ignoreReason.needsFurtherInvestigation),
   'g_V_shortestPath_edgesIncluded_edgesXoutEX': new IgnoreError(ignoreReason.needsFurtherInvestigation),
@@ -132,17 +186,30 @@
   });
 });
 
+var removeProperties = function(p) {
+  if (p === undefined) {   
+  } else if (p instanceof graphModule.Vertex || p instanceof graphModule.Edge) {
+    p.properties = undefined;
+  } else if (p instanceof Array) {
+    p.forEach(removeProperties)
+  } else if (p instanceof Map) {
+    removeProperties(Array.from(p.keys()))
+    removeProperties(Array.from(p.values()))
+  } else if (p instanceof graphModule.Path) {
+    removeProperties(p.objects)
+  }
+
+  return p
+}
+
 When('iterated to list', function () {
-  return this.traversal.toList().then(list => this.result = list).catch(err => this.result = err);
+  return this.traversal.toList().then(list => this.result = removeProperties(list)).catch(err => this.result = err);
 });
 
 When('iterated next', function () {
   return this.traversal.next().then(it => {
-    this.result = it.value;
-    if (this.result instanceof Path) {
-      // Compare using the objects array
-      this.result = this.result.objects;
-    }
+    // for Path compare using the objects array
+    this.result = removeProperties(it.value instanceof Path ? it.value.objects : it.value )
   }).catch(err => this.result = err);
 });
 
@@ -179,7 +246,7 @@
       expect(toCompare(this.result)).to.have.deep.ordered.members(expectedResult);
       break;
     case 'unordered':
-      expect(toCompare(this.result)).to.have.deep.members(expectedResult);
+      expect(toCompare(this.result)).to.have.deep.members(toCompare(expectedResult));
       break;
     case 'of':
       // result is a subset of the expected
@@ -354,6 +421,10 @@
     return direction[value.toLowerCase()];
 }
 
+function toDateTime(value) {
+  return new Date(value);
+}
+
 function toMerge(value) {
   return merge[value];
 }
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
index 3a9e1f8..fe3804f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
@@ -30,6 +30,7 @@
 const __ = graphTraversalModule.statics;
 const Barrier = traversalModule.barrier
 const Cardinality = traversalModule.cardinality
+const CardinalityValue = graphTraversalModule.CardinalityValue;
 const Column = traversalModule.column
 const Direction = {
     BOTH: traversalModule.direction.both,
@@ -38,6 +39,7 @@
     from_: traversalModule.direction.out,
     to: traversalModule.direction.in
 };
+const DT = traversalModule.dt;
 const Merge = traversalModule.merge;
 const P = traversalModule.P;
 const Pick = traversalModule.pick
@@ -105,6 +107,15 @@
     g_VX1X_repeatXrepeatXunionXout_uses_out_traversesXX_whereXloops_isX0X_timesX1X_timeX2X_name: [function({g, vid1}) { return g.V(vid1).repeat(__.repeat(__.union(__.out("uses"),__.out("traverses")).where(__.loops().is(0))).times(1)).times(2).values("name") }], 
     g_V_repeatXa_outXknows_repeatXb_outXcreatedX_filterXloops_isX0XX_emit_lang: [function({g}) { return g.V().repeat("a",__.out("knows").repeat("b",__.out("created").filter(__.loops("a").is(0))).emit()).emit().values("lang") }], 
     g_VX6X_repeatXa_bothXcreatedX_simplePathX_emitXrepeatXb_bothXknowsXX_untilXloopsXbX_asXb_whereXloopsXaX_asXbX_hasXname_vadasXX_dedup_name: [function({g, vid6}) { return g.V(vid6).repeat("a",__.both("created").simplePath()).emit(__.repeat("b",__.both("knows")).until(__.loops("b").as("b").where(__.loops("a").as("b"))).has("name","vadas")).dedup().values("name") }], 
+    g_unionXX: [function({g}) { return g.union() }], 
+    g_unionXV_name: [function({g}) { return g.union(__.V().values("name")) }], 
+    g_unionXVXv1X_VX4XX_name: [function({g, v4, v1}) { return g.union(__.V(v1),__.V(v4)).values("name") }], 
+    g_unionXV_hasLabelXsoftwareX_V_hasLabelXpersonXX_name: [function({g}) { return g.union(__.V().hasLabel("software"),__.V().hasLabel("person")).values("name") }], 
+    g_unionXV_out_out_V_hasLabelXsoftwareXX_path: [function({g}) { return g.union(__.V().out().out(),__.V().hasLabel("software")).path() }], 
+    g_unionXV_out_out_V_hasLabelXsoftwareXX_path_byXnameX: [function({g}) { return g.union(__.V().out().out(),__.V().hasLabel("software")).path().by("name") }], 
+    g_unionXunionXV_out_outX_V_hasLabelXsoftwareXX_path_byXnameX: [function({g}) { return g.union(__.union(__.V().out().out()),__.V().hasLabel("software")).path().by("name") }], 
+    g_unionXinjectX1X_injectX2X: [function({g}) { return g.union(__.inject(1),__.inject(2)) }], 
+    g_V_unionXconstantX1X_constantX2X_constantX3XX: [function({g, xx1, xx3, xx2, v2}) { return g.V(v2).union(__.constant(xx1),__.constant(xx2),__.constant(xx3)) }], 
     g_V_unionXout__inX_name: [function({g}) { return g.V().union(__.out(),__.in_()).values("name") }], 
     g_VX1X_unionXrepeatXoutX_timesX2X__outX_name: [function({g, vid1}) { return g.V(vid1).union(__.repeat(__.out()).times(2),__.out()).values("name") }], 
     g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX: [function({g}) { return g.V().choose(__.label().is("person"),__.union(__.out().values("lang"),__.out().values("name")),__.in_().label()) }], 
@@ -113,11 +124,36 @@
     g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX: [function({g, vid2, vid1}) { return g.V(vid1,vid2).union(__.outE().count(),__.inE().count(),__.outE().values("weight").sum()) }], 
     g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX: [function({g, vid2, vid1}) { return g.V(vid1,vid2).local(__.union(__.outE().count(),__.inE().count(),__.outE().values("weight").sum())) }], 
     g_VX1_2X_localXunionXcountXX: [function({g, vid2, vid1}) { return g.V(vid1,vid2).local(__.union(__.count())) }], 
+    g_unionXaddVXpersonX_propertyXname_aliceX_addVXpersonX_propertyXname_bobX_addVXpersonX_propertyXname_chrisX_name: [function({g}) { return g.union(__.addV("person").property("name","alice"),__.addV("person").property("name","bob"),__.addV("person").property("name","chris")).values("name") }], 
+    g_V_valuesXageX_allXgtX32XX: [function({g}) { return g.V().values("age").all(P.gt(32)) }], 
+    g_V_valuesXageX_whereXisXP_gtX33XXX_fold_allXgtX33XX: [function({g}) { return g.V().values("age").where(__.is(P.gt(33))).fold().all(P.gt(33)) }], 
+    g_V_valuesXageX_order_byXdescX_fold_allXgtX10XX: [function({g}) { return g.V().values("age").order().by(Order.desc).fold().all(P.gt(10)) }], 
+    g_V_valuesXageX_order_byXdescX_fold_allXgtX30XX: [function({g}) { return g.V().values("age").order().by(Order.desc).fold().all(P.gt(30)) }], 
+    g_injectXabc_bcdX_allXeqXbcdXX: [function({g}) { return g.inject(["abc", "bcd"]).all(P.eq("bcd")) }], 
+    g_injectXbcd_bcdX_allXeqXbcdXX: [function({g, xx1}) { return g.inject(xx1).all(P.eq("bcd")) }], 
+    g_injectXnull_abcX_allXTextP_startingWithXaXX: [function({g, xx1}) { return g.inject(xx1).all(TextP.startingWith("a")) }], 
+    g_injectX5_8_10_10_7X_allXgteX7XX: [function({g, xx1, xx2}) { return g.inject(xx1,xx2).all(P.gte(7)) }], 
+    g_injectXnullX_allXeqXnullXX: [function({g}) { return g.inject(null).all(P.eq(null)) }], 
+    g_injectX7X_allXeqX7XX: [function({g}) { return g.inject(7).all(P.eq(7)) }], 
+    g_injectXnull_nullX_allXeqXnullXX: [function({g, xx1}) { return g.inject(xx1).all(P.eq(null)) }], 
+    g_injectX3_threeX_allXeqX3XX: [function({g, xx1}) { return g.inject(xx1).all(P.eq(3)) }], 
     g_V_andXhasXage_gt_27X__outE_count_gte_2X_name: [function({g}) { return g.V().and(__.has("age",P.gt(27)),__.outE().count().is(P.gte(2))).values("name") }], 
     g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name: [function({g}) { return g.V().and(__.outE(),__.has(T.label,"person").and().has("age",P.gte(32))).values("name") }], 
     g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name: [function({g}) { return g.V().as("a").out("knows").and().out("created").in_("created").as("a").values("name") }], 
     g_V_asXaX_andXselectXaX_selectXaXX: [function({g}) { return g.V().as("a").and(__.select("a"),__.select("a")) }], 
     g_V_hasXname_markoX_and_hasXname_markoX_and_hasXname_markoX: [function({g}) { return g.V().has("name","marko").and().has("name","marko").and().has("name","marko") }], 
+    g_V_valuesXageX_anyXgtX32XX: [function({g}) { return g.V().values("age").any(P.gt(32)) }], 
+    g_V_valuesXageX_order_byXdescX_fold_anyXeqX29XX: [function({g}) { return g.V().values("age").order().by(Order.desc).fold().any(P.eq(29)) }], 
+    g_V_valuesXageX_order_byXdescX_fold_anyXgtX10XX: [function({g}) { return g.V().values("age").order().by(Order.desc).fold().any(P.gt(10)) }], 
+    g_V_valuesXageX_order_byXdescX_fold_anyXgtX42XX: [function({g}) { return g.V().values("age").order().by(Order.desc).fold().any(P.gt(42)) }], 
+    g_injectXabc_cdeX_anyXeqXbcdXX: [function({g}) { return g.inject(["abc", "cde"]).any(P.eq("bcd")) }], 
+    g_injectXabc_bcdX_anyXeqXbcdXX: [function({g, xx1}) { return g.inject(xx1).any(P.eq("bcd")) }], 
+    g_injectXnull_abcX_anyXTextP_startingWithXaXX: [function({g, xx1}) { return g.inject(xx1).any(TextP.startingWith("a")) }], 
+    g_injectX5_8_10_10_7X_anyXeqX7XX: [function({g, xx1, xx2}) { return g.inject(xx1,xx2).any(P.eq(7)) }], 
+    g_injectXnullX_anyXeqXnullXX: [function({g}) { return g.inject(null).any(P.eq(null)) }], 
+    g_injectX7X_anyXeqX7XX: [function({g}) { return g.inject(7).any(P.eq(7)) }], 
+    g_injectXnull_nullX_anyXeqXnullXX: [function({g, xx1}) { return g.inject(xx1).any(P.eq(null)) }], 
+    g_injectX3_threeX_anyXeqX3XX: [function({g, xx1}) { return g.inject(xx1).any(P.eq(3)) }], 
     g_V_coinX1X: [function({g}) { return g.V().coin(1.0) }], 
     g_V_coinX0X: [function({g}) { return g.V().coin(0.0) }], 
     g_withStrategiesXSeedStrategyX_V_order_byXnameX_coinX50X: [function({g}) { return g.withStrategies(new SeedStrategy({seed:999999})).V().order().by("name").coin(0.5) }], 
@@ -152,6 +188,8 @@
     g_V_both_dedup_age_name: [function({g}) { return g.V().both().dedup().by("age").values("name") }], 
     g_VX1X_asXaX_both_asXbX_both_asXcX_dedupXa_bX_age_selectXa_b_cX_name: [function({g, vid1}) { return g.V(vid1).as("a").both().as("b").both().as("c").dedup("a","b").by("age").select("a","b","c").by("name") }], 
     g_VX1X_valuesXageX_dedupXlocalX_unfold: [function({g, vid1}) { return g.V(vid1).values("age").dedup(Scope.local).unfold() }], 
+    g_V_properties_dedup_count: [function({g}) { return g.addV("person").property("name","josh").addV("person").property("name","josh").addV("person").property("name","josh") }, function({g}) { return g.V().properties("name").dedup().count() }], 
+    g_V_properties_dedup_byXvalueX_count: [function({g}) { return g.addV("person").property("name","josh").addV("person").property("name","josh").addV("person").property("name","josh") }, function({g}) { return g.V().properties("name").dedup().by(T.value).count() }], 
     g_V_drop: [function({g}) { return g.addV().as("a").addV().as("b").addE("knows").to("a") }, function({g}) { return g.V().drop() }, function({g}) { return g.V() }, function({g}) { return g.E() }], 
     g_V_outE_drop: [function({g}) { return g.addV().as("a").addV().as("b").addE("knows").to("a") }, function({g}) { return g.V().outE().drop() }, function({g}) { return g.V() }, function({g}) { return g.E() }], 
     g_V_properties_drop: [function({g}) { return g.addV().property("name","bob").addV().property("name","alice") }, function({g}) { return g.V().properties().drop() }, function({g}) { return g.V() }, function({g}) { return g.V().properties() }], 
@@ -346,23 +384,24 @@
     g_withStrategiesXProductiveByStrategyX_VX3X_asXaX_in_out_asXbX_whereXa_eqXbXX_byXageX_name: [function({g, vid3}) { return g.withStrategies(new ProductiveByStrategy({productiveKeys:[]})).V(vid3).as("a").in_().out().as("b").where("a",P.eq("b")).by("age").values("name") }], 
     g_V_asXnX_whereXorXhasLabelXsoftwareX_hasLabelXpersonXXX_selectXnX_byXnameX: [function({g}) { return g.V().as("n").where(__.or(__.hasLabel("software"),__.hasLabel("person"))).select("n").by("name") }], 
     g_V_asXnX_whereXorXselectXnX_hasLabelXsoftwareX_selectXnX_hasLabelXpersonXXX_selectXnX_byXnameX: [function({g}) { return g.V().as("n").where(__.or(__.select("n").hasLabel("software"),__.select("n").hasLabel("person"))).select("n").by("name") }], 
+    g_V_hasLabelXpersonX_asXxX_whereXinEXknowsX_count_isXgteX1XXX_selectXxX: [function({g}) { return g.V().hasLabel("person").as("x").where(__.inE("knows").count().is(P.gte(1))).select("x") }], 
     g_V_coworker: [function({g, xx1}) { return g.V().hasLabel("person").filter(__.outE("created")).aggregate("p").as("p1").values("name").as("p1n").select("p").unfold().where(P.neq("p1")).as("p2").values("name").as("p2n").select("p2").out("created").choose(__.in_("created").where(P.eq("p1")),__.values("name"),__.constant(xx1)).group().by(__.select("p1n")).by(__.group().by(__.select("p2n")).by(__.unfold().fold().project("numCoCreated","coCreated").by(__.count(Scope.local)).by())).unfold() }], 
     g_V_coworker_with_midV: [function({g}) { return g.V().hasLabel("person").filter(__.outE("created")).as("p1").V().hasLabel("person").where(P.neq("p1")).filter(__.outE("created")).as("p2").map(__.out("created").where(__.in_("created").as("p1")).values("name").fold()).group().by(__.select("p1").by("name")).by(__.group().by(__.select("p2").by("name")).by(__.project("numCoCreated","coCreated").by(__.count(Scope.local)).by())).unfold() }], 
     g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").addV("person").property("_partition","b").property("name","bob") }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).V().values("name") }], 
     g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").addV("person").property("_partition","b").property("name","bob") }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a", "b"],writePartition:"a"})).V().values("name") }], 
     g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").addV("person").property("_partition","b").property("name","bob") }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["c"],writePartition:"a"})).V().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).V().bothE().values("weight") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["b"],writePartition:"a"})).V().bothE().values("weight") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a", "b"],writePartition:"a"})).V().bothE().dedup().values("weight") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["c"],writePartition:"a"})).V().bothE().values("weight") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).V().both().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["b"],writePartition:"a"})).V().both().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a", "b"],writePartition:"a"})).V().both().dedup().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["c"],writePartition:"a"})).V().both().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).V().out().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["b"],writePartition:"a"})).V().in_().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a", "b"],writePartition:"a"})).V().out().values("name") }], 
-    g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["c"],writePartition:"a"})).V().out().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).V().bothE().values("weight") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["b"],writePartition:"a"})).V().bothE().values("weight") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a", "b"],writePartition:"a"})).V().bothE().dedup().values("weight") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["c"],writePartition:"a"})).V().bothE().values("weight") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).V().both().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["b"],writePartition:"a"})).V().both().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a", "b"],writePartition:"a"})).V().both().dedup().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["c"],writePartition:"a"})).V().both().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).V().out().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["b"],writePartition:"a"})).V().in_().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a", "b"],writePartition:"a"})).V().out().values("name") }], 
+    g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name: [function({g}) { return g.addV("person").property("_partition","a").property("name","alice").as("a").addV("person").property("_partition","b").property("name","bob").as("b").addE("knows").from_("a").to("b").property("_partition","a").property("weight",1.0).addE("knows").from_("b").to("a").property("_partition","b").property("weight",2.0) }, function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["c"],writePartition:"a"})).V().out().values("name") }], 
     g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_addVXpersonX_propertyXname_aliceX_addXselfX: [function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).addV("person").property("name","alice").addE("self") }, function({g}) { return g.V().has("person","name","alice").has("_partition","a") }, function({g}) { return g.V() }, function({g}) { return g.E().has("_partition","a") }, function({g}) { return g.E() }], 
     g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectXzeroX_addVXpersonX_propertyXname_aliceX_addXselfX: [function({g}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).inject(0).addV("person").property("name","alice").addE("self") }, function({g}) { return g.V().has("person","name","alice").has("_partition","a") }, function({g}) { return g.V() }, function({g}) { return g.E().has("_partition","a") }, function({g}) { return g.E() }], 
     g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV: [function({g, xx1}) { return g.withStrategies(new PartitionStrategy({includeMetaProperties:false,partitionKey:"_partition",readPartitions:["a"],writePartition:"a"})).mergeV(xx1) }, function({g, xx1}) { return g.V().has("person","name","alice").has("_partition","a") }, function({g, xx1}) { return g.V() }], 
@@ -430,6 +469,7 @@
     g_withStrategiesXSubgraphStrategyXedges_hasLabelXusesX_hasXskill_5XXX_V_outE_valueMap_selectXvaluesX_unfold: [function({g}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:true,edges:__.hasLabel("uses").has("skill",5)})).V().outE().valueMap().select(Column.values).unfold() }], 
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_V: [function({g}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).V() }], 
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_E: [function({g}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).E() }], 
+    g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_E: [function({g}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:true,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).E() }], 
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_outE: [function({g, vid4}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).V(vid4).outE() }], 
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_inE: [function({g, vid4}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).V(vid4).inE() }], 
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_out: [function({g, vid4}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).V(vid4).out() }], 
@@ -440,6 +480,7 @@
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX11X_bothV: [function({g, eid11}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).E(eid11).bothV() }], 
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV: [function({g, eid12}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).E(eid12).bothV() }], 
     g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV: [function({g, eid9}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:false,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).E(eid9).bothV() }], 
+    g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV: [function({g, eid9}) { return g.withStrategies(new SubgraphStrategy({checkAdjacentVertices:true,vertices:__.has("name",P.within(["josh", "lop", "ripple"])),edges:__.or(__.has("weight",0.4).hasLabel("created"),__.has("weight",1.0).hasLabel("created"))})).E(eid9).bothV() }], 
     g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX: [function({g, vid1}) { return g.addV("person").property("name","marko").property("age",29).as("marko").addV("person").property("name","vadas").property("age",27).as("vadas").addV("software").property("name","lop").property("lang","java").as("lop").addV("person").property("name","josh").property("age",32).as("josh").addV("software").property("name","ripple").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g, vid1}) { return g.V(vid1).as("a").out("created").addE("createdBy").to("a") }, function({g, vid1}) { return g.E() }, function({g, vid1}) { return g.V(vid1).inE() }], 
     g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X: [function({g, vid1}) { return g.addV("person").property("name","marko").property("age",29).as("marko").addV("person").property("name","vadas").property("age",27).as("vadas").addV("software").property("name","lop").property("lang","java").as("lop").addV("person").property("name","josh").property("age",32).as("josh").addV("software").property("name","ripple").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g, vid1}) { return g.V(vid1).as("a").out("created").addE("createdBy").to("a").property("weight",2.0) }, function({g, vid1}) { return g.E() }, function({g, vid1}) { return g.V(vid1).bothE() }, function({g, vid1}) { return g.V(vid1).inE().has("weight",2.0) }], 
     g_V_outE_propertyXweight_nullX: [function({g}) { return g.addV("person").property("name","marko").property("age",29).as("marko").addV("person").property("name","vadas").property("age",27).as("vadas").addV("software").property("name","lop").property("lang","java").as("lop").addV("person").property("name","josh").property("age",32).as("josh").addV("software").property("name","ripple").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().outE().property("weight",null) }, function({g}) { return g.E().properties("weight") }], 
@@ -471,6 +512,8 @@
     g_addV_propertyXlabel_personX: [function({g}) { return g.addV().property(T.label,"person") }, function({g}) { return g.V().hasLabel("person") }], 
     g_addV_propertyXmapX: [function({g}) { return g.addV().property("name","foo").property("age",42) }, function({g}) { return g.V().has("name","foo") }], 
     g_addV_propertyXsingle_mapX: [function({g}) { return g.addV().property(Cardinality.single,"name","foo").property(Cardinality.single,"age",42) }, function({g}) { return g.V().has("name","foo") }], 
+    g_V_hasXname_fooX_propertyXname_setXbarX_age_43X: [function({g}) { return g.addV().property(Cardinality.single,"name","foo").property("age",42) }, function({g}) { return g.V().has("name","foo").property(Cardinality.set,"name","bar").property("age",43) }, function({g}) { return g.V().has("name","foo") }, function({g}) { return g.V().has("name","bar") }, function({g}) { return g.V().has("age",43) }, function({g}) { return g.V().has("age",42) }], 
+    g_V_hasXname_fooX_propertyXset_name_bar_age_singleX43XX: [function({g}) { return g.addV().property(Cardinality.single,"name","foo").property("age",42) }, function({g}) { return g.V().has("name","foo").property(Cardinality.set,"name","bar").property(Cardinality.single,"age",43) }, function({g}) { return g.V().has("name","foo") }, function({g}) { return g.V().has("name","bar") }, function({g}) { return g.V().has("age",43) }, function({g}) { return g.V().has("age",42) }], 
     g_addV_propertyXnullX: [function({g}) { return g.addV("person") }, function({g}) { return g.V().hasLabel("person").values() }], 
     g_addV_propertyXemptyX: [function({g}) { return g.addV("person") }, function({g}) { return g.V().hasLabel("person").values() }], 
     g_addV_propertyXset_nullX: [function({g}) { return g.addV("foo") }, function({g}) { return g.V().hasLabel("foo").values() }], 
@@ -478,6 +521,28 @@
     g_addVXpersonX_propertyXname_joshX_propertyXage_nullX: [function({g}) { return g.addV("person").property("name","josh").property("age",null) }, function({g}) { return g.V().has("person","age",null) }], 
     g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX: [function({g}) { return g.addV("person").property("name","marko").property("friendWeight",null,"acl",null) }, function({g}) { return g.V().has("person","name","marko").has("friendWeight",null) }, function({g}) { return g.V().has("person","name","marko").properties("friendWeight").has("acl",null) }, function({g}) { return g.V().has("person","name","marko").properties("friendWeight").count() }], 
     g_V_hasXperson_name_aliceX_propertyXsingle_age_unionXage_constantX1XX_sumX: [function({g}) { return g.addV("person").property("name","alice").property(Cardinality.single,"age",50) }, function({g}) { return g.V().has("person","name","alice").property("age",__.union(__.values("age"),__.constant(1)).sum()) }, function({g}) { return g.V().has("person","age",50) }, function({g}) { return g.V().has("person","age",51) }], 
+    g_V_limitX3X_addVXsoftwareX_aggregateXa1X_byXlabelX_aggregateXa2X_byXlabelX_capXa1_a2X_selectXa_bX_byXunfoldX_foldX: [function({g}) { return g.addV("person").property("name","marko").property("age",29).as("marko").addV("person").property("name","vadas").property("age",27).as("vadas").addV("software").property("name","lop").property("lang","java").as("lop").addV("person").property("name","josh").property("age",32).as("josh").addV("software").property("name","ripple").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().limit(3).addV("software").aggregate("a1").by(T.label).aggregate("a2").by(T.label).cap("a1","a2").select("a1","a2").by(__.unfold().fold()) }], 
+    g_injectXstrX_asDate: [function({g}) { return g.inject("2023-08-02T00:00:00Z").asDate() }], 
+    g_injectX1694017707000X_asDate: [function({g}) { return g.inject(1694017707000).asDate() }], 
+    g_injectX1694017708000LX_asDate: [function({g, xx1}) { return g.inject(xx1).asDate() }], 
+    g_injectX1694017709000dX_asDate: [function({g, xx1}) { return g.inject(xx1).asDate() }], 
+    g_injectX1_2X_asDate: [function({g, xx1}) { return g.inject(xx1).asDate() }], 
+    g_injectXnullX_asDate: [function({g}) { return g.inject(null).asDate() }], 
+    g_injectXinvalidstrX_asDate: [function({g}) { return g.inject("This String is not an ISO 8601 Date").asDate() }], 
+    g_injectX1_2X_asString: [function({g, xx1, xx2}) { return g.inject(xx1,xx2).asString() }], 
+    g_injectX1_2X_asStringXlocalX: [function({g, xx1, xx2}) { return g.inject(xx1,xx2).asString(Scope.local) }], 
+    g_injectXlist_1_2X_asStringXlocalX: [function({g, xx1}) { return g.inject(xx1).asString(Scope.local) }], 
+    g_injectX1_nullX_asString: [function({g, xx1}) { return g.inject(null,xx1).asString() }], 
+    g_injectX1_nullX_asStringXlocalX: [function({g, xx1}) { return g.inject(xx1).asString(Scope.local) }], 
+    g_V_valueMapXnameX_asString: [function({g}) { return g.V().valueMap("name").asString() }], 
+    g_V_valueMapXnameX_order_fold_asStringXlocalX: [function({g}) { return g.V().valueMap("name").order().fold().asString(Scope.local) }], 
+    g_V_asString: [function({g}) { return g.V().asString() }], 
+    g_V_fold_asStringXlocalX_orderXlocalX: [function({g}) { return g.V().fold().asString(Scope.local).order(Scope.local) }], 
+    g_E_asString: [function({g}) { return g.E().asString() }], 
+    g_V_properties: [function({g}) { return g.V().properties().asString() }], 
+    g_V_hasLabelXpersonX_valuesXageX_asString: [function({g}) { return g.V().hasLabel("person").values("age").asString() }], 
+    g_V_hasLabelXpersonX_valuesXageX_order_fold_asStringXlocalX: [function({g}) { return g.V().hasLabel("person").values("age").order().fold().asString(Scope.local) }], 
+    g_V_hasLabelXpersonX_valuesXageX_asString_concatX_years_oldX: [function({g}) { return g.V().hasLabel("person").values("age").asString().concat(" years old") }], 
     g_call: [function({g}) { return g.call() }], 
     g_callXlistX: [function({g}) { return g.call("--list") }], 
     g_callXlistX_withXstring_stringX: [function({g}) { return g.call("--list").with_("service","tinker.search") }], 
@@ -504,6 +569,50 @@
     g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX: [function({g}) { return g.V().coalesce(__.out("likes"),__.out("knows"),__.out("created")).groupCount().by("name") }], 
     g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX: [function({g}) { return g.V().coalesce(__.outE("knows"),__.outE("created")).otherV().path().by("name").by(T.label) }], 
     g_V_outXcreatedX_order_byXnameX_coalesceXname_constantXxXX: [function({g}) { return g.V().out("created").order().by("name").coalesce(__.values("name"),__.constant("x")) }], 
+    g_injectXnullX_combineXinjectX1XX: [function({g}) { return g.inject(null).combine(__.inject(1)) }], 
+    g_V_valuesXnameX_combineXV_foldX: [function({g}) { return g.V().values("name").combine(__.V().fold()) }], 
+    g_V_fold_combineXconstantXnullXX: [function({g}) { return g.V().fold().combine(__.constant(null)) }], 
+    g_V_fold_combineXVX: [function({g}) { return g.V().fold().combine(__.V()) }], 
+    g_V_valuesXnameX_fold_combineX2X: [function({g}) { return g.V().values("name").fold().combine(2) }], 
+    g_V_valuesXnameX_fold_combineXnullX: [function({g}) { return g.V().values("name").fold().combine(null) }], 
+    g_V_valuesXnonexistantX_fold_combineXV_valuesXnameX_foldX_unfold: [function({g}) { return g.V().values("nonexistant").fold().combine(__.V().values("name").fold()).unfold() }], 
+    g_V_valuesXnameX_fold_combineXV_valuesXnonexistantX_foldX_unfold: [function({g}) { return g.V().values("name").fold().combine(__.V().values("nonexistant").fold()).unfold() }], 
+    g_V_valuesXageX_order_byXdescX_fold_combineXV_valuesXageX_order_byXdescX_foldX: [function({g}) { return g.V().values("age").order().by(Order.desc).fold().combine(__.V().values("age").order().by(Order.desc).fold()) }], 
+    g_V_out_path_byXvaluesXnameX_toUpperX_combineXMARKOX: [function({g, xx1}) { return g.V().out().path().by(__.values("name").toUpper()).combine(xx1) }], 
+    g_injectXxx1X_combineXV_valuesXnameX_foldX_unfold: [function({g, xx1}) { return g.inject(xx1).combine(__.V().values("name").fold()).unfold() }], 
+    g_V_valueMapXlocationX_selectXvaluesX_unfold_combineXseattle_vancouverX_orderXlocalX: [function({g, xx1}) { return g.V().valueMap("location").select(Column.values).unfold().combine(xx1).order(Scope.local) }], 
+    g_V_out_out_path_byXnameX_combineXempty_listX: [function({g, xx1}) { return g.V().out().out().path().by("name").combine(xx1) }], 
+    g_V_valuesXageX_order_fold_combineXconstantX27X_foldX: [function({g}) { return g.V().values("age").order().fold().combine(__.constant(27).fold()) }], 
+    g_V_out_out_path_byXnameX_combineXdave_kelvinX: [function({g, xx1}) { return g.V().out().out().path().by("name").combine(xx1) }], 
+    g_injectXa_null_bX_combineXa_cX: [function({g, xx1, xx2}) { return g.inject(xx1).combine(xx2) }], 
+    g_injectXa_null_bX_combineXa_null_cX: [function({g, xx1, xx2}) { return g.inject(xx1).combine(xx2) }], 
+    g_injectX3_threeX_combineXfive_three_7X: [function({g, xx1, xx2}) { return g.inject(xx1).combine(xx2) }], 
+    g_injectXa_bX_concat: [function({g}) { return g.inject("a","b").concat() }], 
+    g_injectXa_bX_concat_XcX: [function({g}) { return g.inject("a","b").concat("c") }], 
+    g_injectXa_bX_concat_Xc_dX: [function({g}) { return g.inject("a","b").concat("c","d") }], 
+    g_injectXa_bX_concat_Xinject_c_dX: [function({g}) { return g.inject("a","b").concat(__.inject("c")) }], 
+    g_injectXaX_concat_Xinject_List_b_cX: [function({g, xx1}) { return g.inject("a").concat(__.inject(xx1)) }], 
+    g_injectXListXa_bXcX_concat_XdX: [function({g, xx1}) { return g.inject(xx1,"c").concat("d") }], 
+    g_injectXnullX_concat_XinjectX: [function({g}) { return g.inject(null).concat() }], 
+    g_injectXnull_aX_concat_Xnull_bX: [function({g}) { return g.inject(null,"a").concat(null,"b") }], 
+    g_injectXhello_hiX_concat_XV_valuesXnameXX: [function({g}) { return g.inject("hello","hi").concat(__.V().order().by(T.id).values("name")) }], 
+    g_V_hasLabel_value_concat_X_X_concat_XpersonX: [function({g}) { return g.V().hasLabel("person").values("name").concat(" ").concat("person") }], 
+    g_hasLabelXpersonX_valuesXnameX_asXaX_constantXMrX_concatXselectXaX: [function({g}) { return g.V().hasLabel("person").values("name").as("a").constant("Mr.").concat(__.select("a")) }], 
+    g_hasLabelXsoftwareX_asXaX_valuesXnameX_concatXunsesX_concatXselectXaXvaluesXlangX: [function({g}) { return g.V().hasLabel("software").as("a").values("name").concat(" uses ").concat(__.select("a").values("lang")) }], 
+    g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_labelX_concatXselectXaX_inV_valuesXnameXX: [function({g, vid1}) { return g.V(vid1).outE().as("a").V(vid1).values("name").concat(__.select("a").label()).concat(__.select("a").inV().values("name")) }], 
+    g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_label_selectXaX_inV_valuesXnameXX: [function({g, vid1}) { return g.V(vid1).outE().as("a").V(vid1).values("name").concat(__.select("a").label(),__.select("a").inV().values("name")) }], 
+    g_addVXconstantXprefix_X_concatXVX1X_labelX_label: [function({g, vid1}) { return g.addV("person").property("name","marko").property("age",29).as("marko").addV("person").property("name","vadas").property("age",27).as("vadas").addV("software").property("name","lop").property("lang","java").as("lop").addV("person").property("name","josh").property("age",32).as("josh").addV("software").property("name","ripple").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g, vid1}) { return g.addV(__.constant("prefix_").concat(__.V(vid1).label())).label() }], 
+    g_injectXnullX_conjoinX1X: [function({g}) { return g.inject(null).conjoin("1") }], 
+    g_V_valuesXnameX_conjoinX1X: [function({g}) { return g.V().values("name").conjoin("1") }], 
+    g_V_valuesXnonexistantX_fold_conjoinX_X: [function({g}) { return g.V().values("nonexistant").fold().conjoin(";") }], 
+    g_V_valuesXnameX_order_fold_conjoinX_X: [function({g}) { return g.V().values("name").order().fold().conjoin("_") }], 
+    g_V_valuesXageX_order_fold_conjoinX_X: [function({g}) { return g.V().values("age").order().fold().conjoin(";") }], 
+    g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX: [function({g}) { return g.V().out().path().by(__.values("name").toUpper()).conjoin("MARKO") }], 
+    g_injectXmarkoX_conjoinX_X: [function({g, xx1}) { return g.inject(xx1).conjoin("-") }], 
+    g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X: [function({g}) { return g.V().valueMap("location").select(Column.values).unfold().order(Scope.local).conjoin("1") }], 
+    g_V_out_out_path_byXnameX_conjoinXX: [function({g}) { return g.V().out().out().path().by("name").conjoin("") }], 
+    g_injectXa_null_bX_conjoinXxyzX: [function({g, xx1}) { return g.inject(xx1).conjoin("xyz") }], 
+    g_injectX3_threeX_conjoinX_X: [function({g, xx1}) { return g.inject(xx1).conjoin(";") }], 
     g_V_connectedComponent_hasXcomponentX: [function({g}) { return g.V().connectedComponent().has("gremlin.connectedComponentVertexProgram.component") }], 
     g_V_dedup_connectedComponent_hasXcomponentX: [function({g}) { return g.V().dedup().connectedComponent().has("gremlin.connectedComponentVertexProgram.component") }], 
     g_V_hasLabelXsoftwareX_connectedComponent_project_byXnameX_byXcomponentX: [function({g}) { return g.V().hasLabel("software").connectedComponent().project("name","component").by("name").by("gremlin.connectedComponentVertexProgram.component") }], 
@@ -524,6 +633,59 @@
     g_E_sampleX1X_count: [function({g}) { return g.E().sample(1).count() }], 
     g_V_sampleX1X_byXageX_count: [function({g}) { return g.V().sample(1).by("age").count() }], 
     g_V_order_byXnoX_count: [function({g}) { return g.V().order().by("no").count() }], 
+    g_V_group_byXlabelX_count: [function({g}) { return g.V().group().by(T.label).count() }], 
+    g_V_group_byXlabelX_countXlocalX: [function({g}) { return g.V().group().by(T.label).count(Scope.local) }], 
+    g_injectXdatetimeXstrXX_dateAddXDT_hour_2X: [function({g}) { return g.inject(new Date(1690934400000)).dateAdd(DT.hour,2) }], 
+    g_injectXdatetimeXstrXX_dateAddXhour_2X: [function({g}) { return g.inject(new Date(1690934400000)).dateAdd(DT.hour,2) }], 
+    g_injectXdatetimeXstrXX_dateAddXhour_1X: [function({g}) { return g.inject(new Date(1690934400000)).dateAdd(DT.hour,-1) }], 
+    g_injectXdatetimeXstrXX_dateAddXminute_10X: [function({g}) { return g.inject(new Date(1690934400000)).dateAdd(DT.minute,10) }], 
+    g_injectXdatetimeXstrXX_dateAddXsecond_20X: [function({g}) { return g.inject(new Date(1690934400000)).dateAdd(DT.second,20) }], 
+    g_injectXdatetimeXstrXX_dateAddXday_11X: [function({g}) { return g.inject(new Date(1693958400000)).dateAdd(DT.day,11) }], 
+    g_injectXdatetimeXstr1XX_dateDiffXdatetimeXstr2XX: [function({g}) { return g.inject(new Date(1690934400000)).dateDiff(new Date(1691539200000)) }], 
+    g_injectXdatetimeXstr1XX_dateDiffXconstantXdatetimeXstr2XXX: [function({g}) { return g.inject(new Date(1691452800000)).dateDiff(__.constant(new Date(1690848000000))) }], 
+    g_injectXdatetimeXstr1XX_dateDiffXinjectXdatetimeXstr2XXX: [function({g}) { return g.inject(new Date(1691452800000)).dateDiff(__.inject(new Date(1696982400000))) }], 
+    g_injectXnullX_differenceXinjectX1XX: [function({g}) { return g.inject(null).difference(__.inject(1)) }], 
+    g_V_valuesXnameX_differenceXV_foldX: [function({g}) { return g.V().values("name").difference(__.V().fold()) }], 
+    g_V_fold_differenceXconstantXnullXX: [function({g}) { return g.V().fold().difference(__.constant(null)) }], 
+    g_V_fold_differenceXVX: [function({g}) { return g.V().fold().difference(__.V()) }], 
+    g_V_valuesXnameX_fold_differenceX2X: [function({g}) { return g.V().values("name").fold().difference(2) }], 
+    g_V_valuesXnameX_fold_differenceXnullX: [function({g}) { return g.V().values("name").fold().difference(null) }], 
+    g_V_valuesXnonexistantX_fold_differenceXV_valuesXnameX_foldX: [function({g}) { return g.V().values("nonexistant").fold().difference(__.V().values("name").fold()) }], 
+    g_V_valuesXnameX_fold_differenceXV_valuesXnonexistantX_foldX: [function({g}) { return g.V().values("name").fold().difference(__.V().values("nonexistant").fold()) }], 
+    g_V_valuesXageX_fold_differenceXV_valuesXageX_foldX: [function({g}) { return g.V().values("age").fold().difference(__.V().values("age").fold()) }], 
+    g_V_out_path_byXvaluesXnameX_toUpperX_differenceXMARKOX: [function({g, xx1}) { return g.V().out().path().by(__.values("name").toUpper()).difference(xx1) }], 
+    g_injectXmarkoX_differenceXV_valuesXnameX_foldX: [function({g, xx1}) { return g.inject(xx1).difference(__.V().values("name").fold()) }], 
+    g_V_valueMapXlocationX_selectXvaluesX_unfold_differenceXseattle_vancouverX: [function({g, xx1}) { return g.V().valueMap("location").select(Column.values).unfold().difference(xx1) }], 
+    g_V_out_out_path_byXnameX_differenceXrippleX: [function({g, xx1}) { return g.V().out().out().path().by("name").difference(xx1) }], 
+    g_V_out_out_path_byXnameX_differenceXempty_listX: [function({g, xx1}) { return g.V().out().out().path().by("name").difference(xx1) }], 
+    g_V_valuesXageX_fold_differenceXconstantX27X_foldX: [function({g}) { return g.V().values("age").fold().difference(__.constant(27).fold()) }], 
+    g_V_out_out_path_byXnameX_differenceXdave_kelvinX: [function({g, xx1}) { return g.V().out().out().path().by("name").difference(xx1) }], 
+    g_injectXa_null_bX_differenceXa_cX: [function({g, xx1, xx2}) { return g.inject(xx1).difference(xx2) }], 
+    g_injectXa_null_bX_differenceXa_null_cX: [function({g, xx1, xx2}) { return g.inject(xx1).difference(xx2) }], 
+    g_injectX3_threeX_differenceXfive_three_7X: [function({g, xx1, xx2}) { return g.inject(xx1).difference(xx2) }], 
+    g_injectXnullX_disjunctXinjectX1XX: [function({g}) { return g.inject(null).disjunct(__.inject(1)) }], 
+    g_V_valuesXnameX_disjunctXV_foldX: [function({g}) { return g.V().values("name").disjunct(__.V().fold()) }], 
+    g_V_fold_disjunctXconstantXnullXX: [function({g}) { return g.V().fold().disjunct(__.constant(null)) }], 
+    g_V_fold_disjunctXVX: [function({g}) { return g.V().fold().disjunct(__.V()) }], 
+    g_V_valuesXnameX_fold_disjunctX2X: [function({g}) { return g.V().values("name").fold().disjunct(2) }], 
+    g_V_valuesXnameX_fold_disjunctXnullX: [function({g}) { return g.V().values("name").fold().disjunct(null) }], 
+    g_V_valuesXnonexistantX_fold_disjunctXV_valuesXnameX_foldX: [function({g}) { return g.V().values("nonexistant").fold().disjunct(__.V().values("name").fold()) }], 
+    g_V_valuesXnameX_fold_disjunctXV_valuesXnonexistantX_foldX: [function({g}) { return g.V().values("name").fold().disjunct(__.V().values("nonexistant").fold()) }], 
+    g_V_valuesXageX_fold_disjunctXV_valuesXageX_foldX: [function({g}) { return g.V().values("age").fold().disjunct(__.V().values("age").fold()) }], 
+    g_V_out_path_byXvaluesXnameX_toUpperX_disjunctXMARKOX: [function({g, xx1}) { return g.V().out().path().by(__.values("name").toUpper()).disjunct(xx1) }], 
+    g_V_valueMapXlocationX_selectXvaluesX_unfold_disjunctXseattle_vancouverX: [function({g, xx1}) { return g.V().valueMap("location").select(Column.values).unfold().disjunct(xx1) }], 
+    g_V_out_out_path_byXnameX_disjunctXmarkoX: [function({g, xx1}) { return g.V().out().out().path().by("name").disjunct(xx1) }], 
+    g_V_out_out_path_byXnameX_disjunctXstephen_markoX: [function({g, xx1}) { return g.V().out().out().path().by("name").disjunct(xx1) }], 
+    g_V_out_out_path_byXnameX_disjunctXdave_kelvinX: [function({g, xx1}) { return g.V().out().out().path().by("name").disjunct(xx1) }], 
+    g_injectXa_null_bX_disjunctXa_cX: [function({g, xx1, xx2}) { return g.inject(xx1).disjunct(xx2) }], 
+    g_injectXa_null_bX_disjunctXa_null_cX: [function({g, xx1, xx2}) { return g.inject(xx1).disjunct(xx2) }], 
+    g_injectX3_threeX_disjunctXfive_three_7X: [function({g, xx1, xx2}) { return g.inject(xx1).disjunct(xx2) }], 
+    g_V_EX11X: [function({g, eid11}) { return g.V().E(eid11) }], 
+    g_EX11X_E: [function({g, eid11}) { return g.E(eid11).E() }], 
+    g_V_EXnullX: [function({g}) { return g.V().E(null) }], 
+    g_V_EXlistXnullXX: [function({g, xx1}) { return g.V().E(xx1) }], 
+    g_injectX1X_EX11_nullX: [function({g, eid11}) { return g.inject(1).E(eid11,null) }], 
+    g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX: [function({g}) { return g.addV("person").property("name","josh").addV("person").property("name","vadas") }, function({g}) { return g.inject(1).coalesce(__.E().hasLabel("tests"),__.addE("tests").from_(__.V().has("name","josh")).to(__.V().has("name","vadas"))) }, function({g}) { return g.E().hasLabel("tests") }], 
     g_VX1X_properties_element: [function({g, v2}) { return g.V(v2).properties().element().limit(1) }], 
     g_V_properties_element: [function({g}) { return g.V().properties().element() }], 
     g_V_propertiesXageX_element: [function({g}) { return g.V().properties("age").element() }], 
@@ -541,6 +703,17 @@
     g_V_age_foldX0_plusX: [function({g}) { return g.V().values("age").fold(0,Operator.sum) }], 
     g_injectXa1_b2X_foldXm_addAllX: [function({g}) { return g.inject(new Map([["a",1]]),new Map([["b",2]])).fold(new Map([]),Operator.addAll) }], 
     g_injectXa1_b2_b4X_foldXm_addAllX: [function({g}) { return g.inject(new Map([["a",1]]),new Map([["b",2]]),new Map([["b",4]])).fold(new Map([]),Operator.addAll) }], 
+    g_VX1X_formatXstrX: [function({g}) { return g.V().has("name","marko").format("Hello world") }], 
+    g_V_formatXstrX: [function({g}) { return g.V().format("%{name} is %{age} years old") }], 
+    g_injectX1X_asXageX_V_formatXstrX: [function({g}) { return g.inject(1).as("age").V().format("%{name} is %{age} years old") }], 
+    g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX: [function({g}) { return g.V().format("%{_} is %{_} years old").by(__.values("name")).by(__.values("age")) }], 
+    g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX: [function({g}) { return g.V().hasLabel("person").format("%{_} %{_} %{_}").by(__.constant("hello")).by(__.values("name")) }], 
+    g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX: [function({g, vid1}) { return g.V(vid1).format("%{_}").by(__.constant("hello")).by(__.values("name")) }], 
+    g_V_formatXstrX_byXbothE_countX: [function({g}) { return g.V().format("%{name} has %{_} connections").by(__.bothE().count()) }], 
+    g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX: [function({g}) { return g.V().project("name","count").by(__.values("name")).by(__.bothE().count()).format("%{name} has %{count} connections") }], 
+    g_V_elementMap_formatXstrX: [function({g}) { return g.V().elementMap().format("%{name} is %{age} years old") }], 
+    g_V_hasLabelXpersonX_asXaX_valuesXnameX_asXp1X_selectXaX_inXknowsX_formatXstrX: [function({g}) { return g.V().hasLabel("person").as("a").values("name").as("p1").select("a").in_("knows").format("%{p1} knows %{name}") }], 
+    g_V_asXsX_label_asXsubjectX_selectXsX_outE_asXpX_label_asXpredicateX_selectXpX_inV_label_asXobjectX_formatXstrX: [function({g}) { return g.V().as("s").label().as("subject").select("s").outE().as("p").label().as("predicate").select("p").inV().label().as("object").format("%{subject} %{predicate} %{object}") }], 
     g_VX1X_V_valuesXnameX: [function({g, vid1}) { return g.V(vid1).V().values("name") }], 
     g_V_outXknowsX_V_name: [function({g}) { return g.V().out("knows").V().values("name") }], 
     g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name: [function({g}) { return g.V().has("artist","name","Garcia").in_("sungBy").as("song").V().has("artist","name","Willie_Dixon").in_("writtenBy").where(P.eq("song")).values("name") }], 
@@ -550,6 +723,34 @@
     g_V_hasLabelXsoftwareX_name_fold_orderXlocalX_index_unfold_order_byXtailXlocal_1XX: [function({g}) { return g.V().hasLabel("software").values("name").fold().order(Scope.local).index().unfold().order().by(__.tail(Scope.local,1)) }], 
     g_V_hasLabelXpersonX_name_fold_orderXlocalX_index_withXmapX: [function({g}) { return g.V().hasLabel("person").values("name").fold().order(Scope.local).index().with_("~tinkerpop.index.indexer",1) }], 
     g_VX1X_valuesXageX_index_unfold_unfold: [function({g, vid1}) { return g.V(vid1).values("age").index().unfold().unfold() }], 
+    g_injectXnullX_intersectXinjectX1XX: [function({g}) { return g.inject(null).intersect(__.inject(1)) }], 
+    g_V_valuesXnameX_intersectXV_foldX: [function({g}) { return g.V().values("name").intersect(__.V().fold()) }], 
+    g_V_fold_intersectXconstantXnullXX: [function({g}) { return g.V().fold().intersect(__.constant(null)) }], 
+    g_V_fold_intersectXVX: [function({g}) { return g.V().fold().intersect(__.V()) }], 
+    g_V_valuesXnameX_fold_intersectX2X: [function({g}) { return g.V().values("name").fold().intersect(2) }], 
+    g_V_valuesXnameX_fold_intersectXnullX: [function({g}) { return g.V().values("name").fold().intersect(null) }], 
+    g_V_valuesXnonexistantX_fold_intersectXV_valuesXnameX_foldX: [function({g}) { return g.V().values("nonexistant").fold().intersect(__.V().values("name").fold()) }], 
+    g_V_valuesXnameX_fold_intersectXV_valuesXnonexistantX_foldX: [function({g}) { return g.V().values("name").fold().intersect(__.V().values("nonexistant").fold()) }], 
+    g_V_valuesXageX_fold_intersectXV_valuesXageX_foldX_order_local: [function({g}) { return g.V().values("age").fold().intersect(__.V().values("age").fold()).order(Scope.local) }], 
+    g_V_out_path_byXvaluesXnameX_toUpperX_intersectXMARKOX: [function({g, xx1}) { return g.V().out().path().by(__.values("name").toUpper()).intersect(xx1) }], 
+    g_injectXmarkoX_intersectX___V_valuesXnameX_foldX: [function({g, xx1}) { return g.inject(xx1).intersect(__.V().values("name").fold()) }], 
+    g_V_valueMapXlocationX_selectXvaluesX_unfold_intersectXseattle_vancouverX: [function({g, xx1}) { return g.V().valueMap("location").select(Column.values).unfold().intersect(xx1) }], 
+    g_V_valuesXageX_fold_intersectX___constantX27X_foldX: [function({g}) { return g.V().values("age").fold().intersect(__.constant(27).fold()) }], 
+    g_V_out_out_path_byXnameX_intersectXdave_kelvinX: [function({g, xx1}) { return g.V().out().out().path().by("name").intersect(xx1) }], 
+    g_injectXa_null_bX_intersectXa_cX: [function({g, xx1, xx2}) { return g.inject(xx1).intersect(xx2) }], 
+    g_injectXa_null_bX_intersectXa_null_cX: [function({g, xx1, xx2}) { return g.inject(xx1).intersect(xx2) }], 
+    g_injectX3_threeX_intersectXfive_three_7X: [function({g, xx1, xx2}) { return g.inject(xx1).intersect(xx2) }], 
+    g_injectX__feature___test__nullX_lTrim: [function({g}) { return g.inject("  feature"," one test",null,""," ").lTrim() }], 
+    g_injectX__feature__X_lTrim: [function({g}) { return g.inject("  feature  ").lTrim() }], 
+    g_injectXListXa_bXX_lTrim: [function({g, xx1}) { return g.inject(xx1).lTrim() }], 
+    g_injectXListX1_2XX_lTrimXlocalX: [function({g, xx1}) { return g.inject(xx1).lTrim(Scope.local) }], 
+    g_V_valuesXnameX_lTrim: [function({g}) { return g.addV("person").property("name"," marko ").property("age",29).as("marko").addV("person").property("name","  vadas  ").property("age",27).as("vadas").addV("software").property("name","  lop").property("lang","java").as("lop").addV("person").property("name","josh  ").property("age",32).as("josh").addV("software").property("name","   ripple   ").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").lTrim() }], 
+    g_V_valuesXnameX_order_fold_lTrimXlocalX: [function({g}) { return g.addV("person").property("name"," marko ").property("age",29).as("marko").addV("person").property("name","  vadas  ").property("age",27).as("vadas").addV("software").property("name","  lop").property("lang","java").as("lop").addV("person").property("name","josh  ").property("age",32).as("josh").addV("software").property("name","   ripple   ").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").order().fold().lTrim(Scope.local) }], 
+    g_injectXfeature_test_nullX_length: [function({g}) { return g.inject("feature","test",null).length() }], 
+    g_injectXfeature_test_nullX_lengthXlocalX: [function({g}) { return g.inject("feature","test",null).length(Scope.local) }], 
+    g_injectXListXa_bXX_length: [function({g, xx1}) { return g.inject(xx1).length() }], 
+    g_V_valuesXnameX_length: [function({g}) { return g.V().values("name").length() }], 
+    g_V_valuesXnameX_order_fold_lengthXlocalX: [function({g}) { return g.V().values("name").order().fold().length(Scope.local) }], 
     g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX: [function({g, vid1}) { return g.V(vid1).repeat(__.both().simplePath()).until(__.has("name","peter").or().loops().is(3)).has("name","peter").path().by("name") }], 
     g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX: [function({g, vid1}) { return g.V(vid1).repeat(__.both().simplePath()).until(__.has("name","peter").or().loops().is(2)).has("name","peter").path().by("name") }], 
     g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX: [function({g, vid1}) { return g.V(vid1).repeat(__.both().simplePath()).until(__.has("name","peter").and().loops().is(3)).has("name","peter").path().by("name") }], 
@@ -640,6 +841,29 @@
     g_injectXnull_10_20_nullX_mean: [function({g, xx1, xx2}) { return g.inject(null,xx1,xx2,null).mean() }], 
     g_injectXlistXnull_10_20_nullXX_meanXlocalX: [function({g, xx1}) { return g.inject(xx1).mean(Scope.local) }], 
     g_VX1X_valuesXageX_meanXlocalX: [function({g, vid1}) { return g.V(vid1).values("age").mean(Scope.local) }], 
+    g_injectXnullX_mergeXinjectX1XX: [function({g}) { return g.inject(null).merge(__.inject(1)) }], 
+    g_V_valuesXnameX_mergeXV_foldX: [function({g}) { return g.V().values("name").merge(__.V().fold()) }], 
+    g_V_fold_mergeXconstantXnullXX: [function({g}) { return g.V().fold().merge(__.constant(null)) }], 
+    g_V_fold_mergeXVX: [function({g}) { return g.V().fold().merge(__.V()) }], 
+    g_V_elementMap_mergeXconstantXaXX: [function({g}) { return g.V().elementMap().merge(__.constant("a")) }], 
+    g_V_fold_mergeXV_asXaX_projectXaX_byXnameXX: [function({g}) { return g.V().fold().merge(__.V().as("a").project("a").by("name")) }], 
+    g_V_fold_mergeXk_vX: [function({g, xx1}) { return g.V().fold().merge(xx1) }], 
+    g_V_valuesXnameX_fold_mergeX2X: [function({g}) { return g.V().values("name").fold().merge(2) }], 
+    g_V_valuesXnameX_fold_mergeXnullX: [function({g}) { return g.V().values("name").fold().merge(null) }], 
+    g_V_valuesXnonexistantX_fold_mergeXV_valuesXnameX_foldX: [function({g}) { return g.V().values("nonexistant").fold().merge(__.V().values("name").fold()) }], 
+    g_V_valuesXnameX_fold_mergeXV_valuesXnonexistantX_foldX: [function({g}) { return g.V().values("name").fold().merge(__.V().values("nonexistant").fold()) }], 
+    g_V_valuesXageX_fold_mergeXV_valuesXageX_foldX: [function({g}) { return g.V().values("age").fold().merge(__.V().values("age").fold()) }], 
+    g_V_out_path_byXvaluesXnameX_toUpperX_mergeXMARKOX: [function({g, xx1}) { return g.V().out().path().by(__.values("name").toUpper()).merge(xx1) }], 
+    g_injectXmarkoX_mergeXV_valuesXnameX_foldX: [function({g, xx1}) { return g.inject(xx1).merge(__.V().values("name").fold()) }], 
+    g_V_valueMapXlocationX_selectXvaluesX_unfold_mergeXseattle_vancouverX: [function({g, xx1}) { return g.V().valueMap("location").select(Column.values).unfold().merge(xx1) }], 
+    g_V_out_out_path_byXnameX_mergeXempty_listX: [function({g, xx1}) { return g.V().out().out().path().by("name").merge(xx1) }], 
+    g_V_valuesXageX_fold_mergeXconstantX27X_foldX: [function({g}) { return g.V().values("age").fold().merge(__.constant(27).fold()) }], 
+    g_V_out_out_path_byXnameX_mergeXdave_kelvinX: [function({g, xx1}) { return g.V().out().out().path().by("name").merge(xx1) }], 
+    g_injectXa_null_bX_mergeXa_cX: [function({g, xx1, xx2}) { return g.inject(xx1).merge(xx2) }], 
+    g_injectXa_null_bX_mergeXa_null_cX: [function({g, xx1, xx2}) { return g.inject(xx1).merge(xx2) }], 
+    g_injectX3_threeX_mergeXfive_three_7X: [function({g, xx1, xx2}) { return g.inject(xx1).merge(xx2) }], 
+    g_V_asXnameX_projectXnameX_byXnameX_mergeXother_blueprintX: [function({g, xx1}) { return g.V().as("name").project("name").by("name").merge(xx1) }], 
+    g_V_hasXname_markoX_elementMap_mergeXV_hasXname_lopX_elementMapX: [function({g}) { return g.V().has("name","marko").elementMap().merge(__.V().has("name","lop").elementMap()) }], 
     g_V_mergeEXlabel_selfX_optionXonMatch_emptyX: [function({g, xx1}) { return g.addV("person").property("name","marko").property("age",29).addE("self") }, function({g, xx1}) { return g.V().mergeE(xx1).option(Merge.onMatch,new Map([])) }, function({g, xx1}) { return g.E() }, function({g, xx1}) { return g.E().properties() }, function({g, xx1}) { return g.V() }], 
     g_V_mergeEXlabel_selfX_optionXonMatch_nullX: [function({g, xx1}) { return g.addV("person").property("name","marko").property("age",29).addE("self") }, function({g, xx1}) { return g.V().mergeE(xx1).option(Merge.onMatch,null) }, function({g, xx1}) { return g.E() }, function({g, xx1}) { return g.E().properties() }, function({g, xx1}) { return g.V() }], 
     g_V_mergeEXemptyX_optionXonCreate_nullX: [function({g, xx1}) { return g.addV("person").property("name","marko").property("age",29) }, function({g, xx1}) { return g.V().as("v").mergeE(xx1).option(Merge.onCreate,null).option(Merge.outV,__.select("v")).option(Merge.inV,__.select("v")) }, function({g, xx1}) { return g.E() }, function({g, xx1}) { return g.V() }], 
@@ -667,7 +891,7 @@
     g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX: [function({g, xx1, xx3, xx2}) { return g.addV("person").property("name","marko").as("a").addV("person").property("name","vadas").as("b") }, function({g, xx1, xx3, xx2}) { return g.withSideEffect("c",xx2).withSideEffect("m",xx3).mergeE(xx1).option(Merge.onCreate,__.select("c")).option(Merge.onMatch,__.select("m")) }, function({g, xx1, xx3, xx2}) { return g.V() }, function({g, xx1, xx3, xx2}) { return g.E() }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("created","Y") }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("created","N") }], 
     g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction: [function({g, xx1}) { return g.addV("person").property("name","marko").addV("person").property("name","vadas") }, function({g, xx1}) { return g.mergeE(xx1) }, function({g, xx1}) { return g.V().has("person","name","marko").out("knows").has("person","name","vadas") }], 
     g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX: [function({g, xx1, xx2}) { return g.addV("person").property("name","marko").addV("person").property("name","vadas") }, function({g, xx1, xx2}) { return g.inject(xx1,xx2).mergeE() }, function({g, xx1, xx2}) { return g.V() }, function({g, xx1, xx2}) { return g.E() }, function({g, xx1, xx2}) { return g.V().has("person","name","marko").out("knows").has("person","name","vadas") }, function({g, xx1, xx2}) { return g.V().has("person","name","vadas").out("self").has("person","name","vadas") }], 
-    g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists: [function({g, xx1, xx3, xx2}) { return g.addV("person").property("name","marko").as("a").addV("person").property("name","vadas").as("b").addE("knows").property("weight",1).from_("a").to("b") }, function({g, xx1, xx3, xx2}) { return g.withSideEffect("c",xx2).withSideEffect("m",xx3).mergeE(xx1).option(Merge.onCreate,__.select("c")).option(Merge.onMatch,__.sideEffect(__.properties("weight").drop()).select("m")) }, function({g, xx1, xx3, xx2}) { return g.V() }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("created","Y") }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("created","N") }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("weight") }], 
+    g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists: [function({g, xx1, xx3, xx2}) { return g.addV("person").property("name","marko").as("a").addV("person").property("name","vadas").as("b").addE("knows").property("weight",1.0).from_("a").to("b") }, function({g, xx1, xx3, xx2}) { return g.withSideEffect("c",xx2).withSideEffect("m",xx3).mergeE(xx1).option(Merge.onCreate,__.select("c")).option(Merge.onMatch,__.sideEffect(__.properties("weight").drop()).select("m")) }, function({g, xx1, xx3, xx2}) { return g.V() }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("created","Y") }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("created","N") }, function({g, xx1, xx3, xx2}) { return g.E().hasLabel("knows").has("weight") }], 
     g_mergeE_with_outVinV_options_map: [function({g, xx1, xx3, xx2}) { return g.addV("person").property("name","marko").addV("person").property("name","vadas") }, function({g, xx1, xx3, xx2}) { return g.mergeE(xx1).option(Merge.outV,xx2).option(Merge.inV,xx3) }, function({g, xx1, xx3, xx2}) { return g.V() }, function({g, xx1, xx3, xx2}) { return g.V().has("name","marko").out("knows").has("name","vadas") }], 
     g_mergeE_with_outVinV_options_select: [function({g, xx1, vid2, vid1}) { return g.addV("person").property("name","marko").addV("person").property("name","vadas") }, function({g, xx1, vid2, vid1}) { return g.V(vid1).as("x").V(vid2).as("y").mergeE(xx1).option(Merge.outV,__.select("x")).option(Merge.inV,__.select("y")) }, function({g, xx1, vid2, vid1}) { return g.V() }, function({g, xx1, vid2, vid1}) { return g.V().has("name","marko").out("knows").has("name","vadas") }], 
     g_mergeE_with_eid_specified_and_inheritance_1: [function({g, xx1, xx2}) { return g.addV("person").property("name","marko").addV("person").property("name","vadas") }, function({g, xx1, xx2}) { return g.mergeE(xx1).option(Merge.onCreate,xx2) }, function({g, xx1, xx2}) { return g.V() }, function({g, xx1, xx2}) { return g.E() }, function({g, xx1, xx2}) { return g.E("201") }, function({g, xx1, xx2}) { return g.V().has("name","marko").out("knows").has("name","vadas") }], 
@@ -731,6 +955,16 @@
     g_mergeV_hidden_label_value_onCreate_prohibited: [function({g, xx1}) { return g.mergeV(new Map([])).option(Merge.onCreate,xx1) }], 
     g_mergeV_hidden_id_key_onMatch_matched_prohibited: [function({g, xx1}) { return g.addV("vertex") }, function({g, xx1}) { return g.mergeV(new Map([])).option(Merge.onMatch,xx1) }], 
     g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited: [function({g, xx1}) { return g.addV("vertex") }, function({g, xx1}) { return g.mergeV(new Map([])).option(Merge.onMatch,xx1) }], 
+    g_mergeVXname_markoX_optionXonMatch_age_listX33XX: [function({g}) { return g.addV("person").property("name","marko").property(Cardinality.list,"age",29).property(Cardinality.list,"age",31).property(Cardinality.list,"age",32) }, function({g}) { return g.mergeV(new Map([["name","marko"]])).option(Merge.onMatch,new Map([["age",CardinalityValue.list(33)]])) }, function({g}) { return g.V().has("person","name","marko").has("age",33) }, function({g}) { return g.V().has("person","name","marko").has("age") }, function({g}) { return g.V().has("person","name","marko").properties("age") }], 
+    g_mergeVXname_markoX_optionXonMatch_age_setX33XX: [function({g}) { return g.addV("person").property("name","marko").property(Cardinality.list,"age",29).property(Cardinality.list,"age",31).property(Cardinality.list,"age",32) }, function({g}) { return g.mergeV(new Map([["name","marko"]])).option(Merge.onMatch,new Map([["age",CardinalityValue.set(33)]])) }, function({g}) { return g.V().has("person","name","marko").has("age",33) }, function({g}) { return g.V().has("person","name","marko").has("age") }, function({g}) { return g.V().has("person","name","marko").properties("age") }], 
+    g_mergeVXname_markoX_optionXonMatch_age_setX31XX: [function({g}) { return g.addV("person").property("name","marko").property(Cardinality.list,"age",29).property(Cardinality.list,"age",31).property(Cardinality.list,"age",32) }, function({g}) { return g.mergeV(new Map([["name","marko"]])).option(Merge.onMatch,new Map([["age",CardinalityValue.set(31)]])) }, function({g}) { return g.V().has("person","name","marko").has("age",31) }, function({g}) { return g.V().has("person","name","marko").has("age") }, function({g}) { return g.V().has("person","name","marko").properties("age") }], 
+    g_mergeVXname_markoX_optionXonMatch_age_singleX33XX: [function({g}) { return g.addV("person").property("name","marko").property(Cardinality.list,"age",29).property(Cardinality.list,"age",31).property(Cardinality.list,"age",32) }, function({g}) { return g.mergeV(new Map([["name","marko"]])).option(Merge.onMatch,new Map([["age",CardinalityValue.single(33)]])) }, function({g}) { return g.V().has("person","name","marko").has("age",33) }, function({g}) { return g.V().has("person","name","marko").has("age") }, function({g}) { return g.V().has("person","name","marko").properties("age") }], 
+    g_mergeVXname_markoX_optionXonMatch_age_33_singleX: [function({g}) { return g.addV("person").property("name","marko").property(Cardinality.list,"age",29).property(Cardinality.list,"age",31).property(Cardinality.list,"age",32) }, function({g}) { return g.mergeV(new Map([["name","marko"]])).option(Merge.onMatch,new Map([["age",33]]),Cardinality.single) }, function({g}) { return g.V().has("person","name","marko").has("age",33) }, function({g}) { return g.V().has("person","name","marko").has("age") }, function({g}) { return g.V().has("person","name","marko").properties("age") }], 
+    g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX: [function({g}) { return g.addV("person").property("name","marko").property(Cardinality.list,"age",29).property(Cardinality.list,"age",31).property(Cardinality.list,"age",32) }, function({g}) { return g.mergeV(new Map([["name","marko"]])).option(Merge.onMatch,new Map([["name","allen"],["age",CardinalityValue.set(31)]]),Cardinality.single) }, function({g}) { return g.V().has("person","name","marko") }, function({g}) { return g.V().has("person","name","allen").has("age",31) }, function({g}) { return g.V().has("person","name","allen").has("age") }, function({g}) { return g.V().has("person","name","allen").properties("age") }], 
+    g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX: [function({g}) { return g.addV("person").property("name","marko").property(Cardinality.list,"age",29).property(Cardinality.list,"age",31).property(Cardinality.list,"age",32) }, function({g}) { return g.mergeV(new Map([["name","marko"]])).option(Merge.onMatch,new Map([["name","allen"],["age",CardinalityValue.single(31)]]),Cardinality.single) }, function({g}) { return g.V().has("person","name","marko") }, function({g}) { return g.V().has("person","name","allen").has("age",33) }, function({g}) { return g.V().has("person","name","allen").has("age",31) }, function({g}) { return g.V().has("person","name","allen").has("age") }, function({g}) { return g.V().has("person","name","allen").properties("age") }], 
+    g_mergeVXname_aliceX_optionXonCreate_age_singleX81XX: [function({g}) { return g.mergeV(new Map([["name","alice"],[T.label,"person"]])).option(Merge.onCreate,new Map([["age",CardinalityValue.single(81)]])) }, function({g}) { return g.V().has("person","name","alice").has("age",81) }, function({g}) { return g.V().has("person","name","alice").has("age") }, function({g}) { return g.V().has("person","name","alice").properties("age") }], 
+    g_mergeVXname_aliceX_optionXonCreate_age_setX81XX: [function({g}) { return g.mergeV(new Map([["name","alice"],[T.label,"person"]])).option(Merge.onCreate,new Map([["age",CardinalityValue.set(81)]])) }, function({g}) { return g.V().has("person","name","alice").has("age",81) }, function({g}) { return g.V().has("person","name","alice").has("age") }, function({g}) { return g.V().has("person","name","alice").properties("age") }], 
+    g_mergeVXname_aliceX_optionXonCreate_age_singleX81X_age_81_setX: [function({g}) { return g.mergeV(new Map([["name","alice"],[T.label,"person"]])).option(Merge.onCreate,new Map([["age",81]]),Cardinality.set) }, function({g}) { return g.V().has("person","name","alice").has("age",81) }, function({g}) { return g.V().has("person","name","alice").has("age") }, function({g}) { return g.V().has("person","name","alice").properties("age") }], 
     g_mergeV_hidden_label_key_onMatch_matched_prohibited: [function({g, xx1}) { return g.mergeV(new Map([])).option(Merge.onMatch,xx1) }], 
     g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_match: [function({g, xx1, xx2}) { return g.addV("person").property("name","marko").property("age",29) }, function({g, xx1, xx2}) { return g.inject(xx1,xx1,xx2).fold().mergeV(__.limit(Scope.local,1)).option(Merge.onCreate,__.range(Scope.local,1,2)).option(Merge.onMatch,__.tail(Scope.local)) }, function({g, xx1, xx2}) { return g.V().has("person","name","marko").has("created","N") }, function({g, xx1, xx2}) { return g.V() }], 
     g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_create: [function({g, xx1, xx2}) { return g.addV("person").property("name","marko").property("age",29) }, function({g, xx1, xx2}) { return g.inject(xx1,xx1,xx2).fold().mergeV(__.limit(Scope.local,1)).option(Merge.onCreate,__.range(Scope.local,1,2)).option(Merge.onMatch,__.tail(Scope.local)) }, function({g, xx1, xx2}) { return g.V().has("person","name","stephen").hasNot("created") }, function({g, xx1, xx2}) { return g.V() }], 
@@ -805,6 +1039,23 @@
     g_V_peerPressure_hasXclusterX: [function({g}) { return g.V().peerPressure().has("gremlin.peerPressureVertexProgram.cluster") }], 
     g_V_peerPressure_withXpropertyName_clusterX_withXedges_outEXknowsXX_pageRankX1X_byXrankX_withXedges_outEXknowsX_withXtimes_2X_group_byXclusterX_byXrank_sumX_limitX100X: [function({g}) { return g.V().peerPressure().with_("~tinkerpop.peerPressure.propertyName","cluster").with_("~tinkerpop.peerPressure.edges",__.outE("knows")).pageRank(1.0).with_("~tinkerpop.pageRank.propertyName","rank").with_("~tinkerpop.pageRank.edges",__.outE("knows")).with_("~tinkerpop.pageRank.times",1).group().by("cluster").by(__.values("rank").sum()).limit(100) }], 
     g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXedges_outEX_withyXpropertyName_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX: [function({g}) { return g.V().has("name","ripple").in_("created").peerPressure().with_("~tinkerpop.peerPressure.edges",__.outE()).with_("~tinkerpop.peerPressure.propertyName","cluster").repeat(__.union(__.identity(),__.both())).times(2).dedup().valueMap("name","cluster") }], 
+    g_injectXnullX_productXinjectX1XX: [function({g}) { return g.inject(null).product(__.inject(1)) }], 
+    g_V_valuesXnameX_productXV_foldX: [function({g}) { return g.V().values("name").product(__.V().fold()) }], 
+    g_V_fold_productXconstantXnullXX: [function({g}) { return g.V().fold().product(__.constant(null)) }], 
+    g_V_fold_productXVX: [function({g}) { return g.V().fold().product(__.V()) }], 
+    g_V_valuesXnameX_fold_productX2X: [function({g}) { return g.V().values("name").fold().product(2) }], 
+    g_V_valuesXnameX_fold_productXnullX: [function({g}) { return g.V().values("name").fold().product(null) }], 
+    g_V_valuesXnonexistantX_fold_productXV_valuesXnameX_foldX: [function({g}) { return g.V().values("nonexistant").fold().product(__.V().values("name").fold()) }], 
+    g_V_valuesXnameX_fold_productXV_valuesXnonexistantX_foldX: [function({g}) { return g.V().values("name").fold().product(__.V().values("nonexistant").fold()) }], 
+    g_V_valuesXageX_order_byXdescX_limitX3X_fold_productXV_valuesXageX_order_byXascX_limitX2X_foldX_unfold: [function({g}) { return g.V().values("age").order().by(Order.desc).limit(3).fold().product(__.V().values("age").order().by(Order.asc).limit(2).fold()).unfold() }], 
+    g_V_out_path_byXvaluesXnameX_toUpperX_productXMARKOX_unfold: [function({g, xx1}) { return g.V().out().path().by(__.values("name").toUpper()).product(xx1).unfold() }], 
+    g_injectXmarkoX_productXV_valuesXnameX_order_foldX_unfold: [function({g, xx1}) { return g.inject(xx1).product(__.V().values("name").order().fold()).unfold() }], 
+    g_V_valueMapXlocationX_selectXvaluesX_unfold_productXdulles_seattle_vancouverX_unfold: [function({g, xx1}) { return g.V().valueMap("location").select(Column.values).unfold().product(xx1).unfold() }], 
+    g_V_valuesXageX_order_byXascX_fold_productXconstantX27X_foldX_unfold: [function({g}) { return g.V().values("age").order().by(Order.asc).fold().product(__.constant(27).fold()).unfold() }], 
+    g_V_out_out_path_byXnameX_productXdave_kelvinX_unfold: [function({g, xx1}) { return g.V().out().out().path().by("name").product(xx1).unfold() }], 
+    g_injectXa_null_bX_productXa_cX_unfold: [function({g, xx1, xx2}) { return g.inject(xx1).product(xx2).unfold() }], 
+    g_injectXa_null_bX_productXa_null_cX_unfold: [function({g, xx1, xx2}) { return g.inject(xx1).product(xx2).unfold() }], 
+    g_injectX3_threeX_productXfive_three_7X_unfold: [function({g, xx1, xx2}) { return g.inject(xx1).product(xx2).unfold() }], 
     g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX: [function({g}) { return g.V().hasLabel("person").project("a","b").by(__.outE().count()).by("age") }], 
     g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX: [function({g}) { return g.V().out("created").project("a","b").by("name").by(__.in_("created").count()).order().by(__.select("b"),Order.desc).select("a") }], 
     g_V_valueMap_projectXxX_byXselectXnameXX: [function({g}) { return g.V().valueMap().project("x").by(__.select("name")) }], 
@@ -815,6 +1066,28 @@
     g_V_hasXageX_propertiesXage_nameX_value: [function({g}) { return g.V().has("age").properties("age","name").value() }], 
     g_V_propertiesXname_age_nullX_value: [function({g}) { return g.V().properties("name","age",null).value() }], 
     g_V_valuesXname_age_nullX: [function({g}) { return g.V().values("name","age",null) }], 
+    g_injectX__feature___test__nullX_rTrim: [function({g}) { return g.inject("feature  ","one test ",null,""," ").rTrim() }], 
+    g_injectX__feature__X_rTrim: [function({g}) { return g.inject("  feature  ").rTrim() }], 
+    g_injectXListXa_bXX_rTrim: [function({g, xx1}) { return g.inject(xx1).rTrim() }], 
+    g_injectXListX1_2XX_rTrimXlocalX: [function({g, xx1}) { return g.inject(xx1).rTrim(Scope.local) }], 
+    g_V_valuesXnameX_rTrim: [function({g}) { return g.addV("person").property("name"," marko ").property("age",29).as("marko").addV("person").property("name","  vadas  ").property("age",27).as("vadas").addV("software").property("name","  lop").property("lang","java").as("lop").addV("person").property("name","josh  ").property("age",32).as("josh").addV("software").property("name","   ripple   ").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").rTrim() }], 
+    g_V_valuesXnameX_order_fold_rTrimXlocalX: [function({g}) { return g.addV("person").property("name"," marko ").property("age",29).as("marko").addV("person").property("name","  vadas  ").property("age",27).as("vadas").addV("software").property("name","  lop").property("lang","java").as("lop").addV("person").property("name","josh  ").property("age",32).as("josh").addV("software").property("name","   ripple   ").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").order().fold().rTrim(Scope.local) }], 
+    g_injectXthat_this_test_nullX_replaceXh_jX: [function({g}) { return g.inject("that","this","test",null).replace("h","j") }], 
+    g_injectXthat_this_test_nullX_fold_replaceXlocal_h_jX: [function({g}) { return g.inject("that","this","test",null).fold().replace(Scope.local,"h","j") }], 
+    g_injectXListXa_bXcX_replaceXa_bX: [function({g, xx1}) { return g.inject(xx1).replace("a","b") }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_replaceXnull_iX: [function({g}) { return g.V().hasLabel("software").values("name").replace(null,"g") }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_replaceXa_iX: [function({g}) { return g.V().hasLabel("software").values("name").replace("p","g") }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_order_fold_replaceXloacl_a_iX: [function({g}) { return g.V().hasLabel("software").values("name").order().fold().replace(Scope.local,"p","g") }], 
+    g_injectXfeature_test_nullX_reverse: [function({g}) { return g.inject("feature","test one",null).reverse() }], 
+    g_V_valuesXnameX_reverse: [function({g}) { return g.V().values("name").reverse() }], 
+    g_V_valuesXageX_reverse: [function({g}) { return g.V().values("age").reverse() }], 
+    g_V_out_path_byXnameX_reverse: [function({g}) { return g.V().out().path().by("name").reverse() }], 
+    g_V_out_out_path_byXnameX_reverse: [function({g}) { return g.V().out().out().path().by("name").reverse() }], 
+    g_V_valuesXageX_fold_orderXlocalX_byXdescX_reverse: [function({g}) { return g.V().values("age").fold().order(Scope.local).by(Order.desc).reverse() }], 
+    g_V_valuesXnameX_fold_orderXlocalX_by_reverse: [function({g}) { return g.V().values("name").fold().order(Scope.local).by().reverse() }], 
+    g_injectXnullX_reverse: [function({g}) { return g.inject(null).reverse() }], 
+    g_injectXbX_reverse: [function({g}) { return g.inject("b").reverse() }], 
+    g_injectX3_threeX_reverse: [function({g, xx1}) { return g.inject(xx1).reverse() }], 
     g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX: [function({g, vid1}) { return g.V(vid1).as("a").out("knows").as("b").select("a","b") }], 
     g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX_byXnameX: [function({g, vid1}) { return g.V(vid1).as("a").out("knows").as("b").select("a","b").by("name") }], 
     g_VX1X_asXaX_outXknowsX_asXbX_selectXaX: [function({g, vid1}) { return g.V(vid1).as("a").out("knows").as("b").select("a") }], 
@@ -898,6 +1171,22 @@
     g_V_hasXsong_name_MIGHT_AS_WELLX_shortestPath_targetXhasXsong_name_MAYBE_YOU_KNOW_HOW_I_FEELXX_edgesXoutEXfollowedByXX_distanceXweightX: [function({g}) { return g.V().has("song","name","MIGHT AS WELL").shortestPath().with_("~tinkerpop.shortestPath.target",__.has("song","name","MAYBE YOU KNOW HOW I FEEL")).with_("~tinkerpop.shortestPath.edges",__.outE("followedBy")).with_("~tinkerpop.shortestPath.distance","weight") }], 
     g_V_hasXname_markoX_shortestPath_maxDistanceX1X: [function({g}) { return g.V().has("name","marko").shortestPath().with_("~tinkerpop.shortestPath.maxDistance",1) }], 
     g_V_hasXname_vadasX_shortestPath_distanceXweightX_maxDistanceX1_3X: [function({g}) { return g.V().has("name","vadas").shortestPath().with_("~tinkerpop.shortestPath.distance","weight").with_("~tinkerpop.shortestPath.maxDistance",1.3) }], 
+    g_injectXthat_this_testX_spiltXhX: [function({g}) { return g.inject("that","this","test",null).split("h") }], 
+    g_injectXhello_worldX_spiltXnullX: [function({g}) { return g.inject("hello world").split(null) }], 
+    g_injectXListXa_bXcX_splitXa_bX: [function({g, xx1}) { return g.inject(xx1).split("a") }], 
+    g_V_hasLabelXpersonX_valueXnameX_splitXnullX: [function({g}) { return g.V().hasLabel("person").values("name").split(null) }], 
+    g_V_hasLabelXpersonX_valueXnameX_order_fold_splitXlocal_aX_unfold: [function({g}) { return g.V().hasLabel("person").values("name").order().fold().split(Scope.local,"a").unfold() }], 
+    g_injectXthat_this_testX_substringX1_8X: [function({g}) { return g.inject("test","hello world",null).substring(1,8) }], 
+    g_injectXListXa_bXcX_substringX1_2X: [function({g, xx1}) { return g.inject(xx1).substring(1,2) }], 
+    g_V_hasLabelXpersonX_valueXnameX_substringX2X: [function({g}) { return g.V().hasLabel("software").values("name").substring(2) }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_substringX1_4X: [function({g}) { return g.V().hasLabel("software").values("name").substring(1,4) }], 
+    g_V_hasLabelXpersonX_valueXnameX_order_fold_substringXlocal_2X: [function({g}) { return g.V().hasLabel("software").values("name").order().fold().substring(Scope.local,2) }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_order_fold_substringXlocal_1_4X: [function({g}) { return g.V().hasLabel("software").values("name").order().fold().substring(Scope.local,1,4) }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_substringX1_0X: [function({g}) { return g.V().hasLabel("software").values("name").substring(1,0) }], 
+    g_V_hasLabelXpersonX_valueXnameX_substringXneg3X: [function({g}) { return g.V().hasLabel("person").values("name").substring(-3) }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_substringX1_neg1X: [function({g}) { return g.V().hasLabel("software").values("name").substring(1,-1) }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_substringXneg4_2X: [function({g}) { return g.V().hasLabel("software").values("name").substring(-4,2) }], 
+    g_V_hasLabelXsoftwareX_valueXnameX_substringXneg3_neg1X: [function({g}) { return g.V().hasLabel("software").values("name").substring(-3,-1) }], 
     g_V_age_sum: [function({g}) { return g.V().values("age").sum() }], 
     g_V_foo_sum: [function({g}) { return g.V().values("foo").sum() }], 
     g_V_age_fold_sumXlocalX: [function({g}) { return g.V().values("age").fold().sum(Scope.local) }], 
@@ -914,6 +1203,24 @@
     g_injectXnull_10_5_nullX_sum: [function({g, xx1, xx2}) { return g.inject(null,xx1,xx2,null).sum() }], 
     g_injectXlistXnull_10_5_nullXX_sumXlocalX: [function({g, xx1}) { return g.inject(xx1).sum(Scope.local) }], 
     g_VX1X_valuesXageX_sumXlocalX: [function({g, vid1}) { return g.V(vid1).values("age").sum(Scope.local) }], 
+    g_injectXfeature_test_nullX_toLower: [function({g}) { return g.inject("FEATURE","tESt",null).toLower() }], 
+    g_injectXfeature_test_nullX_toLowerXlocalX: [function({g, xx1}) { return g.inject(xx1).toLower(Scope.local) }], 
+    g_injectXListXa_bXX_toLower: [function({g, xx1}) { return g.inject(xx1).toLower() }], 
+    g_V_valuesXnameX_toLower: [function({g}) { return g.addV("person").property("name","MARKO").property("age",29).as("marko").addV("person").property("name","VADAS").property("age",27).as("vadas").addV("software").property("name","LOP").property("lang","java").as("lop").addV("person").property("name","JOSH").property("age",32).as("josh").addV("software").property("name","RIPPLE").property("lang","java").as("ripple").addV("person").property("name","PETER").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").toLower() }], 
+    g_V_valuesXnameX_toLowerXlocalX: [function({g}) { return g.addV("person").property("name","MARKO").property("age",29).as("marko").addV("person").property("name","VADAS").property("age",27).as("vadas").addV("software").property("name","LOP").property("lang","java").as("lop").addV("person").property("name","JOSH").property("age",32).as("josh").addV("software").property("name","RIPPLE").property("lang","java").as("ripple").addV("person").property("name","PETER").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").toLower(Scope.local) }], 
+    g_V_valuesXnameX_order_fold_toLowerXlocalX: [function({g}) { return g.addV("person").property("name","MARKO").property("age",29).as("marko").addV("person").property("name","VADAS").property("age",27).as("vadas").addV("software").property("name","LOP").property("lang","java").as("lop").addV("person").property("name","JOSH").property("age",32).as("josh").addV("software").property("name","RIPPLE").property("lang","java").as("ripple").addV("person").property("name","PETER").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").order().fold().toLower(Scope.local) }], 
+    g_injectXfeature_test_nullX_toUpper: [function({g}) { return g.inject("feature","tESt",null).toUpper() }], 
+    g_injectXfeature_test_nullX_toUpperXlocalX: [function({g, xx1}) { return g.inject(xx1).toUpper(Scope.local) }], 
+    g_injectXfeature_test_nullX_asString_toUpper: [function({g}) { return g.inject("feature","tESt",null).asString().toUpper() }], 
+    g_injectXListXa_bXX_toUpper: [function({g, xx1}) { return g.inject(xx1).toUpper() }], 
+    g_V_valuesXnameX_toUpper: [function({g}) { return g.V().values("name").toUpper() }], 
+    g_V_valuesXnameX_toUpperXlocalX: [function({g}) { return g.V().values("name").toUpper(Scope.local) }], 
+    g_V_valuesXnameX_order_fold_toUpperXlocalX: [function({g}) { return g.V().values("name").order().fold().toUpper(Scope.local) }], 
+    g_injectX__feature___test__nullX_trim: [function({g}) { return g.inject("  feature  "," one test ",null,""," ").trim() }], 
+    g_injectXListXa_bXX_trim: [function({g, xx1}) { return g.inject(xx1).trim() }], 
+    g_injectXListX1_2XX_trimXlocalX: [function({g, xx1}) { return g.inject(xx1).trim(Scope.local) }], 
+    g_V_valuesXnameX_trim: [function({g}) { return g.addV("person").property("name"," marko ").property("age",29).as("marko").addV("person").property("name","  vadas  ").property("age",27).as("vadas").addV("software").property("name","  lop").property("lang","java").as("lop").addV("person").property("name","josh  ").property("age",32).as("josh").addV("software").property("name","   ripple   ").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").trim() }], 
+    g_V_valuesXnameX_order_fold_trimXlocalX: [function({g}) { return g.addV("person").property("name"," marko ").property("age",29).as("marko").addV("person").property("name","  vadas  ").property("age",27).as("vadas").addV("software").property("name","  lop").property("lang","java").as("lop").addV("person").property("name","josh  ").property("age",32).as("josh").addV("software").property("name","   ripple   ").property("lang","java").as("ripple").addV("person").property("name","peter").property("age",35).as("peter").addE("knows").from_("marko").to("vadas").property("weight",0.5).addE("knows").from_("marko").to("josh").property("weight",1.0).addE("created").from_("marko").to("lop").property("weight",0.4).addE("created").from_("josh").to("ripple").property("weight",1.0).addE("created").from_("josh").to("lop").property("weight",0.4).addE("created").from_("peter").to("lop").property("weight",0.2) }, function({g}) { return g.V().values("name").order().fold().trim(Scope.local) }], 
     g_V_localXoutE_foldX_unfold: [function({g}) { return g.V().local(__.outE().fold()).unfold() }], 
     g_V_valueMap_unfold_mapXkeyX: [function({g, l1}) { return g.V().valueMap().unfold().map(l1) }], 
     g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold: [function({g, vid6, vid1}) { return g.V(vid1).repeat(__.both().simplePath()).until(__.hasId(vid6)).path().by("name").unfold() }], 
@@ -1110,6 +1417,7 @@
     g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXvaluesXageX_isXgtX29XXX_capXxX: [function({g}) { return g.withStrategies(new ProductiveByStrategy({productiveKeys:[]})).V().aggregate("x").by(__.values("age").is(P.gt(29))).cap("x") }], 
     g_V_aggregateXxX_byXout_order_byXnameXX_capXxX: [function({g}) { return g.V().aggregate("x").by(__.out().order().by("name")).cap("x") }], 
     g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXout_order_byXnameXX_capXxX: [function({g}) { return g.withStrategies(new ProductiveByStrategy({productiveKeys:[]})).V().aggregate("x").by(__.out().order().by("name")).cap("x") }], 
+    g_V_aggregateXaX_hasXperson_age_gteX30XXX_capXaX_unfold_valuesXnameX: [function({g}) { return g.V().aggregate("a").has("person","age",P.gte(30)).cap("a").unfold().values("name") }], 
     g_V_fail: [function({g}) { return g.V().fail() }], 
     g_V_failXmsgX: [function({g}) { return g.V().fail("msg") }], 
     g_V_unionXout_failX: [function({g}) { return g.V().union(__.out(),__.fail()) }], 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
index 6e0b7a8..0296a7d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
@@ -108,7 +108,15 @@
 
 function getVertices(connection) {
   const g = traversal().withRemote(connection);
-  return g.V().group().by('name').by(__.tail()).next().then(it => it.value);
+  return g.V().group().by('name').by(__.tail()).next().then(it => {
+    // properties excluded from verification
+    if (it.value instanceof Map) {
+      for (const value of it.value.values()) {
+        value.properties = undefined
+      }
+    }
+    return it.value
+  });
 }
 
 function getEdges(connection) {
@@ -120,6 +128,8 @@
     .then(it => {
       const edges = {};
       it.value.forEach((v, k) => {
+        // properties excluded from verification
+        v.properties = undefined
         edges[getEdgeKey(k)] = v;
       });
       return edges;
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
index 296f7c3..6232570 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
@@ -27,14 +27,23 @@
 const Client = require('../lib/driver/client');
 const PlainTextSaslAuthenticator = require('../lib/driver/auth/plain-text-sasl-authenticator');
 
+const yaml = require('js-yaml');
+const fs   = require('fs');
+
 let serverUrl;
 let serverAuthUrl;
+let socketServerUrl;
+let sockerServerConfigPath;
 if (process.env.DOCKER_ENVIRONMENT === 'true') {
   serverUrl = 'ws://gremlin-server-test-js:45940/gremlin';
   serverAuthUrl = 'wss://gremlin-server-test-js:45941/gremlin';
+  socketServerUrl = 'ws://gremlin-socket-server-js:';
+  sockerServerConfigPath = '/js_app/gremlin-socket-server/conf/test-ws-gremlin.yaml';
 } else {
   serverUrl = 'ws://localhost:45940/gremlin';
   serverAuthUrl = 'wss://localhost:45941/gremlin';
+  socketServerUrl = 'ws://localhost:';
+  sockerServerConfigPath = '../../../../../gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml';
 }
 
 /** @returns {DriverRemoteConnection} */
@@ -68,3 +77,39 @@
     mimeType: process.env.CLIENT_MIMETYPE,
   });
 };
+
+function getMimeTypeFromSocketServerSettings(socketServerSettings) {
+  let mimeType;
+  switch(socketServerSettings.SERIALIZER) {
+    case "GraphSONV2":
+      mimeType = 'application/vnd.gremlin-v2.0+json';
+      break;
+    case "GraphSONV3":
+      mimeType = 'application/vnd.gremlin-v3.0+json';
+      break;
+    case "GraphBinaryV1":
+    default:
+      mimeType = 'application/vnd.graphbinary-v1.0';
+      break;
+  }
+  return mimeType;
+}
+
+exports.getGremlinSocketServerClient = function getGremlinSocketServerClient(traversalSource) {
+  const settings = exports.getGremlinSocketServerSettings();
+  const url = socketServerUrl + settings.PORT + '/gremlin';
+  let mimeType = getMimeTypeFromSocketServerSettings(settings)
+  return new Client(url, { traversalSource, mimeType });
+};
+
+exports.getGremlinSocketServerClientNoUserAgent = function getGremlinSocketServerClient(traversalSource) {
+  const settings = exports.getGremlinSocketServerSettings();
+  const url = socketServerUrl + settings.PORT + '/gremlin';
+  let mimeType = getMimeTypeFromSocketServerSettings(settings)
+  return new Client(url, { traversalSource, mimeType, enableUserAgentOnConnect:false });
+};
+
+exports.getGremlinSocketServerSettings = function getGremlinSocketServerSettings() {
+  const settings = yaml.load(fs.readFileSync(sockerServerConfigPath, 'utf8'));
+  return settings;
+};
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-behavior-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-behavior-tests.js
new file mode 100644
index 0000000..20f5362
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-behavior-tests.js
@@ -0,0 +1,78 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+'use strict';
+
+const assert = require('assert');
+const helper = require('../helper');
+const {getUserAgent} = require("../../lib/utils");
+
+let client;
+let settings;
+
+describe('Client', function () {
+    before(function () {
+        client = helper.getGremlinSocketServerClient('gmodern');
+        settings = helper.getGremlinSocketServerSettings();
+        return client.open();
+    });
+    after(function () {
+        return client.close();
+    });
+    describe('#submit()', function () {
+        it('should reconnect after server closes connection', async function () {
+            let connectionClosed = false;
+            await client.submit('1', null, {requestId: settings.CLOSE_CONNECTION_REQUEST_ID})
+                .catch(function(error){
+                    assert.equal(error.toString(), 'Error: Connection has been closed.');
+                    connectionClosed = true;
+                });
+
+            assert.equal(connectionClosed, true);
+
+            let result = await client.submit('1', null, {requestId: settings.SINGLE_VERTEX_REQUEST_ID})
+            assert.ok(result);
+        });
+        it('should include user agent in handshake request', async function () {
+            let result = await client.submit('1', null, {requestId: settings.USER_AGENT_REQUEST_ID});
+
+            assert.strictEqual(result.first(), await getUserAgent());
+        });
+        it('should not include user agent in handshake request if disabled', async function () {
+            let noUserAgentClient = helper.getGremlinSocketServerClientNoUserAgent('gmodern');
+            let result = await noUserAgentClient.submit('1', null,
+                {requestId: settings.USER_AGENT_REQUEST_ID});
+
+            assert.strictEqual(result.first(), "");
+
+            await noUserAgentClient.close();
+        });
+        it('should send per request settings to server', async function () {
+            const resultSet = await client.submit('1', null, {
+                requestId: settings.PER_REQUEST_SETTINGS_REQUEST_ID,
+                evaluationTimeout: 1234,
+                batchSize: 12,
+                userAgent: 'helloWorld',
+                materializeProperties: 'tokens'
+            })
+            const expectedResult = `requestId=${settings.PER_REQUEST_SETTINGS_REQUEST_ID} evaluationTimeout=1234, batchSize=12, userAgent=helloWorld, materializeProperties=tokens`;
+            assert.equal(expectedResult, resultSet.first());
+        });
+    });
+});
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js
index 3986850..a52b92f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/client-tests.js
@@ -75,6 +75,98 @@
         });
     });
 
+    it('should handle Vertex properties for bytecode request', function () {
+      return client.submit(new Bytecode().addStep('V', [1]))
+        .then(function (result) {
+          assert.ok(result);
+          assert.strictEqual(result.length, 1);
+          const vertex = result.first().object;
+          assert.ok(vertex instanceof graphModule.Vertex);
+          let age, name
+          if (vertex.properties instanceof Array) {
+            age = vertex.properties[1]
+            name = vertex.properties[0]
+          } else {
+            age = vertex.properties.age[0]
+            name = vertex.properties.name[0]
+          }
+          assert.strictEqual(age.value, 29);
+          assert.strictEqual(name.value, 'marko');
+        });
+    });
+
+    it('should skip Vertex properties for bytecode request with tokens', function () {
+      return client.submit(new Bytecode().addStep('V', [1]), null, {'materializeProperties': 'tokens'})
+        .then(function (result) {
+          assert.ok(result);
+          assert.strictEqual(result.length, 1);
+          const vertex = result.first().object;
+          assert.ok(vertex instanceof graphModule.Vertex);
+          assert.ok(vertex.properties === undefined || vertex.properties.length === 0);
+        });
+    });
+
+    it('should handle Vertex properties for gremlin request', function () {
+      return client.submit('g.V(1)')
+        .then(function (result) {
+          assert.ok(result);
+          assert.strictEqual(result.length, 1);
+          const vertex = result.first();
+          assert.ok(vertex instanceof graphModule.Vertex);
+          let age, name
+          if (vertex.properties instanceof Array) {
+            age = vertex.properties[1]
+            name = vertex.properties[0]
+          } else {
+            age = vertex.properties.age[0]
+            name = vertex.properties.name[0]
+          }
+          assert.strictEqual(age.value, 29);
+          assert.strictEqual(name.value, 'marko');
+        });
+    });
+
+    it('should skip Vertex properties for gremlin request with tokens', function () {
+      return client.submit('g.with("materializeProperties", "tokens").V(1)')
+        .then(function (result) {
+          assert.ok(result);
+          assert.strictEqual(result.length, 1);
+          const vertex = result.first();
+          assert.ok(vertex instanceof graphModule.Vertex);
+          assert.ok(vertex.properties === undefined || vertex.properties.length === 0);
+        });
+    });
+
+    it('should handle VertexProperties properties for gremlin request', async function () {
+      const crewClient = helper.getClient('gcrew');
+      await crewClient.open();
+
+      const result = await crewClient.submit('g.V(7)');
+
+      assert.ok(result);
+      assert.strictEqual(result.length, 1);
+      const vertex = result.first();
+      
+      assertVertexProperties(vertex);
+
+      await crewClient.close();
+    });
+
+    it('should handle VertexProperties properties for bytecode request', async function () {
+      const crewClient = helper.getClient('gcrew');
+      await crewClient.open();
+
+      const result = await crewClient.submit(new Bytecode().addStep('V', [7]));
+
+      assert.ok(result);
+      assert.strictEqual(result.length, 1);
+      const vertex = result.first().object;
+      
+      assertVertexProperties(vertex);
+
+      await crewClient.close();
+    });
+
     it('should be able to stream results from the gremlin server', (done) => {
       const output = [];
       let calls = 0;
@@ -200,3 +292,26 @@
     });
   });
 });
+
+function assertVertexProperties(vertex) {
+  assert.ok(vertex instanceof graphModule.Vertex);
+  let locations;
+  if (vertex.properties instanceof Array) {
+    locations = vertex.properties.filter(p => p.key == 'location');
+  } else {
+    locations = vertex.properties.location
+  }
+  assert.strictEqual(locations.length, 3);
+
+  const vertexProperty = locations[0];
+  assert.strictEqual(vertexProperty.value, 'centreville');
+  if (vertexProperty.properties instanceof Array) {
+    assert.strictEqual(vertexProperty.properties[0].key, 'startTime');
+    assert.strictEqual(vertexProperty.properties[0].value, 1990);
+    assert.strictEqual(vertexProperty.properties[1].key, 'endTime');
+    assert.strictEqual(vertexProperty.properties[1].value, 2000);
+  } else {
+    assert.strictEqual(vertexProperty.properties.startTime, 1990);
+    assert.strictEqual(vertexProperty.properties.endTime, 2000);
+  }
+}
\ No newline at end of file
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js
index 1fa5850..3d2b937 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/sasl-authentication-tests.js
@@ -54,6 +54,19 @@
           });
       });
 
+      it('should be able to send multiple requests concurrently with valid credentials and parse the response', async function () {
+        connection = helper.getSecureConnectionWithPlainTextSaslAuthenticator(null, 'stephen', 'password');
+
+        const submissions = await Promise.all(
+          Array.from({ length: 10 }).map(() => connection.submit(new Bytecode().addStep('V', []).addStep('tail', []))),
+        );
+
+        submissions.forEach((response) => {
+          assert.ok(response);
+          assert.ok(response.traversers);
+        });
+      });
+
       it('should send the request with invalid credentials and parse the response error', function () {
         connection = helper.getSecureConnectionWithPlainTextSaslAuthenticator(null, 'Bob', 'password');
 
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
index 64e1bc5..5d15469 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js
@@ -81,7 +81,7 @@
         assert.fail("there is no server so an error should have occurred");
       }).catch(function(err) {
         if (err instanceof AssertionError) throw err;
-        assert.strictEqual(err.message, "connect ECONNREFUSED 127.0.0.1:9998");
+        assert.strictEqual(err.code, "ECONNREFUSED");
       });
     });
   });
@@ -160,11 +160,11 @@
   describe("more complex traversals", function() {
     it('should return paths of value maps', function() {
       const g = traversal().withRemote(connection);
-      return g.V(1).out().in_().limit(1).path().by(__.valueMap('name')).toList().then(function (list) {
+      return g.V(1).out().order().in_().order().limit(1).path().by(__.valueMap('name')).toList().then(function (list) {
         assert.ok(list);
         assert.strictEqual(list.length, 1);
         assert.strictEqual(list[0].objects[0].get('name')[0], "marko");
-        assert.strictEqual(list[0].objects[1].get('name')[0], "lop");
+        assert.strictEqual(list[0].objects[1].get('name')[0], "vadas");
         assert.strictEqual(list[0].objects[2].get('name')[0], "marko");
       });
     });
@@ -246,19 +246,14 @@
   });
   describe('support remote transactions - commit', function() {
     before(function () {
-      if (process.env.TEST_TRANSACTIONS !== "true") return this.skip();
-
       txConnection = helper.getConnection('gtx');
       return txConnection.open();
     });
     after(function () {
-      if (process.env.TEST_TRANSACTIONS === "true") {
-        // neo4j gets re-used and has to be cleaned up per test that uses it
-        const g = traversal().withRemote(txConnection);
-        return g.V().drop().iterate().then(() => {
-          return txConnection.close()
-        });
-      }
+      const g = traversal().withRemote(txConnection);
+      return g.V().drop().iterate().then(() => {
+        return txConnection.close()
+      });
     });
     it('should commit a simple transaction', async function () {
       const g = traversal().withRemote(txConnection);
@@ -289,19 +284,15 @@
   });
   describe('support remote transactions - rollback', function() {
     before(function () {
-      if (process.env.TEST_TRANSACTIONS !== "true") return this.skip();
 
       txConnection = helper.getConnection('gtx');
       return txConnection.open();
     });
     after(function () {
-      if (process.env.TEST_TRANSACTIONS === "true") {
-        // neo4j gets re-used and has to be cleaned up per test that uses it
-        const g = traversal().withRemote(txConnection);
-        return g.V().drop().iterate().then(() => {
-          return txConnection.close()
-        });
-      }
+      const g = traversal().withRemote(txConnection);
+      return g.V().drop().iterate().then(() => {
+        return txConnection.close()
+      });
     });
     it('should rollback a simple transaction', async function() {
       const g = traversal().withRemote(txConnection);
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
index a0b0de1..fee184f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
@@ -61,6 +61,7 @@
       submit: function (processor, op, args, requestId) {
         assert.strictEqual(args.gremlin, query);
         assert.strictEqual(args.evaluationTimeout, 123);
+        assert.strictEqual(args.materializeProperties, 'tokens');
         assert.strictEqual(processor, customOpProcessor);
 
         return Promise.resolve();
@@ -69,6 +70,6 @@
 
     const customClient = new Client('ws://localhost:9321', {traversalSource: 'g', processor: customOpProcessor, connectOnStartup: false});
     customClient._connection = connectionMock;
-    customClient.submit(query, null, {"evaluationTimeout": 123})
+    customClient.submit(query, null, {'evaluationTimeout': 123, 'materializeProperties': 'tokens'})
   });
 });
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js
new file mode 100644
index 0000000..fc459e5
--- /dev/null
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/element-comparison-test.js
@@ -0,0 +1,299 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+const chai = require('chai')
+const { expect } = require('chai');
+const { VertexProperty, Property, Vertex, Edge, Path } = require('../../lib/structure/graph');
+const { deepMembersById, compareElements, opt } = require('../cucumber/element-comparison');
+const deepEqual = require('deep-eql');
+
+chai.use(function (chai, chaiUtils) {
+  chai.Assertion.overwriteMethod('members', function (_super) {
+    return deepMembersById;
+  });
+});
+
+describe('primitives', function () {
+    it('should pass', function () {
+        expect(deepEqual(1, 1, opt)).to.be.true;
+        expect(deepEqual(false, false, opt)).to.be.true;
+        expect(deepEqual(null, null, opt)).to.be.true;
+    });
+
+    it('should fail', function () {
+        expect(deepEqual(1, 2, opt)).to.be.false;
+        expect(deepEqual(true, false, opt)).to.be.false;
+        expect(deepEqual(0, "0", opt)).to.be.false;
+        expect(deepEqual(0, false, opt)).to.be.false;
+        expect(deepEqual(0, null, opt)).to.be.false;
+        expect(deepEqual(false, null, opt)).to.be.false;
+    });
+});
+
+describe('elements', function () {
+    const v1 = new Vertex(1, "dog", undefined);
+    const v2 = new Vertex(1, "cat", undefined);
+    const v3 = new Vertex(2, "cat", undefined);
+
+    const e1 = new Edge(2, v1, "chases", v3, undefined);
+    const e2 = new Edge(3, v1, "chases", v3, undefined);
+    const e3 = new Edge(3, v2, "chases", v3, undefined);
+
+    const vp1 = new VertexProperty(3, "size", "small", undefined);
+    const vp2 = new VertexProperty(3, "size", "large", undefined);
+    const vp3 = new VertexProperty(4, "size", "large", undefined);
+
+    it('should pass with same id, different values', function () {
+        expect(deepEqual(v1, v2, opt)).to.be.true;
+        expect(deepEqual(e2, e3, opt)).to.be.true;
+        expect(deepEqual(vp1, vp2, opt)).to.be.true;
+    });
+
+    it('should fail with different id, same values', function () {
+        expect(deepEqual(v2, v3, opt)).to.be.false;
+        expect(deepEqual(e1, e2, opt)).to.be.false;
+        expect(deepEqual(vp2, vp3, opt)).to.be.false;
+    });
+
+    it('should fail with same id, different type', function () {
+        expect(deepEqual(v3, e1, opt)).to.be.false;
+        expect(deepEqual(e3, vp1, opt)).to.be.false;
+    });
+
+    describe('element arrays', function () {
+        const ea1 = [v1, e2, v3];
+        const ea2 = [v1, e2, v3];
+        const ea3 = [e2, v1, v3];
+        const ea4 = [e2, e2, v3];
+        const ea5 = [v1, e2, v3, vp1];
+
+        it('unordered', function () {
+            expect(ea1).to.have.deep.members(ea2);
+            expect(ea1).to.have.deep.members(ea3);
+            expect(ea1).to.not.have.deep.members(ea4);
+            expect(ea1).to.not.have.deep.members(ea5);
+            expect(ea5).to.not.have.deep.members(ea1);
+        });
+
+        it('ordered', function () {
+            expect(ea1).to.have.deep.ordered.members(ea2);
+            expect(ea1).to.not.have.deep.ordered.members(ea3);
+            expect(ea1).to.not.have.deep.ordered.members(ea4);
+            expect(ea1).to.not.have.deep.ordered.members(ea5);
+            expect(ea5).to.not.have.deep.ordered.members(ea1);
+        });
+
+        it('include', function () {
+            expect(ea1).to.include.deep.members(ea2);
+            expect(ea1).to.include.deep.members(ea3);
+            expect(ea1).to.include.deep.members(ea4);
+            expect(ea1).to.not.include.deep.members(ea5);
+
+            expect(ea2).to.include.deep.members(ea1);
+            expect(ea3).to.include.deep.members(ea1);
+            expect(ea4).to.not.include.deep.members(ea1);
+            expect(ea5).to.include.deep.members(ea1);
+        });
+    });
+});
+
+describe('property', function () {
+    const p1 = new Property("a", "1");
+    const p2 = new Property("a", "1");
+    const p3 = new Property("a", 1);
+    const p4 = new Property(1, 1);
+    const p5 = new Property(1, "a");
+
+    it('should pass only properties that match exactly', function () {
+        expect(deepEqual(p1, p2, opt)).to.be.true;
+        expect(deepEqual(p1, p3, opt)).to.be.false;
+        expect(deepEqual(p1, p4, opt)).to.be.false;
+        expect(deepEqual(p3, p5, opt)).to.be.false;
+    });
+});
+
+describe('arrays', function () {
+    const a1 = [1, 2, 3];
+    const a2 = [1, 2, 3];
+    const a3 = [2, 1, 3];
+    const a4 = [2, 2, 3];
+    const a5 = [1, 2, 3, 4];
+
+    it('unordered', function () {
+        expect(a1).to.have.deep.members(a2);
+        expect(a1).to.have.deep.members(a3);
+        expect(a1).to.not.have.deep.members(a4);
+        expect(a1).to.not.have.deep.members(a5);
+        expect(a5).to.not.have.deep.members(a1);
+    });
+
+    it('ordered', function () {
+        expect(a1).to.have.deep.ordered.members(a2);
+        expect(a1).to.not.have.deep.ordered.members(a3);
+        expect(a1).to.not.have.deep.ordered.members(a4);
+        expect(a1).to.not.have.deep.ordered.members(a5);
+        expect(a5).to.not.have.deep.ordered.members(a1);
+    });
+
+    const a6 = [1, 2, a1];
+    const a7 = [1, a3, 2];
+    const a8 = [1, 2, a5];
+
+    const a9 = [1, a1, a1];
+    const a10 = [1, a1, a3];
+
+    const a11 = [a9]
+    const a12 = [a10]
+
+    it('unordered nested', function () {
+        expect(a6).to.have.not.deep.members(a7); // nested arrays ordered differently don't pass as the same item
+        expect(a6).to.not.have.deep.members(a8);
+        expect(a9).to.not.have.deep.members(a10);
+        expect(a11).to.not.have.deep.members(a12);
+    });
+
+    it('ordered nested', function () {
+        expect(a6).to.have.deep.ordered.members(a6);
+        expect(a6).to.not.have.deep.ordered.members(a7);
+        expect(a6).to.not.have.deep.ordered.members(a8);
+        expect(a9).to.not.have.deep.ordered.members(a10);
+        expect(a10).to.have.deep.ordered.members(a10);
+        expect(a11).to.have.deep.ordered.members(a11);
+        expect(a11).to.not.have.deep.ordered.members(a12);
+    });
+});
+
+describe('map', function () {
+    const m1 = [new Map([
+        ['ripple', [new Vertex(5, 'software', undefined)]],
+        ['peter', [new Vertex(6, 'person', undefined)]],
+        ['vadas', [new Vertex(2, 'person', undefined)]]
+    ])];
+    const m2 = [new Map([
+        ['ripple', [new Vertex(5, 'software', undefined)]],
+        ['peter', [new Vertex(6, 'person', undefined)]]
+    ])];
+    const m3 = [new Map([
+        ['ripple', [new Vertex(5, 'software', undefined)]],
+        ['vadas', [new Vertex(2, 'person', undefined)]],
+        ['peter', [new Vertex(6, 'person', undefined)]]
+    ])];
+    const m4 = [new Map([
+        ['ripple', [new Vertex(5, 'software', undefined)]],
+        ['vadas', [new Vertex(6, 'person', undefined)]],
+        ['peter', [new Vertex(2, 'person', undefined)]]
+    ])];
+
+    it('unordered', function () {
+        expect(m1).to.have.deep.members(m1);
+        expect(m1).to.not.have.deep.members(m2);
+        expect(m1).to.have.deep.members(m3);
+        expect(m1).to.not.have.deep.members(m4);
+    });
+
+    it('ordered', function () {
+        expect(m1).to.have.deep.ordered.members(m1);
+        expect(m1).to.not.have.deep.ordered.members(m2);
+        expect(m1).to.have.deep.ordered.members(m3); // map entries can be unordered
+        expect(m1).to.not.have.deep.ordered.members(m4);
+    });
+});
+
+describe('objects', function () {
+    const obj1 = [{
+        k1: "v1",
+        k2: "v2",
+        k3: { k4: "v4", k5: "v5" }
+    }];
+    const obj2 = [{
+        k1: "v1",
+        k2: "v2",
+        k3: { k4: "v4", k5: "v5" }
+    }];
+    const obj3 = [{
+        k2: "v2",
+        k1: "v1",
+        k3: { k5: "v5", k4: "v4" }
+    }];
+    const obj4 = [{
+        k1: "v1",
+        k2: "v2",
+        k3: { k4: "v4" }
+    }];
+    const obj5 = [{
+        k1: "v1",
+        k2: "v2",
+        k3: { k4: "v5", k5: "v4" }
+    }];
+
+    it('should pass', function () {
+        expect(obj1).to.have.deep.members(obj2); // identical
+        expect(obj1).to.have.deep.members(obj3); // order swapped
+    });
+
+    it('should fail', function () {
+        expect(obj1).to.not.have.deep.members(obj4); // missing nested kvp
+        expect(obj1).to.not.have.deep.members(obj5); // values swapped
+    });
+
+    const obj6 = [{
+        k1: "v1",
+        k2: "v2",
+        k3: [ 1, 2, 3 ]
+    }];
+    const obj7 = [{
+        k3: [ 1, 2, 3 ],
+        k1: "v1",
+        k2: "v2"
+    }];
+    const obj8 = [{
+        k1: "v1",
+        k2: "v2",
+        k3: [ 2, 1, 3 ]
+    }];
+
+    it('unordered', function () {
+        expect(obj6).to.have.deep.members(obj7);
+        expect(obj6).to.not.have.deep.members(obj8);
+    });
+
+    it('ordered', function () {
+        expect(obj6).to.have.deep.ordered.members(obj7); // kvp can be unordered
+        expect(obj6).to.not.have.deep.ordered.members(obj8); // array must be ordered
+    });
+
+    const path1 = new Path(["path"], [new Vertex(1, 'person', undefined),
+                                      new Vertex(2, 'person', undefined)]);
+    const path2 = new Path(["path"], [new Vertex(1, 'person', undefined)]);
+    const path3 = new Path(["path"], [new Vertex(2, 'person', undefined),
+                                      new Vertex(1, 'person', undefined)]);
+
+    it('unordered', function () {
+        expect(deepEqual(path1, path1)).to.be.true;
+        expect(deepEqual(path1, path2)).to.be.false;
+        expect(deepEqual(path1, path3)).to.be.false;
+    });
+
+    it('ordered', function () {
+        expect(deepEqual(path1, path1)).to.be.true;
+        expect(deepEqual(path1, path2)).to.be.false;
+        expect(deepEqual(path1, path3)).to.be.false;
+    });
+
+});
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
index 1b3fc9a..d4b5deb 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphbinary/AnySerializer-test.js
@@ -167,6 +167,9 @@
       { v: new t.EnumValue('Direction', 'OUT'),
         b: [ DataType.DIRECTION,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x03, ...from('OUT') ]
       },
+      { v: new t.EnumValue('DT', 'minute'),
+        b: [ DataType.DT,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x06, ...from('minute') ]
+      },
       { v: new t.EnumValue('Merge', 'onMatch'),
         b: [ DataType.MERGE,0x00, DataType.STRING,0x00, 0x00,0x00,0x00,0x07, ...from('onMatch') ]
       },
@@ -494,6 +497,10 @@
       { v:null,                                   b:[0x18,0x01] },
       { v:new t.EnumValue('Direction','OUT'),     b:[0x18,0x00, 0x03,0x00, 0x00,0x00,0x00,0x03, ...from('OUT')] },
 
+      // DT
+      { v:null,                                   b:[0x2f,0x01] },
+      { v:new t.EnumValue('DT','minute'),         b:[0x2f,0x00, 0x03,0x00, 0x00,0x00,0x00,0x06, ...from('minute')] },
+
       // MERGE
       { v:null,                                   b:[0x2e,0x01] },
       { v:new t.EnumValue('Merge','onCreate'),    b:[0x2e,0x00, 0x03,0x00, 0x00,0x00,0x00,0x08, ...from('onCreate')] },
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js
index df161f0..9bd97f4 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/result-set-test.js
@@ -23,14 +23,12 @@
 'use strict';
 
 const assert = require('assert');
-const util = require('util');
 const ResultSet = require('../../lib/driver/result-set');
 
 describe('ResultSet', function () {
-
   describe('#toArray()', () => {
     it('should return an array of items', () => {
-      const items = [ 'a', 'b' ];
+      const items = ['a', 'b'];
       const result = new ResultSet(items);
       assert.ok(Array.isArray(result.toArray()));
       assert.deepStrictEqual(result.toArray(), items);
@@ -39,7 +37,7 @@
 
   describe('#length', () => {
     it('should return the length of the items', () => {
-      const items = [ 'a', 'b', 1, 0 ];
+      const items = ['a', 'b', 1, 0];
       const result = new ResultSet(items);
       assert.strictEqual(result.length, items.length);
     });
@@ -58,7 +56,7 @@
 
   describe('#[Symbol.iterator]()', () => {
     it('should support be iterable', () => {
-      const items = [ 1, 2, 3 ];
+      const items = [1, 2, 3];
       const result = new ResultSet(items);
       const obtained = [];
       for (let item of result) {
@@ -72,7 +70,7 @@
 
   describe('#[util.inspect.custom]()', () => {
     it('should return the Array representation', () => {
-      assert.strictEqual(util.inspect(new ResultSet([ 1, 2, 3 ])), '[ 1, 2, 3 ]');
+      assert.deepStrictEqual(new ResultSet([1, 2, 3])._items, [1, 2, 3]);
     });
   });
 
@@ -84,10 +82,13 @@
     });
 
     it('should return the attributes when defined', () => {
-      const attributes = new Map([['a', 1], ['b', 1]]);
+      const attributes = new Map([
+        ['a', 1],
+        ['b', 1],
+      ]);
       const rs = new ResultSet([], attributes);
       assert.ok(rs.attributes instanceof Map);
       assert.strictEqual(rs.attributes, attributes);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/gremlin-language/pom.xml b/gremlin-language/pom.xml
index 799b120..5772e8a 100644
--- a/gremlin-language/pom.xml
+++ b/gremlin-language/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-language</artifactId>
diff --git a/gremlin-language/src/main/antlr4/Gremlin.g4 b/gremlin-language/src/main/antlr4/Gremlin.g4
index baa9498..95b93e9 100644
--- a/gremlin-language/src/main/antlr4/Gremlin.g4
+++ b/gremlin-language/src/main/antlr4/Gremlin.g4
@@ -67,7 +67,7 @@
     ;
 
 traversalSourceSelfMethod_withBulk
-    : 'withBulk' LPAREN booleanLiteral RPAREN
+    : 'withBulk' LPAREN booleanArgument RPAREN
     ;
 
 traversalSourceSelfMethod_withPath
@@ -75,12 +75,12 @@
     ;
 
 traversalSourceSelfMethod_withSack
-    : 'withSack' LPAREN genericLiteral RPAREN
-    | 'withSack' LPAREN genericLiteral COMMA traversalOperator RPAREN
+    : 'withSack' LPAREN genericLiteralArgument RPAREN
+    | 'withSack' LPAREN genericLiteralArgument COMMA traversalBiFunctionArgument RPAREN
     ;
 
 traversalSourceSelfMethod_withSideEffect
-    : 'withSideEffect' LPAREN stringBasedLiteral COMMA genericLiteral RPAREN
+    : 'withSideEffect' LPAREN stringArgument COMMA genericLiteralArgument RPAREN
     ;
 
 traversalSourceSelfMethod_withStrategies
@@ -88,8 +88,8 @@
     ;
 
 traversalSourceSelfMethod_with
-    : 'with' LPAREN stringBasedLiteral RPAREN
-    | 'with' LPAREN stringBasedLiteral COMMA genericLiteral RPAREN
+    : 'with' LPAREN stringArgument RPAREN
+    | 'with' LPAREN stringArgument COMMA genericLiteralArgument RPAREN
     ;
 
 traversalSourceSpawnMethod
@@ -102,51 +102,56 @@
     | traversalSourceSpawnMethod_inject
     | traversalSourceSpawnMethod_io
     | traversalSourceSpawnMethod_call
+    | traversalSourceSpawnMethod_union
     ;
 
 traversalSourceSpawnMethod_addE
-    : 'addE' LPAREN stringBasedLiteral RPAREN
+    : 'addE' LPAREN stringArgument RPAREN
     | 'addE' LPAREN nestedTraversal RPAREN
     ;
 
 traversalSourceSpawnMethod_addV
     : 'addV' LPAREN RPAREN
-    | 'addV' LPAREN stringBasedLiteral RPAREN
+    | 'addV' LPAREN stringArgument RPAREN
     | 'addV' LPAREN nestedTraversal RPAREN
     ;
 
 traversalSourceSpawnMethod_E
-    : 'E' LPAREN genericLiteralList RPAREN
+    : 'E' LPAREN genericLiteralVarargs RPAREN
     ;
 
 traversalSourceSpawnMethod_V
-    : 'V' LPAREN genericLiteralList RPAREN
+    : 'V' LPAREN genericLiteralVarargs RPAREN
     ;
 
 traversalSourceSpawnMethod_inject
-    : 'inject' LPAREN genericLiteralList RPAREN
+    : 'inject' LPAREN genericLiteralVarargs RPAREN
     ;
 
 traversalSourceSpawnMethod_io
-    : 'io' LPAREN stringBasedLiteral RPAREN
+    : 'io' LPAREN stringArgument RPAREN
     ;
 
 traversalSourceSpawnMethod_mergeV
-    : 'mergeV' LPAREN (genericLiteralMap | nullLiteral) RPAREN #traversalSourceSpawnMethod_mergeV_Map
+    : 'mergeV' LPAREN genericLiteralMapNullableArgument RPAREN #traversalSourceSpawnMethod_mergeV_Map
     | 'mergeV' LPAREN nestedTraversal RPAREN #traversalSourceSpawnMethod_mergeV_Traversal
     ;
 
 traversalSourceSpawnMethod_mergeE
-    : 'mergeE' LPAREN (genericLiteralMap | nullLiteral) RPAREN #traversalSourceSpawnMethod_mergeE_Map
+    : 'mergeE' LPAREN genericLiteralMapNullableArgument RPAREN #traversalSourceSpawnMethod_mergeE_Map
     | 'mergeE' LPAREN nestedTraversal RPAREN #traversalSourceSpawnMethod_mergeE_Traversal
     ;
 
 traversalSourceSpawnMethod_call
     : 'call' LPAREN RPAREN #traversalSourceSpawnMethod_call_empty
-    | 'call' LPAREN stringBasedLiteral RPAREN #traversalSourceSpawnMethod_call_string
-    | 'call' LPAREN stringBasedLiteral COMMA genericLiteralMap RPAREN #traversalSourceSpawnMethod_call_string_map
-    | 'call' LPAREN stringBasedLiteral COMMA nestedTraversal RPAREN #traversalSourceSpawnMethod_call_string_traversal
-    | 'call' LPAREN stringBasedLiteral COMMA genericLiteralMap COMMA nestedTraversal RPAREN #traversalSourceSpawnMethod_call_string_map_traversal
+    | 'call' LPAREN stringArgument RPAREN #traversalSourceSpawnMethod_call_string
+    | 'call' LPAREN stringArgument COMMA genericLiteralMapArgument RPAREN #traversalSourceSpawnMethod_call_string_map
+    | 'call' LPAREN stringArgument COMMA nestedTraversal RPAREN #traversalSourceSpawnMethod_call_string_traversal
+    | 'call' LPAREN stringArgument COMMA genericLiteralMapArgument COMMA nestedTraversal RPAREN #traversalSourceSpawnMethod_call_string_map_traversal
+    ;
+
+traversalSourceSpawnMethod_union
+    : 'union' LPAREN nestedTraversalList RPAREN
     ;
 
 chainedTraversal
@@ -170,18 +175,17 @@
     : rootTraversal DOT traversalTerminalMethod
     ;
 
-/*********************************************
-    GENERATED GRAMMAR - DO NOT CHANGE
-**********************************************/
-
 traversalMethod
     : traversalMethod_V
+    | traversalMethod_E
     | traversalMethod_addE
     | traversalMethod_addV
     | traversalMethod_mergeE
     | traversalMethod_mergeV
     | traversalMethod_aggregate
+    | traversalMethod_all
     | traversalMethod_and
+    | traversalMethod_any
     | traversalMethod_as
     | traversalMethod_barrier
     | traversalMethod_both
@@ -193,11 +197,14 @@
     | traversalMethod_choose
     | traversalMethod_coalesce
     | traversalMethod_coin
+    | traversalMethod_conjoin
     | traversalMethod_connectedComponent
     | traversalMethod_constant
     | traversalMethod_count
     | traversalMethod_cyclicPath
     | traversalMethod_dedup
+    | traversalMethod_difference
+    | traversalMethod_disjunct
     | traversalMethod_drop
     | traversalMethod_elementMap
     | traversalMethod_emit
@@ -217,6 +224,7 @@
     | traversalMethod_identity
     | traversalMethod_in
     | traversalMethod_inE
+    | traversalMethod_intersect
     | traversalMethod_inV
     | traversalMethod_index
     | traversalMethod_inject
@@ -255,6 +263,9 @@
     | traversalMethod_sack
     | traversalMethod_sample
     | traversalMethod_select
+    | traversalMethod_combine
+    | traversalMethod_product
+    | traversalMethod_merge
     | traversalMethod_shortestPath
     | traversalMethod_sideEffect
     | traversalMethod_simplePath
@@ -281,59 +292,88 @@
     | traversalMethod_write
     | traversalMethod_element
     | traversalMethod_call
+    | traversalMethod_concat
+    | traversalMethod_asString
+    | traversalMethod_format
+    | traversalMethod_toUpper
+    | traversalMethod_toLower
+    | traversalMethod_length
+    | traversalMethod_trim
+    | traversalMethod_lTrim
+    | traversalMethod_rTrim
+    | traversalMethod_reverse
+    | traversalMethod_replace
+    | traversalMethod_split
+    | traversalMethod_substring
+    | traversalMethod_asDate
+    | traversalMethod_dateAdd
+    | traversalMethod_dateDiff
     ;
+
 traversalMethod_V
-    : 'V' LPAREN genericLiteralList RPAREN
+    : 'V' LPAREN genericLiteralVarargs RPAREN
+    ;
+
+traversalMethod_E
+    : 'E' LPAREN genericLiteralVarargs RPAREN
     ;
 
 traversalMethod_addE
-    : 'addE' LPAREN stringBasedLiteral RPAREN #traversalMethod_addE_String
+    : 'addE' LPAREN stringArgument RPAREN #traversalMethod_addE_String
     | 'addE' LPAREN nestedTraversal RPAREN #traversalMethod_addE_Traversal
     ;
 
 traversalMethod_addV
     : 'addV' LPAREN RPAREN #traversalMethod_addV_Empty
-    | 'addV' LPAREN stringBasedLiteral RPAREN #traversalMethod_addV_String
+    | 'addV' LPAREN stringArgument RPAREN #traversalMethod_addV_String
     | 'addV' LPAREN nestedTraversal RPAREN #traversalMethod_addV_Traversal
     ;
 
 traversalMethod_mergeV
     : 'mergeV' LPAREN RPAREN #traversalMethod_mergeV_empty
-    | 'mergeV' LPAREN (genericLiteralMap | nullLiteral) RPAREN #traversalMethod_mergeV_Map
+    | 'mergeV' LPAREN genericLiteralMapNullableArgument RPAREN #traversalMethod_mergeV_Map
     | 'mergeV' LPAREN nestedTraversal RPAREN #traversalMethod_mergeV_Traversal
     ;
 
 traversalMethod_mergeE
     : 'mergeE' LPAREN RPAREN #traversalMethod_mergeE_empty
-    | 'mergeE' LPAREN (genericLiteralMap | nullLiteral) RPAREN #traversalMethod_mergeE_Map
+    | 'mergeE' LPAREN genericLiteralMapNullableArgument RPAREN #traversalMethod_mergeE_Map
     | 'mergeE' LPAREN nestedTraversal RPAREN #traversalMethod_mergeE_Traversal
     ;
 
 traversalMethod_aggregate
-    : 'aggregate' LPAREN traversalScope COMMA stringBasedLiteral RPAREN #traversalMethod_aggregate_Scope_String
-    | 'aggregate' LPAREN stringBasedLiteral RPAREN #traversalMethod_aggregate_String
+    : 'aggregate' LPAREN traversalScopeArgument COMMA stringArgument RPAREN #traversalMethod_aggregate_Scope_String
+    | 'aggregate' LPAREN stringArgument RPAREN #traversalMethod_aggregate_String
+    ;
+
+traversalMethod_all
+    : 'all' LPAREN traversalPredicate RPAREN #traversalMethod_all_P
     ;
 
 traversalMethod_and
     : 'and' LPAREN nestedTraversalList RPAREN
     ;
 
+traversalMethod_any
+    : 'any' LPAREN traversalPredicate RPAREN #traversalMethod_any_P
+    ;
+
 traversalMethod_as
-    : 'as' LPAREN stringBasedLiteral (COMMA stringLiteralList)? RPAREN
+    : 'as' LPAREN stringArgument (COMMA stringLiteralVarargs)? RPAREN
     ;
 
 traversalMethod_barrier
-    : 'barrier' LPAREN traversalSackMethod RPAREN #traversalMethod_barrier_Consumer
+    : 'barrier' LPAREN traversalSackMethodArgument RPAREN #traversalMethod_barrier_Consumer
     | 'barrier' LPAREN RPAREN #traversalMethod_barrier_Empty
-    | 'barrier' LPAREN integerLiteral RPAREN #traversalMethod_barrier_int
+    | 'barrier' LPAREN integerArgument RPAREN #traversalMethod_barrier_int
     ;
 
 traversalMethod_both
-    : 'both' LPAREN stringLiteralList RPAREN
+    : 'both' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_bothE
-    : 'bothE' LPAREN stringLiteralList RPAREN
+    : 'bothE' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_bothV
@@ -345,24 +385,24 @@
     ;
 
 traversalMethod_by
-    : 'by' LPAREN traversalComparator RPAREN #traversalMethod_by_Comparator
+    : 'by' LPAREN traversalComparatorArgument RPAREN #traversalMethod_by_Comparator
     | 'by' LPAREN RPAREN #traversalMethod_by_Empty
-    | 'by' LPAREN traversalFunction RPAREN #traversalMethod_by_Function
-    | 'by' LPAREN traversalFunction COMMA traversalComparator RPAREN #traversalMethod_by_Function_Comparator
-    | 'by' LPAREN traversalOrder RPAREN #traversalMethod_by_Order
-    | 'by' LPAREN stringBasedLiteral RPAREN #traversalMethod_by_String
-    | 'by' LPAREN stringBasedLiteral COMMA traversalComparator RPAREN #traversalMethod_by_String_Comparator
-    | 'by' LPAREN traversalToken RPAREN #traversalMethod_by_T
+    | 'by' LPAREN traversalFunctionArgument RPAREN #traversalMethod_by_Function
+    | 'by' LPAREN traversalFunctionArgument COMMA traversalComparatorArgument RPAREN #traversalMethod_by_Function_Comparator
+    | 'by' LPAREN traversalOrderArgument RPAREN #traversalMethod_by_Order
+    | 'by' LPAREN stringArgument RPAREN #traversalMethod_by_String
+    | 'by' LPAREN stringArgument COMMA traversalComparatorArgument RPAREN #traversalMethod_by_String_Comparator
+    | 'by' LPAREN traversalTokenArgument RPAREN #traversalMethod_by_T
     | 'by' LPAREN nestedTraversal RPAREN #traversalMethod_by_Traversal
-    | 'by' LPAREN nestedTraversal COMMA traversalComparator RPAREN #traversalMethod_by_Traversal_Comparator
+    | 'by' LPAREN nestedTraversal COMMA traversalComparatorArgument RPAREN #traversalMethod_by_Traversal_Comparator
     ;
 
 traversalMethod_cap
-    : 'cap' LPAREN stringBasedLiteral (COMMA stringLiteralList)? RPAREN
+    : 'cap' LPAREN stringArgument (COMMA stringLiteralVarargs)? RPAREN
     ;
 
 traversalMethod_choose
-    : 'choose' LPAREN traversalFunction RPAREN #traversalMethod_choose_Function
+    : 'choose' LPAREN traversalFunctionArgument RPAREN #traversalMethod_choose_Function
     | 'choose' LPAREN traversalPredicate COMMA nestedTraversal RPAREN #traversalMethod_choose_Predicate_Traversal
     | 'choose' LPAREN traversalPredicate COMMA nestedTraversal COMMA nestedTraversal RPAREN #traversalMethod_choose_Predicate_Traversal_Traversal
     | 'choose' LPAREN nestedTraversal RPAREN #traversalMethod_choose_Traversal
@@ -375,7 +415,11 @@
     ;
 
 traversalMethod_coin
-    : 'coin' LPAREN floatLiteral RPAREN
+    : 'coin' LPAREN floatArgument RPAREN
+    ;
+
+traversalMethod_combine
+    : 'combine' LPAREN genericLiteralArgument RPAREN #traversalMethod_combine_Object
     ;
 
 traversalMethod_connectedComponent
@@ -383,12 +427,12 @@
     ;
 
 traversalMethod_constant
-    : 'constant' LPAREN genericLiteral RPAREN
+    : 'constant' LPAREN genericLiteralArgument RPAREN
     ;
 
 traversalMethod_count
     : 'count' LPAREN RPAREN #traversalMethod_count_Empty
-    | 'count' LPAREN traversalScope RPAREN #traversalMethod_count_Scope
+    | 'count' LPAREN traversalScopeArgument RPAREN #traversalMethod_count_Scope
     ;
 
 traversalMethod_cyclicPath
@@ -396,8 +440,16 @@
     ;
 
 traversalMethod_dedup
-    : 'dedup' LPAREN traversalScope (COMMA stringLiteralList)? RPAREN #traversalMethod_dedup_Scope_String
-    | 'dedup' LPAREN stringLiteralList RPAREN #traversalMethod_dedup_String
+    : 'dedup' LPAREN traversalScopeArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_dedup_Scope_String
+    | 'dedup' LPAREN stringLiteralVarargs RPAREN #traversalMethod_dedup_String
+    ;
+
+traversalMethod_difference
+    : 'difference' LPAREN genericLiteralArgument RPAREN #traversalMethod_difference_Object
+    ;
+
+traversalMethod_disjunct
+    : 'disjunct' LPAREN genericLiteralArgument RPAREN #traversalMethod_disjunct_Object
     ;
 
 traversalMethod_drop
@@ -405,7 +457,7 @@
     ;
 
 traversalMethod_elementMap
-    : 'elementMap' LPAREN stringLiteralList RPAREN
+    : 'elementMap' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_emit
@@ -425,58 +477,58 @@
 
 traversalMethod_fold
     : 'fold' LPAREN RPAREN #traversalMethod_fold_Empty
-    | 'fold' LPAREN genericLiteral COMMA traversalBiFunction RPAREN #traversalMethod_fold_Object_BiFunction
+    | 'fold' LPAREN genericLiteralArgument COMMA traversalBiFunctionArgument RPAREN #traversalMethod_fold_Object_BiFunction
     ;
 
 traversalMethod_from
-    : 'from' LPAREN stringBasedLiteral RPAREN #traversalMethod_from_String
-    | 'from' LPAREN structureVertex RPAREN #traversalMethod_from_Vertex
+    : 'from' LPAREN stringArgument RPAREN #traversalMethod_from_String
+    | 'from' LPAREN structureVertexArgument RPAREN #traversalMethod_from_Vertex
     | 'from' LPAREN nestedTraversal RPAREN #traversalMethod_from_Traversal
     ;
 
 traversalMethod_group
     : 'group' LPAREN RPAREN #traversalMethod_group_Empty
-    | 'group' LPAREN stringBasedLiteral RPAREN #traversalMethod_group_String
+    | 'group' LPAREN stringArgument RPAREN #traversalMethod_group_String
     ;
 
 traversalMethod_groupCount
     : 'groupCount' LPAREN RPAREN #traversalMethod_groupCount_Empty
-    | 'groupCount' LPAREN stringBasedLiteral RPAREN #traversalMethod_groupCount_String
+    | 'groupCount' LPAREN stringArgument RPAREN #traversalMethod_groupCount_String
     ;
 
 traversalMethod_has
-    : 'has' LPAREN stringBasedLiteral RPAREN #traversalMethod_has_String
-    | 'has' LPAREN stringBasedLiteral COMMA genericLiteral RPAREN #traversalMethod_has_String_Object
-    | 'has' LPAREN stringBasedLiteral COMMA traversalPredicate RPAREN #traversalMethod_has_String_P
-    | 'has' LPAREN stringBasedLiteral COMMA stringBasedLiteral COMMA genericLiteral RPAREN #traversalMethod_has_String_String_Object
-    | 'has' LPAREN stringBasedLiteral COMMA stringBasedLiteral COMMA traversalPredicate RPAREN #traversalMethod_has_String_String_P
-    | 'has' LPAREN stringBasedLiteral COMMA nestedTraversal RPAREN #traversalMethod_has_String_Traversal
-    | 'has' LPAREN traversalToken COMMA genericLiteral RPAREN #traversalMethod_has_T_Object
-    | 'has' LPAREN traversalToken COMMA traversalPredicate RPAREN #traversalMethod_has_T_P
-    | 'has' LPAREN traversalToken COMMA nestedTraversal RPAREN #traversalMethod_has_T_Traversal
+    : 'has' LPAREN stringNullableArgument RPAREN #traversalMethod_has_String
+    | 'has' LPAREN stringNullableArgument COMMA genericLiteralArgument RPAREN #traversalMethod_has_String_Object
+    | 'has' LPAREN stringNullableArgument COMMA traversalPredicate RPAREN #traversalMethod_has_String_P
+    | 'has' LPAREN stringNullableArgument COMMA stringNullableArgument COMMA genericLiteralArgument RPAREN #traversalMethod_has_String_String_Object
+    | 'has' LPAREN stringNullableArgument COMMA stringNullableArgument COMMA traversalPredicate RPAREN #traversalMethod_has_String_String_P
+    | 'has' LPAREN stringNullableArgument COMMA nestedTraversal RPAREN #traversalMethod_has_String_Traversal
+    | 'has' LPAREN traversalTokenArgument COMMA genericLiteralArgument RPAREN #traversalMethod_has_T_Object
+    | 'has' LPAREN traversalTokenArgument COMMA traversalPredicate RPAREN #traversalMethod_has_T_P
+    | 'has' LPAREN traversalTokenArgument COMMA nestedTraversal RPAREN #traversalMethod_has_T_Traversal
     ;
 
 traversalMethod_hasId
-    : 'hasId' LPAREN genericLiteral (COMMA genericLiteralList)? RPAREN #traversalMethod_hasId_Object_Object
+    : 'hasId' LPAREN genericLiteralArgument (COMMA genericLiteralVarargs)? RPAREN #traversalMethod_hasId_Object_Object
     | 'hasId' LPAREN traversalPredicate RPAREN #traversalMethod_hasId_P
     ;
 
 traversalMethod_hasKey
     : 'hasKey' LPAREN traversalPredicate RPAREN #traversalMethod_hasKey_P
-    | 'hasKey' LPAREN stringBasedLiteral (COMMA stringLiteralList)? RPAREN #traversalMethod_hasKey_String_String
+    | 'hasKey' LPAREN stringNullableArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_hasKey_String_String
     ;
 
 traversalMethod_hasLabel
     : 'hasLabel' LPAREN traversalPredicate RPAREN #traversalMethod_hasLabel_P
-    | 'hasLabel' LPAREN stringBasedLiteral (COMMA stringLiteralList)? RPAREN #traversalMethod_hasLabel_String_String
+    | 'hasLabel' LPAREN stringNullableArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_hasLabel_String_String
     ;
 
 traversalMethod_hasNot
-    : 'hasNot' LPAREN stringBasedLiteral RPAREN
+    : 'hasNot' LPAREN stringNullableArgument RPAREN
     ;
 
 traversalMethod_hasValue
-    : 'hasValue' LPAREN genericLiteral (COMMA genericLiteralList)? RPAREN #traversalMethod_hasValue_Object_Object
+    : 'hasValue' LPAREN genericLiteralArgument (COMMA genericLiteralVarargs)? RPAREN #traversalMethod_hasValue_Object_Object
     | 'hasValue' LPAREN traversalPredicate RPAREN #traversalMethod_hasValue_P
     ;
 
@@ -489,11 +541,15 @@
     ;
 
 traversalMethod_in
-    : 'in' LPAREN stringLiteralList RPAREN
+    : 'in' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_inE
-    : 'inE' LPAREN stringLiteralList RPAREN
+    : 'inE' LPAREN stringLiteralVarargs RPAREN
+    ;
+
+traversalMethod_intersect
+    : 'intersect' LPAREN genericLiteralArgument RPAREN #traversalMethod_intersect_Object
     ;
 
 traversalMethod_inV
@@ -505,14 +561,18 @@
     ;
 
 traversalMethod_inject
-    : 'inject' LPAREN genericLiteralList RPAREN
+    : 'inject' LPAREN genericLiteralVarargs RPAREN
     ;
 
 traversalMethod_is
-    : 'is' LPAREN genericLiteral RPAREN #traversalMethod_is_Object
+    : 'is' LPAREN genericLiteralArgument RPAREN #traversalMethod_is_Object
     | 'is' LPAREN traversalPredicate RPAREN #traversalMethod_is_P
     ;
 
+traversalMethod_conjoin
+    : 'conjoin' LPAREN stringArgument RPAREN #traversalMethod_conjoin_String
+    ;
+
 traversalMethod_key
     : 'key' LPAREN RPAREN
     ;
@@ -522,8 +582,8 @@
     ;
 
 traversalMethod_limit
-    : 'limit' LPAREN traversalScope COMMA integerLiteral RPAREN #traversalMethod_limit_Scope_long
-    | 'limit' LPAREN integerLiteral RPAREN #traversalMethod_limit_long
+    : 'limit' LPAREN traversalScopeArgument COMMA integerArgument RPAREN #traversalMethod_limit_Scope_long
+    | 'limit' LPAREN integerArgument RPAREN #traversalMethod_limit_long
     ;
 
 traversalMethod_local
@@ -532,7 +592,7 @@
 
 traversalMethod_loops
     : 'loops' LPAREN RPAREN #traversalMethod_loops_Empty
-    | 'loops' LPAREN stringBasedLiteral RPAREN #traversalMethod_loops_String
+    | 'loops' LPAREN stringArgument RPAREN #traversalMethod_loops_String
     ;
 
 traversalMethod_map
@@ -544,22 +604,26 @@
     ;
 
 traversalMethod_math
-    : 'math' LPAREN stringBasedLiteral RPAREN
+    : 'math' LPAREN stringArgument RPAREN
     ;
 
 traversalMethod_max
     : 'max' LPAREN RPAREN #traversalMethod_max_Empty
-    | 'max' LPAREN traversalScope RPAREN #traversalMethod_max_Scope
+    | 'max' LPAREN traversalScopeArgument RPAREN #traversalMethod_max_Scope
     ;
 
 traversalMethod_mean
     : 'mean' LPAREN RPAREN #traversalMethod_mean_Empty
-    | 'mean' LPAREN traversalScope RPAREN #traversalMethod_mean_Scope
+    | 'mean' LPAREN traversalScopeArgument RPAREN #traversalMethod_mean_Scope
+    ;
+
+traversalMethod_merge
+    : 'merge' LPAREN genericLiteralArgument RPAREN #traversalMethod_merge_Object
     ;
 
 traversalMethod_min
     : 'min' LPAREN RPAREN #traversalMethod_min_Empty
-    | 'min' LPAREN traversalScope RPAREN #traversalMethod_min_Scope
+    | 'min' LPAREN traversalScopeArgument RPAREN #traversalMethod_min_Scope
     ;
 
 traversalMethod_not
@@ -568,9 +632,10 @@
 
 traversalMethod_option
     : 'option' LPAREN traversalPredicate COMMA nestedTraversal RPAREN #traversalMethod_option_Predicate_Traversal
-    | 'option' LPAREN traversalMerge COMMA (genericLiteralMap | nullLiteral) RPAREN #traversalMethod_option_Merge_Map
-    | 'option' LPAREN traversalMerge COMMA nestedTraversal RPAREN #traversalMethod_option_Merge_Traversal
-    | 'option' LPAREN genericLiteral COMMA nestedTraversal RPAREN #traversalMethod_option_Object_Traversal
+    | 'option' LPAREN traversalMergeArgument COMMA genericLiteralMapNullableArgument RPAREN #traversalMethod_option_Merge_Map
+    | 'option' LPAREN traversalMergeArgument COMMA genericLiteralMapNullableArgument COMMA traversalCardinality RPAREN #traversalMethod_option_Merge_Map_Cardinality
+    | 'option' LPAREN traversalMergeArgument COMMA nestedTraversal RPAREN #traversalMethod_option_Merge_Traversal
+    | 'option' LPAREN genericLiteralArgument COMMA nestedTraversal RPAREN #traversalMethod_option_Object_Traversal
     | 'option' LPAREN nestedTraversal RPAREN #traversalMethod_option_Traversal
     ;
 
@@ -584,7 +649,7 @@
 
 traversalMethod_order
     : 'order' LPAREN RPAREN #traversalMethod_order_Empty
-    | 'order' LPAREN traversalScope RPAREN #traversalMethod_order_Scope
+    | 'order' LPAREN traversalScopeArgument RPAREN #traversalMethod_order_Scope
     ;
 
 traversalMethod_otherV
@@ -592,11 +657,11 @@
     ;
 
 traversalMethod_out
-    : 'out' LPAREN stringLiteralList RPAREN
+    : 'out' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_outE
-    : 'outE' LPAREN stringLiteralList RPAREN
+    : 'outE' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_outV
@@ -605,7 +670,7 @@
 
 traversalMethod_pageRank
     : 'pageRank' LPAREN RPAREN #traversalMethod_pageRank_Empty
-    | 'pageRank' LPAREN floatLiteral RPAREN #traversalMethod_pageRank_double
+    | 'pageRank' LPAREN floatArgument RPAREN #traversalMethod_pageRank_double
     ;
 
 traversalMethod_path
@@ -616,33 +681,37 @@
     : 'peerPressure' LPAREN RPAREN
     ;
 
+traversalMethod_product
+    : 'product' LPAREN genericLiteralArgument RPAREN #traversalMethod_product_Object
+    ;
+
 traversalMethod_profile
     : 'profile' LPAREN RPAREN #traversalMethod_profile_Empty
-    | 'profile' LPAREN stringBasedLiteral RPAREN #traversalMethod_profile_String
+    | 'profile' LPAREN stringArgument RPAREN #traversalMethod_profile_String
     ;
 
 traversalMethod_project
-    : 'project' LPAREN stringBasedLiteral (COMMA stringLiteralList)? RPAREN
+    : 'project' LPAREN stringArgument (COMMA stringLiteralVarargs)? RPAREN
     ;
 
 traversalMethod_properties
-    : 'properties' LPAREN stringLiteralList RPAREN
+    : 'properties' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_property
-    : 'property' LPAREN traversalCardinality COMMA genericLiteral COMMA genericLiteral (COMMA genericLiteralList)? RPAREN #traversalMethod_property_Cardinality_Object_Object_Object
-    | 'property' LPAREN genericLiteral COMMA genericLiteral (COMMA genericLiteralList)? RPAREN #traversalMethod_property_Object_Object_Object
-    | 'property' LPAREN (genericLiteralMap | nullLiteral) RPAREN # traversalMethod_property_Object
-    | 'property' LPAREN traversalCardinality COMMA (genericLiteralMap | nullLiteral) RPAREN # traversalMethod_property_Cardinality_Object
+    : 'property' LPAREN traversalCardinalityArgument COMMA genericLiteralArgument COMMA genericLiteralArgument (COMMA genericLiteralVarargs)? RPAREN #traversalMethod_property_Cardinality_Object_Object_Object
+    | 'property' LPAREN genericLiteralArgument COMMA genericLiteralArgument (COMMA genericLiteralVarargs)? RPAREN #traversalMethod_property_Object_Object_Object
+    | 'property' LPAREN genericLiteralMapNullableArgument RPAREN # traversalMethod_property_Object
+    | 'property' LPAREN traversalCardinalityArgument COMMA genericLiteralMapNullableArgument RPAREN # traversalMethod_property_Cardinality_Object
     ;
 
 traversalMethod_propertyMap
-    : 'propertyMap' LPAREN stringLiteralList RPAREN
+    : 'propertyMap' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_range
-    : 'range' LPAREN traversalScope COMMA integerLiteral COMMA integerLiteral RPAREN #traversalMethod_range_Scope_long_long
-    | 'range' LPAREN integerLiteral COMMA integerLiteral RPAREN #traversalMethod_range_long_long
+    : 'range' LPAREN traversalScopeArgument COMMA integerArgument COMMA integerArgument RPAREN #traversalMethod_range_Scope_long_long
+    | 'range' LPAREN integerArgument COMMA integerArgument RPAREN #traversalMethod_range_long_long
     ;
 
 traversalMethod_read
@@ -650,27 +719,31 @@
     ;
 
 traversalMethod_repeat
-    : 'repeat' LPAREN stringBasedLiteral COMMA nestedTraversal RPAREN #traversalMethod_repeat_String_Traversal
+    : 'repeat' LPAREN stringArgument COMMA nestedTraversal RPAREN #traversalMethod_repeat_String_Traversal
     | 'repeat' LPAREN nestedTraversal RPAREN #traversalMethod_repeat_Traversal
     ;
 
+traversalMethod_reverse
+    : 'reverse' LPAREN RPAREN #traversalMethod_reverse_Empty
+    ;
+
 traversalMethod_sack
-    : 'sack' LPAREN traversalBiFunction RPAREN #traversalMethod_sack_BiFunction
+    : 'sack' LPAREN traversalBiFunctionArgument RPAREN #traversalMethod_sack_BiFunction
     | 'sack' LPAREN RPAREN #traversalMethod_sack_Empty
     ;
 
 traversalMethod_sample
-    : 'sample' LPAREN traversalScope COMMA integerLiteral RPAREN #traversalMethod_sample_Scope_int
-    | 'sample' LPAREN integerLiteral RPAREN #traversalMethod_sample_int
+    : 'sample' LPAREN traversalScopeArgument COMMA integerArgument RPAREN #traversalMethod_sample_Scope_int
+    | 'sample' LPAREN integerArgument RPAREN #traversalMethod_sample_int
     ;
 
 traversalMethod_select
-    : 'select' LPAREN traversalColumn RPAREN #traversalMethod_select_Column
-    | 'select' LPAREN traversalPop COMMA stringBasedLiteral RPAREN #traversalMethod_select_Pop_String
-    | 'select' LPAREN traversalPop COMMA stringBasedLiteral COMMA stringBasedLiteral (COMMA stringLiteralList)? RPAREN #traversalMethod_select_Pop_String_String_String
-    | 'select' LPAREN traversalPop COMMA nestedTraversal RPAREN #traversalMethod_select_Pop_Traversal
-    | 'select' LPAREN stringBasedLiteral RPAREN #traversalMethod_select_String
-    | 'select' LPAREN stringBasedLiteral COMMA stringBasedLiteral (COMMA stringLiteralList)? RPAREN #traversalMethod_select_String_String_String
+    : 'select' LPAREN traversalColumnArgument RPAREN #traversalMethod_select_Column
+    | 'select' LPAREN traversalPopArgument COMMA stringArgument RPAREN #traversalMethod_select_Pop_String
+    | 'select' LPAREN traversalPopArgument COMMA stringArgument COMMA stringArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_select_Pop_String_String_String
+    | 'select' LPAREN traversalPopArgument COMMA nestedTraversal RPAREN #traversalMethod_select_Pop_Traversal
+    | 'select' LPAREN stringArgument RPAREN #traversalMethod_select_String
+    | 'select' LPAREN stringArgument COMMA stringArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_select_String_String_String
     | 'select' LPAREN nestedTraversal RPAREN #traversalMethod_select_Traversal
     ;
 
@@ -687,61 +760,61 @@
     ;
 
 traversalMethod_skip
-    : 'skip' LPAREN traversalScope COMMA integerLiteral RPAREN #traversalMethod_skip_Scope_long
-    | 'skip' LPAREN integerLiteral RPAREN #traversalMethod_skip_long
+    : 'skip' LPAREN traversalScopeArgument COMMA integerArgument RPAREN #traversalMethod_skip_Scope_long
+    | 'skip' LPAREN integerArgument RPAREN #traversalMethod_skip_long
     ;
 
 traversalMethod_store
-    : 'store' LPAREN stringBasedLiteral RPAREN
+    : 'store' LPAREN stringArgument RPAREN
     ;
 
 traversalMethod_subgraph
-    : 'subgraph' LPAREN stringBasedLiteral RPAREN
+    : 'subgraph' LPAREN stringArgument RPAREN
     ;
 
 traversalMethod_sum
     : 'sum' LPAREN RPAREN #traversalMethod_sum_Empty
-    | 'sum' LPAREN traversalScope RPAREN #traversalMethod_sum_Scope
+    | 'sum' LPAREN traversalScopeArgument RPAREN #traversalMethod_sum_Scope
     ;
 
 traversalMethod_tail
     : 'tail' LPAREN RPAREN #traversalMethod_tail_Empty
-    | 'tail' LPAREN traversalScope RPAREN #traversalMethod_tail_Scope
-    | 'tail' LPAREN traversalScope COMMA integerLiteral RPAREN #traversalMethod_tail_Scope_long
-    | 'tail' LPAREN integerLiteral RPAREN #traversalMethod_tail_long
+    | 'tail' LPAREN traversalScopeArgument RPAREN #traversalMethod_tail_Scope
+    | 'tail' LPAREN traversalScopeArgument COMMA integerArgument RPAREN #traversalMethod_tail_Scope_long
+    | 'tail' LPAREN integerArgument RPAREN #traversalMethod_tail_long
     ;
 
 traversalMethod_fail
     : 'fail' LPAREN RPAREN #traversalMethod_fail_Empty
-    | 'fail' LPAREN stringBasedLiteral RPAREN #traversalMethod_fail_String
+    | 'fail' LPAREN stringArgument RPAREN #traversalMethod_fail_String
     ;
 
 traversalMethod_timeLimit
-    : 'timeLimit' LPAREN integerLiteral RPAREN
+    : 'timeLimit' LPAREN integerArgument RPAREN
     ;
 
 traversalMethod_times
-    : 'times' LPAREN integerLiteral RPAREN
+    : 'times' LPAREN integerArgument RPAREN
     ;
 
 traversalMethod_to
-    : 'to' LPAREN traversalDirection (COMMA stringLiteralList)? RPAREN #traversalMethod_to_Direction_String
-    | 'to' LPAREN stringBasedLiteral RPAREN #traversalMethod_to_String
-    | 'to' LPAREN structureVertex RPAREN #traversalMethod_to_Vertex
+    : 'to' LPAREN traversalDirectionArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_to_Direction_String
+    | 'to' LPAREN stringArgument RPAREN #traversalMethod_to_String
+    | 'to' LPAREN structureVertexArgument RPAREN #traversalMethod_to_Vertex
     | 'to' LPAREN nestedTraversal RPAREN #traversalMethod_to_Traversal
     ;
 
 traversalMethod_toE
-    : 'toE' LPAREN traversalDirection (COMMA stringLiteralList)? RPAREN
+    : 'toE' LPAREN traversalDirectionArgument (COMMA stringLiteralVarargs)? RPAREN
     ;
 
 traversalMethod_toV
-    : 'toV' LPAREN traversalDirection RPAREN
+    : 'toV' LPAREN traversalDirectionArgument RPAREN
     ;
 
 traversalMethod_tree
     : 'tree' LPAREN RPAREN #traversalMethod_tree_Empty
-    | 'tree' LPAREN stringBasedLiteral RPAREN #traversalMethod_tree_String
+    | 'tree' LPAREN stringArgument RPAREN #traversalMethod_tree_String
     ;
 
 traversalMethod_unfold
@@ -762,23 +835,23 @@
     ;
 
 traversalMethod_valueMap
-    : 'valueMap' LPAREN stringLiteralList RPAREN #traversalMethod_valueMap_String
-    | 'valueMap' LPAREN booleanLiteral (COMMA stringLiteralList)? RPAREN #traversalMethod_valueMap_boolean_String
+    : 'valueMap' LPAREN stringLiteralVarargs RPAREN #traversalMethod_valueMap_String
+    | 'valueMap' LPAREN booleanArgument (COMMA stringLiteralVarargs)? RPAREN #traversalMethod_valueMap_boolean_String
     ;
 
 traversalMethod_values
-    : 'values' LPAREN stringLiteralList RPAREN
+    : 'values' LPAREN stringLiteralVarargs RPAREN
     ;
 
 traversalMethod_where
     : 'where' LPAREN traversalPredicate RPAREN #traversalMethod_where_P
-    | 'where' LPAREN stringBasedLiteral COMMA traversalPredicate RPAREN #traversalMethod_where_String_P
+    | 'where' LPAREN stringArgument COMMA traversalPredicate RPAREN #traversalMethod_where_String_P
     | 'where' LPAREN nestedTraversal RPAREN #traversalMethod_where_Traversal
     ;
 
 traversalMethod_with
-    : 'with' LPAREN stringBasedLiteral RPAREN #traversalMethod_with_String
-    | 'with' LPAREN stringBasedLiteral COMMA genericLiteral RPAREN #traversalMethod_with_String_Object
+    : 'with' LPAREN (withOptionKeys | stringArgument) RPAREN #traversalMethod_with_String
+    | 'with' LPAREN (withOptionKeys | stringArgument) COMMA (withOptionsValues | ioOptionsValues | genericLiteralArgument) RPAREN #traversalMethod_with_String_Object
     ;
 
 traversalMethod_write
@@ -790,12 +863,85 @@
     ;
 
 traversalMethod_call
-    : 'call' LPAREN stringBasedLiteral RPAREN #traversalMethod_call_string
-    | 'call' LPAREN stringBasedLiteral COMMA genericLiteralMap RPAREN #traversalMethod_call_string_map
-    | 'call' LPAREN stringBasedLiteral COMMA nestedTraversal RPAREN #traversalMethod_call_string_traversal
-    | 'call' LPAREN stringBasedLiteral COMMA genericLiteralMap COMMA nestedTraversal RPAREN #traversalMethod_call_string_map_traversal
+    : 'call' LPAREN stringArgument RPAREN #traversalMethod_call_string
+    | 'call' LPAREN stringArgument COMMA genericLiteralMapArgument RPAREN #traversalMethod_call_string_map
+    | 'call' LPAREN stringArgument COMMA nestedTraversal RPAREN #traversalMethod_call_string_traversal
+    | 'call' LPAREN stringArgument COMMA genericLiteralMapArgument COMMA nestedTraversal RPAREN #traversalMethod_call_string_map_traversal
     ;
 
+traversalMethod_concat
+    : 'concat' LPAREN nestedTraversal (COMMA nestedTraversalList)? RPAREN #traversalMethod_concat_Traversal_Traversal
+    | 'concat' LPAREN stringLiteralVarargs RPAREN #traversalMethod_concat_String
+    ;
+
+traversalMethod_asString
+    : 'asString' LPAREN RPAREN #traversalMethod_asString_Empty
+    | 'asString' LPAREN traversalScopeArgument RPAREN #traversalMethod_asString_Scope
+    ;
+
+traversalMethod_format
+    : 'format' LPAREN stringArgument RPAREN #traversalMethod_format_String
+    ;
+
+traversalMethod_toUpper
+    : 'toUpper' LPAREN RPAREN #traversalMethod_toUpper_Empty
+    | 'toUpper' LPAREN traversalScopeArgument RPAREN #traversalMethod_toUpper_Scope
+    ;
+
+traversalMethod_toLower
+    : 'toLower' LPAREN RPAREN #traversalMethod_toLower_Empty
+    | 'toLower' LPAREN traversalScopeArgument RPAREN #traversalMethod_toLower_Scope
+    ;
+
+traversalMethod_length
+    : 'length' LPAREN RPAREN #traversalMethod_length_Empty
+    | 'length' LPAREN traversalScopeArgument RPAREN #traversalMethod_length_Scope
+    ;
+
+traversalMethod_trim
+    : 'trim' LPAREN RPAREN #traversalMethod_trim_Empty
+    | 'trim' LPAREN traversalScopeArgument RPAREN #traversalMethod_trim_Scope
+    ;
+
+traversalMethod_lTrim
+    : 'lTrim' LPAREN RPAREN #traversalMethod_lTrim_Empty
+    | 'lTrim' LPAREN traversalScopeArgument RPAREN #traversalMethod_lTrim_Scope
+    ;
+
+traversalMethod_rTrim
+    : 'rTrim' LPAREN RPAREN #traversalMethod_rTrim_Empty
+    | 'rTrim' LPAREN traversalScopeArgument RPAREN #traversalMethod_rTrim_Scope
+    ;
+
+traversalMethod_replace
+    : 'replace' LPAREN stringNullableArgument COMMA stringNullableArgument RPAREN #traversalMethod_replace_String_String
+    | 'replace' LPAREN traversalScopeArgument COMMA stringNullableArgument COMMA stringNullableArgument RPAREN #traversalMethod_replace_Scope_String_String
+    ;
+
+traversalMethod_split
+    : 'split' LPAREN stringNullableArgument RPAREN #traversalMethod_split_String
+    | 'split' LPAREN traversalScopeArgument COMMA stringNullableArgument RPAREN #traversalMethod_split_Scope_String
+    ;
+
+traversalMethod_substring
+    : 'substring' LPAREN integerArgument RPAREN #traversalMethod_substring_int
+    | 'substring' LPAREN traversalScopeArgument COMMA integerArgument RPAREN #traversalMethod_substring_Scope_int
+    | 'substring' LPAREN integerArgument COMMA integerArgument RPAREN #traversalMethod_substring_int_int
+    | 'substring' LPAREN traversalScopeArgument COMMA integerArgument COMMA integerArgument RPAREN #traversalMethod_substring_Scope_int_int
+    ;
+
+traversalMethod_asDate
+    : 'asDate' LPAREN RPAREN
+    ;
+
+traversalMethod_dateAdd
+    : 'dateAdd' LPAREN traversalDTArgument COMMA integerArgument RPAREN
+    ;
+
+traversalMethod_dateDiff
+    : 'dateDiff' LPAREN nestedTraversal RPAREN #traversalMethod_dateDiff_Traversal
+    | 'dateDiff' LPAREN dateArgument RPAREN #traversalMethod_dateDiff_Date
+    ;
 
 /*********************************************
     ARGUMENT AND TERMINAL RULES
@@ -806,7 +952,7 @@
 // fail fast scenarios in that processing model. It is not relevant to the grammar however when a user is creating
 // the Vertex to be used in a Traversal and therefore both id and label are required.
 structureVertex
-    : NEW ('Vertex'|'ReferenceVertex') LPAREN genericLiteral COMMA stringBasedLiteral RPAREN
+    : NEW ('Vertex'|'ReferenceVertex') LPAREN genericLiteralArgument COMMA stringArgument RPAREN
     ;
 
 traversalStrategy
@@ -818,7 +964,7 @@
     : NEW 'PartitionStrategy' LPAREN traversalStrategyArgs_PartitionStrategy? (COMMA traversalStrategyArgs_PartitionStrategy)* RPAREN
 //  | 'RequirementStrategy' - not supported as it's internally relevant only
 //  | 'SackStrategy' - not supported directly as it's internal to withSack()
-    | NEW 'SeedStrategy' LPAREN 'seed' COLON integerLiteral RPAREN
+    | NEW 'SeedStrategy' LPAREN 'seed' COLON integerArgument RPAREN
 //  | 'SideEffectStrategy' - not supported directly as it's internal to withSideEffect()
     | NEW 'SubgraphStrategy' LPAREN traversalStrategyArgs_SubgraphStrategy? (COMMA traversalStrategyArgs_SubgraphStrategy)* RPAREN
 //  | 'MatchAlgorithmStrategy' - not supported directly as it's internal to match()
@@ -852,9 +998,9 @@
     ;
 
 traversalStrategyArgs_PartitionStrategy
-    : 'includeMetaProperties' COLON booleanLiteral
-    | 'writePartition' COLON stringBasedLiteral
-    | 'partitionKey' COLON stringBasedLiteral
+    : 'includeMetaProperties' COLON booleanArgument
+    | 'writePartition' COLON stringArgument
+    | 'partitionKey' COLON stringArgument
     | 'readPartitions' COLON stringLiteralList
     ;
 
@@ -862,18 +1008,18 @@
     : 'vertices' COLON nestedTraversal
     | 'edges' COLON nestedTraversal
     | 'vertexProperties' COLON nestedTraversal
-    | 'checkAdjacentVertices' COLON booleanLiteral
+    | 'checkAdjacentVertices' COLON booleanArgument
     ;
 
 traversalStrategyArgs_EdgeLabelVerificationStrategy
-    : 'throwException' COLON booleanLiteral
-    | 'logWarning' COLON booleanLiteral
+    : 'throwException' COLON booleanArgument
+    | 'logWarning' COLON booleanArgument
     ;
 
 traversalStrategyArgs_ReservedKeysVerificationStrategy
     : 'keys' COLON stringLiteralList
-    | 'throwException' COLON booleanLiteral
-    | 'logWarning' COLON booleanLiteral
+    | 'throwException' COLON booleanArgument
+    | 'logWarning' COLON booleanArgument
     ;
 
 traversalScope
@@ -910,7 +1056,13 @@
     ;
 
 traversalCardinality
-    : 'single' | 'Cardinality.single'
+    : 'Cardinality.single' LPAREN genericLiteral RPAREN
+    | 'Cardinality.set' LPAREN genericLiteral RPAREN
+    | 'Cardinality.list' LPAREN genericLiteral RPAREN
+    | 'single' LPAREN genericLiteral RPAREN
+    | 'set' LPAREN genericLiteral RPAREN
+    | 'list' LPAREN genericLiteral RPAREN
+    | 'single' | 'Cardinality.single'
     | 'set' | 'Cardinality.set'
     | 'list' | 'Cardinality.list'
     ;
@@ -946,6 +1098,13 @@
     | 'none' | 'Pick.none'
     ;
 
+traversalDT
+    : 'second' | 'DT.second'
+    | 'minute' | 'DT.minute'
+    | 'hour' | 'DT.hour'
+    | 'day' | 'DT.day'
+    ;
+
 traversalPredicate
     : traversalPredicate_eq
     | traversalPredicate_neq
@@ -1008,49 +1167,49 @@
     ;
 
 traversalPredicate_eq
-    : ('P.eq' | 'eq') LPAREN genericLiteral RPAREN
+    : ('P.eq' | 'eq') LPAREN genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_neq
-    : ('P.neq' | 'neq') LPAREN genericLiteral RPAREN
+    : ('P.neq' | 'neq') LPAREN genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_lt
-    : ('P.lt' | 'lt') LPAREN genericLiteral RPAREN
+    : ('P.lt' | 'lt') LPAREN genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_lte
-    : ('P.lte' | 'lte') LPAREN genericLiteral RPAREN
+    : ('P.lte' | 'lte') LPAREN genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_gt
-    : ('P.gt' | 'gt') LPAREN genericLiteral RPAREN
+    : ('P.gt' | 'gt') LPAREN genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_gte
-    : ('P.gte' | 'gte') LPAREN genericLiteral RPAREN
+    : ('P.gte' | 'gte') LPAREN genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_inside
-    : ('P.inside' | 'inside') LPAREN genericLiteral COMMA genericLiteral RPAREN
+    : ('P.inside' | 'inside') LPAREN genericLiteralArgument COMMA genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_outside
-    : ('P.outside' | 'outside') LPAREN genericLiteral COMMA genericLiteral RPAREN
+    : ('P.outside' | 'outside') LPAREN genericLiteralArgument COMMA genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_between
-    : ('P.between' | 'between') LPAREN genericLiteral COMMA genericLiteral RPAREN
+    : ('P.between' | 'between') LPAREN genericLiteralArgument COMMA genericLiteralArgument RPAREN
     ;
 
 traversalPredicate_within
     : ('P.within' | 'within') LPAREN RPAREN
-    | ('P.within' | 'within') LPAREN genericLiteralList RPAREN
+    | ('P.within' | 'within') LPAREN genericLiteralListArgument RPAREN
     ;
 
 traversalPredicate_without
     : ('P.without' | 'without') LPAREN RPAREN
-    | ('P.without' | 'without') LPAREN genericLiteralList RPAREN
+    | ('P.without' | 'without') LPAREN genericLiteralListArgument RPAREN
     ;
 
 traversalPredicate_not
@@ -1058,35 +1217,35 @@
     ;
 
 traversalPredicate_containing
-    : ('TextP.containing' | 'containing') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.containing' | 'containing') LPAREN stringArgument RPAREN
     ;
 
 traversalPredicate_notContaining
-    : ('TextP.notContaining' | 'notContaining') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.notContaining' | 'notContaining') LPAREN stringArgument RPAREN
     ;
 
 traversalPredicate_startingWith
-    : ('TextP.startingWith' | 'startingWith') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.startingWith' | 'startingWith') LPAREN stringArgument RPAREN
     ;
 
 traversalPredicate_notStartingWith
-    : ('TextP.notStartingWith' | 'notStartingWith') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.notStartingWith' | 'notStartingWith') LPAREN stringArgument RPAREN
     ;
 
 traversalPredicate_endingWith
-    : ('TextP.endingWith' | 'endingWith') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.endingWith' | 'endingWith') LPAREN stringArgument RPAREN
     ;
 
 traversalPredicate_notEndingWith
-    : ('TextP.notEndingWith' | 'notEndingWith') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.notEndingWith' | 'notEndingWith') LPAREN stringArgument RPAREN
     ;
 
 traversalPredicate_regex
-    : ('TextP.regex' | 'regex') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.regex' | 'regex') LPAREN stringArgument RPAREN
     ;
 
 traversalPredicate_notRegex
-    : ('TextP.notRegex' | 'notRegex') LPAREN stringBasedLiteral RPAREN
+    : ('TextP.notRegex' | 'notRegex') LPAREN stringArgument RPAREN
     ;
 
 traversalTerminalMethod_explain
@@ -1128,175 +1287,178 @@
 
 // Gremlin specific lexer rules
 
-gremlinStringConstants
-    : withOptionsStringConstants
-    | shortestPathStringConstants
+withOptionKeys
+    : shortestPathConstants
     | connectedComponentConstants
-    | pageRankStringConstants
-    | peerPressureStringConstants
-    | ioOptionsStringConstants
+    | pageRankConstants
+    | peerPressureConstants
+    | ioOptionsKeys
+    | withOptionsConstants_tokens
+    | withOptionsConstants_indexer
     ;
 
 connectedComponentConstants
-    : gremlinStringConstants_connectedComponentStringConstants_component
-    | gremlinStringConstants_connectedComponentStringConstants_edges
-    | gremlinStringConstants_connectedComponentStringConstants_propertyName
+    : connectedComponentConstants_component
+    | connectedComponentConstants_edges
+    | connectedComponentConstants_propertyName
     ;
 
-pageRankStringConstants
-    : gremlinStringConstants_pageRankStringConstants_edges
-    | gremlinStringConstants_pageRankStringConstants_times
-    | gremlinStringConstants_pageRankStringConstants_propertyName
+pageRankConstants
+    : pageRankConstants_edges
+    | pageRankConstants_times
+    | pageRankConstants_propertyName
     ;
 
-peerPressureStringConstants
-    : gremlinStringConstants_peerPressureStringConstants_edges
-    | gremlinStringConstants_peerPressureStringConstants_times
-    | gremlinStringConstants_peerPressureStringConstants_propertyName
+peerPressureConstants
+    : peerPressureConstants_edges
+    | peerPressureConstants_times
+    | peerPressureConstants_propertyName
     ;
 
-shortestPathStringConstants
-    : gremlinStringConstants_shortestPathStringConstants_target
-    | gremlinStringConstants_shortestPathStringConstants_edges
-    | gremlinStringConstants_shortestPathStringConstants_distance
-    | gremlinStringConstants_shortestPathStringConstants_maxDistance
-    | gremlinStringConstants_shortestPathStringConstants_includeEdges
+shortestPathConstants
+    : shortestPathConstants_target
+    | shortestPathConstants_edges
+    | shortestPathConstants_distance
+    | shortestPathConstants_maxDistance
+    | shortestPathConstants_includeEdges
     ;
 
-withOptionsStringConstants
-    : gremlinStringConstants_withOptionsStringConstants_tokens
-    | gremlinStringConstants_withOptionsStringConstants_none
-    | gremlinStringConstants_withOptionsStringConstants_ids
-    | gremlinStringConstants_withOptionsStringConstants_labels
-    | gremlinStringConstants_withOptionsStringConstants_keys
-    | gremlinStringConstants_withOptionsStringConstants_values
-    | gremlinStringConstants_withOptionsStringConstants_all
-    | gremlinStringConstants_withOptionsStringConstants_indexer
-    | gremlinStringConstants_withOptionsStringConstants_list
-    | gremlinStringConstants_withOptionsStringConstants_map
+withOptionsValues
+    : withOptionsConstants_tokens
+    | withOptionsConstants_none
+    | withOptionsConstants_ids
+    | withOptionsConstants_labels
+    | withOptionsConstants_keys
+    | withOptionsConstants_values
+    | withOptionsConstants_all
+    | withOptionsConstants_list
+    | withOptionsConstants_map
     ;
 
-ioOptionsStringConstants
-    : gremlinStringConstants_ioOptionsStringConstants_reader
-    | gremlinStringConstants_ioOptionsStringConstants_writer
-    | gremlinStringConstants_ioOptionsStringConstants_gryo
-    | gremlinStringConstants_ioOptionsStringConstants_graphson
-    | gremlinStringConstants_ioOptionsStringConstants_graphml
+ioOptionsKeys
+    : ioOptionsConstants_reader
+    | ioOptionsConstants_writer
     ;
 
-gremlinStringConstants_connectedComponentStringConstants_component
+ioOptionsValues
+    : ioOptionsConstants_gryo
+    | ioOptionsConstants_graphson
+    | ioOptionsConstants_graphml
+    ;
+
+connectedComponentConstants_component
     : connectedComponentStringConstant DOT 'component'
     ;
 
-gremlinStringConstants_connectedComponentStringConstants_edges
+connectedComponentConstants_edges
     : connectedComponentStringConstant DOT 'edges'
     ;
 
-gremlinStringConstants_connectedComponentStringConstants_propertyName
+connectedComponentConstants_propertyName
     : connectedComponentStringConstant DOT 'propertyName'
     ;
 
-gremlinStringConstants_pageRankStringConstants_edges
+pageRankConstants_edges
     : pageRankStringConstant DOT 'edges'
     ;
 
-gremlinStringConstants_pageRankStringConstants_times
+pageRankConstants_times
     : pageRankStringConstant DOT 'times'
     ;
 
-gremlinStringConstants_pageRankStringConstants_propertyName
+pageRankConstants_propertyName
     : pageRankStringConstant DOT 'propertyName'
     ;
 
-gremlinStringConstants_peerPressureStringConstants_edges
+peerPressureConstants_edges
     : peerPressureStringConstant DOT 'edges'
     ;
 
-gremlinStringConstants_peerPressureStringConstants_times
+peerPressureConstants_times
     : peerPressureStringConstant DOT 'times'
     ;
 
-gremlinStringConstants_peerPressureStringConstants_propertyName
+peerPressureConstants_propertyName
     : peerPressureStringConstant DOT 'propertyName'
     ;
 
-gremlinStringConstants_shortestPathStringConstants_target
+shortestPathConstants_target
     : shortestPathStringConstant DOT 'target'
     ;
 
-gremlinStringConstants_shortestPathStringConstants_edges
+shortestPathConstants_edges
     : shortestPathStringConstant DOT 'edges'
     ;
 
-gremlinStringConstants_shortestPathStringConstants_distance
+shortestPathConstants_distance
     : shortestPathStringConstant DOT 'distance'
     ;
 
-gremlinStringConstants_shortestPathStringConstants_maxDistance
+shortestPathConstants_maxDistance
     : shortestPathStringConstant DOT 'maxDistance'
     ;
 
-gremlinStringConstants_shortestPathStringConstants_includeEdges
+shortestPathConstants_includeEdges
     : shortestPathStringConstant DOT 'includeEdges'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_tokens
+withOptionsConstants_tokens
     : withOptionsStringConstant DOT 'tokens'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_none
+withOptionsConstants_none
     : withOptionsStringConstant DOT 'none'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_ids
+withOptionsConstants_ids
     : withOptionsStringConstant DOT 'ids'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_labels
+withOptionsConstants_labels
     : withOptionsStringConstant DOT 'labels'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_keys
+withOptionsConstants_keys
     : withOptionsStringConstant DOT 'keys'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_values
+withOptionsConstants_values
     : withOptionsStringConstant DOT 'values'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_all
+withOptionsConstants_all
     : withOptionsStringConstant DOT 'all'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_indexer
+withOptionsConstants_indexer
     : withOptionsStringConstant DOT 'indexer'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_list
+withOptionsConstants_list
     : withOptionsStringConstant DOT 'list'
     ;
 
-gremlinStringConstants_withOptionsStringConstants_map
+withOptionsConstants_map
     : withOptionsStringConstant DOT 'map'
     ;
 
-gremlinStringConstants_ioOptionsStringConstants_reader
+ioOptionsConstants_reader
     : ioOptionsStringConstant DOT 'reader'
     ;
 
-gremlinStringConstants_ioOptionsStringConstants_writer
+ioOptionsConstants_writer
     : ioOptionsStringConstant DOT 'writer'
     ;
 
-gremlinStringConstants_ioOptionsStringConstants_gryo
+ioOptionsConstants_gryo
     : ioOptionsStringConstant DOT 'gryo'
     ;
 
-gremlinStringConstants_ioOptionsStringConstants_graphson
+ioOptionsConstants_graphson
     : ioOptionsStringConstant DOT 'graphson'
     ;
 
-gremlinStringConstants_ioOptionsStringConstants_graphml
+ioOptionsConstants_graphml
     : ioOptionsStringConstant DOT 'graphml'
     ;
 
@@ -1324,6 +1486,127 @@
     : 'IO'
     ;
 
+booleanArgument
+    : booleanLiteral
+    | variable
+    ;
+
+integerArgument
+    : integerLiteral
+    | variable
+    ;
+
+floatArgument
+    : floatLiteral
+    | variable
+    ;
+
+stringArgument
+    : stringLiteral
+    | variable
+    ;
+
+stringNullableArgument
+    : stringNullableLiteral
+    | variable
+    ;
+
+dateArgument
+    : dateLiteral
+    | variable
+    ;
+
+genericLiteralArgument
+    : genericLiteral
+    | variable
+    ;
+
+genericLiteralListArgument
+    : genericLiteralList
+    | variable
+    ;
+
+genericLiteralMapArgument
+    : genericLiteralMap
+    | variable
+    ;
+
+genericLiteralMapNullableArgument
+    : genericLiteralMap
+    | nullLiteral
+    | variable
+    ;
+
+structureVertexArgument
+    : structureVertex
+    | variable
+    ;
+
+traversalCardinalityArgument
+    : traversalCardinality
+    | variable
+    ;
+
+traversalColumnArgument
+    : traversalColumn
+    | variable
+    ;
+
+traversalDirectionArgument
+    : traversalDirection
+    | variable
+    ;
+
+traversalMergeArgument
+    : traversalMerge
+    | variable
+    ;
+
+traversalOrderArgument
+    : traversalOrder
+    | variable
+    ;
+
+traversalPopArgument
+    : traversalPop
+    | variable
+    ;
+
+traversalSackMethodArgument
+    : traversalSackMethod
+    | variable
+    ;
+
+traversalScopeArgument
+    : traversalScope
+    | variable
+    ;
+
+traversalTokenArgument
+    : traversalToken
+    | variable
+    ;
+
+traversalComparatorArgument
+    : traversalComparator
+    | variable
+    ;
+
+traversalFunctionArgument
+    : traversalFunction
+    | variable
+    ;
+
+traversalBiFunctionArgument
+    : traversalBiFunction
+    | variable
+    ;
+
+traversalDTArgument
+    : traversalDT
+    | variable
+    ;
+
 traversalStrategyList
     : traversalStrategyExpr?
     ;
@@ -1340,6 +1623,10 @@
     : nestedTraversal (COMMA nestedTraversal)*
     ;
 
+genericLiteralVarargs
+    : (genericLiteralArgument (COMMA genericLiteralArgument)*)?
+    ;
+
 genericLiteralList
     : genericLiteralExpr?
     ;
@@ -1357,19 +1644,23 @@
     : LBRACK (genericLiteral (COMMA genericLiteral)*)? RBRACK
     ;
 
+stringLiteralVarargs
+    : (stringNullableArgument (COMMA stringNullableArgument)*)?
+    ;
+
 stringLiteralList
     : stringLiteralExpr?
     | LBRACK stringLiteralExpr? RBRACK
     ;
 
 stringLiteralExpr
-    : stringBasedLiteral (COMMA stringBasedLiteral)*
+    : stringNullableLiteral (COMMA stringNullableLiteral)*
     ;
 
 genericLiteral
     : numericLiteral
     | booleanLiteral
-    | stringBasedLiteral
+    | stringLiteral
     | dateLiteral
     | nullLiteral
     | nanLiteral
@@ -1380,6 +1671,7 @@
     | traversalDirection
     | traversalMerge
     | traversalPick
+    | traversalDT
     | structureVertex
     | genericLiteralCollection
     | genericLiteralRange
@@ -1393,7 +1685,7 @@
     | LBRACK mapEntry (COMMA mapEntry)* RBRACK
     ;
 
-// allow builds of Map that sorta make sense in the Gremlin context
+// allow builds of Map that sorta make sense in the Gremlin context.
 mapEntry
     : NEW COLON genericLiteral  // explicit for [new: true] - if we had other keywords like that maybe we'd group them up?
     | (LPAREN stringLiteral RPAREN | stringLiteral) COLON genericLiteral
@@ -1410,6 +1702,12 @@
     | NonEmptyStringLiteral
     ;
 
+stringNullableLiteral
+    : EmptyStringLiteral
+    | NonEmptyStringLiteral
+    | NullLiteral
+    ;
+
 integerLiteral
     : IntegerLiteral
     ;
@@ -1427,15 +1725,9 @@
     : BooleanLiteral
     ;
 
-stringBasedLiteral
-    : EmptyStringLiteral
-    | NonEmptyStringLiteral
-    | NullLiteral
-    | gremlinStringConstants
-    ;
-
 dateLiteral
-    : 'datetime' LPAREN stringLiteral RPAREN
+    : 'datetime' LPAREN stringArgument RPAREN
+    | 'datetime' LPAREN RPAREN
     ;
 
 nullLiteral
@@ -1450,6 +1742,10 @@
     : SignedInfLiteral
     ;
 
+variable
+    : Identifier
+    ;
+
 /*********************************************
     LEXER RULES
 **********************************************/
diff --git a/gremlin-python/build/generate.groovy b/gremlin-python/build/generate.groovy
index 6ccfa9e..054792f 100644
--- a/gremlin-python/build/generate.groovy
+++ b/gremlin-python/build/generate.groovy
@@ -89,11 +89,13 @@
 
     writer.writeLine(
                     'from radish import world\n' +
+                    'import datetime\n' +
+                    'from gremlin_python.statics import long\n' +
                     'from gremlin_python.process.anonymous_traversal import traversal\n' +
                     'from gremlin_python.process.traversal import TraversalStrategy\n' +
                     'from gremlin_python.process.graph_traversal import __\n' +
                     'from gremlin_python.structure.graph import Graph\n' +
-                    'from gremlin_python.process.traversal import Barrier, Cardinality, P, TextP, Pop, Scope, Column, Order, Direction, Merge, T, Pick, Operator, IO, WithOptions\n')
+                    'from gremlin_python.process.traversal import Barrier, Cardinality, CardinalityValue, P, TextP, Pop, Scope, Column, Order, Direction, DT, Merge, T, Pick, Operator, IO, WithOptions\n')
 
     // Groovy can't process certain null oriented calls because it gets confused with the right overload to call
     // at runtime. using this approach for now as these are the only such situations encountered so far. a better
diff --git a/gremlin-python/docker-compose.yml b/gremlin-python/docker-compose.yml
index 02e693e..5f9ef5d 100644
--- a/gremlin-python/docker-compose.yml
+++ b/gremlin-python/docker-compose.yml
@@ -43,6 +43,8 @@
       timeout: 10s
       retries: 30
       start_period: 30s
+    depends_on:
+      - gremlin-socket-server
 
   gremlin-python-integration-tests:
     container_name: gremlin-python-integration-tests
@@ -51,8 +53,9 @@
       - ${BUILD_DIR:-./src/main/python}:/python_app
       - ../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features:/python_app/gremlin-test/features
       - ../docker/gremlin-test-server:/python_app/gremlin-test-server
+      - ../gremlin-tools/gremlin-socket-server/conf:/python_app/gremlin-socket-server/conf/
+
     environment:
-      - TEST_TRANSACTIONS=${TEST_TRANSACTIONS:-true}
       - DEBIAN_FRONTEND=noninteractive
       - KRB5_CONFIG=./gremlin-test-server/krb5.conf
       - KRB5CCNAME=./test-tkt.cc
@@ -62,6 +65,8 @@
       - GREMLIN_SERVER_BASIC_AUTH_URL_HTTP=https://gremlin-server-test-python:{}/
       - KRB_HOSTNAME=${KRB_HOSTNAME:-gremlin-server-test}
       - VERSION=${VERSION}
+      - GREMLIN_SOCKET_SERVER_URL=ws://gremlin-socket-server-python:{}/gremlin
+      - GREMLIN_SOCKET_SERVER_CONFIG_PATH=/python_app/gremlin-socket-server/conf/test-ws-gremlin.yaml
     working_dir: /python_app
     command: >
       bash -c "apt-get update && apt-get -y install libkrb5-dev krb5-user
@@ -89,3 +94,9 @@
     command: >
       bash -c "python3 setup.py sdist bdist_wheel;
       EXIT_CODE=$$?; chown -R `stat -c "%u:%g" .` .; exit $$EXIT_CODE"
+
+  gremlin-socket-server:
+    container_name: gremlin-socket-server-python
+    image: tinkerpop/gremlin-socket-server:${GREMLIN_SERVER}
+    ports:
+      - "45943:45943"
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index df98f2f..3dc2296 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-python</artifactId>
     <name>Apache TinkerPop :: Gremlin Python</name>
@@ -29,7 +29,6 @@
         <!-- provides a way to convert maven.test.skip value to skipTests for use in skipping python tests -->
         <maven.test.skip>false</maven.test.skip>
         <skipTests>${maven.test.skip}</skipTests>
-        <TEST_TRANSACTIONS>false</TEST_TRANSACTIONS>
         <gremlin.server.dir>${project.parent.basedir}/gremlin-server</gremlin.server.dir>
         <tinkerpop.root.dir>${project.parent.basedir}</tinkerpop.root.dir>
     </properties>
@@ -211,12 +210,7 @@
                                 <version>${project.version}</version>
                             </dependency>
                             <dependency>
-                                <groupId>org.apache.tinkerpop</groupId>
-                                <artifactId>neo4j-gremlin</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
+                                <groupId>org.apache.groovy</groupId>
                                 <artifactId>groovy-all</artifactId>
                                 <version>${groovy.version}</version>
                                 <type>pom</type>
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py
index 8d75f1d..6058a6b 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/driver_remote_connection.py
@@ -175,7 +175,7 @@
                                  if x[0] == "withStrategies" and type(x[1]) is OptionsStrategy), None)
         request_options = None
         if options_strategy:
-            allowed_keys = ['evaluationTimeout', 'scriptEvaluationTimeout', 'batchSize', 'requestId', 'userAgent']
+            allowed_keys = ['evaluationTimeout', 'scriptEvaluationTimeout', 'batchSize', 'requestId', 'userAgent', 'materializeProperties']
             request_options = {allowed: options_strategy[1].configuration[allowed] for allowed in allowed_keys
                                if allowed in options_strategy[1].configuration}
         return request_options
diff --git a/gremlin-python/src/main/python/gremlin_python/driver/useragent.py b/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
index 365f69a..34ca811 100644
--- a/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
+++ b/gremlin-python/src/main/python/gremlin_python/driver/useragent.py
@@ -18,7 +18,7 @@
 #
 import platform
 
-gremlin_version = "3.6.8-SNAPSHOT"  # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
+gremlin_version = "3.7.3-SNAPSHOT"  # DO NOT MODIFY - Configured automatically by Maven Replacer Plugin
 
 def _generate_user_agent():
     application_name = "NotAvailable"
diff --git a/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
index 3cae9b1..c5c3009 100644
--- a/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py
@@ -180,7 +180,7 @@
         return self.with_computer(graph_computer, workers, result, persist, vertices, edges, configuration)
 
     def with_computer(self, graph_computer=None, workers=None, result=None, persist=None, vertices=None,
-                  edges=None, configuration=None):
+                      edges=None, configuration=None):
         return self.with_strategies(
             VertexProgramStrategy(graph_computer, workers, result, persist, vertices, edges, configuration))
 
@@ -243,6 +243,11 @@
         traversal.bytecode.add_step("call", *args)
         return traversal
 
+    def union(self, *args):
+        traversal = self.get_graph_traversal()
+        traversal.bytecode.add_step("union", *args)
+        return traversal
+
 
 class GraphTraversal(Traversal):
     def __init__(self, graph, traversal_strategies, bytecode):
@@ -274,6 +279,10 @@
         self.bytecode.add_step("V", *args)
         return self
 
+    def E(self, *args):
+        self.bytecode.add_step("E", *args)
+        return self
+
     def addE(self, *args):
         warnings.warn(
             "gremlin_python.process.GraphTraversal.addE will be replaced by "
@@ -300,14 +309,30 @@
         self.bytecode.add_step("aggregate", *args)
         return self
 
+    def all_(self, *args):
+        self.bytecode.add_step("all", *args)
+        return self
+
     def and_(self, *args):
         self.bytecode.add_step("and", *args)
         return self
 
+    def any_(self, *args):
+        self.bytecode.add_step("any", *args)
+        return self
+
     def as_(self, *args):
         self.bytecode.add_step("as", *args)
         return self
 
+    def as_date(self, *args):
+        self.bytecode.add_step("asDate", *args)
+        return self
+
+    def as_string(self, *args):
+        self.bytecode.add_step("asString", *args)
+        return self
+
     def barrier(self, *args):
         self.bytecode.add_step("barrier", *args)
         return self
@@ -366,6 +391,18 @@
         self.bytecode.add_step("coin", *args)
         return self
 
+    def combine(self, *args):
+        self.bytecode.add_step("combine", *args)
+        return self
+
+    def concat(self, *args):
+        self.bytecode.add_step("concat", *args)
+        return self
+
+    def conjoin(self, *args):
+        self.bytecode.add_step("conjoin", *args)
+        return self
+
     def connectedComponent(self, *args):
         warnings.warn(
             "gremlin_python.process.GraphTraversalSource.connectedComponent will be replaced by "
@@ -396,10 +433,26 @@
         self.bytecode.add_step("cyclicPath", *args)
         return self
 
+    def date_add(self, *args):
+        self.bytecode.add_step("dateAdd", *args)
+        return self
+
+    def date_diff(self, *args):
+        self.bytecode.add_step("dateDiff", *args)
+        return self
+
     def dedup(self, *args):
         self.bytecode.add_step("dedup", *args)
         return self
 
+    def difference(self, *args):
+        self.bytecode.add_step("difference", *args)
+        return self
+
+    def disjunct(self, *args):
+        self.bytecode.add_step("disjunct", *args)
+        return self
+
     def drop(self, *args):
         self.bytecode.add_step("drop", *args)
         return self
@@ -446,6 +499,10 @@
         self.bytecode.add_step("fold", *args)
         return self
 
+    def format_(self, *args):
+        self.bytecode.add_step("format", *args)
+        return self
+
     def from_(self, *args):
         self.bytecode.add_step("from", *args)
         return self
@@ -566,6 +623,10 @@
         self.bytecode.add_step("inject", *args)
         return self
 
+    def intersect(self, *args):
+        self.bytecode.add_step("intersect", *args)
+        return self
+
     def is_(self, *args):
         self.bytecode.add_step("is", *args)
         return self
@@ -578,6 +639,10 @@
         self.bytecode.add_step("label", *args)
         return self
 
+    def length(self, *args):
+        self.bytecode.add_step("length", *args)
+        return self
+
     def limit(self, *args):
         self.bytecode.add_step("limit", *args)
         return self
@@ -590,6 +655,14 @@
         self.bytecode.add_step("loops", *args)
         return self
 
+    def lTrim(self, *args):
+        self.bytecode.add_step("lTrim", *args)
+        return self
+
+    def l_trim(self, *args):
+        self.bytecode.add_step("lTrim", *args)
+        return self
+
     def map(self, *args):
         self.bytecode.add_step("map", *args)
         return self
@@ -610,6 +683,10 @@
         self.bytecode.add_step("mean", *args)
         return self
 
+    def merge(self, *args):
+        self.bytecode.add_step("merge", *args)
+        return self
+
     def merge_e(self, *args):
         self.bytecode.add_step("mergeE", *args)
         return self
@@ -709,6 +786,10 @@
         self.bytecode.add_step("peerPressure", *args)
         return self
 
+    def product(self, *args):
+        self.bytecode.add_step("product", *args)
+        return self
+
     def profile(self, *args):
         self.bytecode.add_step("profile", *args)
         return self
@@ -752,6 +833,22 @@
         self.bytecode.add_step("repeat", *args)
         return self
 
+    def replace(self, *args):
+        self.bytecode.add_step("replace", *args)
+        return self
+
+    def reverse(self, *args):
+        self.bytecode.add_step("reverse", *args)
+        return self
+
+    def rTrim(self, *args):
+        self.bytecode.add_step("rTrim", *args)
+        return self
+
+    def r_trim(self, *args):
+        self.bytecode.add_step("rTrim", *args)
+        return self
+
     def sack(self, *args):
         self.bytecode.add_step("sack", *args)
         return self
@@ -801,6 +898,10 @@
         self.bytecode.add_step("skip", *args)
         return self
 
+    def split(self, *args):
+        self.bytecode.add_step("split", *args)
+        return self
+
     def store(self, *args):
         self.bytecode.add_step("store", *args)
         return self
@@ -809,6 +910,10 @@
         self.bytecode.add_step("subgraph", *args)
         return self
 
+    def substring(self, *args):
+        self.bytecode.add_step("substring", *args)
+        return self
+
     def sum_(self, *args):
         self.bytecode.add_step("sum", *args)
         return self
@@ -847,6 +952,14 @@
         self.bytecode.add_step("toE", *args)
         return self
 
+    def to_lower(self, *args):
+        self.bytecode.add_step("toLower", *args)
+        return self
+
+    def to_upper(self, *args):
+        self.bytecode.add_step("toUpper", *args)
+        return self
+
     def toV(self, *args):
         warnings.warn(
             "gremlin_python.process.GraphTraversalSource.toV will be replaced by "
@@ -862,6 +975,10 @@
         self.bytecode.add_step("tree", *args)
         return self
 
+    def trim(self, *args):
+        self.bytecode.add_step("trim", *args)
+        return self
+
     def unfold(self, *args):
         self.bytecode.add_step("unfold", *args)
         return self
@@ -927,6 +1044,10 @@
         return __.inject(*args)
 
     @classmethod
+    def E(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).E(*args)
+
+    @classmethod
     def V(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).V(*args)
 
@@ -959,14 +1080,30 @@
         return cls.graph_traversal(None, None, Bytecode()).aggregate(*args)
 
     @classmethod
+    def all_(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).all_(*args)
+
+    @classmethod
     def and_(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).and_(*args)
 
     @classmethod
+    def any_(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).any_(*args)
+
+    @classmethod
     def as_(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).as_(*args)
 
     @classmethod
+    def as_date(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).as_date(*args)
+
+    @classmethod
+    def as_string(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).as_string(*args)
+
+    @classmethod
     def barrier(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).barrier(*args)
 
@@ -1023,6 +1160,18 @@
         return cls.graph_traversal(None, None, Bytecode()).coin(*args)
 
     @classmethod
+    def combine(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).combine(*args)
+
+    @classmethod
+    def concat(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).concat(*args)
+
+    @classmethod
+    def conjoin(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).conjoin(*args)
+
+    @classmethod
     def constant(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).constant(*args)
 
@@ -1043,10 +1192,26 @@
         return cls.graph_traversal(None, None, Bytecode()).cyclic_path(*args)
 
     @classmethod
+    def date_add(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).date_add(*args)
+
+    @classmethod
+    def date_diff(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).date_diff(*args)
+
+    @classmethod
     def dedup(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).dedup(*args)
 
     @classmethod
+    def difference(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).difference(*args)
+
+    @classmethod
+    def disjunct(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).disjunct(*args)
+
+    @classmethod
     def drop(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).drop(*args)
 
@@ -1095,6 +1260,10 @@
         return cls.graph_traversal(None, None, Bytecode()).fold(*args)
 
     @classmethod
+    def format_(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).format_(*args)
+
+    @classmethod
     def group(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).group(*args)
 
@@ -1219,6 +1388,10 @@
         return cls.graph_traversal(None, None, Bytecode()).inject(*args)
 
     @classmethod
+    def intersect(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).intersect(*args)
+
+    @classmethod
     def is_(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).is_(*args)
 
@@ -1231,6 +1404,10 @@
         return cls.graph_traversal(None, None, Bytecode()).label(*args)
 
     @classmethod
+    def length(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).length(*args)
+
+    @classmethod
     def limit(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).limit(*args)
 
@@ -1243,6 +1420,18 @@
         return cls.graph_traversal(None, None, Bytecode()).loops(*args)
 
     @classmethod
+    def ltrim(cls, *args):
+        warnings.warn(
+            "gremlin_python.process.__.ltrim will be replaced by "
+            "gremlin_python.process.__.l_trim.",
+            DeprecationWarning)
+        return cls.l_trim(*args)
+    
+    @classmethod
+    def l_trim(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).l_trim(*args)
+
+    @classmethod
     def map(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).map(*args)
 
@@ -1263,6 +1452,10 @@
         return cls.graph_traversal(None, None, Bytecode()).mean(*args)
 
     @classmethod
+    def merge(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).merge(*args)
+
+    @classmethod
     def merge_e(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).merge_e(*args)
 
@@ -1335,6 +1528,10 @@
         return cls.graph_traversal(None, None, Bytecode()).path(*args)
 
     @classmethod
+    def product(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).product(*args)
+
+    @classmethod
     def project(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).project(*args)
 
@@ -1367,6 +1564,26 @@
         return cls.graph_traversal(None, None, Bytecode()).repeat(*args)
 
     @classmethod
+    def replace(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).replace(*args)
+
+    @classmethod
+    def reverse(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).reverse(*args)
+
+    @classmethod
+    def rTrim(cls, *args):
+        warnings.warn(
+            "gremlin_python.process.__.rTrim will be replaced by "
+            "gremlin_python.process.__.r_trim.",
+            DeprecationWarning)
+        return cls.r_trim(*args)
+
+    @classmethod
+    def r_trim(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).r_trim(*args)
+
+    @classmethod
     def sack(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).sack(*args)
 
@@ -1407,6 +1624,10 @@
         return cls.graph_traversal(None, None, Bytecode()).skip(*args)
 
     @classmethod
+    def split(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).split(*args)
+
+    @classmethod
     def store(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).store(*args)
 
@@ -1415,6 +1636,10 @@
         return cls.graph_traversal(None, None, Bytecode()).subgraph(*args)
 
     @classmethod
+    def substring(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).substring(*args)
+
+    @classmethod
     def sum_(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).sum_(*args)
 
@@ -1455,6 +1680,14 @@
         return cls.graph_traversal(None, None, Bytecode()).to_e(*args)
 
     @classmethod
+    def to_lower(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).to_lower(*args)
+
+    @classmethod
+    def to_upper(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).to_upper(*args)
+
+    @classmethod
     def toV(cls, *args):
         warnings.warn(
             "gremlin_python.process.__.toV will be replaced by "
@@ -1471,6 +1704,10 @@
         return cls.graph_traversal(None, None, Bytecode()).tree(*args)
 
     @classmethod
+    def trim(cls, *args):
+        return cls.graph_traversal(None, None, Bytecode()).trim(*args)
+
+    @classmethod
     def unfold(cls, *args):
         return cls.graph_traversal(None, None, Bytecode()).unfold(*args)
 
@@ -1582,6 +1819,10 @@
         return session
 
 
+def E(*args):
+    return __.E(*args)
+
+
 def V(*args):
     return __.V(*args)
 
@@ -1614,6 +1855,14 @@
     return __.as_(*args)
 
 
+def as_date(*args):
+    return __.as_date(*args)
+
+
+def as_string(*args):
+    return __.as_string(*args)
+
+
 def barrier(*args):
     return __.barrier(*args)
 
@@ -1662,6 +1911,10 @@
     return __.coin(*args)
 
 
+def concat(*args):
+    return __.concat(*args)
+
+
 def constant(*args):
     return __.constant(*args)
 
@@ -1678,6 +1931,14 @@
     return __.cyclic_path(*args)
 
 
+def date_add(*args):
+    return __.date_add(*args)
+
+
+def date_diff(*args):
+    return __.date_diff(*args)
+
+
 def dedup(*args):
     return __.dedup(*args)
 
@@ -1722,6 +1983,10 @@
     return __.fold(*args)
 
 
+def format_(*args):
+    return __.format_(*args)
+
+
 def group(*args):
     return __.group(*args)
 
@@ -1826,6 +2091,10 @@
     return __.label(*args)
 
 
+def length(*args):
+    return __.length(*args)
+
+
 def limit(*args):
     return __.limit(*args)
 
@@ -1838,6 +2107,14 @@
     return __.loops(*args)
 
 
+def ltrim(*args):
+    return __.l_trim(*args)
+
+
+def l_trim(*args):
+    return __.l_trim(*args)
+
+
 def map(*args):
     return __.map(*args)
 
@@ -1946,6 +2223,22 @@
     return __.repeat(*args)
 
 
+def replace(*args):
+    return __.replace(*args)
+
+
+def reverse(*args):
+    return __.reverse(*args)
+
+
+def rTrim(*args):
+    return __.r_trim(*args)
+
+
+def r_trim(*args):
+    return __.r_trim(*args)
+
+
 def sack(*args):
     return __.sack(*args)
 
@@ -1978,6 +2271,10 @@
     return __.skip(*args)
 
 
+def split(*args):
+    return __.split(*args)
+
+
 def store(*args):
     return __.store(*args)
 
@@ -1986,6 +2283,10 @@
     return __.subgraph(*args)
 
 
+def substring(*args):
+    return __.substring(*args)
+
+
 def sum_(*args):
     return __.sum_(*args)
 
@@ -2018,6 +2319,14 @@
     return __.to_e(*args)
 
 
+def to_lower(*args):
+    return __.to_lower(*args)
+
+
+def to_upper(*args):
+    return __.to_upper(*args)
+
+
 def toV(*args):
     return __.to_v(*args)
 
@@ -2030,6 +2339,10 @@
     return __.tree(*args)
 
 
+def trim(*args):
+    return __.trim(*args)
+
+
 def unfold(*args):
     return __.unfold(*args)
 
@@ -2078,6 +2391,10 @@
 
 statics.add_static('as_', as_)
 
+statics.add_static('as_date', as_date)
+
+statics.add_static('as_string', as_string)
+
 statics.add_static('barrier', barrier)
 
 statics.add_static('both', both)
@@ -2102,6 +2419,8 @@
 
 statics.add_static('coin', coin)
 
+statics.add_static('concat', concat)
+
 statics.add_static('constant', constant)
 
 statics.add_static('count', count)
@@ -2110,6 +2429,10 @@
 
 statics.add_static('cyclicpath', cyclic_path)
 
+statics.add_static('date_add', date_add)
+
+statics.add_static('date_diff', date_diff)
+
 statics.add_static('dedup', dedup)
 
 statics.add_static('drop', drop)
@@ -2132,6 +2455,8 @@
 
 statics.add_static('fold', fold)
 
+statics.add_static('format_', format_)
+
 statics.add_static('group', group)
 
 statics.add_static('groupCount', groupCount)
@@ -2182,12 +2507,18 @@
 
 statics.add_static('label', label)
 
+statics.add_static('length', length)
+
 statics.add_static('limit', limit)
 
 statics.add_static('local', local)
 
 statics.add_static('loops', loops)
 
+statics.add_static('ltrim', ltrim)
+
+statics.add_static('l_trim', l_trim)
+
 statics.add_static('map', map)
 
 statics.add_static('match', match)
@@ -2242,6 +2573,14 @@
 
 statics.add_static('repeat', repeat)
 
+statics.add_static('replace', replace)
+
+statics.add_static('reverse', reverse)
+
+statics.add_static('rTrim', rTrim)
+
+statics.add_static('r_trim', r_trim)
+
 statics.add_static('sack', sack)
 
 statics.add_static('sample', sample)
@@ -2258,10 +2597,14 @@
 
 statics.add_static('skip', skip)
 
+statics.add_static('split', split)
+
 statics.add_static('store', store)
 
 statics.add_static('subgraph', subgraph)
 
+statics.add_static('substring', substring)
+
 statics.add_static('sum_', sum_)
 
 statics.add_static('tail', tail)
@@ -2280,10 +2623,16 @@
 
 statics.add_static('toV', toV)
 
+statics.add_static('to_lower', to_lower)
+
+statics.add_static('to_upper', to_upper)
+
 statics.add_static('to_v', to_v)
 
 statics.add_static('tree', tree)
 
+statics.add_static('trim', trim)
+
 statics.add_static('unfold', unfold)
 
 statics.add_static('union', union)
diff --git a/gremlin-python/src/main/python/gremlin_python/process/traversal.py b/gremlin-python/src/main/python/gremlin_python/process/traversal.py
index d3f1f27..d4137c4 100644
--- a/gremlin-python/src/main/python/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/python/gremlin_python/process/traversal.py
@@ -194,6 +194,13 @@
 statics.add_static('V1_0', GryoVersion.V1_0)
 statics.add_static('V3_0', GryoVersion.V3_0)
 
+DT = Enum('DT', ' second minute hour day')
+
+statics.add_static('second', DT.second)
+statics.add_static('minute', DT.minute)
+statics.add_static('hour', DT.hour)
+statics.add_static('day', DT.day)
+
 Merge = Enum('Merge', ' on_create on_match out_v in_v')
 
 statics.add_static('on_create', Merge.on_create)
@@ -817,6 +824,24 @@
             return Bytecode._create_graph_op("tx", "rollback")
 
 
+class CardinalityValue(Bytecode):
+    def __init__(self, cardinality, val):
+        super().__init__()
+        self.add_source("CardinalityValueTraversal", cardinality, val)
+
+    @classmethod
+    def single(cls, val):
+        return CardinalityValue(Cardinality.single, val)
+
+    @classmethod
+    def list_(cls, val):
+        return CardinalityValue(Cardinality.list_, val)
+
+    @classmethod
+    def set_(cls, val):
+        return CardinalityValue(Cardinality.set_, val)
+
+
 '''
 BINDINGS
 '''
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/graph.py b/gremlin-python/src/main/python/gremlin_python/structure/graph.py
index 751f0bb..75082dc 100644
--- a/gremlin-python/src/main/python/gremlin_python/structure/graph.py
+++ b/gremlin-python/src/main/python/gremlin_python/structure/graph.py
@@ -43,9 +43,10 @@
 
 
 class Element(object):
-    def __init__(self, id, label):
+    def __init__(self, id, label, properties=None):
         self.id = id
         self.label = label
+        self.properties = properties
 
     def __eq__(self, other):
         return isinstance(other, self.__class__) and self.id == other.id
@@ -55,16 +56,16 @@
 
 
 class Vertex(Element):
-    def __init__(self, id, label="vertex"):
-        Element.__init__(self, id, label)
+    def __init__(self, id, label="vertex", properties=None):
+        Element.__init__(self, id, label, properties)
 
     def __repr__(self):
         return "v[" + str(self.id) + "]"
 
 
 class Edge(Element):
-    def __init__(self, id, outV, label, inV):
-        Element.__init__(self, id, label)
+    def __init__(self, id, outV, label, inV, properties=None):
+        Element.__init__(self, id, label, properties)
         self.outV = outV
         self.inV = inV
 
@@ -73,8 +74,8 @@
 
 
 class VertexProperty(Element):
-    def __init__(self, id, label, value, vertex):
-        Element.__init__(self, id, label)
+    def __init__(self, id, label, value, vertex, properties=None):
+        Element.__init__(self, id, label, properties)
         self.value = value
         self.key = self.label
         self.vertex = vertex
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py
index 47a777e..cb9284f 100644
--- a/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py
+++ b/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV1.py
@@ -33,7 +33,7 @@
 from gremlin_python.statics import FloatType, BigDecimal, FunctionType, ShortType, IntType, LongType, BigIntType, \
                                    TypeType, DictType, ListType, SetType, SingleByte, ByteBufferType, GremlinType, \
                                    SingleChar
-from gremlin_python.process.traversal import Barrier, Binding, Bytecode, Cardinality, Column, Direction, Merge, \
+from gremlin_python.process.traversal import Barrier, Binding, Bytecode, Cardinality, Column, Direction, DT, Merge, \
                                              Operator, Order, Pick, Pop, P, Scope, TextP, Traversal, Traverser, \
                                              TraversalStrategy, T
 from gremlin_python.process.graph_traversal import GraphTraversal
@@ -97,6 +97,7 @@
     metrics = 0x2c
     traversalmetrics = 0x2d
     merge = 0x2e
+    dt = 0x2f
     char = 0x80
     duration = 0x81
     inetaddress = 0x82            # todo
@@ -601,8 +602,9 @@
         edgelbl = r.to_object(b, DataType.string, False)
         inv = Vertex(r.read_object(b), r.to_object(b, DataType.string, False))
         outv = Vertex(r.read_object(b), r.to_object(b, DataType.string, False))
-        edge = Edge(edgeid, outv, edgelbl, inv)
-        b.read(4)
+        b.read(2)
+        properties = r.read_object(b)
+        edge = Edge(edgeid, outv, edgelbl, inv, properties)
         return edge
 
 
@@ -680,8 +682,7 @@
 
     @classmethod
     def _read_vertex(cls, b, r):
-        vertex = Vertex(r.read_object(b), r.to_object(b, DataType.string, False))
-        b.read(2)
+        vertex = Vertex(r.read_object(b), r.to_object(b, DataType.string, False), r.read_object(b))
         return vertex
 
 
@@ -707,7 +708,8 @@
     @classmethod
     def _read_vertexproperty(cls, b, r):
         vp = VertexProperty(r.read_object(b), r.to_object(b, DataType.string, False), r.read_object(b), None)
-        b.read(4)
+        b.read(2)
+        vp.properties = r.read_object(b)
         return vp
 
 
@@ -918,6 +920,11 @@
         return to_extend
 
 
+class DTIO(_EnumIO):
+    graphbinary_type = DataType.dt
+    python_type = DT
+
+
 class MergeIO(_EnumIO):
     graphbinary_type = DataType.merge
     python_type = Merge
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py
index d75dbb8..d4138b6 100644
--- a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py
+++ b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV2d0.py
@@ -585,7 +585,12 @@
 
     @classmethod
     def objectify(cls, d, reader):
-        return Vertex(reader.to_object(d["id"]), d.get("label", "vertex"))
+        properties = None
+        if "properties" in d:
+            properties = reader.to_object(d["properties"])
+            if properties is not None:
+                properties = [item for sublist in properties.values() for item in sublist]
+        return Vertex(reader.to_object(d["id"]), d.get("label", "vertex"), properties)
 
 
 class EdgeDeserializer(_GraphSONTypeIO):
@@ -593,10 +598,16 @@
 
     @classmethod
     def objectify(cls, d, reader):
+        properties = None
+        if "properties" in d:
+            properties = reader.to_object(d["properties"])
+            if properties is not None:
+                properties = list(properties.values())
         return Edge(reader.to_object(d["id"]),
                     Vertex(reader.to_object(d["outV"]), d.get("outVLabel", "vertex")),
                     d.get("label", "edge"),
-                    Vertex(reader.to_object(d["inV"]), d.get("inVLabel", "vertex")))
+                    Vertex(reader.to_object(d["inV"]), d.get("inVLabel", "vertex")),
+                    properties)
 
 
 class VertexPropertyDeserializer(_GraphSONTypeIO):
@@ -604,11 +615,17 @@
 
     @classmethod
     def objectify(cls, d, reader):
+        properties = None
+        if "properties" in d:
+            properties = reader.to_object(d["properties"])
+            if properties is not None:
+                properties = list(map(lambda x: Property(x[0], x[1], None), properties.items()))
         vertex = Vertex(reader.to_object(d.get("vertex"))) if "vertex" in d else None
         return VertexProperty(reader.to_object(d["id"]),
                               d["label"],
                               reader.to_object(d["value"]),
-                              vertex)
+                              vertex,
+                              properties)
 
 
 class PropertyDeserializer(_GraphSONTypeIO):
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py
index e80bdbd..692e4d2 100644
--- a/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py
+++ b/gremlin-python/src/main/python/gremlin_python/structure/io/graphsonV3d0.py
@@ -685,7 +685,12 @@
 
     @classmethod
     def objectify(cls, d, reader):
-        return Vertex(reader.to_object(d["id"]), d.get("label", "vertex"))
+        properties = None
+        if "properties" in d:
+            properties = reader.to_object(d["properties"])
+            if properties is not None:
+                properties = [item for sublist in properties.values() for item in sublist]
+        return Vertex(reader.to_object(d["id"]), d.get("label", "vertex"), properties)
 
 
 class EdgeDeserializer(_GraphSONTypeIO):
@@ -693,10 +698,16 @@
 
     @classmethod
     def objectify(cls, d, reader):
+        properties = None
+        if "properties" in d:
+            properties = reader.to_object(d["properties"])
+            if properties is not None:
+                properties = list(properties.values())
         return Edge(reader.to_object(d["id"]),
                     Vertex(reader.to_object(d["outV"]), d.get("outVLabel", "vertex")),
                     d.get("label", "edge"),
-                    Vertex(reader.to_object(d["inV"]), d.get("inVLabel", "vertex")))
+                    Vertex(reader.to_object(d["inV"]), d.get("inVLabel", "vertex")),
+                    properties)
 
 
 class VertexPropertyDeserializer(_GraphSONTypeIO):
@@ -704,11 +715,17 @@
 
     @classmethod
     def objectify(cls, d, reader):
+        properties = None
+        if "properties" in d:
+            properties = reader.to_object(d["properties"])
+            if properties is not None:
+                properties = list(map(lambda x: Property(x[0], x[1], None), properties.items()))
         vertex = Vertex(reader.to_object(d.get("vertex"))) if "vertex" in d else None
         return VertexProperty(reader.to_object(d["id"]),
                               d["label"],
                               reader.to_object(d["value"]),
-                              vertex)
+                              vertex,
+                              properties)
 
 
 class PropertyDeserializer(_GraphSONTypeIO):
diff --git a/gremlin-python/src/main/python/radish/feature_steps.py b/gremlin-python/src/main/python/radish/feature_steps.py
index 9b4cd42..1660bfb 100644
--- a/gremlin-python/src/main/python/radish/feature_steps.py
+++ b/gremlin-python/src/main/python/radish/feature_steps.py
@@ -17,6 +17,7 @@
 # under the License.
 #
 
+from datetime import datetime
 import json
 import re
 from gremlin_python.statics import long
@@ -198,6 +199,11 @@
         return [] if val == "l[]" else list(map((lambda x: _convert(x, ctx)), val[2:-1].split(",")))
     elif isinstance(val, str) and re.match(r"^s\[.*\]$", val):  # parse set
         return set() if val == "s[]" else set(map((lambda x: _convert(x, ctx)), val[2:-1].split(",")))
+    elif isinstance(val, str) and re.match(r"^str\[.*\]$", val):  # return string as is
+        return val[4:-1]
+    elif isinstance(val, str) and re.match(r"^dt\[.*\]$", val):  # parse datetime
+        # python 3.8 can handle only subset of ISO 8601 dates
+        return datetime.fromisoformat(val[3:-1].replace('Z', ''))
     elif isinstance(val, str) and re.match(r"^d\[NaN\]$", val):  # parse nan
         return float("nan")
     elif isinstance(val, str) and re.match(r"^d\[Infinity\]$", val):  # parse +inf
diff --git a/gremlin-python/src/main/python/radish/gremlin.py b/gremlin-python/src/main/python/radish/gremlin.py
index 5ee5e25..70c1751 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -25,11 +25,13 @@
 
 
 from radish import world
+import datetime
+from gremlin_python.statics import long
 from gremlin_python.process.anonymous_traversal import traversal
 from gremlin_python.process.traversal import TraversalStrategy
 from gremlin_python.process.graph_traversal import __
 from gremlin_python.structure.graph import Graph
-from gremlin_python.process.traversal import Barrier, Cardinality, P, TextP, Pop, Scope, Column, Order, Direction, Merge, T, Pick, Operator, IO, WithOptions
+from gremlin_python.process.traversal import Barrier, Cardinality, CardinalityValue, P, TextP, Pop, Scope, Column, Order, Direction, DT, Merge, T, Pick, Operator, IO, WithOptions
 
 world.gremlins = {
     'g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX': [(lambda g, l1=None:g.V().branch(l1).option('a',__.age).option('b',__.lang).option('b',__.name))], 
@@ -87,6 +89,15 @@
     'g_VX1X_repeatXrepeatXunionXout_uses_out_traversesXX_whereXloops_isX0X_timesX1X_timeX2X_name': [(lambda g, vid1=None:g.V(vid1).repeat(__.repeat(__.union(__.out('uses'),__.out('traverses')).where(__.loops().is_(0))).times(1)).times(2).name)], 
     'g_V_repeatXa_outXknows_repeatXb_outXcreatedX_filterXloops_isX0XX_emit_lang': [(lambda g:g.V().repeat('a',__.out('knows').repeat('b',__.out('created').filter_(__.loops('a').is_(0))).emit()).emit().lang)], 
     'g_VX6X_repeatXa_bothXcreatedX_simplePathX_emitXrepeatXb_bothXknowsXX_untilXloopsXbX_asXb_whereXloopsXaX_asXbX_hasXname_vadasXX_dedup_name': [(lambda g, vid6=None:g.V(vid6).repeat('a',__.both('created').simplePath()).emit(__.repeat('b',__.both('knows')).until(__.loops('b').as_('b').where(__.loops('a').as_('b'))).has('name','vadas')).dedup().name)], 
+    'g_unionXX': [(lambda g:g.union())], 
+    'g_unionXV_name': [(lambda g:g.union(__.V().name))], 
+    'g_unionXVXv1X_VX4XX_name': [(lambda g, v4=None,v1=None:g.union(__.V(v1),__.V(v4)).name)], 
+    'g_unionXV_hasLabelXsoftwareX_V_hasLabelXpersonXX_name': [(lambda g:g.union(__.V().hasLabel('software'),__.V().hasLabel('person')).name)], 
+    'g_unionXV_out_out_V_hasLabelXsoftwareXX_path': [(lambda g:g.union(__.V().out().out(),__.V().hasLabel('software')).path())], 
+    'g_unionXV_out_out_V_hasLabelXsoftwareXX_path_byXnameX': [(lambda g:g.union(__.V().out().out(),__.V().hasLabel('software')).path().by('name'))], 
+    'g_unionXunionXV_out_outX_V_hasLabelXsoftwareXX_path_byXnameX': [(lambda g:g.union(__.union(__.V().out().out()),__.V().hasLabel('software')).path().by('name'))], 
+    'g_unionXinjectX1X_injectX2X': [(lambda g:g.union(__.inject(1),__.inject(2)))], 
+    'g_V_unionXconstantX1X_constantX2X_constantX3XX': [(lambda g, xx1=None,xx3=None,xx2=None,v2=None:g.V(v2).union(__.constant(xx1),__.constant(xx2),__.constant(xx3)))], 
     'g_V_unionXout__inX_name': [(lambda g:g.V().union(__.out(),__.in_()).name)], 
     'g_VX1X_unionXrepeatXoutX_timesX2X__outX_name': [(lambda g, vid1=None:g.V(vid1).union(__.repeat(__.out()).times(2),__.out()).name)], 
     'g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX': [(lambda g:g.V().choose(__.label().is_('person'),__.union(__.out().lang,__.out().name),__.in_().label()))], 
@@ -95,11 +106,36 @@
     'g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX': [(lambda g, vid2=None,vid1=None:g.V(vid1,vid2).union(__.outE().count(),__.inE().count(),__.outE().weight.sum_()))], 
     'g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX': [(lambda g, vid2=None,vid1=None:g.V(vid1,vid2).local(__.union(__.outE().count(),__.inE().count(),__.outE().weight.sum_())))], 
     'g_VX1_2X_localXunionXcountXX': [(lambda g, vid2=None,vid1=None:g.V(vid1,vid2).local(__.union(__.count())))], 
+    'g_unionXaddVXpersonX_propertyXname_aliceX_addVXpersonX_propertyXname_bobX_addVXpersonX_propertyXname_chrisX_name': [(lambda g:g.union(__.addV('person').property('name','alice'),__.addV('person').property('name','bob'),__.addV('person').property('name','chris')).name)], 
+    'g_V_valuesXageX_allXgtX32XX': [(lambda g:g.V().age.all_(P.gt(32)))], 
+    'g_V_valuesXageX_whereXisXP_gtX33XXX_fold_allXgtX33XX': [(lambda g:g.V().age.where(__.is_(P.gt(33))).fold().all_(P.gt(33)))], 
+    'g_V_valuesXageX_order_byXdescX_fold_allXgtX10XX': [(lambda g:g.V().age.order().by(Order.desc).fold().all_(P.gt(10)))], 
+    'g_V_valuesXageX_order_byXdescX_fold_allXgtX30XX': [(lambda g:g.V().age.order().by(Order.desc).fold().all_(P.gt(30)))], 
+    'g_injectXabc_bcdX_allXeqXbcdXX': [(lambda g:g.inject(['abc','bcd']).all_(P.eq('bcd')))], 
+    'g_injectXbcd_bcdX_allXeqXbcdXX': [(lambda g, xx1=None:g.inject(xx1).all_(P.eq('bcd')))], 
+    'g_injectXnull_abcX_allXTextP_startingWithXaXX': [(lambda g, xx1=None:g.inject(xx1).all_(TextP.startingWith('a')))], 
+    'g_injectX5_8_10_10_7X_allXgteX7XX': [(lambda g, xx1=None,xx2=None:g.inject(xx1,xx2).all_(P.gte(7)))], 
+    'g_injectXnullX_allXeqXnullXX': [(lambda g:g.inject(None).all_(P.eq(None)))], 
+    'g_injectX7X_allXeqX7XX': [(lambda g:g.inject(7).all_(P.eq(7)))], 
+    'g_injectXnull_nullX_allXeqXnullXX': [(lambda g, xx1=None:g.inject(xx1).all_(P.eq(None)))], 
+    'g_injectX3_threeX_allXeqX3XX': [(lambda g, xx1=None:g.inject(xx1).all_(P.eq(3)))], 
     'g_V_andXhasXage_gt_27X__outE_count_gte_2X_name': [(lambda g:g.V().and_(__.has('age',P.gt(27)),__.outE().count().is_(P.gte(2))).name)], 
     'g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name': [(lambda g:g.V().and_(__.outE(),__.has(T.label,'person').and_().has('age',P.gte(32))).name)], 
     'g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name': [(lambda g:g.V().as_('a').out('knows').and_().out('created').in_('created').as_('a').name)], 
     'g_V_asXaX_andXselectXaX_selectXaXX': [(lambda g:g.V().as_('a').and_(__.select('a'),__.select('a')))], 
     'g_V_hasXname_markoX_and_hasXname_markoX_and_hasXname_markoX': [(lambda g:g.V().has('name','marko').and_().has('name','marko').and_().has('name','marko'))], 
+    'g_V_valuesXageX_anyXgtX32XX': [(lambda g:g.V().age.any_(P.gt(32)))], 
+    'g_V_valuesXageX_order_byXdescX_fold_anyXeqX29XX': [(lambda g:g.V().age.order().by(Order.desc).fold().any_(P.eq(29)))], 
+    'g_V_valuesXageX_order_byXdescX_fold_anyXgtX10XX': [(lambda g:g.V().age.order().by(Order.desc).fold().any_(P.gt(10)))], 
+    'g_V_valuesXageX_order_byXdescX_fold_anyXgtX42XX': [(lambda g:g.V().age.order().by(Order.desc).fold().any_(P.gt(42)))], 
+    'g_injectXabc_cdeX_anyXeqXbcdXX': [(lambda g:g.inject(['abc','cde']).any_(P.eq('bcd')))], 
+    'g_injectXabc_bcdX_anyXeqXbcdXX': [(lambda g, xx1=None:g.inject(xx1).any_(P.eq('bcd')))], 
+    'g_injectXnull_abcX_anyXTextP_startingWithXaXX': [(lambda g, xx1=None:g.inject(xx1).any_(TextP.startingWith('a')))], 
+    'g_injectX5_8_10_10_7X_anyXeqX7XX': [(lambda g, xx1=None,xx2=None:g.inject(xx1,xx2).any_(P.eq(7)))], 
+    'g_injectXnullX_anyXeqXnullXX': [(lambda g:g.inject(None).any_(P.eq(None)))], 
+    'g_injectX7X_anyXeqX7XX': [(lambda g:g.inject(7).any_(P.eq(7)))], 
+    'g_injectXnull_nullX_anyXeqXnullXX': [(lambda g, xx1=None:g.inject(xx1).any_(P.eq(None)))], 
+    'g_injectX3_threeX_anyXeqX3XX': [(lambda g, xx1=None:g.inject(xx1).any_(P.eq(3)))], 
     'g_V_coinX1X': [(lambda g:g.V().coin(float(1.0)))], 
     'g_V_coinX0X': [(lambda g:g.V().coin(float(0.0)))], 
     'g_withStrategiesXSeedStrategyX_V_order_byXnameX_coinX50X': [(lambda g:g.withStrategies(*[TraversalStrategy('SeedStrategy',{'seed':999999,'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SeedStrategy')]).V().order().by('name').coin(float(0.5)))], 
@@ -134,6 +170,8 @@
     'g_V_both_dedup_age_name': [(lambda g:g.V().both().dedup().by('age').name)], 
     'g_VX1X_asXaX_both_asXbX_both_asXcX_dedupXa_bX_age_selectXa_b_cX_name': [(lambda g, vid1=None:g.V(vid1).as_('a').both().as_('b').both().as_('c').dedup('a','b').by('age').select('a','b','c').by('name'))], 
     'g_VX1X_valuesXageX_dedupXlocalX_unfold': [(lambda g, vid1=None:g.V(vid1).age.dedup(Scope.local).unfold())], 
+    'g_V_properties_dedup_count': [(lambda g:g.addV('person').property('name','josh').addV('person').property('name','josh').addV('person').property('name','josh')), (lambda g:g.V().properties('name').dedup().count())], 
+    'g_V_properties_dedup_byXvalueX_count': [(lambda g:g.addV('person').property('name','josh').addV('person').property('name','josh').addV('person').property('name','josh')), (lambda g:g.V().properties('name').dedup().by(T.value).count())], 
     'g_V_drop': [(lambda g:g.addV().as_('a').addV().as_('b').addE('knows').to('a')), (lambda g:g.V().drop()), (lambda g:g.V()), (lambda g:g.E())], 
     'g_V_outE_drop': [(lambda g:g.addV().as_('a').addV().as_('b').addE('knows').to('a')), (lambda g:g.V().outE().drop()), (lambda g:g.V()), (lambda g:g.E())], 
     'g_V_properties_drop': [(lambda g:g.addV().property('name','bob').addV().property('name','alice')), (lambda g:g.V().properties().drop()), (lambda g:g.V()), (lambda g:g.V().properties())], 
@@ -328,23 +366,24 @@
     'g_withStrategiesXProductiveByStrategyX_VX3X_asXaX_in_out_asXbX_whereXa_eqXbXX_byXageX_name': [(lambda g, vid3=None:g.withStrategies(*[TraversalStrategy('ProductiveByStrategy',{'productiveKeys':[],'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy')]).V(vid3).as_('a').in_().out().as_('b').where('a',P.eq('b')).by('age').name)], 
     'g_V_asXnX_whereXorXhasLabelXsoftwareX_hasLabelXpersonXXX_selectXnX_byXnameX': [(lambda g:g.V().as_('n').where(__.or_(__.hasLabel('software'),__.hasLabel('person'))).select('n').by('name'))], 
     'g_V_asXnX_whereXorXselectXnX_hasLabelXsoftwareX_selectXnX_hasLabelXpersonXXX_selectXnX_byXnameX': [(lambda g:g.V().as_('n').where(__.or_(__.select('n').hasLabel('software'),__.select('n').hasLabel('person'))).select('n').by('name'))], 
+    'g_V_hasLabelXpersonX_asXxX_whereXinEXknowsX_count_isXgteX1XXX_selectXxX': [(lambda g:g.V().hasLabel('person').as_('x').where(__.inE('knows').count().is_(P.gte(1))).select('x'))], 
     'g_V_coworker': [(lambda g, xx1=None:g.V().hasLabel('person').filter_(__.outE('created')).aggregate('p').as_('p1').name.as_('p1n').select('p').unfold().where(P.neq('p1')).as_('p2').name.as_('p2n').select('p2').out('created').choose(__.in_('created').where(P.eq('p1')),__.name,__.constant(xx1)).group().by(__.select('p1n')).by(__.group().by(__.select('p2n')).by(__.unfold().fold().project('numCoCreated','coCreated').by(__.count(Scope.local)).by())).unfold())], 
     'g_V_coworker_with_midV': [(lambda g:g.V().hasLabel('person').filter_(__.outE('created')).as_('p1').V().hasLabel('person').where(P.neq('p1')).filter_(__.outE('created')).as_('p2').map(__.out('created').where(__.in_('created').as_('p1')).name.fold()).group().by(__.select('p1').by('name')).by(__.group().by(__.select('p2').by('name')).by(__.project('numCoCreated','coCreated').by(__.count(Scope.local)).by())).unfold())], 
     'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').addV('person').property('_partition','b').property('name','bob')), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().name)], 
     'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').addV('person').property('_partition','b').property('name','bob')), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a','b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().name)], 
     'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').addV('person').property('_partition','b').property('name','bob')), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('c')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().weight)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().weight)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a','b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().dedup().weight)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('c')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().weight)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a','b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().dedup().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('c')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().out().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().in_().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a','b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().out().name)], 
-    'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',1).addE('knows').from_('b').to('a').property('_partition','b').property('weight',2)), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('c')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().out().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_bothE_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().weight)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().weight)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a','b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().dedup().weight)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('c')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().bothE().weight)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_both_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_both_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_both_dedup_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a','b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().dedup().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_both_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('c')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().both().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_V_out_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().out().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_in_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().in_().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_out_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a','b')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().out().name)], 
+    'g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_out_name': [(lambda g:g.addV('person').property('_partition','a').property('name','alice').as_('a').addV('person').property('_partition','b').property('name','bob').as_('b').addE('knows').from_('a').to('b').property('_partition','a').property('weight',float(1.0)).addE('knows').from_('b').to('a').property('_partition','b').property('weight',float(2.0))), (lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('c')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).V().out().name)], 
     'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_addVXpersonX_propertyXname_aliceX_addXselfX': [(lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).addV('person').property('name','alice').addE('self')), (lambda g:g.V().has('person','name','alice').has('_partition','a')), (lambda g:g.V()), (lambda g:g.E().has('_partition','a')), (lambda g:g.E())], 
     'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_injectXzeroX_addVXpersonX_propertyXname_aliceX_addXselfX': [(lambda g:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).inject(0).addV('person').property('name','alice').addE('self')), (lambda g:g.V().has('person','name','alice').has('_partition','a')), (lambda g:g.V()), (lambda g:g.E().has('_partition','a')), (lambda g:g.E())], 
     'g_withStrategiesXPartitionStrategyXwrite_a_read_aXX_mergeV': [(lambda g, xx1=None:g.withStrategies(*[TraversalStrategy('PartitionStrategy',{'includeMetaProperties':False,'partitionKey':'_partition','readPartitions':set(('a')),'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy','writePartition':'a'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy')]).merge_v(xx1)), (lambda g, xx1=None:g.V().has('person','name','alice').has('_partition','a')), (lambda g, xx1=None:g.V())], 
@@ -412,6 +451,7 @@
     'g_withStrategiesXSubgraphStrategyXedges_hasLabelXusesX_hasXskill_5XXX_V_outE_valueMap_selectXvaluesX_unfold': [(lambda g:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':True,'edges':__.hasLabel('uses').has('skill',5)}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).V().outE().valueMap().select(Column.values).unfold())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_V': [(lambda g:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).V())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_E': [(lambda g:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).E())], 
+    'g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_E': [(lambda g:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':True,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).E())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_outE': [(lambda g, vid4=None:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).V(vid4).outE())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_inE': [(lambda g, vid4=None:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).V(vid4).inE())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_out': [(lambda g, vid4=None:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).V(vid4).out())], 
@@ -422,6 +462,7 @@
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX11X_bothV': [(lambda g, eid11=None:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).E(eid11).bothV())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV': [(lambda g, eid12=None:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).E(eid12).bothV())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV': [(lambda g, eid9=None:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':False,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).E(eid9).bothV())], 
+    'g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV': [(lambda g, eid9=None:g.withStrategies(*[TraversalStrategy('SubgraphStrategy',{'checkAdjacentVertices':True,'vertices':__.has('name',P.within(['josh','lop','ripple'])),'edges':__.or_(__.has('weight',float(0.4)).hasLabel('created'),__.has('weight',float(1.0)).hasLabel('created'))}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy')]).E(eid9).bothV())], 
     'g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX': [(lambda g, vid1=None:g.addV('person').property('name','marko').property('age',29).as_('marko').addV('person').property('name','vadas').property('age',27).as_('vadas').addV('software').property('name','lop').property('lang','java').as_('lop').addV('person').property('name','josh').property('age',32).as_('josh').addV('software').property('name','ripple').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g, vid1=None:g.V(vid1).as_('a').out('created').addE('createdBy').to('a')), (lambda g, vid1=None:g.E()), (lambda g, vid1=None:g.V(vid1).inE())], 
     'g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X': [(lambda g, vid1=None:g.addV('person').property('name','marko').property('age',29).as_('marko').addV('person').property('name','vadas').property('age',27).as_('vadas').addV('software').property('name','lop').property('lang','java').as_('lop').addV('person').property('name','josh').property('age',32).as_('josh').addV('software').property('name','ripple').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g, vid1=None:g.V(vid1).as_('a').out('created').addE('createdBy').to('a').property('weight',float(2.0))), (lambda g, vid1=None:g.E()), (lambda g, vid1=None:g.V(vid1).bothE()), (lambda g, vid1=None:g.V(vid1).inE().has('weight',float(2.0)))], 
     'g_V_outE_propertyXweight_nullX': [(lambda g:g.addV('person').property('name','marko').property('age',29).as_('marko').addV('person').property('name','vadas').property('age',27).as_('vadas').addV('software').property('name','lop').property('lang','java').as_('lop').addV('person').property('name','josh').property('age',32).as_('josh').addV('software').property('name','ripple').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().outE().property('weight',None)), (lambda g:g.E().properties('weight'))], 
@@ -453,6 +494,8 @@
     'g_addV_propertyXlabel_personX': [(lambda g:g.addV().property(T.label,'person')), (lambda g:g.V().hasLabel('person'))], 
     'g_addV_propertyXmapX': [(lambda g:g.addV().property('name','foo').property('age',42)), (lambda g:g.V().has('name','foo'))], 
     'g_addV_propertyXsingle_mapX': [(lambda g:g.addV().property(Cardinality.single,'name','foo').property(Cardinality.single,'age',42)), (lambda g:g.V().has('name','foo'))], 
+    'g_V_hasXname_fooX_propertyXname_setXbarX_age_43X': [(lambda g:g.addV().property(Cardinality.single,'name','foo').property('age',42)), (lambda g:g.V().has('name','foo').property(Cardinality.set_,'name','bar').property('age',43)), (lambda g:g.V().has('name','foo')), (lambda g:g.V().has('name','bar')), (lambda g:g.V().has('age',43)), (lambda g:g.V().has('age',42))], 
+    'g_V_hasXname_fooX_propertyXset_name_bar_age_singleX43XX': [(lambda g:g.addV().property(Cardinality.single,'name','foo').property('age',42)), (lambda g:g.V().has('name','foo').property(Cardinality.set_,'name','bar').property(Cardinality.single,'age',43)), (lambda g:g.V().has('name','foo')), (lambda g:g.V().has('name','bar')), (lambda g:g.V().has('age',43)), (lambda g:g.V().has('age',42))], 
     'g_addV_propertyXnullX': [(lambda g:g.addV('person')), (lambda g:g.V().hasLabel('person').values())], 
     'g_addV_propertyXemptyX': [(lambda g:g.addV('person')), (lambda g:g.V().hasLabel('person').values())], 
     'g_addV_propertyXset_nullX': [(lambda g:g.addV('foo')), (lambda g:g.V().hasLabel('foo').values())], 
@@ -460,6 +503,28 @@
     'g_addVXpersonX_propertyXname_joshX_propertyXage_nullX': [(lambda g:g.addV('person').property('name','josh').property('age',None)), (lambda g:g.V().has('person','age',None))], 
     'g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX': [(lambda g:g.addV('person').property('name','marko').property('friendWeight',None,'acl',None)), (lambda g:g.V().has('person','name','marko').has('friendWeight',None)), (lambda g:g.V().has('person','name','marko').properties('friendWeight').has('acl',None)), (lambda g:g.V().has('person','name','marko').properties('friendWeight').count())], 
     'g_V_hasXperson_name_aliceX_propertyXsingle_age_unionXage_constantX1XX_sumX': [(lambda g:g.addV('person').property('name','alice').property(Cardinality.single,'age',50)), (lambda g:g.V().has('person','name','alice').property('age',__.union(__.age,__.constant(1)).sum_())), (lambda g:g.V().has('person','age',50)), (lambda g:g.V().has('person','age',51))], 
+    'g_V_limitX3X_addVXsoftwareX_aggregateXa1X_byXlabelX_aggregateXa2X_byXlabelX_capXa1_a2X_selectXa_bX_byXunfoldX_foldX': [(lambda g:g.addV('person').property('name','marko').property('age',29).as_('marko').addV('person').property('name','vadas').property('age',27).as_('vadas').addV('software').property('name','lop').property('lang','java').as_('lop').addV('person').property('name','josh').property('age',32).as_('josh').addV('software').property('name','ripple').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V()[0:3].addV('software').aggregate('a1').by(T.label).aggregate('a2').by(T.label).cap('a1','a2').select('a1','a2').by(__.unfold().fold()))], 
+    'g_injectXstrX_asDate': [(lambda g:g.inject('2023-08-02T00:00:00Z').as_date())], 
+    'g_injectX1694017707000X_asDate': [(lambda g:g.inject(long(1694017707000)).as_date())], 
+    'g_injectX1694017708000LX_asDate': [(lambda g, xx1=None:g.inject(xx1).as_date())], 
+    'g_injectX1694017709000dX_asDate': [(lambda g, xx1=None:g.inject(xx1).as_date())], 
+    'g_injectX1_2X_asDate': [(lambda g, xx1=None:g.inject(xx1).as_date())], 
+    'g_injectXnullX_asDate': [(lambda g:g.inject(None).as_date())], 
+    'g_injectXinvalidstrX_asDate': [(lambda g:g.inject('This String is not an ISO 8601 Date').as_date())], 
+    'g_injectX1_2X_asString': [(lambda g, xx1=None,xx2=None:g.inject(xx1,xx2).as_string())], 
+    'g_injectX1_2X_asStringXlocalX': [(lambda g, xx1=None,xx2=None:g.inject(xx1,xx2).as_string(Scope.local))], 
+    'g_injectXlist_1_2X_asStringXlocalX': [(lambda g, xx1=None:g.inject(xx1).as_string(Scope.local))], 
+    'g_injectX1_nullX_asString': [(lambda g, xx1=None:g.inject(None,xx1).as_string())], 
+    'g_injectX1_nullX_asStringXlocalX': [(lambda g, xx1=None:g.inject(xx1).as_string(Scope.local))], 
+    'g_V_valueMapXnameX_asString': [(lambda g:g.V().valueMap('name').as_string())], 
+    'g_V_valueMapXnameX_order_fold_asStringXlocalX': [(lambda g:g.V().valueMap('name').order().fold().as_string(Scope.local))], 
+    'g_V_asString': [(lambda g:g.V().as_string())], 
+    'g_V_fold_asStringXlocalX_orderXlocalX': [(lambda g:g.V().fold().as_string(Scope.local).order(Scope.local))], 
+    'g_E_asString': [(lambda g:g.E().as_string())], 
+    'g_V_properties': [(lambda g:g.V().properties().as_string())], 
+    'g_V_hasLabelXpersonX_valuesXageX_asString': [(lambda g:g.V().hasLabel('person').age.as_string())], 
+    'g_V_hasLabelXpersonX_valuesXageX_order_fold_asStringXlocalX': [(lambda g:g.V().hasLabel('person').age.order().fold().as_string(Scope.local))], 
+    'g_V_hasLabelXpersonX_valuesXageX_asString_concatX_years_oldX': [(lambda g:g.V().hasLabel('person').age.as_string().concat(' years old'))], 
     'g_call': [(lambda g:g.call())], 
     'g_callXlistX': [(lambda g:g.call('--list'))], 
     'g_callXlistX_withXstring_stringX': [(lambda g:g.call('--list').with_('service','tinker.search'))], 
@@ -486,6 +551,50 @@
     'g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX': [(lambda g:g.V().coalesce(__.out('likes'),__.out('knows'),__.out('created')).groupCount().by('name'))], 
     'g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX': [(lambda g:g.V().coalesce(__.outE('knows'),__.outE('created')).otherV().path().by('name').by(T.label))], 
     'g_V_outXcreatedX_order_byXnameX_coalesceXname_constantXxXX': [(lambda g:g.V().out('created').order().by('name').coalesce(__.name,__.constant('x')))], 
+    'g_injectXnullX_combineXinjectX1XX': [(lambda g:g.inject(None).combine(__.inject(1)))], 
+    'g_V_valuesXnameX_combineXV_foldX': [(lambda g:g.V().name.combine(__.V().fold()))], 
+    'g_V_fold_combineXconstantXnullXX': [(lambda g:g.V().fold().combine(__.constant(None)))], 
+    'g_V_fold_combineXVX': [(lambda g:g.V().fold().combine(__.V()))], 
+    'g_V_valuesXnameX_fold_combineX2X': [(lambda g:g.V().name.fold().combine(2))], 
+    'g_V_valuesXnameX_fold_combineXnullX': [(lambda g:g.V().name.fold().combine(None))], 
+    'g_V_valuesXnonexistantX_fold_combineXV_valuesXnameX_foldX_unfold': [(lambda g:g.V().nonexistant.fold().combine(__.V().name.fold()).unfold())], 
+    'g_V_valuesXnameX_fold_combineXV_valuesXnonexistantX_foldX_unfold': [(lambda g:g.V().name.fold().combine(__.V().nonexistant.fold()).unfold())], 
+    'g_V_valuesXageX_order_byXdescX_fold_combineXV_valuesXageX_order_byXdescX_foldX': [(lambda g:g.V().age.order().by(Order.desc).fold().combine(__.V().age.order().by(Order.desc).fold()))], 
+    'g_V_out_path_byXvaluesXnameX_toUpperX_combineXMARKOX': [(lambda g, xx1=None:g.V().out().path().by(__.name.to_upper()).combine(xx1))], 
+    'g_injectXxx1X_combineXV_valuesXnameX_foldX_unfold': [(lambda g, xx1=None:g.inject(xx1).combine(__.V().name.fold()).unfold())], 
+    'g_V_valueMapXlocationX_selectXvaluesX_unfold_combineXseattle_vancouverX_orderXlocalX': [(lambda g, xx1=None:g.V().valueMap('location').select(Column.values).unfold().combine(xx1).order(Scope.local))], 
+    'g_V_out_out_path_byXnameX_combineXempty_listX': [(lambda g, xx1=None:g.V().out().out().path().by('name').combine(xx1))], 
+    'g_V_valuesXageX_order_fold_combineXconstantX27X_foldX': [(lambda g:g.V().age.order().fold().combine(__.constant(27).fold()))], 
+    'g_V_out_out_path_byXnameX_combineXdave_kelvinX': [(lambda g, xx1=None:g.V().out().out().path().by('name').combine(xx1))], 
+    'g_injectXa_null_bX_combineXa_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).combine(xx2))], 
+    'g_injectXa_null_bX_combineXa_null_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).combine(xx2))], 
+    'g_injectX3_threeX_combineXfive_three_7X': [(lambda g, xx1=None,xx2=None:g.inject(xx1).combine(xx2))], 
+    'g_injectXa_bX_concat': [(lambda g:g.inject('a','b').concat())], 
+    'g_injectXa_bX_concat_XcX': [(lambda g:g.inject('a','b').concat('c'))], 
+    'g_injectXa_bX_concat_Xc_dX': [(lambda g:g.inject('a','b').concat('c','d'))], 
+    'g_injectXa_bX_concat_Xinject_c_dX': [(lambda g:g.inject('a','b').concat(__.inject('c')))], 
+    'g_injectXaX_concat_Xinject_List_b_cX': [(lambda g, xx1=None:g.inject('a').concat(__.inject(xx1)))], 
+    'g_injectXListXa_bXcX_concat_XdX': [(lambda g, xx1=None:g.inject(xx1,'c').concat('d'))], 
+    'g_injectXnullX_concat_XinjectX': [(lambda g:g.inject(None).concat())], 
+    'g_injectXnull_aX_concat_Xnull_bX': [(lambda g:g.inject(None,'a').concat(None,'b'))], 
+    'g_injectXhello_hiX_concat_XV_valuesXnameXX': [(lambda g:g.inject('hello','hi').concat(__.V().order().by(T.id_).name))], 
+    'g_V_hasLabel_value_concat_X_X_concat_XpersonX': [(lambda g:g.V().hasLabel('person').name.concat(' ').concat('person'))], 
+    'g_hasLabelXpersonX_valuesXnameX_asXaX_constantXMrX_concatXselectXaX': [(lambda g:g.V().hasLabel('person').name.as_('a').constant('Mr.').concat(__.select('a')))], 
+    'g_hasLabelXsoftwareX_asXaX_valuesXnameX_concatXunsesX_concatXselectXaXvaluesXlangX': [(lambda g:g.V().hasLabel('software').as_('a').name.concat(' uses ').concat(__.select('a').lang))], 
+    'g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_labelX_concatXselectXaX_inV_valuesXnameXX': [(lambda g, vid1=None:g.V(vid1).outE().as_('a').V(vid1).name.concat(__.select('a').label()).concat(__.select('a').in_v().name))], 
+    'g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_label_selectXaX_inV_valuesXnameXX': [(lambda g, vid1=None:g.V(vid1).outE().as_('a').V(vid1).name.concat(__.select('a').label(),__.select('a').in_v().name))], 
+    'g_addVXconstantXprefix_X_concatXVX1X_labelX_label': [(lambda g, vid1=None:g.addV('person').property('name','marko').property('age',29).as_('marko').addV('person').property('name','vadas').property('age',27).as_('vadas').addV('software').property('name','lop').property('lang','java').as_('lop').addV('person').property('name','josh').property('age',32).as_('josh').addV('software').property('name','ripple').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g, vid1=None:g.addV(__.constant('prefix_').concat(__.V(vid1).label())).label())], 
+    'g_injectXnullX_conjoinX1X': [(lambda g:g.inject(None).conjoin('1'))], 
+    'g_V_valuesXnameX_conjoinX1X': [(lambda g:g.V().name.conjoin('1'))], 
+    'g_V_valuesXnonexistantX_fold_conjoinX_X': [(lambda g:g.V().nonexistant.fold().conjoin(';'))], 
+    'g_V_valuesXnameX_order_fold_conjoinX_X': [(lambda g:g.V().name.order().fold().conjoin('_'))], 
+    'g_V_valuesXageX_order_fold_conjoinX_X': [(lambda g:g.V().age.order().fold().conjoin(';'))], 
+    'g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX': [(lambda g:g.V().out().path().by(__.name.to_upper()).conjoin('MARKO'))], 
+    'g_injectXmarkoX_conjoinX_X': [(lambda g, xx1=None:g.inject(xx1).conjoin('-'))], 
+    'g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X': [(lambda g:g.V().valueMap('location').select(Column.values).unfold().order(Scope.local).conjoin('1'))], 
+    'g_V_out_out_path_byXnameX_conjoinXX': [(lambda g:g.V().out().out().path().by('name').conjoin(''))], 
+    'g_injectXa_null_bX_conjoinXxyzX': [(lambda g, xx1=None:g.inject(xx1).conjoin('xyz'))], 
+    'g_injectX3_threeX_conjoinX_X': [(lambda g, xx1=None:g.inject(xx1).conjoin(';'))], 
     'g_V_connectedComponent_hasXcomponentX': [(lambda g:g.V().connectedComponent().has('gremlin.connectedComponentVertexProgram.component'))], 
     'g_V_dedup_connectedComponent_hasXcomponentX': [(lambda g:g.V().dedup().connectedComponent().has('gremlin.connectedComponentVertexProgram.component'))], 
     'g_V_hasLabelXsoftwareX_connectedComponent_project_byXnameX_byXcomponentX': [(lambda g:g.V().hasLabel('software').connectedComponent().project('name','component').by('name').by('gremlin.connectedComponentVertexProgram.component'))], 
@@ -506,6 +615,59 @@
     'g_E_sampleX1X_count': [(lambda g:g.E().sample(1).count())], 
     'g_V_sampleX1X_byXageX_count': [(lambda g:g.V().sample(1).by('age').count())], 
     'g_V_order_byXnoX_count': [(lambda g:g.V().order().by('no').count())], 
+    'g_V_group_byXlabelX_count': [(lambda g:g.V().group().by(T.label).count())], 
+    'g_V_group_byXlabelX_countXlocalX': [(lambda g:g.V().group().by(T.label).count(Scope.local))], 
+    'g_injectXdatetimeXstrXX_dateAddXDT_hour_2X': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1690934400000 / 1000.0)).date_add(DT.hour,2))], 
+    'g_injectXdatetimeXstrXX_dateAddXhour_2X': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1690934400000 / 1000.0)).date_add(DT.hour,2))], 
+    'g_injectXdatetimeXstrXX_dateAddXhour_1X': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1690934400000 / 1000.0)).date_add(DT.hour,-1))], 
+    'g_injectXdatetimeXstrXX_dateAddXminute_10X': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1690934400000 / 1000.0)).date_add(DT.minute,10))], 
+    'g_injectXdatetimeXstrXX_dateAddXsecond_20X': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1690934400000 / 1000.0)).date_add(DT.second,20))], 
+    'g_injectXdatetimeXstrXX_dateAddXday_11X': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1693958400000 / 1000.0)).date_add(DT.day,11))], 
+    'g_injectXdatetimeXstr1XX_dateDiffXdatetimeXstr2XX': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1690934400000 / 1000.0)).date_diff(datetime.datetime.utcfromtimestamp(1691539200000 / 1000.0)))], 
+    'g_injectXdatetimeXstr1XX_dateDiffXconstantXdatetimeXstr2XXX': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1691452800000 / 1000.0)).date_diff(__.constant(datetime.datetime.utcfromtimestamp(1690848000000 / 1000.0))))], 
+    'g_injectXdatetimeXstr1XX_dateDiffXinjectXdatetimeXstr2XXX': [(lambda g:g.inject(datetime.datetime.utcfromtimestamp(1691452800000 / 1000.0)).date_diff(__.inject(datetime.datetime.utcfromtimestamp(1696982400000 / 1000.0))))], 
+    'g_injectXnullX_differenceXinjectX1XX': [(lambda g:g.inject(None).difference(__.inject(1)))], 
+    'g_V_valuesXnameX_differenceXV_foldX': [(lambda g:g.V().name.difference(__.V().fold()))], 
+    'g_V_fold_differenceXconstantXnullXX': [(lambda g:g.V().fold().difference(__.constant(None)))], 
+    'g_V_fold_differenceXVX': [(lambda g:g.V().fold().difference(__.V()))], 
+    'g_V_valuesXnameX_fold_differenceX2X': [(lambda g:g.V().name.fold().difference(2))], 
+    'g_V_valuesXnameX_fold_differenceXnullX': [(lambda g:g.V().name.fold().difference(None))], 
+    'g_V_valuesXnonexistantX_fold_differenceXV_valuesXnameX_foldX': [(lambda g:g.V().nonexistant.fold().difference(__.V().name.fold()))], 
+    'g_V_valuesXnameX_fold_differenceXV_valuesXnonexistantX_foldX': [(lambda g:g.V().name.fold().difference(__.V().nonexistant.fold()))], 
+    'g_V_valuesXageX_fold_differenceXV_valuesXageX_foldX': [(lambda g:g.V().age.fold().difference(__.V().age.fold()))], 
+    'g_V_out_path_byXvaluesXnameX_toUpperX_differenceXMARKOX': [(lambda g, xx1=None:g.V().out().path().by(__.name.to_upper()).difference(xx1))], 
+    'g_injectXmarkoX_differenceXV_valuesXnameX_foldX': [(lambda g, xx1=None:g.inject(xx1).difference(__.V().name.fold()))], 
+    'g_V_valueMapXlocationX_selectXvaluesX_unfold_differenceXseattle_vancouverX': [(lambda g, xx1=None:g.V().valueMap('location').select(Column.values).unfold().difference(xx1))], 
+    'g_V_out_out_path_byXnameX_differenceXrippleX': [(lambda g, xx1=None:g.V().out().out().path().by('name').difference(xx1))], 
+    'g_V_out_out_path_byXnameX_differenceXempty_listX': [(lambda g, xx1=None:g.V().out().out().path().by('name').difference(xx1))], 
+    'g_V_valuesXageX_fold_differenceXconstantX27X_foldX': [(lambda g:g.V().age.fold().difference(__.constant(27).fold()))], 
+    'g_V_out_out_path_byXnameX_differenceXdave_kelvinX': [(lambda g, xx1=None:g.V().out().out().path().by('name').difference(xx1))], 
+    'g_injectXa_null_bX_differenceXa_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).difference(xx2))], 
+    'g_injectXa_null_bX_differenceXa_null_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).difference(xx2))], 
+    'g_injectX3_threeX_differenceXfive_three_7X': [(lambda g, xx1=None,xx2=None:g.inject(xx1).difference(xx2))], 
+    'g_injectXnullX_disjunctXinjectX1XX': [(lambda g:g.inject(None).disjunct(__.inject(1)))], 
+    'g_V_valuesXnameX_disjunctXV_foldX': [(lambda g:g.V().name.disjunct(__.V().fold()))], 
+    'g_V_fold_disjunctXconstantXnullXX': [(lambda g:g.V().fold().disjunct(__.constant(None)))], 
+    'g_V_fold_disjunctXVX': [(lambda g:g.V().fold().disjunct(__.V()))], 
+    'g_V_valuesXnameX_fold_disjunctX2X': [(lambda g:g.V().name.fold().disjunct(2))], 
+    'g_V_valuesXnameX_fold_disjunctXnullX': [(lambda g:g.V().name.fold().disjunct(None))], 
+    'g_V_valuesXnonexistantX_fold_disjunctXV_valuesXnameX_foldX': [(lambda g:g.V().nonexistant.fold().disjunct(__.V().name.fold()))], 
+    'g_V_valuesXnameX_fold_disjunctXV_valuesXnonexistantX_foldX': [(lambda g:g.V().name.fold().disjunct(__.V().nonexistant.fold()))], 
+    'g_V_valuesXageX_fold_disjunctXV_valuesXageX_foldX': [(lambda g:g.V().age.fold().disjunct(__.V().age.fold()))], 
+    'g_V_out_path_byXvaluesXnameX_toUpperX_disjunctXMARKOX': [(lambda g, xx1=None:g.V().out().path().by(__.name.to_upper()).disjunct(xx1))], 
+    'g_V_valueMapXlocationX_selectXvaluesX_unfold_disjunctXseattle_vancouverX': [(lambda g, xx1=None:g.V().valueMap('location').select(Column.values).unfold().disjunct(xx1))], 
+    'g_V_out_out_path_byXnameX_disjunctXmarkoX': [(lambda g, xx1=None:g.V().out().out().path().by('name').disjunct(xx1))], 
+    'g_V_out_out_path_byXnameX_disjunctXstephen_markoX': [(lambda g, xx1=None:g.V().out().out().path().by('name').disjunct(xx1))], 
+    'g_V_out_out_path_byXnameX_disjunctXdave_kelvinX': [(lambda g, xx1=None:g.V().out().out().path().by('name').disjunct(xx1))], 
+    'g_injectXa_null_bX_disjunctXa_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).disjunct(xx2))], 
+    'g_injectXa_null_bX_disjunctXa_null_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).disjunct(xx2))], 
+    'g_injectX3_threeX_disjunctXfive_three_7X': [(lambda g, xx1=None,xx2=None:g.inject(xx1).disjunct(xx2))], 
+    'g_V_EX11X': [(lambda g, eid11=None:g.V().E(eid11))], 
+    'g_EX11X_E': [(lambda g, eid11=None:g.E(eid11).E())], 
+    'g_V_EXnullX': [(lambda g:g.V().E(None))], 
+    'g_V_EXlistXnullXX': [(lambda g, xx1=None:g.V().E(xx1))], 
+    'g_injectX1X_EX11_nullX': [(lambda g, eid11=None:g.inject(1).E(eid11,None))], 
+    'g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX': [(lambda g:g.addV('person').property('name','josh').addV('person').property('name','vadas')), (lambda g:g.inject(1).coalesce(__.E().hasLabel('tests'),__.addE('tests').from_(__.V().has('name','josh')).to(__.V().has('name','vadas')))), (lambda g:g.E().hasLabel('tests'))], 
     'g_VX1X_properties_element': [(lambda g, v2=None:g.V(v2).properties().element()[0:1])], 
     'g_V_properties_element': [(lambda g:g.V().properties().element())], 
     'g_V_propertiesXageX_element': [(lambda g:g.V().properties('age').element())], 
@@ -523,6 +685,17 @@
     'g_V_age_foldX0_plusX': [(lambda g:g.V().age.fold(0,Operator.sum_))], 
     'g_injectXa1_b2X_foldXm_addAllX': [(lambda g:g.inject({'a':1},{'b':2}).fold({},Operator.addAll))], 
     'g_injectXa1_b2_b4X_foldXm_addAllX': [(lambda g:g.inject({'a':1},{'b':2},{'b':4}).fold({},Operator.addAll))], 
+    'g_VX1X_formatXstrX': [(lambda g:g.V().has('name','marko').format_('Hello world'))], 
+    'g_V_formatXstrX': [(lambda g:g.V().format_('%{name} is %{age} years old'))], 
+    'g_injectX1X_asXageX_V_formatXstrX': [(lambda g:g.inject(1).as_('age').V().format_('%{name} is %{age} years old'))], 
+    'g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX': [(lambda g:g.V().format_('%{_} is %{_} years old').by(__.name).by(__.age))], 
+    'g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX': [(lambda g:g.V().hasLabel('person').format_('%{_} %{_} %{_}').by(__.constant('hello')).by(__.name))], 
+    'g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX': [(lambda g, vid1=None:g.V(vid1).format_('%{_}').by(__.constant('hello')).by(__.name))], 
+    'g_V_formatXstrX_byXbothE_countX': [(lambda g:g.V().format_('%{name} has %{_} connections').by(__.bothE().count()))], 
+    'g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX': [(lambda g:g.V().project('name','count').by(__.name).by(__.bothE().count()).format_('%{name} has %{count} connections'))], 
+    'g_V_elementMap_formatXstrX': [(lambda g:g.V().elementMap().format_('%{name} is %{age} years old'))], 
+    'g_V_hasLabelXpersonX_asXaX_valuesXnameX_asXp1X_selectXaX_inXknowsX_formatXstrX': [(lambda g:g.V().hasLabel('person').as_('a').name.as_('p1').select('a').in_('knows').format_('%{p1} knows %{name}'))], 
+    'g_V_asXsX_label_asXsubjectX_selectXsX_outE_asXpX_label_asXpredicateX_selectXpX_inV_label_asXobjectX_formatXstrX': [(lambda g:g.V().as_('s').label().as_('subject').select('s').outE().as_('p').label().as_('predicate').select('p').in_v().label().as_('object').format_('%{subject} %{predicate} %{object}'))], 
     'g_VX1X_V_valuesXnameX': [(lambda g, vid1=None:g.V(vid1).V().name)], 
     'g_V_outXknowsX_V_name': [(lambda g:g.V().out('knows').V().name)], 
     'g_V_hasXname_GarciaX_inXsungByX_asXsongX_V_hasXname_Willie_DixonX_inXwrittenByX_whereXeqXsongXX_name': [(lambda g:g.V().has('artist','name','Garcia').in_('sungBy').as_('song').V().has('artist','name','Willie_Dixon').in_('writtenBy').where(P.eq('song')).name)], 
@@ -532,6 +705,34 @@
     'g_V_hasLabelXsoftwareX_name_fold_orderXlocalX_index_unfold_order_byXtailXlocal_1XX': [(lambda g:g.V().hasLabel('software').name.fold().order(Scope.local).index().unfold().order().by(__.tail(Scope.local,1)))], 
     'g_V_hasLabelXpersonX_name_fold_orderXlocalX_index_withXmapX': [(lambda g:g.V().hasLabel('person').name.fold().order(Scope.local).index().with_('~tinkerpop.index.indexer',1))], 
     'g_VX1X_valuesXageX_index_unfold_unfold': [(lambda g, vid1=None:g.V(vid1).age.index().unfold().unfold())], 
+    'g_injectXnullX_intersectXinjectX1XX': [(lambda g:g.inject(None).intersect(__.inject(1)))], 
+    'g_V_valuesXnameX_intersectXV_foldX': [(lambda g:g.V().name.intersect(__.V().fold()))], 
+    'g_V_fold_intersectXconstantXnullXX': [(lambda g:g.V().fold().intersect(__.constant(None)))], 
+    'g_V_fold_intersectXVX': [(lambda g:g.V().fold().intersect(__.V()))], 
+    'g_V_valuesXnameX_fold_intersectX2X': [(lambda g:g.V().name.fold().intersect(2))], 
+    'g_V_valuesXnameX_fold_intersectXnullX': [(lambda g:g.V().name.fold().intersect(None))], 
+    'g_V_valuesXnonexistantX_fold_intersectXV_valuesXnameX_foldX': [(lambda g:g.V().nonexistant.fold().intersect(__.V().name.fold()))], 
+    'g_V_valuesXnameX_fold_intersectXV_valuesXnonexistantX_foldX': [(lambda g:g.V().name.fold().intersect(__.V().nonexistant.fold()))], 
+    'g_V_valuesXageX_fold_intersectXV_valuesXageX_foldX_order_local': [(lambda g:g.V().age.fold().intersect(__.V().age.fold()).order(Scope.local))], 
+    'g_V_out_path_byXvaluesXnameX_toUpperX_intersectXMARKOX': [(lambda g, xx1=None:g.V().out().path().by(__.name.to_upper()).intersect(xx1))], 
+    'g_injectXmarkoX_intersectX___V_valuesXnameX_foldX': [(lambda g, xx1=None:g.inject(xx1).intersect(__.V().name.fold()))], 
+    'g_V_valueMapXlocationX_selectXvaluesX_unfold_intersectXseattle_vancouverX': [(lambda g, xx1=None:g.V().valueMap('location').select(Column.values).unfold().intersect(xx1))], 
+    'g_V_valuesXageX_fold_intersectX___constantX27X_foldX': [(lambda g:g.V().age.fold().intersect(__.constant(27).fold()))], 
+    'g_V_out_out_path_byXnameX_intersectXdave_kelvinX': [(lambda g, xx1=None:g.V().out().out().path().by('name').intersect(xx1))], 
+    'g_injectXa_null_bX_intersectXa_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).intersect(xx2))], 
+    'g_injectXa_null_bX_intersectXa_null_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).intersect(xx2))], 
+    'g_injectX3_threeX_intersectXfive_three_7X': [(lambda g, xx1=None,xx2=None:g.inject(xx1).intersect(xx2))], 
+    'g_injectX__feature___test__nullX_lTrim': [(lambda g:g.inject('  feature',' one test',None,'',' ').lTrim())], 
+    'g_injectX__feature__X_lTrim': [(lambda g:g.inject('  feature  ').lTrim())], 
+    'g_injectXListXa_bXX_lTrim': [(lambda g, xx1=None:g.inject(xx1).lTrim())], 
+    'g_injectXListX1_2XX_lTrimXlocalX': [(lambda g, xx1=None:g.inject(xx1).lTrim(Scope.local))], 
+    'g_V_valuesXnameX_lTrim': [(lambda g:g.addV('person').property('name',' marko ').property('age',29).as_('marko').addV('person').property('name','  vadas  ').property('age',27).as_('vadas').addV('software').property('name','  lop').property('lang','java').as_('lop').addV('person').property('name','josh  ').property('age',32).as_('josh').addV('software').property('name','   ripple   ').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.lTrim())], 
+    'g_V_valuesXnameX_order_fold_lTrimXlocalX': [(lambda g:g.addV('person').property('name',' marko ').property('age',29).as_('marko').addV('person').property('name','  vadas  ').property('age',27).as_('vadas').addV('software').property('name','  lop').property('lang','java').as_('lop').addV('person').property('name','josh  ').property('age',32).as_('josh').addV('software').property('name','   ripple   ').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.order().fold().lTrim(Scope.local))], 
+    'g_injectXfeature_test_nullX_length': [(lambda g:g.inject('feature','test',None).length())], 
+    'g_injectXfeature_test_nullX_lengthXlocalX': [(lambda g:g.inject('feature','test',None).length(Scope.local))], 
+    'g_injectXListXa_bXX_length': [(lambda g, xx1=None:g.inject(xx1).length())], 
+    'g_V_valuesXnameX_length': [(lambda g:g.V().name.length())], 
+    'g_V_valuesXnameX_order_fold_lengthXlocalX': [(lambda g:g.V().name.order().fold().length(Scope.local))], 
     'g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX': [(lambda g, vid1=None:g.V(vid1).repeat(__.both().simplePath()).until(__.has('name','peter').or_().loops().is_(3)).has('name','peter').path().by('name'))], 
     'g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX': [(lambda g, vid1=None:g.V(vid1).repeat(__.both().simplePath()).until(__.has('name','peter').or_().loops().is_(2)).has('name','peter').path().by('name'))], 
     'g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX': [(lambda g, vid1=None:g.V(vid1).repeat(__.both().simplePath()).until(__.has('name','peter').and_().loops().is_(3)).has('name','peter').path().by('name'))], 
@@ -622,6 +823,29 @@
     'g_injectXnull_10_20_nullX_mean': [(lambda g, xx1=None,xx2=None:g.inject(None,xx1,xx2,None).mean())], 
     'g_injectXlistXnull_10_20_nullXX_meanXlocalX': [(lambda g, xx1=None:g.inject(xx1).mean(Scope.local))], 
     'g_VX1X_valuesXageX_meanXlocalX': [(lambda g, vid1=None:g.V(vid1).age.mean(Scope.local))], 
+    'g_injectXnullX_mergeXinjectX1XX': [(lambda g:g.inject(None).merge(__.inject(1)))], 
+    'g_V_valuesXnameX_mergeXV_foldX': [(lambda g:g.V().name.merge(__.V().fold()))], 
+    'g_V_fold_mergeXconstantXnullXX': [(lambda g:g.V().fold().merge(__.constant(None)))], 
+    'g_V_fold_mergeXVX': [(lambda g:g.V().fold().merge(__.V()))], 
+    'g_V_elementMap_mergeXconstantXaXX': [(lambda g:g.V().elementMap().merge(__.constant('a')))], 
+    'g_V_fold_mergeXV_asXaX_projectXaX_byXnameXX': [(lambda g:g.V().fold().merge(__.V().as_('a').project('a').by('name')))], 
+    'g_V_fold_mergeXk_vX': [(lambda g, xx1=None:g.V().fold().merge(xx1))], 
+    'g_V_valuesXnameX_fold_mergeX2X': [(lambda g:g.V().name.fold().merge(2))], 
+    'g_V_valuesXnameX_fold_mergeXnullX': [(lambda g:g.V().name.fold().merge(None))], 
+    'g_V_valuesXnonexistantX_fold_mergeXV_valuesXnameX_foldX': [(lambda g:g.V().nonexistant.fold().merge(__.V().name.fold()))], 
+    'g_V_valuesXnameX_fold_mergeXV_valuesXnonexistantX_foldX': [(lambda g:g.V().name.fold().merge(__.V().nonexistant.fold()))], 
+    'g_V_valuesXageX_fold_mergeXV_valuesXageX_foldX': [(lambda g:g.V().age.fold().merge(__.V().age.fold()))], 
+    'g_V_out_path_byXvaluesXnameX_toUpperX_mergeXMARKOX': [(lambda g, xx1=None:g.V().out().path().by(__.name.to_upper()).merge(xx1))], 
+    'g_injectXmarkoX_mergeXV_valuesXnameX_foldX': [(lambda g, xx1=None:g.inject(xx1).merge(__.V().name.fold()))], 
+    'g_V_valueMapXlocationX_selectXvaluesX_unfold_mergeXseattle_vancouverX': [(lambda g, xx1=None:g.V().valueMap('location').select(Column.values).unfold().merge(xx1))], 
+    'g_V_out_out_path_byXnameX_mergeXempty_listX': [(lambda g, xx1=None:g.V().out().out().path().by('name').merge(xx1))], 
+    'g_V_valuesXageX_fold_mergeXconstantX27X_foldX': [(lambda g:g.V().age.fold().merge(__.constant(27).fold()))], 
+    'g_V_out_out_path_byXnameX_mergeXdave_kelvinX': [(lambda g, xx1=None:g.V().out().out().path().by('name').merge(xx1))], 
+    'g_injectXa_null_bX_mergeXa_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).merge(xx2))], 
+    'g_injectXa_null_bX_mergeXa_null_cX': [(lambda g, xx1=None,xx2=None:g.inject(xx1).merge(xx2))], 
+    'g_injectX3_threeX_mergeXfive_three_7X': [(lambda g, xx1=None,xx2=None:g.inject(xx1).merge(xx2))], 
+    'g_V_asXnameX_projectXnameX_byXnameX_mergeXother_blueprintX': [(lambda g, xx1=None:g.V().as_('name').project('name').by('name').merge(xx1))], 
+    'g_V_hasXname_markoX_elementMap_mergeXV_hasXname_lopX_elementMapX': [(lambda g:g.V().has('name','marko').elementMap().merge(__.V().has('name','lop').elementMap()))], 
     'g_V_mergeEXlabel_selfX_optionXonMatch_emptyX': [(lambda g, xx1=None:g.addV('person').property('name','marko').property('age',29).addE('self')), (lambda g, xx1=None:g.V().merge_e(xx1).option(Merge.on_match,{})), (lambda g, xx1=None:g.E()), (lambda g, xx1=None:g.E().properties()), (lambda g, xx1=None:g.V())], 
     'g_V_mergeEXlabel_selfX_optionXonMatch_nullX': [(lambda g, xx1=None:g.addV('person').property('name','marko').property('age',29).addE('self')), (lambda g, xx1=None:g.V().merge_e(xx1).option(Merge.on_match,None)), (lambda g, xx1=None:g.E()), (lambda g, xx1=None:g.E().properties()), (lambda g, xx1=None:g.V())], 
     'g_V_mergeEXemptyX_optionXonCreate_nullX': [(lambda g, xx1=None:g.addV('person').property('name','marko').property('age',29)), (lambda g, xx1=None:g.V().as_('v').merge_e(xx1).option(Merge.on_create,None).option(Merge.out_v,__.select('v')).option(Merge.in_v,__.select('v'))), (lambda g, xx1=None:g.E()), (lambda g, xx1=None:g.V())], 
@@ -649,7 +873,7 @@
     'g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX': [(lambda g, xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').as_('a').addV('person').property('name','vadas').as_('b')), (lambda g, xx1=None,xx3=None,xx2=None:g.withSideEffect('c',xx2).withSideEffect('m',xx3).merge_e(xx1).option(Merge.on_create,__.select('c')).option(Merge.on_match,__.select('m'))), (lambda g, xx1=None,xx3=None,xx2=None:g.V()), (lambda g, xx1=None,xx3=None,xx2=None:g.E()), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('created','Y')), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('created','N'))], 
     'g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction': [(lambda g, xx1=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')), (lambda g, xx1=None:g.merge_e(xx1)), (lambda g, xx1=None:g.V().has('person','name','marko').out('knows').has('person','name','vadas'))], 
     'g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX': [(lambda g, xx1=None,xx2=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')), (lambda g, xx1=None,xx2=None:g.inject(xx1,xx2).merge_e()), (lambda g, xx1=None,xx2=None:g.V()), (lambda g, xx1=None,xx2=None:g.E()), (lambda g, xx1=None,xx2=None:g.V().has('person','name','marko').out('knows').has('person','name','vadas')), (lambda g, xx1=None,xx2=None:g.V().has('person','name','vadas').out('self').has('person','name','vadas'))], 
-    'g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists': [(lambda g, xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').as_('a').addV('person').property('name','vadas').as_('b').addE('knows').property('weight',1).from_('a').to('b')), (lambda g, xx1=None,xx3=None,xx2=None:g.withSideEffect('c',xx2).withSideEffect('m',xx3).merge_e(xx1).option(Merge.on_create,__.select('c')).option(Merge.on_match,__.sideEffect(__.properties('weight').drop()).select('m'))), (lambda g, xx1=None,xx3=None,xx2=None:g.V()), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('created','Y')), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('created','N')), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('weight'))], 
+    'g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists': [(lambda g, xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').as_('a').addV('person').property('name','vadas').as_('b').addE('knows').property('weight',float(1.0)).from_('a').to('b')), (lambda g, xx1=None,xx3=None,xx2=None:g.withSideEffect('c',xx2).withSideEffect('m',xx3).merge_e(xx1).option(Merge.on_create,__.select('c')).option(Merge.on_match,__.sideEffect(__.properties('weight').drop()).select('m'))), (lambda g, xx1=None,xx3=None,xx2=None:g.V()), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('created','Y')), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('created','N')), (lambda g, xx1=None,xx3=None,xx2=None:g.E().hasLabel('knows').has('weight'))], 
     'g_mergeE_with_outVinV_options_map': [(lambda g, xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')), (lambda g, xx1=None,xx3=None,xx2=None:g.merge_e(xx1).option(Merge.out_v,xx2).option(Merge.in_v,xx3)), (lambda g, xx1=None,xx3=None,xx2=None:g.V()), (lambda g, xx1=None,xx3=None,xx2=None:g.V().has('name','marko').out('knows').has('name','vadas'))], 
     'g_mergeE_with_outVinV_options_select': [(lambda g, xx1=None,vid2=None,vid1=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')), (lambda g, xx1=None,vid2=None,vid1=None:g.V(vid1).as_('x').V(vid2).as_('y').merge_e(xx1).option(Merge.out_v,__.select('x')).option(Merge.in_v,__.select('y'))), (lambda g, xx1=None,vid2=None,vid1=None:g.V()), (lambda g, xx1=None,vid2=None,vid1=None:g.V().has('name','marko').out('knows').has('name','vadas'))], 
     'g_mergeE_with_eid_specified_and_inheritance_1': [(lambda g, xx1=None,xx2=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')), (lambda g, xx1=None,xx2=None:g.merge_e(xx1).option(Merge.on_create,xx2)), (lambda g, xx1=None,xx2=None:g.V()), (lambda g, xx1=None,xx2=None:g.E()), (lambda g, xx1=None,xx2=None:g.E('201')), (lambda g, xx1=None,xx2=None:g.V().has('name','marko').out('knows').has('name','vadas'))], 
@@ -713,6 +937,16 @@
     'g_mergeV_hidden_label_value_onCreate_prohibited': [(lambda g, xx1=None:g.merge_v({}).option(Merge.on_create,xx1))], 
     'g_mergeV_hidden_id_key_onMatch_matched_prohibited': [(lambda g, xx1=None:g.addV('vertex')), (lambda g, xx1=None:g.merge_v({}).option(Merge.on_match,xx1))], 
     'g_mergeV_hidden_label_key_matched_onMatch_matched_prohibited': [(lambda g, xx1=None:g.addV('vertex')), (lambda g, xx1=None:g.merge_v({}).option(Merge.on_match,xx1))], 
+    'g_mergeVXname_markoX_optionXonMatch_age_listX33XX': [(lambda g:g.addV('person').property('name','marko').property(Cardinality.list_,'age',29).property(Cardinality.list_,'age',31).property(Cardinality.list_,'age',32)), (lambda g:g.merge_v({'name':'marko'}).option(Merge.on_match,{'age':CardinalityValue.list_(33)})), (lambda g:g.V().has('person','name','marko').has('age',33)), (lambda g:g.V().has('person','name','marko').has('age')), (lambda g:g.V().has('person','name','marko').properties('age'))], 
+    'g_mergeVXname_markoX_optionXonMatch_age_setX33XX': [(lambda g:g.addV('person').property('name','marko').property(Cardinality.list_,'age',29).property(Cardinality.list_,'age',31).property(Cardinality.list_,'age',32)), (lambda g:g.merge_v({'name':'marko'}).option(Merge.on_match,{'age':CardinalityValue.set_(33)})), (lambda g:g.V().has('person','name','marko').has('age',33)), (lambda g:g.V().has('person','name','marko').has('age')), (lambda g:g.V().has('person','name','marko').properties('age'))], 
+    'g_mergeVXname_markoX_optionXonMatch_age_setX31XX': [(lambda g:g.addV('person').property('name','marko').property(Cardinality.list_,'age',29).property(Cardinality.list_,'age',31).property(Cardinality.list_,'age',32)), (lambda g:g.merge_v({'name':'marko'}).option(Merge.on_match,{'age':CardinalityValue.set_(31)})), (lambda g:g.V().has('person','name','marko').has('age',31)), (lambda g:g.V().has('person','name','marko').has('age')), (lambda g:g.V().has('person','name','marko').properties('age'))], 
+    'g_mergeVXname_markoX_optionXonMatch_age_singleX33XX': [(lambda g:g.addV('person').property('name','marko').property(Cardinality.list_,'age',29).property(Cardinality.list_,'age',31).property(Cardinality.list_,'age',32)), (lambda g:g.merge_v({'name':'marko'}).option(Merge.on_match,{'age':CardinalityValue.single(33)})), (lambda g:g.V().has('person','name','marko').has('age',33)), (lambda g:g.V().has('person','name','marko').has('age')), (lambda g:g.V().has('person','name','marko').properties('age'))], 
+    'g_mergeVXname_markoX_optionXonMatch_age_33_singleX': [(lambda g:g.addV('person').property('name','marko').property(Cardinality.list_,'age',29).property(Cardinality.list_,'age',31).property(Cardinality.list_,'age',32)), (lambda g:g.merge_v({'name':'marko'}).option(Merge.on_match,{'age':33},Cardinality.single)), (lambda g:g.V().has('person','name','marko').has('age',33)), (lambda g:g.V().has('person','name','marko').has('age')), (lambda g:g.V().has('person','name','marko').properties('age'))], 
+    'g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX': [(lambda g:g.addV('person').property('name','marko').property(Cardinality.list_,'age',29).property(Cardinality.list_,'age',31).property(Cardinality.list_,'age',32)), (lambda g:g.merge_v({'name':'marko'}).option(Merge.on_match,{'name':'allen','age':CardinalityValue.set_(31)},Cardinality.single)), (lambda g:g.V().has('person','name','marko')), (lambda g:g.V().has('person','name','allen').has('age',31)), (lambda g:g.V().has('person','name','allen').has('age')), (lambda g:g.V().has('person','name','allen').properties('age'))], 
+    'g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX': [(lambda g:g.addV('person').property('name','marko').property(Cardinality.list_,'age',29).property(Cardinality.list_,'age',31).property(Cardinality.list_,'age',32)), (lambda g:g.merge_v({'name':'marko'}).option(Merge.on_match,{'name':'allen','age':CardinalityValue.single(31)},Cardinality.single)), (lambda g:g.V().has('person','name','marko')), (lambda g:g.V().has('person','name','allen').has('age',33)), (lambda g:g.V().has('person','name','allen').has('age',31)), (lambda g:g.V().has('person','name','allen').has('age')), (lambda g:g.V().has('person','name','allen').properties('age'))], 
+    'g_mergeVXname_aliceX_optionXonCreate_age_singleX81XX': [(lambda g:g.merge_v({'name':'alice',T.label:'person'}).option(Merge.on_create,{'age':CardinalityValue.single(81)})), (lambda g:g.V().has('person','name','alice').has('age',81)), (lambda g:g.V().has('person','name','alice').has('age')), (lambda g:g.V().has('person','name','alice').properties('age'))], 
+    'g_mergeVXname_aliceX_optionXonCreate_age_setX81XX': [(lambda g:g.merge_v({'name':'alice',T.label:'person'}).option(Merge.on_create,{'age':CardinalityValue.set_(81)})), (lambda g:g.V().has('person','name','alice').has('age',81)), (lambda g:g.V().has('person','name','alice').has('age')), (lambda g:g.V().has('person','name','alice').properties('age'))], 
+    'g_mergeVXname_aliceX_optionXonCreate_age_singleX81X_age_81_setX': [(lambda g:g.merge_v({'name':'alice',T.label:'person'}).option(Merge.on_create,{'age':81},Cardinality.set_)), (lambda g:g.V().has('person','name','alice').has('age',81)), (lambda g:g.V().has('person','name','alice').has('age')), (lambda g:g.V().has('person','name','alice').properties('age'))], 
     'g_mergeV_hidden_label_key_onMatch_matched_prohibited': [(lambda g, xx1=None:g.merge_v({}).option(Merge.on_match,xx1))], 
     'g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_match': [(lambda g, xx1=None,xx2=None:g.addV('person').property('name','marko').property('age',29)), (lambda g, xx1=None,xx2=None:g.inject(xx1,xx1,xx2).fold().merge_v(__.limit(Scope.local,1)).option(Merge.on_create,__.range_(Scope.local,1,2)).option(Merge.on_match,__.tail(Scope.local))), (lambda g, xx1=None,xx2=None:g.V().has('person','name','marko').has('created','N')), (lambda g, xx1=None,xx2=None:g.V())], 
     'g_injectXlist1_list2X_mergeVXlimitXlocal_1XX_optionXonCreate_rangeXlocal_1_2X_optionXonMatch_tailXlocalXX_to_create': [(lambda g, xx1=None,xx2=None:g.addV('person').property('name','marko').property('age',29)), (lambda g, xx1=None,xx2=None:g.inject(xx1,xx1,xx2).fold().merge_v(__.limit(Scope.local,1)).option(Merge.on_create,__.range_(Scope.local,1,2)).option(Merge.on_match,__.tail(Scope.local))), (lambda g, xx1=None,xx2=None:g.V().has('person','name','stephen').hasNot('created')), (lambda g, xx1=None,xx2=None:g.V())], 
@@ -787,6 +1021,23 @@
     'g_V_peerPressure_hasXclusterX': [(lambda g:g.V().peerPressure().has('gremlin.peerPressureVertexProgram.cluster'))], 
     'g_V_peerPressure_withXpropertyName_clusterX_withXedges_outEXknowsXX_pageRankX1X_byXrankX_withXedges_outEXknowsX_withXtimes_2X_group_byXclusterX_byXrank_sumX_limitX100X': [(lambda g:g.V().peerPressure().with_('~tinkerpop.peerPressure.propertyName','cluster').with_('~tinkerpop.peerPressure.edges',__.outE('knows')).pageRank(float(1.0)).with_('~tinkerpop.pageRank.propertyName','rank').with_('~tinkerpop.pageRank.edges',__.outE('knows')).with_('~tinkerpop.pageRank.times',1).group().by('cluster').by(__.rank.sum_())[0:100])], 
     'g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXedges_outEX_withyXpropertyName_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX': [(lambda g:g.V().has('name','ripple').in_('created').peerPressure().with_('~tinkerpop.peerPressure.edges',__.outE()).with_('~tinkerpop.peerPressure.propertyName','cluster').repeat(__.union(__.identity(),__.both())).times(2).dedup().valueMap('name','cluster'))], 
+    'g_injectXnullX_productXinjectX1XX': [(lambda g:g.inject(None).product(__.inject(1)))], 
+    'g_V_valuesXnameX_productXV_foldX': [(lambda g:g.V().name.product(__.V().fold()))], 
+    'g_V_fold_productXconstantXnullXX': [(lambda g:g.V().fold().product(__.constant(None)))], 
+    'g_V_fold_productXVX': [(lambda g:g.V().fold().product(__.V()))], 
+    'g_V_valuesXnameX_fold_productX2X': [(lambda g:g.V().name.fold().product(2))], 
+    'g_V_valuesXnameX_fold_productXnullX': [(lambda g:g.V().name.fold().product(None))], 
+    'g_V_valuesXnonexistantX_fold_productXV_valuesXnameX_foldX': [(lambda g:g.V().nonexistant.fold().product(__.V().name.fold()))], 
+    'g_V_valuesXnameX_fold_productXV_valuesXnonexistantX_foldX': [(lambda g:g.V().name.fold().product(__.V().nonexistant.fold()))], 
+    'g_V_valuesXageX_order_byXdescX_limitX3X_fold_productXV_valuesXageX_order_byXascX_limitX2X_foldX_unfold': [(lambda g:g.V().age.order().by(Order.desc)[0:3].fold().product(__.V().age.order().by(Order.asc)[0:2].fold()).unfold())], 
+    'g_V_out_path_byXvaluesXnameX_toUpperX_productXMARKOX_unfold': [(lambda g, xx1=None:g.V().out().path().by(__.name.to_upper()).product(xx1).unfold())], 
+    'g_injectXmarkoX_productXV_valuesXnameX_order_foldX_unfold': [(lambda g, xx1=None:g.inject(xx1).product(__.V().name.order().fold()).unfold())], 
+    'g_V_valueMapXlocationX_selectXvaluesX_unfold_productXdulles_seattle_vancouverX_unfold': [(lambda g, xx1=None:g.V().valueMap('location').select(Column.values).unfold().product(xx1).unfold())], 
+    'g_V_valuesXageX_order_byXascX_fold_productXconstantX27X_foldX_unfold': [(lambda g:g.V().age.order().by(Order.asc).fold().product(__.constant(27).fold()).unfold())], 
+    'g_V_out_out_path_byXnameX_productXdave_kelvinX_unfold': [(lambda g, xx1=None:g.V().out().out().path().by('name').product(xx1).unfold())], 
+    'g_injectXa_null_bX_productXa_cX_unfold': [(lambda g, xx1=None,xx2=None:g.inject(xx1).product(xx2).unfold())], 
+    'g_injectXa_null_bX_productXa_null_cX_unfold': [(lambda g, xx1=None,xx2=None:g.inject(xx1).product(xx2).unfold())], 
+    'g_injectX3_threeX_productXfive_three_7X_unfold': [(lambda g, xx1=None,xx2=None:g.inject(xx1).product(xx2).unfold())], 
     'g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX': [(lambda g:g.V().hasLabel('person').project('a','b').by(__.outE().count()).by('age'))], 
     'g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX': [(lambda g:g.V().out('created').project('a','b').by('name').by(__.in_('created').count()).order().by(__.select('b'),Order.desc).select('a'))], 
     'g_V_valueMap_projectXxX_byXselectXnameXX': [(lambda g:g.V().valueMap().project('x').by(__.select('name')))], 
@@ -797,6 +1048,28 @@
     'g_V_hasXageX_propertiesXage_nameX_value': [(lambda g:g.V().has('age').properties('age','name').value())], 
     'g_V_propertiesXname_age_nullX_value': [(lambda g:g.V().properties('name','age',None).value())], 
     'g_V_valuesXname_age_nullX': [(lambda g:g.V().values('name','age',None))], 
+    'g_injectX__feature___test__nullX_rTrim': [(lambda g:g.inject('feature  ','one test ',None,'',' ').rTrim())], 
+    'g_injectX__feature__X_rTrim': [(lambda g:g.inject('  feature  ').rTrim())], 
+    'g_injectXListXa_bXX_rTrim': [(lambda g, xx1=None:g.inject(xx1).rTrim())], 
+    'g_injectXListX1_2XX_rTrimXlocalX': [(lambda g, xx1=None:g.inject(xx1).rTrim(Scope.local))], 
+    'g_V_valuesXnameX_rTrim': [(lambda g:g.addV('person').property('name',' marko ').property('age',29).as_('marko').addV('person').property('name','  vadas  ').property('age',27).as_('vadas').addV('software').property('name','  lop').property('lang','java').as_('lop').addV('person').property('name','josh  ').property('age',32).as_('josh').addV('software').property('name','   ripple   ').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.rTrim())], 
+    'g_V_valuesXnameX_order_fold_rTrimXlocalX': [(lambda g:g.addV('person').property('name',' marko ').property('age',29).as_('marko').addV('person').property('name','  vadas  ').property('age',27).as_('vadas').addV('software').property('name','  lop').property('lang','java').as_('lop').addV('person').property('name','josh  ').property('age',32).as_('josh').addV('software').property('name','   ripple   ').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.order().fold().rTrim(Scope.local))], 
+    'g_injectXthat_this_test_nullX_replaceXh_jX': [(lambda g:g.inject('that','this','test',None).replace('h','j'))], 
+    'g_injectXthat_this_test_nullX_fold_replaceXlocal_h_jX': [(lambda g:g.inject('that','this','test',None).fold().replace(Scope.local,'h','j'))], 
+    'g_injectXListXa_bXcX_replaceXa_bX': [(lambda g, xx1=None:g.inject(xx1).replace('a','b'))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_replaceXnull_iX': [(lambda g:g.V().hasLabel('software').name.replace(None,'g'))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_replaceXa_iX': [(lambda g:g.V().hasLabel('software').name.replace('p','g'))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_order_fold_replaceXloacl_a_iX': [(lambda g:g.V().hasLabel('software').name.order().fold().replace(Scope.local,'p','g'))], 
+    'g_injectXfeature_test_nullX_reverse': [(lambda g:g.inject('feature','test one',None).reverse())], 
+    'g_V_valuesXnameX_reverse': [(lambda g:g.V().name.reverse())], 
+    'g_V_valuesXageX_reverse': [(lambda g:g.V().age.reverse())], 
+    'g_V_out_path_byXnameX_reverse': [(lambda g:g.V().out().path().by('name').reverse())], 
+    'g_V_out_out_path_byXnameX_reverse': [(lambda g:g.V().out().out().path().by('name').reverse())], 
+    'g_V_valuesXageX_fold_orderXlocalX_byXdescX_reverse': [(lambda g:g.V().age.fold().order(Scope.local).by(Order.desc).reverse())], 
+    'g_V_valuesXnameX_fold_orderXlocalX_by_reverse': [(lambda g:g.V().name.fold().order(Scope.local).by().reverse())], 
+    'g_injectXnullX_reverse': [(lambda g:g.inject(None).reverse())], 
+    'g_injectXbX_reverse': [(lambda g:g.inject('b').reverse())], 
+    'g_injectX3_threeX_reverse': [(lambda g, xx1=None:g.inject(xx1).reverse())], 
     'g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX': [(lambda g, vid1=None:g.V(vid1).as_('a').out('knows').as_('b').select('a','b'))], 
     'g_VX1X_asXaX_outXknowsX_asXbX_selectXa_bX_byXnameX': [(lambda g, vid1=None:g.V(vid1).as_('a').out('knows').as_('b').select('a','b').by('name'))], 
     'g_VX1X_asXaX_outXknowsX_asXbX_selectXaX': [(lambda g, vid1=None:g.V(vid1).as_('a').out('knows').as_('b').select('a'))], 
@@ -880,6 +1153,22 @@
     'g_V_hasXsong_name_MIGHT_AS_WELLX_shortestPath_targetXhasXsong_name_MAYBE_YOU_KNOW_HOW_I_FEELXX_edgesXoutEXfollowedByXX_distanceXweightX': [(lambda g:g.V().has('song','name','MIGHT AS WELL').shortestPath().with_('~tinkerpop.shortestPath.target',__.has('song','name','MAYBE YOU KNOW HOW I FEEL')).with_('~tinkerpop.shortestPath.edges',__.outE('followedBy')).with_('~tinkerpop.shortestPath.distance','weight'))], 
     'g_V_hasXname_markoX_shortestPath_maxDistanceX1X': [(lambda g:g.V().has('name','marko').shortestPath().with_('~tinkerpop.shortestPath.maxDistance',1))], 
     'g_V_hasXname_vadasX_shortestPath_distanceXweightX_maxDistanceX1_3X': [(lambda g:g.V().has('name','vadas').shortestPath().with_('~tinkerpop.shortestPath.distance','weight').with_('~tinkerpop.shortestPath.maxDistance',float(1.3)))], 
+    'g_injectXthat_this_testX_spiltXhX': [(lambda g:g.inject('that','this','test',None).split('h'))], 
+    'g_injectXhello_worldX_spiltXnullX': [(lambda g:g.inject('hello world').split(None))], 
+    'g_injectXListXa_bXcX_splitXa_bX': [(lambda g, xx1=None:g.inject(xx1).split('a'))], 
+    'g_V_hasLabelXpersonX_valueXnameX_splitXnullX': [(lambda g:g.V().hasLabel('person').name.split(None))], 
+    'g_V_hasLabelXpersonX_valueXnameX_order_fold_splitXlocal_aX_unfold': [(lambda g:g.V().hasLabel('person').name.order().fold().split(Scope.local,'a').unfold())], 
+    'g_injectXthat_this_testX_substringX1_8X': [(lambda g:g.inject('test','hello world',None).substring(1,8))], 
+    'g_injectXListXa_bXcX_substringX1_2X': [(lambda g, xx1=None:g.inject(xx1).substring(1,2))], 
+    'g_V_hasLabelXpersonX_valueXnameX_substringX2X': [(lambda g:g.V().hasLabel('software').name.substring(2))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_substringX1_4X': [(lambda g:g.V().hasLabel('software').name.substring(1,4))], 
+    'g_V_hasLabelXpersonX_valueXnameX_order_fold_substringXlocal_2X': [(lambda g:g.V().hasLabel('software').name.order().fold().substring(Scope.local,2))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_order_fold_substringXlocal_1_4X': [(lambda g:g.V().hasLabel('software').name.order().fold().substring(Scope.local,1,4))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_substringX1_0X': [(lambda g:g.V().hasLabel('software').name.substring(1,0))], 
+    'g_V_hasLabelXpersonX_valueXnameX_substringXneg3X': [(lambda g:g.V().hasLabel('person').name.substring(-3))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_substringX1_neg1X': [(lambda g:g.V().hasLabel('software').name.substring(1,-1))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_substringXneg4_2X': [(lambda g:g.V().hasLabel('software').name.substring(-4,2))], 
+    'g_V_hasLabelXsoftwareX_valueXnameX_substringXneg3_neg1X': [(lambda g:g.V().hasLabel('software').name.substring(-3,-1))], 
     'g_V_age_sum': [(lambda g:g.V().age.sum_())], 
     'g_V_foo_sum': [(lambda g:g.V().foo.sum_())], 
     'g_V_age_fold_sumXlocalX': [(lambda g:g.V().age.fold().sum_(Scope.local))], 
@@ -896,6 +1185,24 @@
     'g_injectXnull_10_5_nullX_sum': [(lambda g, xx1=None,xx2=None:g.inject(None,xx1,xx2,None).sum_())], 
     'g_injectXlistXnull_10_5_nullXX_sumXlocalX': [(lambda g, xx1=None:g.inject(xx1).sum_(Scope.local))], 
     'g_VX1X_valuesXageX_sumXlocalX': [(lambda g, vid1=None:g.V(vid1).age.sum_(Scope.local))], 
+    'g_injectXfeature_test_nullX_toLower': [(lambda g:g.inject('FEATURE','tESt',None).to_lower())], 
+    'g_injectXfeature_test_nullX_toLowerXlocalX': [(lambda g, xx1=None:g.inject(xx1).to_lower(Scope.local))], 
+    'g_injectXListXa_bXX_toLower': [(lambda g, xx1=None:g.inject(xx1).to_lower())], 
+    'g_V_valuesXnameX_toLower': [(lambda g:g.addV('person').property('name','MARKO').property('age',29).as_('marko').addV('person').property('name','VADAS').property('age',27).as_('vadas').addV('software').property('name','LOP').property('lang','java').as_('lop').addV('person').property('name','JOSH').property('age',32).as_('josh').addV('software').property('name','RIPPLE').property('lang','java').as_('ripple').addV('person').property('name','PETER').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.to_lower())], 
+    'g_V_valuesXnameX_toLowerXlocalX': [(lambda g:g.addV('person').property('name','MARKO').property('age',29).as_('marko').addV('person').property('name','VADAS').property('age',27).as_('vadas').addV('software').property('name','LOP').property('lang','java').as_('lop').addV('person').property('name','JOSH').property('age',32).as_('josh').addV('software').property('name','RIPPLE').property('lang','java').as_('ripple').addV('person').property('name','PETER').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.to_lower(Scope.local))], 
+    'g_V_valuesXnameX_order_fold_toLowerXlocalX': [(lambda g:g.addV('person').property('name','MARKO').property('age',29).as_('marko').addV('person').property('name','VADAS').property('age',27).as_('vadas').addV('software').property('name','LOP').property('lang','java').as_('lop').addV('person').property('name','JOSH').property('age',32).as_('josh').addV('software').property('name','RIPPLE').property('lang','java').as_('ripple').addV('person').property('name','PETER').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.order().fold().to_lower(Scope.local))], 
+    'g_injectXfeature_test_nullX_toUpper': [(lambda g:g.inject('feature','tESt',None).to_upper())], 
+    'g_injectXfeature_test_nullX_toUpperXlocalX': [(lambda g, xx1=None:g.inject(xx1).to_upper(Scope.local))], 
+    'g_injectXfeature_test_nullX_asString_toUpper': [(lambda g:g.inject('feature','tESt',None).as_string().to_upper())], 
+    'g_injectXListXa_bXX_toUpper': [(lambda g, xx1=None:g.inject(xx1).to_upper())], 
+    'g_V_valuesXnameX_toUpper': [(lambda g:g.V().name.to_upper())], 
+    'g_V_valuesXnameX_toUpperXlocalX': [(lambda g:g.V().name.to_upper(Scope.local))], 
+    'g_V_valuesXnameX_order_fold_toUpperXlocalX': [(lambda g:g.V().name.order().fold().to_upper(Scope.local))], 
+    'g_injectX__feature___test__nullX_trim': [(lambda g:g.inject('  feature  ',' one test ',None,'',' ').trim())], 
+    'g_injectXListXa_bXX_trim': [(lambda g, xx1=None:g.inject(xx1).trim())], 
+    'g_injectXListX1_2XX_trimXlocalX': [(lambda g, xx1=None:g.inject(xx1).trim(Scope.local))], 
+    'g_V_valuesXnameX_trim': [(lambda g:g.addV('person').property('name',' marko ').property('age',29).as_('marko').addV('person').property('name','  vadas  ').property('age',27).as_('vadas').addV('software').property('name','  lop').property('lang','java').as_('lop').addV('person').property('name','josh  ').property('age',32).as_('josh').addV('software').property('name','   ripple   ').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.trim())], 
+    'g_V_valuesXnameX_order_fold_trimXlocalX': [(lambda g:g.addV('person').property('name',' marko ').property('age',29).as_('marko').addV('person').property('name','  vadas  ').property('age',27).as_('vadas').addV('software').property('name','  lop').property('lang','java').as_('lop').addV('person').property('name','josh  ').property('age',32).as_('josh').addV('software').property('name','   ripple   ').property('lang','java').as_('ripple').addV('person').property('name','peter').property('age',35).as_('peter').addE('knows').from_('marko').to('vadas').property('weight',float(0.5)).addE('knows').from_('marko').to('josh').property('weight',float(1.0)).addE('created').from_('marko').to('lop').property('weight',float(0.4)).addE('created').from_('josh').to('ripple').property('weight',float(1.0)).addE('created').from_('josh').to('lop').property('weight',float(0.4)).addE('created').from_('peter').to('lop').property('weight',float(0.2))), (lambda g:g.V().name.order().fold().trim(Scope.local))], 
     'g_V_localXoutE_foldX_unfold': [(lambda g:g.V().local(__.outE().fold()).unfold())], 
     'g_V_valueMap_unfold_mapXkeyX': [(lambda g, l1=None:g.V().valueMap().unfold().map(l1))], 
     'g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold': [(lambda g, vid6=None,vid1=None:g.V(vid1).repeat(__.both().simplePath()).until(__.hasId(vid6)).path().by('name').unfold())], 
@@ -1092,6 +1399,7 @@
     'g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXvaluesXageX_isXgtX29XXX_capXxX': [(lambda g:g.withStrategies(*[TraversalStrategy('ProductiveByStrategy',{'productiveKeys':[],'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy')]).V().aggregate('x').by(__.age.is_(P.gt(29))).cap('x'))], 
     'g_V_aggregateXxX_byXout_order_byXnameXX_capXxX': [(lambda g:g.V().aggregate('x').by(__.out().order().by('name')).cap('x'))], 
     'g_withStrategiesXProductiveByStrategyX_V_aggregateXxX_byXout_order_byXnameXX_capXxX': [(lambda g:g.withStrategies(*[TraversalStrategy('ProductiveByStrategy',{'productiveKeys':[],'strategy':'org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy'}, 'org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ProductiveByStrategy')]).V().aggregate('x').by(__.out().order().by('name')).cap('x'))], 
+    'g_V_aggregateXaX_hasXperson_age_gteX30XXX_capXaX_unfold_valuesXnameX': [(lambda g:g.V().aggregate('a').has('person','age',P.gte(30)).cap('a').unfold().name)], 
     'g_V_fail': [(lambda g:g.V().fail())], 
     'g_V_failXmsgX': [(lambda g:g.V().fail('msg'))], 
     'g_V_unionXout_failX': [(lambda g:g.V().union(__.out(),__.fail()))], 
diff --git a/gremlin-python/src/main/python/setup.py b/gremlin-python/src/main/python/setup.py
index 71b17a6..2ca7e9a 100644
--- a/gremlin-python/src/main/python/setup.py
+++ b/gremlin-python/src/main/python/setup.py
@@ -76,7 +76,8 @@
         'pytest>=4.6.4,<7.2.0',
         'mock>=3.0.5,<5.0.0',
         'radish-bdd==0.13.4',
-        'PyHamcrest>=1.9.0,<3.0.0'
+        'PyHamcrest>=1.9.0,<3.0.0',
+        'PyYAML>=5.3'
     ],
     install_requires=install_requires,
     extras_require={
diff --git a/gremlin-python/src/main/python/tests/conftest.py b/gremlin-python/src/main/python/tests/conftest.py
index d1b509c..a48fb5f 100644
--- a/gremlin-python/src/main/python/tests/conftest.py
+++ b/gremlin-python/src/main/python/tests/conftest.py
@@ -25,6 +25,8 @@
 import logging
 import queue
 
+import yaml
+
 from gremlin_python.driver.client import Client
 from gremlin_python.driver.connection import Connection
 from gremlin_python.driver import serializer
@@ -38,10 +40,15 @@
 
 gremlin_server_url = os.environ.get('GREMLIN_SERVER_URL', 'ws://localhost:{}/gremlin')
 gremlin_basic_auth_url = os.environ.get('GREMLIN_SERVER_BASIC_AUTH_URL', 'wss://localhost:{}/gremlin')
+gremlin_socket_server_url = os.environ.get('GREMLIN_SOCKET_SERVER_URL', 'ws://localhost:{}/gremlin')
+gremlin_socket_server_config_path = os.environ.get("GREMLIN_SOCKET_SERVER_CONFIG_PATH",
+                                                   "../../../../../../gremlin-tools/gremlin-socket-server/conf/"
+                                                   "test-ws-gremlin.yaml")
 kerberos_hostname = os.environ.get('KRB_HOSTNAME', socket.gethostname())
 anonymous_url = gremlin_server_url.format(45940)
 basic_url = gremlin_basic_auth_url.format(45941)
 kerberos_url = gremlin_server_url.format(45942)
+
 kerberized_service = 'test-service@{}'.format(kerberos_hostname)
 gremlin_server_url_http = os.environ.get('GREMLIN_SERVER_URL_HTTP', 'http://localhost:{}/')
 gremlin_basic_auth_url_http = os.environ.get('GREMLIN_SERVER_BASIC_AUTH_URL_HTTP', 'https://localhost:{}/')
@@ -52,6 +59,7 @@
 logging.basicConfig(format='%(asctime)s [%(levelname)8s] [%(filename)15s:%(lineno)d - %(funcName)10s()] - %(message)s',
                     level=logging.DEBUG if verbose_logging else logging.INFO)
 
+
 @pytest.fixture
 def connection(request):
     protocol = GremlinServerWSProtocol(
@@ -88,6 +96,55 @@
         return client
 
 
+@pytest.fixture
+def gremlin_socket_server_serializer(socket_server_settings):
+    if socket_server_settings["SERIALIZER"] == "GraphBinaryV1":
+        return serializer.GraphBinarySerializersV1()
+    elif socket_server_settings["SERIALIZER"] == "GraphSONV2":
+        return serializer.GraphSONSerializersV2d0()
+    elif socket_server_settings["SERIALIZER"] == "GraphSONV3":
+        return serializer.GraphSONSerializersV3d0()
+    else:
+        return serializer.GraphBinarySerializersV1()
+
+
+@pytest.fixture
+def socket_server_client(request, socket_server_settings, gremlin_socket_server_serializer):
+    url = gremlin_socket_server_url.format(socket_server_settings["PORT"])
+    try:
+        client = Client(url, 'g', pool_size=1, message_serializer=gremlin_socket_server_serializer)
+    except OSError:
+        pytest.skip('Gremlin Socket Server is not running')
+    else:
+        def fin():
+            client.close()
+
+        request.addfinalizer(fin)
+        return client
+
+
+@pytest.fixture
+def socket_server_client_no_user_agent(request, socket_server_settings, gremlin_socket_server_serializer):
+    url = gremlin_socket_server_url.format(socket_server_settings["PORT"])
+    try:
+        client = Client(url, 'g', pool_size=1, message_serializer=gremlin_socket_server_serializer,
+                        enable_user_agent_on_connect=False)
+    except OSError:
+        pytest.skip('Gremlin Socket Server is not running')
+    else:
+        def fin():
+            client.close()
+
+        request.addfinalizer(fin)
+        return client
+
+
+@pytest.fixture
+def socket_server_settings():
+    with open(gremlin_socket_server_config_path, mode="rb") as file:
+        settings = yaml.safe_load(file)
+    return settings
+
 @pytest.fixture(params=['basic', 'kerberos'])
 def authenticated_client(request):
     try:
@@ -136,6 +193,30 @@
 
 
 @pytest.fixture(params=['graphsonv2', 'graphsonv3', 'graphbinaryv1'])
+def remote_connection_crew(request):
+    try:
+        if request.param == 'graphbinaryv1':
+            remote_conn = DriverRemoteConnection(anonymous_url, 'gcrew',
+                                                 message_serializer=serializer.GraphBinarySerializersV1())
+        elif request.param == 'graphsonv2':
+            remote_conn = DriverRemoteConnection(anonymous_url, 'gcrew',
+                                                 message_serializer=serializer.GraphSONSerializersV2d0())
+        elif request.param == 'graphsonv3':
+            remote_conn = DriverRemoteConnection(anonymous_url, 'gcrew',
+                                                 message_serializer=serializer.GraphSONSerializersV3d0())
+        else:
+            raise ValueError("Invalid serializer option - " + request.param)
+    except OSError:
+        pytest.skip('Gremlin Server is not running')
+    else:
+        def fin():
+            remote_conn.close()
+
+        request.addfinalizer(fin)
+        return remote_conn
+
+
+@pytest.fixture(params=['graphsonv2', 'graphsonv3', 'graphbinaryv1'])
 def remote_transaction_connection(request):
     try:
         if request.param == 'graphbinaryv1':
diff --git a/gremlin-python/src/main/python/tests/driver/test_client.py b/gremlin-python/src/main/python/tests/driver/test_client.py
index 9bff038..3d84994 100644
--- a/gremlin-python/src/main/python/tests/driver/test_client.py
+++ b/gremlin-python/src/main/python/tests/driver/test_client.py
@@ -27,7 +27,7 @@
 from gremlin_python.driver.request import RequestMessage
 from gremlin_python.process.graph_traversal import __
 from gremlin_python.process.strategies import OptionsStrategy
-from gremlin_python.structure.graph import Graph
+from gremlin_python.structure.graph import Graph, Vertex
 from gremlin_python.driver.aiohttp.transport import AiohttpTransport
 from gremlin_python.statics import *
 from asyncio import TimeoutError
@@ -159,6 +159,25 @@
     assert asyncio.get_event_loop().run_until_complete(async_connect(True))
 
 
+def test_client_gremlin(client):
+    result_set = client.submit('g.V(1)')
+    result = result_set.all().result()
+    assert 1 == len(result)
+    vertex = result[0]
+    assert type(vertex) is Vertex
+    assert 1 == vertex.id
+    assert 2 == len(vertex.properties)
+    assert 'name' == vertex.properties[0].key
+    assert 'marko' == vertex.properties[0].value
+    ##
+    result_set = client.submit('g.with("materializeProperties", "tokens").V(1)')
+    result = result_set.all().result()
+    assert 1 == len(result)
+    vertex = result[0]
+    assert 1 == vertex.id
+    assert 0 == len(vertex.properties)
+
+
 def test_client_bytecode(client):
     g = Graph().traversal()
     t = g.V()
diff --git a/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py b/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py
new file mode 100644
index 0000000..66848bd
--- /dev/null
+++ b/gremlin-python/src/main/python/tests/driver/test_web_socket_client_behavior.py
@@ -0,0 +1,93 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+__author__ = 'Cole Greer (cole@colegreer.ca)'
+
+
+import re
+import operator
+from functools import reduce
+from gremlin_python.driver import useragent
+
+
+# Note: This test demonstrates different behavior in response to a server sending a close frame than the other GLV's.
+# Other GLV's will respond to this by trying to reconnect. This test is also demonstrating incorrect behavior of
+# client.is_closed() as it appears unaware that the event loop is dead.
+# These differences from other GLV's are being tracked in [TINKERPOP-2846]. If this behavior is changed to resemble
+# other GLV's, this test should be updated to show a vertex is being received by the second request.
+def test_does_not_create_new_connection_if_closed_by_server(socket_server_client, socket_server_settings):
+    try:
+        socket_server_client.submit(
+            "1", request_options={'requestId': socket_server_settings["CLOSE_CONNECTION_REQUEST_ID"]}).all().result()
+    except RuntimeError as err:
+        assert str(err) == "Connection was closed by server."
+
+    assert not socket_server_client.is_closed()
+
+    try:
+        response = socket_server_client.submit(
+            "1", request_options={'requestId': socket_server_settings["SINGLE_VERTEX_REQUEST_ID"]}).all().result()
+    except RuntimeError as err:
+        assert str(err) == "Event loop is closed"
+
+    assert not socket_server_client.is_closed()
+
+
+# Tests that client is correctly sending user agent during web socket handshake by having the server return
+# the captured user agent.
+def test_should_include_user_agent_in_handshake_request(socket_server_client, socket_server_settings):
+    user_agent_response = socket_server_client.submit(
+        "1", request_options={'requestId': socket_server_settings["USER_AGENT_REQUEST_ID"]}).one()[0]
+
+    assert user_agent_response == useragent.userAgent
+
+
+# Tests that no user agent (other than the default one provided by aiohttp) is sent to server when that
+# behaviour is disabled.
+def test_should_not_include_user_agent_in_handshake_request_if_disabled(socket_server_client_no_user_agent,
+                                                                        socket_server_settings):
+    user_agent_response = socket_server_client_no_user_agent.submit(
+        "1", request_options={'requestId': socket_server_settings["USER_AGENT_REQUEST_ID"]}).one()[0]
+
+    # If the gremlin user agent is disabled, the underlying web socket library reverts to sending its default user agent
+    # during connection requests.
+    assert re.search("^Python/(\d\.)*\d aiohttp/(\d\.)*\d", user_agent_response)
+
+# Tests that client is correctly sending all overridable per request settings (requestId, batchSize,
+# evaluationTimeout, and userAgent) to the server.
+def test_should_send_per_request_settings_to_server(socket_server_client, socket_server_settings):
+
+    result = socket_server_client.submit(
+        "1", request_options={
+            'requestId': socket_server_settings["PER_REQUEST_SETTINGS_REQUEST_ID"],
+            'evaluationTimeout': 1234,
+            'batchSize': 12,
+            'userAgent': "helloWorld",
+            'materializeProperties': "tokens"
+        }).all().result()
+
+    expected_result = "requestId={} evaluationTimeout={}, batchSize={}, userAgent={}, materializeProperties={}".format(
+        socket_server_settings["PER_REQUEST_SETTINGS_REQUEST_ID"], 1234, 12, "helloWorld", "tokens"
+    )
+
+    # Socket Server is sending a simple string response which after being serialized in and out of graphBinary,
+    # becomes a list of length 1 strings. This operation folds the list back to a single string for comparison.
+    result = reduce(operator.add, result)
+
+    assert result == expected_result
diff --git a/gremlin-python/src/main/python/tests/process/test_translator.py b/gremlin-python/src/main/python/tests/process/test_translator.py
index eb055e2..14d8c22 100644
--- a/gremlin-python/src/main/python/tests/process/test_translator.py
+++ b/gremlin-python/src/main/python/tests/process/test_translator.py
@@ -359,6 +359,13 @@
                       "g.withStrategies(VertexProgramStrategy).V().shortestPath().with('~tinkerpop.shortestPath.target',__.has('name','peter'))"])

 

         # 99

+        tests.append([g.V().coalesce(__.E(),__.addE('person')),

+                     "g.V().coalesce(__.E(),__.addE('person'))"])

+        # 100

+        tests.append([g.inject(1).E(),

+                     "g.inject(1).E()"])

+

+        # 99

         tests.append([g.V().has("p1", starting_with("foo")),

                       "g.V().has('p1',startingWith('foo'))"])

 

diff --git a/gremlin-python/src/main/python/tests/process/test_traversal.py b/gremlin-python/src/main/python/tests/process/test_traversal.py
index 35c2ae2..a117f29 100644
--- a/gremlin-python/src/main/python/tests/process/test_traversal.py
+++ b/gremlin-python/src/main/python/tests/process/test_traversal.py
@@ -35,10 +35,6 @@
 anonymous_url = gremlin_server_url.format(45940)
 
 
-def transactions_disabled():
-    return (os.environ['TEST_TRANSACTIONS'] != 'true') if 'TEST_TRANSACTIONS' in os.environ else False
-
-
 class TestTraversal(object):
     def test_bytecode(self):
         g = traversal().withGraph(Graph())
@@ -154,7 +150,6 @@
         except TypeError:
             pass
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_transaction_commit(self, remote_transaction_connection):
         # Start a transaction traversal.
         g = traversal().withRemote(remote_transaction_connection)
@@ -178,7 +173,6 @@
         drop_graph_check_count(g)
         verify_gtx_closed(gtx)
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_transaction_rollback(self, remote_transaction_connection):
         # Start a transaction traversal.
         g = traversal().withRemote(remote_transaction_connection)
@@ -202,7 +196,6 @@
         drop_graph_check_count(g)
         verify_gtx_closed(gtx)
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_transaction_no_begin(self, remote_transaction_connection):
         # Start a transaction traversal.
         g = traversal().withRemote(remote_transaction_connection)
@@ -254,7 +247,6 @@
         tx.rollback()
         assert not tx.isOpen()
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_multi_commit_transaction(self, remote_transaction_connection):
         # Start a transaction traversal.
         g = traversal().withRemote(remote_transaction_connection)
@@ -285,7 +277,6 @@
         verify_tx_state([tx1, tx2], False)
         assert g.V().count().next() == start_count + 3
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_multi_rollback_transaction(self, remote_transaction_connection):
         # Start a transaction traversal.
         g = traversal().withRemote(remote_transaction_connection)
@@ -316,7 +307,6 @@
         verify_tx_state([tx1, tx2], False)
         assert g.V().count().next() == start_count
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_multi_commit_and_rollback(self, remote_transaction_connection):
         # Start a transaction traversal.
         g = traversal().withRemote(remote_transaction_connection)
@@ -347,7 +337,6 @@
         verify_tx_state([tx1, tx2], False)
         assert g.V().count().next() == start_count + 2
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_transaction_close_tx(self):
         remote_conn = create_connection_to_gtx()
         g = traversal().withRemote(remote_conn)
@@ -383,7 +372,6 @@
 
         drop_graph_check_count(g)
 
-    @pytest.mark.skipif(transactions_disabled(), reason="Transactions are not enabled.")
     def test_transaction_close_tx_from_parent(self):
         remote_conn = create_connection_to_gtx()
         g = traversal().withRemote(remote_conn)
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py b/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py
index c0c8dc9..5f5f7f0 100644
--- a/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py
+++ b/gremlin-python/src/main/python/tests/structure/io/test_functionalityio.py
@@ -25,6 +25,61 @@
 from gremlin_python.statics import *
 
 
+def test_vertex(remote_connection):
+    g = Graph().traversal().with_remote(remote_connection)
+    vertex = g.V(1).next()
+    assert vertex.id == 1
+    assert vertex.label == 'person'
+    assert len(vertex.properties) == 2
+    assert vertex.properties[0].key == 'name'
+    assert vertex.properties[0].value == 'marko'
+    assert vertex.properties[1].key == 'age'
+    assert vertex.properties[1].value == 29
+
+
+def test_vertex_without_properties(remote_connection):
+    g = Graph().traversal().with_remote(remote_connection)
+    vertex = g.with_('materializeProperties', 'tokens').V(1).next()
+    assert vertex.id == 1
+    assert vertex.label == 'person'
+    # empty array for GraphBinary and missing field for GraphSON
+    assert vertex.properties is None or len(vertex.properties) == 0
+
+
+def test_edge(remote_connection):
+    g = Graph().traversal().with_remote(remote_connection)
+    edge = g.E(7).next()
+    assert edge.id == 7
+    assert edge.label == 'knows'
+    assert len(edge.properties) == 1
+    assert edge.properties[0].key == 'weight'
+    assert edge.properties[0].value == 0.5
+
+
+def test_edge_without_properties(remote_connection):
+    g = Graph().traversal().with_remote(remote_connection)
+    edge = g.with_('materializeProperties', 'tokens').E(7).next()
+    assert edge.id == 7
+    assert edge.label == 'knows'
+    # empty array for GraphBinary and missing field for GraphSON
+    assert edge.properties is None or len(edge.properties) == 0
+
+
+def test_vertex_vertex_properties(remote_connection_crew):
+    g = Graph().traversal().withRemote(remote_connection_crew)
+    vertex = g.V(7).next()
+    assert vertex.id == 7
+    assert vertex.label == 'person'
+    assert len(vertex.properties) == 4
+    assert vertex.properties[1].key == 'location'
+    assert vertex.properties[1].value == 'centreville'
+    assert len(vertex.properties[1].properties) == 2
+    assert vertex.properties[1].properties[0].key == 'startTime'
+    assert vertex.properties[1].properties[0].value == 1990
+    assert vertex.properties[1].properties[1].key == 'endTime'
+    assert vertex.properties[1].properties[1].value == 2000
+
+
 def test_timestamp(remote_connection):
     g = Graph().traversal().withRemote(remote_connection)
     ts = timestamp(1481750076295 / 1000)
diff --git a/gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py b/gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py
index a08ed95..f89c84c 100644
--- a/gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py
+++ b/gremlin-python/src/main/python/tests/structure/io/test_graphsonV2d0.py
@@ -159,6 +159,7 @@
         assert 1 == vertex.id
         assert isinstance(vertex.id, int)
         assert vertex == Vertex(1)
+        assert 2 == len(vertex.properties)
         ##
         vertex = self.graphson_reader.read_object("""
         {"@type":"g:Vertex", "@value":{"id":{"@type":"g:Float","@value":45.23}}}""")
diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml
index 726c007..58429c2 100644
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@ -27,9 +27,9 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-classic.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 metrics: {
   slf4jReporter: {enabled: true, interval: 180000}}
 strictTransactionManagement: false
diff --git a/gremlin-server/conf/gremlin-server-modern-readonly.yaml b/gremlin-server/conf/gremlin-server-modern-readonly.yaml
index 1f81f9e..de0a84a 100644
--- a/gremlin-server/conf/gremlin-server-modern-readonly.yaml
+++ b/gremlin-server/conf/gremlin-server-modern-readonly.yaml
@@ -27,9 +27,9 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-modern-readonly.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 metrics: {
   slf4jReporter: {enabled: true, interval: 180000}}
 strictTransactionManagement: false
diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml
index 70fb2ee..1a477e1 100644
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@ -28,9 +28,9 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-modern.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 metrics: {
   slf4jReporter: {enabled: true, interval: 180000}}
 strictTransactionManagement: false
diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml
index d512d06..4610890 100644
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ b/gremlin-server/conf/gremlin-server-neo4j.yaml
@@ -38,9 +38,9 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/empty-sample.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
diff --git a/gremlin-server/conf/gremlin-server-rest-modern.yaml b/gremlin-server/conf/gremlin-server-rest-modern.yaml
index 66928ac..5da2f36 100644
--- a/gremlin-server/conf/gremlin-server-rest-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-modern.yaml
@@ -28,10 +28,10 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-modern.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}          # application/vnd.gremlin-v3.0+json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
-
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}     # application/vnd.gremlin-v3.0+json;types=false
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/vnd.gremlin-v3.0+json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 metrics: {
   slf4jReporter: {enabled: true, interval: 180000}}
 strictTransactionManagement: false
diff --git a/gremlin-server/conf/gremlin-server-rest-secure.yaml b/gremlin-server/conf/gremlin-server-rest-secure.yaml
index 67a040f..30327f7 100644
--- a/gremlin-server/conf/gremlin-server-rest-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-secure.yaml
@@ -37,7 +37,7 @@
                org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin: {enableThreadInterrupt: true, timedInterrupt: 10000, compilation: COMPILE_STATIC, extensions: org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/empty-sample-secure.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
diff --git a/gremlin-server/conf/gremlin-server-secure.yaml b/gremlin-server/conf/gremlin-server-secure.yaml
index 10384e6..9c996f4 100644
--- a/gremlin-server/conf/gremlin-server-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-secure.yaml
@@ -37,9 +37,9 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/empty-sample-secure.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
diff --git a/gremlin-server/conf/gremlin-server-spark.yaml b/gremlin-server/conf/gremlin-server-spark.yaml
index 3c07cb7..b7c6f5d 100644
--- a/gremlin-server/conf/gremlin-server-spark.yaml
+++ b/gremlin-server/conf/gremlin-server-spark.yaml
@@ -51,9 +51,9 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/spark.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
diff --git a/gremlin-server/conf/gremlin-server-transaction.yaml b/gremlin-server/conf/gremlin-server-transaction.yaml
new file mode 100644
index 0000000..1b0b397
--- /dev/null
+++ b/gremlin-server/conf/gremlin-server-transaction.yaml
@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+host: localhost
+port: 8182
+evaluationTimeout: 30000
+channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
+graphs: {
+  graph: conf/tinkertransactiongraph-empty.properties}
+scriptEngines: {
+  gremlin-groovy: {
+    plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
+               org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin: {},
+               org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
+               org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/empty-sample.groovy]}}}}
+serializers:
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+processors:
+  - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
+  - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
+metrics: {
+  consoleReporter: {enabled: true, interval: 180000},
+  csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv},
+  jmxReporter: {enabled: true},
+  slf4jReporter: {enabled: true, interval: 180000}}
+strictTransactionManagement: false
+idleConnectionTimeout: 0
+keepAliveInterval: 0
+maxInitialLineLength: 4096
+maxHeaderSize: 8192
+maxChunkSize: 8192
+maxContentLength: 10485760
+maxAccumulationBufferComponents: 1024
+resultIterationBatchSize: 64
+writeBufferLowWaterMark: 32768
+writeBufferHighWaterMark: 65536
+ssl: {
+  enabled: false}
\ No newline at end of file
diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml
index 2d9511c..eb33874 100644
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@ -28,9 +28,9 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/empty-sample.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}            # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor}
diff --git a/gremlin-server/conf/tinkertransactiongraph-empty.properties b/gremlin-server/conf/tinkertransactiongraph-empty.properties
new file mode 100644
index 0000000..bb172e4
--- /dev/null
+++ b/gremlin-server/conf/tinkertransactiongraph-empty.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerTransactionGraph
+gremlin.tinkergraph.vertexIdManager=LONG
\ No newline at end of file
diff --git a/gremlin-server/conf/tinkertransactiongraph-service.properties b/gremlin-server/conf/tinkertransactiongraph-service.properties
new file mode 100644
index 0000000..86103c1
--- /dev/null
+++ b/gremlin-server/conf/tinkertransactiongraph-service.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerTransactionGraph
+gremlin.tinkergraph.vertexIdManager=INTEGER
+gremlin.tinkergraph.edgeIdManager=INTEGER
+gremlin.tinkergraph.vertexPropertyIdManager=LONG
+gremlin.tinkergraph.service=org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerTextSearchFactory
+gremlin.tinkergraph.service=org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerDegreeCentralityFactory
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e3a78d5..2e07902 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-server</artifactId>
     <name>Apache TinkerPop :: Gremlin Server</name>
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-driver</artifactId>
+            <artifactId>gremlin-util</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -82,6 +82,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-driver</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>com.carrotsearch</groupId>
             <artifactId>junit-benchmarks</artifactId>
             <version>0.7.2</version>
@@ -99,12 +105,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>neo4j-gremlin</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>io.github.hakky54</groupId>
             <artifactId>logcaptor</artifactId>
             <scope>test</scope>
@@ -274,128 +274,6 @@
         </profile>
 
         <profile>
-            <!--
-              This profile will include neo4j for purposes of transactional testing within Gremlin Server.
-              Tests that require neo4j specifically will be "ignored" if this profile is not turned on.
-            -->
-            <id>include-neo4j</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>includeNeo4j</name>
-                </property>
-            </activation>
-            <dependencies>
-                <!-- TESTING -->
-                <!-- *** WARNING *** -->
-                <dependency>
-                    <groupId>org.neo4j</groupId>
-                    <artifactId>neo4j-tinkerpop-api-impl</artifactId>
-                    <version>0.9-3.4.0</version>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.neo4j</groupId>
-                            <artifactId>neo4j-kernel</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.commons</groupId>
-                            <artifactId>commons-lang3</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.commons</groupId>
-                            <artifactId>commons-text</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.github.ben-manes.caffeine</groupId>
-                            <artifactId>caffeine</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.scala-lang</groupId>
-                            <artifactId>scala-library</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.scala-lang</groupId>
-                            <artifactId>scala-reflect</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-nop</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.lucene</groupId>
-                            <artifactId>lucene-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>io.dropwizard.metrics</groupId>
-                            <artifactId>metrics-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>io.netty</groupId>
-                            <artifactId>netty-all</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.ow2.asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.scala-lang</groupId>
-                    <artifactId>scala-library</artifactId>
-                    <version>2.11.8</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.scala-lang</groupId>
-                    <artifactId>scala-reflect</artifactId>
-                    <version>2.11.8</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.lucene</groupId>
-                    <artifactId>lucene-core</artifactId>
-                    <version>5.5.0</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>io.dropwizard.metrics</groupId>
-                    <artifactId>metrics-core</artifactId>
-                    <version>4.2.11</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.neo4j</groupId>
-                    <artifactId>neo4j-kernel</artifactId>
-                    <version>3.4.11</version>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>io.netty</groupId>
-                            <artifactId>netty-all</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <!-- *** WARNING *** -->
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
             <id>docker-images</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
diff --git a/gremlin-server/scripts/empty-sample.groovy b/gremlin-server/scripts/empty-sample.groovy
index f3c6ac4..68f3ab4 100644
--- a/gremlin-server/scripts/empty-sample.groovy
+++ b/gremlin-server/scripts/empty-sample.groovy
@@ -37,9 +37,4 @@
 ] as LifeCycleHook]
 
 // define the default TraversalSource to bind queries to - this one will be named "g".
-// ReferenceElementStrategy converts all graph elements (vertices/edges/vertex properties)
-// to "references" (i.e. just id and label without properties). this strategy was added
-// in 3.4.0 to make all Gremlin Server results consistent across all protocols and
-// serialization formats aligning it with TinkerPop recommended practices for writing
-// Gremlin.
-globals << [g : traversal().withEmbedded(graph).withStrategies(ReferenceElementStrategy)]
\ No newline at end of file
+globals << [g : traversal().withEmbedded(graph)]
\ No newline at end of file
diff --git a/gremlin-server/scripts/generate-classic.groovy b/gremlin-server/scripts/generate-classic.groovy
index 9245b0a..9dae7b5 100644
--- a/gremlin-server/scripts/generate-classic.groovy
+++ b/gremlin-server/scripts/generate-classic.groovy
@@ -30,9 +30,4 @@
 ] as LifeCycleHook]
 
 // define the default TraversalSource to bind queries to - this one will be named "g".
-// ReferenceElementStrategy converts all graph elements (vertices/edges/vertex properties)
-// to "references" (i.e. just id and label without properties). this strategy was added
-// in 3.4.0 to make all Gremlin Server results consistent across all protocols and
-// serialization formats aligning it with TinkerPop recommended practices for writing
-// Gremlin.
-globals << [g : traversal().withEmbedded(graph).withStrategies(ReferenceElementStrategy)]
\ No newline at end of file
+globals << [g : traversal().withEmbedded(graph)]
\ No newline at end of file
diff --git a/gremlin-server/scripts/generate-modern-readonly.groovy b/gremlin-server/scripts/generate-modern-readonly.groovy
index c02e342..e646f77 100644
--- a/gremlin-server/scripts/generate-modern-readonly.groovy
+++ b/gremlin-server/scripts/generate-modern-readonly.groovy
@@ -30,9 +30,4 @@
 ] as LifeCycleHook]
 
 // define the default TraversalSource to bind queries to - this one will be named "g".
-// ReferenceElementStrategy converts all graph elements (vertices/edges/vertex properties)
-// to "references" (i.e. just id and label without properties). this strategy was added
-// in 3.4.0 to make all Gremlin Server results consistent across all protocols and
-// serialization formats aligning it with TinkerPop recommended practices for writing
-// Gremlin.
-globals << [g : traversal().withEmbedded(graph).withStrategies(ReadOnlyStrategy, ReferenceElementStrategy)]
+globals << [g : traversal().withEmbedded(graph).withStrategies(ReadOnlyStrategy)]
diff --git a/gremlin-server/scripts/generate-modern.groovy b/gremlin-server/scripts/generate-modern.groovy
index cd62e98..594402a 100644
--- a/gremlin-server/scripts/generate-modern.groovy
+++ b/gremlin-server/scripts/generate-modern.groovy
@@ -30,9 +30,4 @@
 ] as LifeCycleHook]
 
 // define the default TraversalSource to bind queries to - this one will be named "g".
-// ReferenceElementStrategy converts all graph elements (vertices/edges/vertex properties)
-// to "references" (i.e. just id and label without properties). this strategy was added
-// in 3.4.0 to make all Gremlin Server results consistent across all protocols and
-// serialization formats aligning it with TinkerPop recommended practices for writing
-// Gremlin.
-globals << [g : traversal().withEmbedded(graph).withStrategies(ReferenceElementStrategy)]
\ No newline at end of file
+globals << [g : traversal().withEmbedded(graph)]
\ No newline at end of file
diff --git a/gremlin-server/scripts/load-sample.groovy b/gremlin-server/scripts/load-sample.groovy
index 7791490..8a4bc18 100644
--- a/gremlin-server/scripts/load-sample.groovy
+++ b/gremlin-server/scripts/load-sample.groovy
@@ -43,9 +43,4 @@
 ] as LifeCycleHook]
 
 // define the default TraversalSource to bind queries to - this one will be named "g".
-// ReferenceElementStrategy converts all graph elements (vertices/edges/vertex properties)
-// to "references" (i.e. just id and label without properties). this strategy was added
-// in 3.4.0 to make all Gremlin Server results consistent across all protocols and
-// serialization formats aligning it with TinkerPop recommended practices for writing
-// Gremlin.
-globals << [g : traversal().withEmbedded(graph).withStrategies(ReferenceElementStrategy)]
\ No newline at end of file
+globals << [g : traversal().withEmbedded(graph)]
\ No newline at end of file
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 3b09663..c086ffa 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -23,11 +23,11 @@
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslProvider;
 import io.netty.handler.timeout.IdleStateHandler;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
 import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
@@ -80,7 +80,7 @@
 public abstract class AbstractChannelizer extends ChannelInitializer<SocketChannel> implements Channelizer {
     private static final Logger logger = LoggerFactory.getLogger(AbstractChannelizer.class);
     protected static final List<Settings.SerializerSettings> DEFAULT_SERIALIZERS = Arrays.asList(
-            new Settings.SerializerSettings(GraphSONMessageSerializerV2d0.class.getName(), Collections.emptyMap()),
+            new Settings.SerializerSettings(GraphSONMessageSerializerV2.class.getName(), Collections.emptyMap()),
             new Settings.SerializerSettings(GraphBinaryMessageSerializerV1.class.getName(), Collections.emptyMap()),
             new Settings.SerializerSettings(GraphBinaryMessageSerializerV1.class.getName(), new HashMap<String,Object>(){{
                 put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
index befebb4..8636954 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java
@@ -18,10 +18,13 @@
  */
 package org.apache.tinkerpop.gremlin.server;
 
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.AbstractTraverser;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceFactory;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
@@ -32,6 +35,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
@@ -53,6 +57,7 @@
     private final ScheduledExecutorService scheduledExecutorService;
     private final AtomicBoolean finalResponseWritten = new AtomicBoolean();
     private final long requestTimeout;
+    private final String materializeProperties;
     private final RequestContentType requestContentType;
     private final Object gremlinArgument;
     private final AtomicBoolean startedResponse = new AtomicBoolean(false);
@@ -94,6 +99,7 @@
         this.gremlinArgument = requestMessage.getArgs().get(Tokens.ARGS_GREMLIN);
         this.requestContentType = determineRequestContents();
         this.requestTimeout = determineTimeout();
+        this.materializeProperties = determineMaterializeProperties();
     }
 
     public void setTimeoutExecutor(final ScheduledFuture<?> timeoutExecutor) {
@@ -125,6 +131,10 @@
         return requestTimeout;
     }
 
+    public String getMaterializeProperties() {
+        return materializeProperties;
+    }
+
     public boolean isFinalResponseWritten() {
         return this.finalResponseWritten.get();
     }
@@ -293,4 +303,36 @@
 
         return timeoutDefinedInScript.orElse(seto);
     }
+
+    private String determineMaterializeProperties() {
+        // with() in Script request has the highest priority
+        if (requestContentType == RequestContentType.SCRIPT) {
+            final Optional<String> mp = GremlinScriptChecker.parse(gremlinArgument.toString()).getMaterializeProperties();
+            if (mp.isPresent())
+                return mp.get().equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)
+                        ? Tokens.MATERIALIZE_PROPERTIES_TOKENS
+                        : Tokens.MATERIALIZE_PROPERTIES_ALL;
+        }
+
+        final Map<String, Object> args = requestMessage.getArgs();
+        // all options except MATERIALIZE_PROPERTIES_TOKENS treated as MATERIALIZE_PROPERTIES_ALL
+        return args.containsKey(Tokens.ARGS_MATERIALIZE_PROPERTIES)
+                && args.get(Tokens.ARGS_MATERIALIZE_PROPERTIES).equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)
+                ? Tokens.MATERIALIZE_PROPERTIES_TOKENS
+                : Tokens.MATERIALIZE_PROPERTIES_ALL;
+    }
+
+    public void handleDetachment(final List<Object> aggregate) {
+        if (!aggregate.isEmpty() && !this.getMaterializeProperties().equals(Tokens.MATERIALIZE_PROPERTIES_ALL)) {
+            final Object firstElement = aggregate.get(0);
+
+            if (firstElement instanceof Element) {
+                for (int i = 0; i < aggregate.size(); i++)
+                    aggregate.set(i, ReferenceFactory.detach((Element) aggregate.get(i)));
+            } else if (firstElement instanceof AbstractTraverser) {
+                for (final Object item : aggregate)
+                    ((AbstractTraverser) item).detach();
+            }
+        }
+    }
 }
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
index d21de8a..bbd9ab5 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.server;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 3286d32..7a21afc 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -20,7 +20,7 @@
 
 import io.netty.handler.ssl.ClientAuth;
 import io.netty.handler.ssl.SslContext;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
 import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin;
 import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
index 4f2eb20..d3a291c 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.server.auth;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.server.Channelizer;
 
 import java.net.InetAddress;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java
index c32b78a..8028bf1 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/authz/Authorizer.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.server.authz;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
@@ -55,7 +55,7 @@
      * {@link AuthorizationException} if this is not the case.
      *
      * @param user {@link AuthenticatedUser} that needs authorization.
-     * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.driver.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
+     * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.util.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
      */
     public void authorize(final AuthenticatedUser user, final RequestMessage msg) throws AuthorizationException;
 
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
index 4b137f3..7c04e9e 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/AbstractSession.java
@@ -23,13 +23,12 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException;
 import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
@@ -737,6 +736,8 @@
         final Map<String, Object> responseMetaData = generateResponseMetaData(sessionTask, code, itty);
         final Map<String, Object> statusAttributes = generateStatusAttributes(sessionTask, code, itty);
         try {
+            sessionTask.handleDetachment(aggregate);
+
             if (useBinary) {
                 return new Frame(serializer.serializeResponseAsBinary(ResponseMessage.build(msg)
                         .code(code)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
index 54fe16b..879b44f 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
@@ -19,11 +19,10 @@
 package org.apache.tinkerpop.gremlin.server.handler;
 
 import com.codahale.metrics.Meter;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.op.session.Session;
 import org.apache.tinkerpop.gremlin.server.util.ExceptionHelper;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java
index 440d370..9477459 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpBasicAuthorizationHandler.java
@@ -25,8 +25,8 @@
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpUtil;
 import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
 import org.apache.tinkerpop.gremlin.server.authz.AuthorizationException;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
index 662ed48..665cf1e 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
@@ -34,25 +34,29 @@
 import io.netty.handler.codec.http.HttpUtil;
 import io.netty.util.ReferenceCountUtil;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
 import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.AbstractTraverser;
 import org.apache.tinkerpop.gremlin.server.GraphManager;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.Settings;
 import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.apache.tinkerpop.gremlin.server.util.TextPlainMessageSerializer;
+import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceFactory;
 import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import org.javatuples.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,7 +98,6 @@
 public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter {
     private static final Logger logger = LoggerFactory.getLogger(HttpGremlinEndpointHandler.class);
     private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
-    private static final Charset UTF8 = StandardCharsets.UTF_8;
 
     private static final Timer evalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "eval"));
 
@@ -232,6 +235,10 @@
                                     requestMessage.getArg(Tokens.ARGS_GREMLIN),
                                     requestMessage.getArg(Tokens.ARGS_BINDINGS), o, Thread.currentThread().getName());
 
+                            final Optional<String> mp = requestMessage.getArg(Tokens.ARGS_GREMLIN) instanceof String
+                                    ? GremlinScriptChecker.parse(requestMessage.getArg(Tokens.ARGS_GREMLIN)).getMaterializeProperties()
+                                    : Optional.empty();
+
                             // need to replicate what TraversalOpProcessor does with the bytecode op. it converts
                             // results to Traverser so that GLVs can handle the results. don't quite get the same
                             // benefit here because the bulk has to be 1 since we've already resolved the result,
@@ -239,6 +246,19 @@
                             final List<Object> results = requestMessage.getOp().equals(Tokens.OPS_BYTECODE) ?
                                     (List<Object>) IteratorUtils.asList(o).stream().map(r -> new DefaultRemoteTraverser<Object>(r, 1)).collect(Collectors.toList()) :
                                     IteratorUtils.asList(o);
+
+                            if (mp.isPresent() && mp.get().equals(Tokens.MATERIALIZE_PROPERTIES_TOKENS)) {
+                                final Object firstElement = results.get(0);
+
+                                if (firstElement instanceof Element) {
+                                    for (int i = 0; i < results.size(); i++)
+                                        results.set(i, ReferenceFactory.detach((Element) results.get(i)));
+                                } else if (firstElement instanceof AbstractTraverser) {
+                                    for (final Object item : results)
+                                        ((AbstractTraverser) item).detach();
+                                }
+                            }
+
                             final ResponseMessage responseMessage = ResponseMessage.build(requestId)
                                     .code(ResponseStatusCode.SUCCESS)
                                     .result(results).create();
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java
index b332a88..91b5a12 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtil.java
@@ -24,16 +24,22 @@
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.*;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpUtil;
+import io.netty.handler.codec.http.QueryStringDecoder;
 import io.netty.util.CharsetUtil;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
 import org.apache.tinkerpop.shaded.jackson.databind.node.ArrayNode;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java
index 9eda46f..6f90bd9 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpUserAgentHandler.java
@@ -23,12 +23,13 @@
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.http.FullHttpMessage;
 import io.netty.util.AttributeKey;
-import org.apache.tinkerpop.gremlin.driver.UserAgent;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.tinkerpop.gremlin.server.handler.WsUserAgentHandler.USER_AGENT_HEADER_NAME;
+
 public class HttpUserAgentHandler extends ChannelInboundHandlerAdapter {
     /**
      * This constant caps the number of unique user agents which will be tracked in the metrics. Any new unique
@@ -37,14 +38,14 @@
     private static final int MAX_USER_AGENT_METRICS = 10000;
 
     private static final Logger logger = LoggerFactory.getLogger(HttpUserAgentHandler.class);
-    public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(UserAgent.USER_AGENT_HEADER_NAME);
+    public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(USER_AGENT_HEADER_NAME);
 
     @Override
     public void channelRead(final ChannelHandlerContext ctx, Object msg) {
         if (msg instanceof FullHttpMessage) {
             final FullHttpMessage request = (FullHttpMessage) msg;
-            if (request.headers().contains(UserAgent.USER_AGENT_HEADER_NAME)) {
-                final String userAgent = request.headers().get(UserAgent.USER_AGENT_HEADER_NAME);
+            if (request.headers().contains(USER_AGENT_HEADER_NAME)) {
+                final String userAgent = request.headers().get(USER_AGENT_HEADER_NAME);
                 ctx.channel().attr(USER_AGENT_ATTR_KEY).set(userAgent);
                 logger.debug("New Connection on channel [{}] with user agent [{}]", ctx.channel().id().asShortText(), userAgent);
 
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java
index 1c858a2..fb623a9 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/MultiTaskSession.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tinkerpop.gremlin.server.handler;
 
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin;
 import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngine;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java
index 068c332..8e3b1ee 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpExecutorHandler.java
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.server.handler;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.Context;
 import org.apache.tinkerpop.gremlin.server.GraphManager;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
index 4259d15..340b913 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java
@@ -20,9 +20,9 @@
 
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.Channelizer;
 import org.apache.tinkerpop.gremlin.server.Context;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
index b53219e..34345ec 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
@@ -22,40 +22,44 @@
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.Attribute;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-
-import io.netty.util.AttributeMap;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.Settings;
-import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
 import org.apache.tinkerpop.gremlin.server.auth.AuthenticationException;
 import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
 import org.apache.tinkerpop.gremlin.server.authz.Authorizer;
 import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.function.Function;
+
 /**
  * A SASL authentication handler that allows the {@link Authenticator} to be plugged into it. This handler is meant
  * to be used with protocols that process a {@link RequestMessage} such as the {@link WebSocketChannelizer}
  *
- * @author Stephen Mallette (http://stephen.genoprime.com)
+ * @author Stephen Mallette (<a href="http://stephen.genoprime.com">http://stephen.genoprime.com</a>)
  */
 @ChannelHandler.Sharable
 public class SaslAuthenticationHandler extends AbstractAuthenticationHandler {
     private static final Logger logger = LoggerFactory.getLogger(SaslAuthenticationHandler.class);
     private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
     private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder();
+    public static final Duration MAX_REQUEST_DEFERRABLE_DURATION = Duration.ofSeconds(5);
     private static final Logger auditLogger = LoggerFactory.getLogger(GremlinServer.AUDIT_LOGGER_NAME);
 
     protected final Settings settings;
@@ -75,96 +79,147 @@
 
     @Override
     public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
-        if (msg instanceof RequestMessage){
-            final RequestMessage requestMessage = (RequestMessage) msg;
-
-            final Attribute<Authenticator.SaslNegotiator> negotiator = ((AttributeMap) ctx).attr(StateKey.NEGOTIATOR);
-            final Attribute<RequestMessage> request = ((AttributeMap) ctx).attr(StateKey.REQUEST_MESSAGE);
-            if (negotiator.get() == null) {
-                try {
-                    // First time through so save the request and send an AUTHENTICATE challenge with no data
-                    negotiator.set(authenticator.newSaslNegotiator(getRemoteInetAddress(ctx)));
-                    request.set(requestMessage);
-                    final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
-                            .code(ResponseStatusCode.AUTHENTICATE).create();
-                    ctx.writeAndFlush(authenticate);
-                } catch (Exception ex) {
-                    // newSaslNegotiator can cause troubles - if we don't catch and respond nicely the driver seems
-                    // to hang until timeout which isn't so nice. treating this like a server error as it means that
-                    // the Authenticator isn't really ready to deal with requests for some reason.
-                    logger.error(String.format("%s is not ready to handle requests - check its configuration or related services",
-                            authenticator.getClass().getSimpleName()), ex);
-
-                    final ResponseMessage error = ResponseMessage.build(requestMessage)
-                            .statusMessage("Authenticator is not ready to handle requests")
-                            .code(ResponseStatusCode.SERVER_ERROR).create();
-                    ctx.writeAndFlush(error);
-                }
-            } else {
-                if (requestMessage.getOp().equals(Tokens.OPS_AUTHENTICATION) && requestMessage.getArgs().containsKey(Tokens.ARGS_SASL)) {
-                    
-                    final Object saslObject = requestMessage.getArgs().get(Tokens.ARGS_SASL);
-                    final byte[] saslResponse;
-                    
-                    if(saslObject instanceof String) {
-                        saslResponse = BASE64_DECODER.decode((String) saslObject);
-                    } else {
-                        final ResponseMessage error = ResponseMessage.build(request.get())
-                                .statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + " - base64 encoded String is expected")
-                                .code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).create();
-                        ctx.writeAndFlush(error);
-                        return;
-                    }
-
-                    try {
-                        final byte[] saslMessage = negotiator.get().evaluateResponse(saslResponse);
-                        if (negotiator.get().isComplete()) {
-                            final AuthenticatedUser user = negotiator.get().getAuthenticatedUser();
-                            ctx.channel().attr(StateKey.AUTHENTICATED_USER).set(user);
-                            // User name logged with the remote socket address and authenticator classname for audit logging
-                            if (settings.enableAuditLog) {
-                                String address = ctx.channel().remoteAddress().toString();
-                                if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
-                                final String[] authClassParts = authenticator.getClass().toString().split("[.]");
-                                auditLogger.info("User {} with address {} authenticated by {}",
-                                        user.getName(), address, authClassParts[authClassParts.length - 1]);
-                            }
-                            // If we have got here we are authenticated so remove the handler and pass
-                            // the original message down the pipeline for processing
-                            ctx.pipeline().remove(this);
-                            final RequestMessage original = request.get();
-                            ctx.fireChannelRead(original);
-                        } else {
-                            // not done here - send back the sasl message for next challenge.
-                            final Map<String,Object> metadata = new HashMap<>();
-                            metadata.put(Tokens.ARGS_SASL, BASE64_ENCODER.encodeToString(saslMessage));
-                            final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
-                                    .statusAttributes(metadata)
-                                    .code(ResponseStatusCode.AUTHENTICATE).create();
-                            ctx.writeAndFlush(authenticate);
-                        }
-                    } catch (AuthenticationException ae) {
-                        final ResponseMessage error = ResponseMessage.build(request.get())
-                                .statusMessage(ae.getMessage())
-                                .code(ResponseStatusCode.UNAUTHORIZED).create();
-                        ctx.writeAndFlush(error);
-                    }
-                } else {
-                    final ResponseMessage error = ResponseMessage.build(requestMessage)
-                            .statusMessage("Failed to authenticate")
-                            .code(ResponseStatusCode.UNAUTHORIZED).create();
-                    ctx.writeAndFlush(error);
-                }
-            }
-        } else {
+        if (!(msg instanceof RequestMessage)) {
             logger.warn("{} only processes RequestMessage instances - received {} - channel closing",
                     this.getClass().getSimpleName(), msg.getClass());
             ctx.close();
+            return;
+        }
+
+        final RequestMessage requestMessage = (RequestMessage) msg;
+
+        final Attribute<Authenticator.SaslNegotiator> negotiator = ctx.channel().attr(StateKey.NEGOTIATOR);
+        final Attribute<RequestMessage> request = ctx.channel().attr(StateKey.REQUEST_MESSAGE);
+        final Attribute<Pair<LocalDateTime, List<RequestMessage>>> deferredRequests = ctx.channel().attr(StateKey.DEFERRED_REQUEST_MESSAGES);
+
+        if (negotiator.get() == null) {
+            try {
+                // First time through so save the request and send an AUTHENTICATE challenge with no data
+                negotiator.set(authenticator.newSaslNegotiator(getRemoteInetAddress(ctx)));
+                request.set(requestMessage);
+                final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
+                        .code(ResponseStatusCode.AUTHENTICATE).create();
+                ctx.writeAndFlush(authenticate);
+            } catch (Exception ex) {
+                // newSaslNegotiator can cause troubles - if we don't catch and respond nicely the driver seems
+                // to hang until timeout which isn't so nice. treating this like a server error as it means that
+                // the Authenticator isn't really ready to deal with requests for some reason.
+                logger.error(String.format("%s is not ready to handle requests - check its configuration or related services",
+                        authenticator.getClass().getSimpleName()), ex);
+
+                respondWithError(
+                        requestMessage,
+                        builder -> builder.statusMessage("Authenticator is not ready to handle requests").code(ResponseStatusCode.SERVER_ERROR),
+                        ctx);
+            }
+
+            return;
+        } else if (!requestMessage.getOp().equals(Tokens.OPS_AUTHENTICATION)) {
+            // If authentication negotiation is pending, store subsequent non-authentication requests for later processing
+            deferredRequests.setIfAbsent(new ImmutablePair<>(LocalDateTime.now(), new ArrayList<>()));
+            deferredRequests.get().getValue().add(requestMessage);
+
+            final Duration deferredDuration = Duration.between(deferredRequests.get().getKey(), LocalDateTime.now());
+
+            if (deferredDuration.compareTo(MAX_REQUEST_DEFERRABLE_DURATION) > 0) {
+                respondWithError(
+                        requestMessage,
+                        builder -> builder.statusMessage("Authentication did not finish in the allowed duration (" + MAX_REQUEST_DEFERRABLE_DURATION + "s).")
+                                    .code(ResponseStatusCode.UNAUTHORIZED),
+                        ctx);
+                return;
+            }
+
+            return;
+        } else if (!requestMessage.getArgs().containsKey(Tokens.ARGS_SASL)) {
+            // This is an authentication request that is missing a "sasl" argument.
+            respondWithError(
+                    requestMessage,
+                    builder -> builder.statusMessage("Failed to authenticate").code(ResponseStatusCode.UNAUTHORIZED),
+                    ctx);
+            return;
+        }
+
+        final Object saslObject = requestMessage.getArgs().get(Tokens.ARGS_SASL);
+
+        if (!(saslObject instanceof String)) {
+            respondWithError(
+                    requestMessage,
+                    builder -> builder
+                            .statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + " - base64 encoded String is expected")
+                            .code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST),
+                    ctx);
+            return;
+        }
+
+        try {
+            final byte[] saslResponse = BASE64_DECODER.decode((String) saslObject);
+            final byte[] saslMessage = negotiator.get().evaluateResponse(saslResponse);
+
+            if (!negotiator.get().isComplete()) {
+                // not done here - send back the sasl message for next challenge.
+                final HashMap<String, Object> metadata = new HashMap<>();
+                metadata.put(Tokens.ARGS_SASL, BASE64_ENCODER.encodeToString(saslMessage));
+                final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
+                        .statusAttributes(metadata)
+                        .code(ResponseStatusCode.AUTHENTICATE).create();
+                ctx.writeAndFlush(authenticate);
+                return;
+            }
+
+            final org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser user = negotiator.get().getAuthenticatedUser();
+            ctx.channel().attr(StateKey.AUTHENTICATED_USER).set(user);
+            // User name logged with the remote socket address and authenticator classname for audit logging
+            if (settings.enableAuditLog) {
+                String address = ctx.channel().remoteAddress().toString();
+                if (address.startsWith("/") && address.length() > 1) address = address.substring(1);
+                final String[] authClassParts = authenticator.getClass().toString().split("[.]");
+                auditLogger.info("User {} with address {} authenticated by {}",
+                        user.getName(), address, authClassParts[authClassParts.length - 1]);
+            }
+            // If we have got here we are authenticated so remove the handler and pass
+            // the original message down the pipeline for processing
+            ctx.pipeline().remove(this);
+            final RequestMessage original = request.get();
+            ctx.fireChannelRead(original);
+
+            // Also send deferred requests if there are any down the pipeline for processing
+            if (deferredRequests.get() != null) {
+                deferredRequests.getAndSet(null).getValue().forEach(ctx::fireChannelRead);
+            }
+        } catch (AuthenticationException ae) {
+            respondWithError(
+                    requestMessage,
+                    builder -> builder.statusMessage(ae.getMessage()).code(ResponseStatusCode.UNAUTHORIZED),
+                    ctx);
         }
     }
 
-    private InetAddress getRemoteInetAddress(final ChannelHandlerContext ctx)
-    {
+    private void respondWithError(final RequestMessage requestMessage, final Function<ResponseMessage.Builder, ResponseMessage.Builder> buildResponse, final ChannelHandlerContext ctx) {
+        final Attribute<RequestMessage> originalRequest = ctx.channel().attr(StateKey.REQUEST_MESSAGE);
+        final Attribute<Pair<LocalDateTime, List<RequestMessage>>> deferredRequests = ctx.channel().attr(StateKey.DEFERRED_REQUEST_MESSAGES);
+
+        if (!requestMessage.getOp().equals(Tokens.OPS_AUTHENTICATION)) {
+            ctx.write(buildResponse.apply(ResponseMessage.build(requestMessage)).create());
+        }
+
+        if (originalRequest.get() != null) {
+            ctx.write(buildResponse.apply(ResponseMessage.build(originalRequest.get())).create());
+        }
+
+        if (deferredRequests.get() != null) {
+            deferredRequests
+                    .getAndSet(null).getValue().stream()
+                    .map(ResponseMessage::build)
+                    .map(buildResponse)
+                    .map(ResponseMessage.Builder::create)
+                    .forEach(ctx::write);
+        }
+
+        ctx.flush();
+    }
+
+    private InetAddress getRemoteInetAddress(final ChannelHandlerContext ctx) {
         final Channel channel = ctx.channel();
 
         if (null == channel)
@@ -172,9 +227,9 @@
 
         final SocketAddress genericSocketAddr = channel.remoteAddress();
 
-        if (null == genericSocketAddr || !(genericSocketAddr instanceof InetSocketAddress))
+        if (!(genericSocketAddr instanceof InetSocketAddress))
             return null;
 
-        return ((InetSocketAddress)genericSocketAddr).getAddress();
+        return ((InetSocketAddress) genericSocketAddr).getAddress();
     }
 }
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
index 32c13da..b107b05 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/ServerSerializers.java
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.server.handler;
 
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
 
@@ -41,6 +41,6 @@
      * Default binary serializer used by the server when the serializer requested does not match what is on the server.
      * This defaults to GraphSON 3.0.
      */
-    static final MessageSerializer<ObjectMapper> DEFAULT_TEXT_SERIALIZER = new GraphSONMessageSerializerV3d0();
+    static final MessageSerializer<ObjectMapper> DEFAULT_TEXT_SERIALIZER = new GraphSONMessageSerializerV3();
 
 }
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java
index cf577e2..5705de2 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionException.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.server.handler;
 
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
 
 /**
  * An exception that holds the error-related {@link ResponseMessage} which is meant to be returned to the calling
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java
index 57c84f7..5dbe5e0 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SessionTask.java
@@ -19,7 +19,7 @@
 package org.apache.tinkerpop.gremlin.server.handler;
 
 import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.Context;
 import org.apache.tinkerpop.gremlin.server.GraphManager;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java
index 4b5f581..4f69394 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/StateKey.java
@@ -18,13 +18,17 @@
  */
 package org.apache.tinkerpop.gremlin.server.handler;
 
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
 import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
 import org.apache.tinkerpop.gremlin.server.op.session.Session;
 import io.netty.util.AttributeKey;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * Keys used in the various handlers to store state in the pipeline.
  *
@@ -60,6 +64,11 @@
     public static final AttributeKey<RequestMessage> REQUEST_MESSAGE = AttributeKey.valueOf("request");
 
     /**
+     * The key for the deferred requests.
+     */
+    public static final AttributeKey<Pair<LocalDateTime, List<RequestMessage>>> DEFERRED_REQUEST_MESSAGES = AttributeKey.valueOf("deferredRequests");
+
+    /**
      * The key for the current {@link AuthenticatedUser}.
      */
     public static final AttributeKey<AuthenticatedUser> AUTHENTICATED_USER = AttributeKey.valueOf("authenticatedUser");
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
index c23d7ed..318a0a0 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/UnifiedHandler.java
@@ -24,10 +24,10 @@
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
 import io.netty.util.ReferenceCountUtil;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Operator;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java
index 98a2411..4b8e6f9 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WebSocketAuthorizationHandler.java
@@ -22,10 +22,10 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.auth.AuthenticatedUser;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java
index a8a6fa9..227b2f7 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinBinaryRequestDecoder.java
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.server.handler;
 
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java
index c9a48c6..5e64eb8 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinCloseRequestDecoder.java
@@ -23,9 +23,9 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java
index 4794307..8c564ac 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsGremlinTextRequestDecoder.java
@@ -18,10 +18,10 @@
  */
 package org.apache.tinkerpop.gremlin.server.handler;
 
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
index cd1e0a6..577b4e7 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/WsUserAgentHandler.java
@@ -24,7 +24,6 @@
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
 import io.netty.util.AttributeKey;
-import org.apache.tinkerpop.gremlin.driver.UserAgent;
 import org.apache.tinkerpop.gremlin.server.GremlinServer;
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.slf4j.Logger;
@@ -41,16 +40,18 @@
      */
     private static final int MAX_USER_AGENT_METRICS = 10000;
 
+    static final String USER_AGENT_HEADER_NAME = "User-Agent";
+
     private static final Logger logger = LoggerFactory.getLogger(WsUserAgentHandler.class);
-    public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(UserAgent.USER_AGENT_HEADER_NAME);
+    public static final AttributeKey<String> USER_AGENT_ATTR_KEY = AttributeKey.valueOf(USER_AGENT_HEADER_NAME);
 
     @Override
     public void userEventTriggered(final ChannelHandlerContext ctx, java.lang.Object evt) {
         if (evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
             final HttpHeaders requestHeaders = ((WebSocketServerProtocolHandler.HandshakeComplete) evt).requestHeaders();
 
-            if (requestHeaders.contains(UserAgent.USER_AGENT_HEADER_NAME)){
-                final String userAgent = requestHeaders.get(UserAgent.USER_AGENT_HEADER_NAME);
+            if (requestHeaders.contains(USER_AGENT_HEADER_NAME)){
+                final String userAgent = requestHeaders.get(USER_AGENT_HEADER_NAME);
 
                 ctx.channel().attr(USER_AGENT_ATTR_KEY).set(userAgent);
                 logger.debug("New Connection on channel [{}] with user agent [{}]", ctx.channel().id().asShortText(), userAgent);
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index bc355df..e8735c1 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -19,10 +19,10 @@
 package org.apache.tinkerpop.gremlin.server.op;
 
 import com.codahale.metrics.Timer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException;
 import org.apache.tinkerpop.gremlin.process.traversal.Failure;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
index a0c3a37..49b9f6f 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
@@ -20,12 +20,12 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
 import org.apache.tinkerpop.gremlin.process.traversal.Failure;
 import org.apache.tinkerpop.gremlin.server.Context;
 import org.apache.tinkerpop.gremlin.server.GraphManager;
@@ -283,6 +283,8 @@
         try {
             final ChannelHandlerContext nettyContext = ctx.getChannelHandlerContext();
 
+            ctx.handleDetachment(aggregate);
+
             if (useBinary) {
                 return new Frame(serializer.serializeResponseAsBinary(ResponseMessage.build(msg)
                         .code(code)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java
index a6ec202..2910112 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/OpProcessorException.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.server.op;
 
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
index 612e544..2c02c65 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
@@ -19,11 +19,11 @@
 package org.apache.tinkerpop.gremlin.server.op.session;
 
 import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin;
 import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java
index 81df30c..bb90ec0 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java
@@ -18,10 +18,10 @@
  */
 package org.apache.tinkerpop.gremlin.server.op.standard;
 
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.server.Context;
 import org.apache.tinkerpop.gremlin.server.OpProcessor;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index f7e2f26..b803852 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -21,11 +21,11 @@
 import com.codahale.metrics.Timer;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.Failure;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java
index ea0332d..002058e 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializer.java
@@ -21,10 +21,10 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.util.CharsetUtil;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.MessageTextSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java
index 8ea6e55..ade1e82 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/TraverserIterator.java
@@ -21,7 +21,6 @@
 import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
 
@@ -33,17 +32,12 @@
 public class TraverserIterator implements Iterator<Object> {
 
     private final Traversal.Admin traversal;
-    private final HaltedTraverserStrategy haltedTraverserStrategy;
     private final TraverserSet bulker = new TraverserSet();
     private final int barrierSize;
 
     public TraverserIterator(final Traversal.Admin traversal) {
         this.traversal = traversal;
         this.barrierSize = traversal.getTraverserRequirements().contains(TraverserRequirement.ONE_BULK) ? 1 : 1000;
-        this.haltedTraverserStrategy = traversal.getStrategies().getStrategy(HaltedTraverserStrategy.class).orElse(
-                Boolean.valueOf(System.getProperty("is.testing", "false")) ?
-                        HaltedTraverserStrategy.detached() :
-                        HaltedTraverserStrategy.reference());
     }
 
     public Traversal.Admin getTraversal() {
@@ -61,7 +55,7 @@
     public Object next() {
         if (this.bulker.isEmpty())
             this.fillBulker();
-        final Traverser.Admin t = this.haltedTraverserStrategy.halt(this.bulker.remove());
+        final Traverser.Admin t = this.bulker.remove();
         return new DefaultRemoteTraverser<>(t.get(), t.bulk());
     }
 
diff --git a/gremlin-server/src/main/static/LICENSE b/gremlin-server/src/main/static/LICENSE
index 1b205ed..e4c2b49 100644
--- a/gremlin-server/src/main/static/LICENSE
+++ b/gremlin-server/src/main/static/LICENSE
@@ -215,6 +215,7 @@
      minlog (com.esotericsoftware:minlog:1.3.0 - https://github.com/EsotericSoftware/minlog)
        - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.minlog
        - for details, see licenses/minlog
+     treelayout (org.abego.treelayout:org.abego.treelayout.core:1.0.3 - http://treelayout.sourceforge.net/) - for details, see licenses/treelayout
 
 ========================================================================
 MIT Licenses
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index b9fe215..09d94a1 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -5,15 +5,10 @@
 The Apache Software Foundation (http://www.apache.org/).
 
 ------------------------------------------------------------------------
-Apache Groovy 2.5.22 (AL ASF)
+Apache Groovy 4.0.9 (AL ASF)
 ------------------------------------------------------------------------
-This product includes/uses ANTLR (http://www.antlr2.org/)
-developed by Terence Parr 1989-2006
-
-This product bundles icons from the famfamfam.com silk icons set
-http://www.famfamfam.com/lab/icons/silk/
-Licensed under the Creative Commons Attribution Licence v2.5
-http://creativecommons.org/licenses/by/2.5/
+This product includes/uses ANTLR4 (https://github.com/antlr/antlr4)
+Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
 
 ------------------------------------------------------------------------
 Apache Ivy 2.5.1 (AL ASF)
@@ -92,11 +87,11 @@
     http://creativecommons.org/publicdomain/zero/1.0/
 
 ------------------------------------------------------------------------
-Netty 4.1.96
+Netty 4.1.101
 ------------------------------------------------------------------------
 Copyright 2014 The Netty Project
 
 ------------------------------------------------------------------------
-Objenesis 2.4 (Included through gremlin-shaded)
+Objenesis 3.3 - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.objenesis
 ------------------------------------------------------------------------
-Copyright 2006-2016 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita
diff --git a/gremlin-server/src/main/static/licenses/treelayout b/gremlin-server/src/main/static/licenses/treelayout
new file mode 100644
index 0000000..e92280d
--- /dev/null
+++ b/gremlin-server/src/main/static/licenses/treelayout
@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
index 3c4c777..861b624 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
@@ -22,10 +22,11 @@
 import ch.qos.logback.classic.Logger;
 import io.netty.handler.codec.CorruptedFrameException;
 import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
 import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest;
 import org.apache.tinkerpop.gremlin.server.TestClientFactory;
 import org.hamcrest.core.Is;
@@ -97,7 +98,7 @@
     public void shouldCloseConnectionDeadDueToUnRecoverableError() throws Exception {
         // Set a low value of maxContentLength to intentionally trigger CorruptedFrameException
         final Cluster cluster = TestClientFactory.build()
-                                                 .serializer(Serializers.GRAPHBINARY_V1D0)
+                                                 .serializer(Serializers.GRAPHBINARY_V1)
                                                  .maxContentLength(64)
                                                  .minConnectionPoolSize(1)
                                                  .maxConnectionPoolSize(2)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
index 89bb7a0..49c9134 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/AbstractRemoteGraphProvider.java
@@ -24,7 +24,7 @@
 import org.apache.tinkerpop.gremlin.TestHelper;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.process.computer.Computer;
 import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
 import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java
index aabd65b..6561589 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphComputerProvider.java
@@ -20,7 +20,7 @@
 package org.apache.tinkerpop.gremlin.driver.remote;
 
 import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
 
@@ -56,6 +56,10 @@
         method = "g_VX1X_V_valuesXnameX",
         reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
 @Graph.OptOut(
+        test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeTest",
+        method = "*",
+        reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
+@Graph.OptOut(
         test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectTest",
         method = "*",
         reason = "The inject() step is not supported by GraphComputer")
@@ -143,6 +147,6 @@
 public class GraphBinaryRemoteGraphComputerProvider extends AbstractRemoteGraphProvider {
 
     public GraphBinaryRemoteGraphComputerProvider() {
-        super(createClusterBuilder(Serializers.GRAPHBINARY_V1D0).create(), true);
+        super(createClusterBuilder(Serializers.GRAPHBINARY_V1).create(), true);
     }
 }
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
index a5f8f88..aac4139 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
@@ -18,13 +18,13 @@
  */
 package org.apache.tinkerpop.gremlin.driver.remote;
 
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public class GraphBinaryRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
     public GraphBinaryRemoteGraphProvider() {
-        super(createClusterBuilder(Serializers.GRAPHBINARY_V1D0).create());
+        super(createClusterBuilder(Serializers.GRAPHBINARY_V1).create());
     }
 }
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
index 4736ae9..508b69c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphComputerProvider.java
@@ -20,7 +20,7 @@
 package org.apache.tinkerpop.gremlin.driver.remote;
 
 import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
 
@@ -56,6 +56,10 @@
         method = "g_VX1X_V_valuesXnameX",
         reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
 @Graph.OptOut(
+        test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeTest",
+        method = "*",
+        reason = "Mid-traversal V()/E() is currently not supported on GraphComputer")
+@Graph.OptOut(
         test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectTest",
         method = "*",
         reason = "The inject() step is not supported by GraphComputer")
@@ -142,6 +146,6 @@
 @GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
 public class GraphSONRemoteGraphComputerProvider extends AbstractRemoteGraphProvider {
     public GraphSONRemoteGraphComputerProvider() {
-        super(createClusterBuilder(Serializers.GRAPHSON_V3D0).create(), true);
+        super(createClusterBuilder(Serializers.GRAPHSON_V3).create(), true);
     }
 }
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
index 61debb2..4405f0d 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphSONRemoteGraphProvider.java
@@ -18,13 +18,13 @@
  */
 package org.apache.tinkerpop.gremlin.driver.remote;
 
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public class GraphSONRemoteGraphProvider extends AbstractRemoteGraphProvider implements AutoCloseable {
     public GraphSONRemoteGraphProvider() {
-        super(createClusterBuilder(Serializers.GRAPHSON_V3D0).create());
+        super(createClusterBuilder(Serializers.GRAPHSON_V3).create());
     }
 }
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java
index 0b1ac62..e6a18ea 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteWorld.java
@@ -23,23 +23,18 @@
 import org.apache.tinkerpop.gremlin.TestHelper;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.features.World;
 import org.apache.tinkerpop.gremlin.process.computer.Computer;
 import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.server.GremlinServer;
-import org.apache.tinkerpop.gremlin.server.ServerTestHelper;
-import org.apache.tinkerpop.gremlin.server.Settings;
 import org.apache.tinkerpop.gremlin.server.TestClientFactory;
 import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
 import org.junit.AssumptionViolatedException;
 
 import java.io.File;
-import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -120,6 +115,7 @@
                 "@StepDrop",
                 "@StepInject",
                 "@StepV",
+                "@StepE",
                 "@GraphComputerVerificationOneBulk",
                 "@GraphComputerVerificationStrategyNotSupported",
                 "@GraphComputerVerificationMidVNotSupported",
@@ -164,24 +160,24 @@
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     public static class GraphBinaryRemoteWorld extends RemoteWorld {
-        public GraphBinaryRemoteWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V1D0)); }
+        public GraphBinaryRemoteWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V1)); }
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     public static class GraphBinaryRemoteComputerWorld extends RemoteComputerWorld {
-        public GraphBinaryRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V1D0)); }
+        public GraphBinaryRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHBINARY_V1)); }
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     public static class GraphSONRemoteWorld extends RemoteWorld {
-        public GraphSONRemoteWorld() { super(createTestCluster(Serializers.GRAPHSON_V3D0)); }
+        public GraphSONRemoteWorld() { super(createTestCluster(Serializers.GRAPHSON_V3)); }
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     public static class GraphSONRemoteComputerWorld extends RemoteComputerWorld {
-        public GraphSONRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHSON_V3D0)); }
+        public GraphSONRemoteComputerWorld() { super(createTestCluster(Serializers.GRAPHSON_V3)); }
     }
 }
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
index 6a8acba..147014c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
@@ -22,7 +22,7 @@
 import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizerIntegrateTest;
 import org.apache.tinkerpop.gremlin.server.op.OpLoader;
 import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -150,7 +150,7 @@
         // calling close() on TinkerGraph does not free resources quickly enough. adding a clear() call let's gc
         // cleanup earlier
         server.getServerGremlinExecutor().getGraphManager().getAsBindings().values().stream()
-                .filter(g -> g instanceof TinkerGraph).forEach(g -> ((TinkerGraph) g).clear());
+                .filter(g -> g instanceof AbstractTinkerGraph).forEach(g -> ((AbstractTinkerGraph) g).clear());
 
         if (server != null) {
             server.stop().join();
@@ -183,25 +183,9 @@
         return (directory.delete());
     }
 
-    protected static void tryIncludeNeo4jGraph(final Settings settings) {
-        if (isNeo4jPresent()) {
-            deleteDirectory(new File("/tmp/neo4j"));
-            settings.graphs.put("graph", "conf/neo4j-empty.properties");
-        }
-    }
-
-    protected static boolean isNeo4jPresent() {
-        try {
-            Class.forName("org.neo4j.tinkerpop.api.impl.Neo4jGraphAPIImpl");
-            return true;
-        } catch (Throwable ex) {
-            return false;
-        }
-    }
-
-    protected static void assumeNeo4jIsPresent() {
-        boolean neo4jIncludedForTesting = isNeo4jPresent();
-        assumeThat("Neo4j implementation was not included for testing - run with -DincludeNeo4j", neo4jIncludedForTesting, is(true));
+    protected static void useTinkerTransactionGraph(final Settings settings) {
+        logger.info("Running transactional tests using TinkerTransactionGraph");
+        settings.graphs.put("graph", "conf/tinkertransactiongraph-empty.properties");
     }
 
     private boolean shouldTestUnified() {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java
index 56cb718..2092713 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ContextTest.java
@@ -20,9 +20,10 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import nl.altindag.log.LogCaptor;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.server.handler.Frame;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -38,6 +39,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
 public class ContextTest {
@@ -175,4 +177,34 @@
         Mockito.verify(frame, Mockito.times(1)).tryRelease();
         Mockito.verify(ctx, Mockito.times(1)).flush();
     }
+
+    @Test
+    public void shouldParseParametersFromScriptRequest()
+    {
+        final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+        final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
+                .addArg(Tokens.ARGS_GREMLIN, "g.with('evaluationTimeout', 1000).with(true).with('materializeProperties', 'tokens').V().out('knows')")
+                .create();
+        final Settings settings = new Settings();
+        final Context context = new Context(request, ctx, settings, null, null, null);
+
+        assertEquals(1000, context.getRequestTimeout());
+        assertEquals("tokens", context.getMaterializeProperties());
+    }
+
+    @Test
+    public void shouldSkipInvalidMaterializePropertiesParameterFromScriptRequest()
+    {
+        final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+        final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
+                .addArg(Tokens.ARGS_GREMLIN,
+                        "g.with('evaluationTimeout', 1000).with(true).with('materializeProperties', 'some-invalid-value').V().out('knows')")
+                .create();
+        final Settings settings = new Settings();
+        final Context context = new Context(request, ctx, settings, null, null, null);
+
+        assertEquals(1000, context.getRequestTimeout());
+        // "all" is default value
+        assertEquals("all", context.getMaterializeProperties());
+    }
 }
\ No newline at end of file
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index caca860..8b1b8da 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -30,16 +30,16 @@
 import org.apache.tinkerpop.gremlin.driver.RequestOptions;
 import org.apache.tinkerpop.gremlin.driver.Result;
 import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
 import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
 import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -47,7 +47,6 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.io.Storage;
 import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
 import org.apache.tinkerpop.gremlin.util.TimeUtil;
 import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
@@ -188,14 +187,14 @@
             case "shouldExecuteScriptInSessionOnTransactionalWithManualTransactionsGraph":
             case "shouldExecuteInSessionAndSessionlessWithoutOpeningTransaction":
             case "shouldManageTransactionsInSession":
-                tryIncludeNeo4jGraph(settings);
+                useTinkerTransactionGraph(settings);
                 break;
             case "shouldRequireAliasedGraphVariablesInStrictTransactionMode":
                 settings.strictTransactionManagement = true;
                 break;
             case "shouldAliasGraphVariablesInStrictTransactionMode":
                 settings.strictTransactionManagement = true;
-                tryIncludeNeo4jGraph(settings);
+                useTinkerTransactionGraph(settings);
                 break;
             case "shouldProcessSessionRequestsInOrderAfterTimeout":
                 settings.evaluationTimeout = 250;
@@ -260,7 +259,7 @@
 
     @Test
     public void shouldReportErrorWhenRequestCantBeSerialized() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
         try {
             final Client client = cluster.connect().alias("g");
 
@@ -910,7 +909,7 @@
 
     @Test
     public void shouldWorkWithGraphSONV1Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1_UNTYPED).create();
         final Client client = cluster.connect();
 
         try {
@@ -931,7 +930,7 @@
 
             final Map<String, Object> nameProperties = (Map<String, Object>) names.get(0);
             assertEquals(2, nameProperties.size());
-            assertEquals(0l, nameProperties.get("id"));
+            assertEquals(0, nameProperties.get("id"));
             assertEquals("marko", nameProperties.get("value"));
 
             final List<Object> ages = (List<Object>) properties.get("age");
@@ -939,7 +938,7 @@
 
             final Map<String, Object> ageProperties = (Map<String, Object>) ages.get(0);
             assertEquals(2, ageProperties.size());
-            assertEquals(1l, ageProperties.get("id"));
+            assertEquals(1, ageProperties.get("id"));
             assertEquals(29, ageProperties.get("value"));
         } finally {
             cluster.close();
@@ -948,7 +947,7 @@
 
     @Test
     public void shouldWorkWithGraphSONV2Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2).create();
         final Client client = cluster.connect();
 
         try {
@@ -969,7 +968,7 @@
 
     @Test
     public void shouldWorkWithGraphSONExtendedV2Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2).create();
         final Client client = cluster.connect();
 
         try {
@@ -985,7 +984,7 @@
 
     @Test
     public void shouldWorkWithGraphSONV3Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
         final Client client = cluster.connect();
 
         try {
@@ -1006,7 +1005,7 @@
 
     @Test
     public void shouldWorkWithGraphSONExtendedV3Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
         final Client client = cluster.connect();
 
         try {
@@ -1022,14 +1021,14 @@
 
     @Test
     public void shouldWorkWithGraphBinaryV1Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
         final Client client = cluster.connect();
 
         try {
             final List<Result> r = client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
             assertEquals(1, r.size());
 
-            final Vertex v = r.get(0).get(ReferenceVertex.class);
+            final Vertex v = r.get(0).get(DetachedVertex.class);
             assertEquals(1, v.id());
             assertEquals("person", v.label());
         } finally {
@@ -1116,6 +1115,25 @@
     }
 
     @Test
+    public void shouldEvalInGremlinLangWithParameters() throws Exception {
+        final Cluster cluster = TestClientFactory.open();
+        final Client client = cluster.connect();
+
+        try {
+            final RequestOptions ro = RequestOptions.build().language("gremlin-lang").
+                    addParameter("x", 100).
+                    addParameter("y", "test").
+                    addParameter("z", true).create();
+            final List<Result> l = client.submit("g.inject(x, y, z)", ro).all().get();
+            assertEquals(100, l.get(0).getInt());
+            assertEquals("test", l.get(1).getString());
+            assertEquals(true, l.get(2).getBoolean());
+        } finally {
+            cluster.close();
+        }
+    }
+
+    @Test
     public void shouldCloseSession() throws Exception {
         final Cluster cluster = TestClientFactory.build().create();
         final Client client = cluster.connect(name.getMethodName());
@@ -1151,7 +1169,6 @@
 
     @Test
     public void shouldExecuteScriptInSessionOnTransactionalGraph() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.open();
         final Client client = cluster.connect(name.getMethodName());
@@ -1174,7 +1191,6 @@
 
     @Test
     public void shouldExecuteScriptInSessionOnTransactionalWithManualTransactionsGraph() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.open();
         final Client client = cluster.connect(name.getMethodName());
@@ -1211,7 +1227,6 @@
 
     @Test
     public void shouldExecuteInSessionAndSessionlessWithoutOpeningTransaction() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.open();
         try {
@@ -1241,7 +1256,6 @@
 
     @Test
     public void shouldExecuteSessionlessScriptOnTransactionalGraph() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.open();
         final Client client = cluster.connect();
@@ -1413,7 +1427,6 @@
 
     @Test
     public void shouldAliasGraphVariablesInStrictTransactionMode() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.open();
         final Client client = cluster.connect();
@@ -1459,7 +1472,7 @@
 
     @Test
     public void shouldAliasTraversalSourceVariables() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
         final Client client = cluster.connect();
         try {
             try {
@@ -1482,7 +1495,7 @@
 
     @Test
     public void shouldAliasGraphVariablesInSession() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
         final Client client = cluster.connect(name.getMethodName());
 
         try {
@@ -1508,7 +1521,7 @@
 
     @Test
     public void shouldAliasTraversalSourceVariablesInSession() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHBINARY_V1).create();
         final Client client = cluster.connect(name.getMethodName());
 
         try {
@@ -1531,7 +1544,6 @@
 
     @Test
     public void shouldManageTransactionsInSession() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.open();
         final Client client = cluster.connect();
@@ -1703,7 +1715,7 @@
 
     @Test
     public void shouldSendUserAgent() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
         final Client client = Mockito.spy(cluster.connect().alias("g"));
         client.submit("", RequestOptions.build().userAgent("test").create()).all().get();
         cluster.close();
@@ -1716,7 +1728,7 @@
 
     @Test
     public void shouldSendUserAgentBytecode() {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
         final Client client = Mockito.spy(cluster.connect().alias("g"));
         Mockito.when(client.alias("g")).thenReturn(client);
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(client));
@@ -1737,7 +1749,7 @@
     @Test
     public void shouldSendRequestIdBytecode() {
         final UUID overrideRequestId = UUID.randomUUID();
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
         final Client client = Mockito.spy(cluster.connect().alias("g"));
         Mockito.when(client.alias("g")).thenReturn(client);
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(client));
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
index 5500315..8e02c8b 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
@@ -20,12 +20,8 @@
 
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.Result;
 import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -36,14 +32,16 @@
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.io.IoTest;
 import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.reference.ReferencePath;
 import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
-import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;
@@ -52,7 +50,6 @@
 import org.junit.runners.Parameterized;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -78,7 +75,7 @@
         final MessageSerializer<GraphBinaryMapper> graphBinaryMessageSerializerV1 = new GraphBinaryMessageSerializerV1();
 
         return Arrays.asList(new Object[][]{
-                {Serializers.GRAPHBINARY_V1D0, graphBinaryMessageSerializerV1}
+                {Serializers.GRAPHBINARY_V1, graphBinaryMessageSerializerV1}
         });
     }
 
@@ -147,21 +144,21 @@
     public void shouldHandleVertexResult() throws Exception {
         final ResultSet results = client.submit("gmodern.V(1).next()");
         final Vertex v = results.all().get().get(0).getVertex();
-        assertThat(v, instanceOf(ReferenceVertex.class));
+        assertThat(v, instanceOf(DetachedVertex.class));
     }
 
     @Test
     public void shouldHandleVertexPropertyResult() throws Exception {
         final ResultSet results = client.submit("gmodern.V().properties('name').next()");
         final VertexProperty<String> v = results.all().get().get(0).getVertexProperty();
-        assertThat(v, instanceOf(ReferenceVertexProperty.class));
+        assertThat(v, instanceOf(DetachedVertexProperty.class));
     }
 
     @Test
     public void shouldHandleEdgeResult() throws Exception {
         final ResultSet results = client.submit("gmodern.E().next()");
         final Edge e = results.all().get().get(0).getEdge();
-        assertThat(e, instanceOf(ReferenceEdge.class));
+        assertThat(e, instanceOf(DetachedEdge.class));
     }
 
     @Test
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
index 63090b3..01367ec 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
@@ -18,26 +18,35 @@
  */
 package org.apache.tinkerpop.gremlin.server;
 
-import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.Result;
+import org.apache.tinkerpop.gremlin.driver.ResultSet;
 import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
+import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
 import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
-import org.ietf.jgss.GSSException;
+import org.apache.tinkerpop.gremlin.server.handler.SaslAuthenticationHandler;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
+import org.ietf.jgss.GSSException;
 import org.junit.Test;
 
+import java.time.Duration;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
 
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
-
-import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.AnyOf.anyOf;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
@@ -166,6 +175,68 @@
     }
 
     @Test
+    public void shouldFailAuthenticateWithUnAuthenticatedRequestAfterMaxDeferrableDuration() throws Exception {
+        try (WebSocketClient client = TestClientFactory.createWebSocketClient()) {
+            // First request will initiate the authentication handshake
+            // Subsequent requests will be deferred
+            CompletableFuture<List<ResponseMessage>> futureOfRequestWithinAuthDuration1  = client.submitAsync("");
+            CompletableFuture<List<ResponseMessage>> futureOfRequestWithinAuthDuration2  = client.submitAsync("");
+            CompletableFuture<List<ResponseMessage>> futureOfRequestWithinAuthDuration3  = client.submitAsync("");
+
+            // After the maximum allowed deferred request duration,
+            // any non-authenticated request will invalidate all requests with 429 error
+            CompletableFuture<List<ResponseMessage>> futureOfRequestSubmittedTooLate = CompletableFuture.runAsync(() -> {
+                try {
+                    Thread.sleep(SaslAuthenticationHandler.MAX_REQUEST_DEFERRABLE_DURATION.plus(Duration.ofSeconds(1)).toMillis());
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }).thenCompose((__) -> {
+                try {
+                    return client.submitAsync("");
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+
+            assertEquals(2, futureOfRequestWithinAuthDuration1.get().size());
+            assertEquals(1, futureOfRequestWithinAuthDuration2.get().size());
+            assertEquals(1, futureOfRequestWithinAuthDuration3.get().size());
+            assertEquals(1, futureOfRequestSubmittedTooLate.get().size());
+
+            assertEquals(ResponseStatusCode.AUTHENTICATE, futureOfRequestWithinAuthDuration1.get().get(0).getStatus().getCode());
+            assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestWithinAuthDuration1.get().get(1).getStatus().getCode());
+            assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestWithinAuthDuration2.get().get(0).getStatus().getCode());
+            assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestWithinAuthDuration3.get().get(0).getStatus().getCode());
+            assertEquals(ResponseStatusCode.UNAUTHORIZED, futureOfRequestSubmittedTooLate.get().get(0).getStatus().getCode());
+        }
+    }
+
+    @Test
+    public void shouldFailAuthenticateWithIncorrectParallelRequests() throws Exception {
+        try (WebSocketClient client = TestClientFactory.createWebSocketClient()) {
+
+            CompletableFuture<List<ResponseMessage>> firstRequest = client.submitAsync("1");
+            CompletableFuture<List<ResponseMessage>> secondRequest  = client.submitAsync("2");
+            CompletableFuture<List<ResponseMessage>> thirdRequest  = client.submitAsync("3");
+
+            Thread.sleep(500);
+
+            // send some incorrect value for username password which should cause all requests to fail.
+            client.submitAsync(RequestMessage.build(Tokens.OPS_AUTHENTICATION).addArg(Tokens.ARGS_SASL, "someincorrectvalue").create());
+
+            assertEquals(2, firstRequest.get().size());
+            assertEquals(1, secondRequest.get().size());
+            assertEquals(1, thirdRequest.get().size());
+
+            assertEquals(ResponseStatusCode.AUTHENTICATE, firstRequest.get().get(0).getStatus().getCode());
+            assertEquals(ResponseStatusCode.UNAUTHORIZED, firstRequest.get().get(1).getStatus().getCode());
+            assertEquals(ResponseStatusCode.UNAUTHORIZED, secondRequest.get().get(0).getStatus().getCode());
+            assertEquals(ResponseStatusCode.UNAUTHORIZED, thirdRequest.get().get(0).getStatus().getCode());
+        }
+    }
+
+    @Test
     public void shouldAuthenticateWithPlainTextOverDefaultJSONSerialization() throws Exception {
         final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
                 .credentials("stephen", "password").create();
@@ -176,7 +247,7 @@
 
     @Test
     public void shouldAuthenticateWithPlainTextOverGraphSONV1Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1_UNTYPED)
                 .credentials("stephen", "password").create();
         final Client client = cluster.connect();
 
@@ -202,7 +273,7 @@
 
     @Test
     public void shouldAuthenticateAndWorkWithVariablesOverGraphSONV1Serialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1_UNTYPED)
                 .credentials("stephen", "password").create();
         final Client client = cluster.connect(name.getMethodName());
 
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
index 9a737d2..2a534bf 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
@@ -21,10 +21,10 @@
 import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
 import org.apache.tinkerpop.gremlin.server.auth.Krb5Authenticator;
 import org.ietf.jgss.GSSException;
 import org.junit.Test;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java
index b3069fd..871ce4f 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthzIntegrateTest.java
@@ -27,7 +27,7 @@
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
 import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 6d01dd4..40de5c0 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -23,15 +23,16 @@
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONUntypedMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONUntypedMessageSerializerV2d0;
-import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
 import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
 import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
 import org.apache.http.Consts;
@@ -92,46 +93,49 @@
                 settings.maxContentLength = 31;
                 break;
             case "should200OnPOSTTransactionalGraph":
-                tryIncludeNeo4jGraph(settings);
+                useTinkerTransactionGraph(settings);
                 break;
             case "should200OnPOSTTransactionalGraphInStrictMode":
-                tryIncludeNeo4jGraph(settings);
+                useTinkerTransactionGraph(settings);
                 settings.strictTransactionManagement = true;
                 break;
             case "should200OnPOSTWithGraphSON1d0AcceptHeaderDefaultResultToJson":
                 settings.serializers.clear();
                 final Settings.SerializerSettings serializerSettingsV1 = new Settings.SerializerSettings();
-                serializerSettingsV1.className = GraphSONUntypedMessageSerializerV1d0.class.getName();
+                serializerSettingsV1.className = GraphSONUntypedMessageSerializerV1.class.getName();
                 settings.serializers.add(serializerSettingsV1);
                 break;
             case "should200OnPOSTWithGraphSON2d0AcceptHeaderDefaultResultToJson":
                 settings.serializers.clear();
                 final Settings.SerializerSettings serializerSettingsV2 = new Settings.SerializerSettings();
-                serializerSettingsV2.className = GraphSONMessageSerializerV2d0.class.getName();
+                serializerSettingsV2.className = GraphSONMessageSerializerV2.class.getName();
                 settings.serializers.add(serializerSettingsV2);
                 break;
             case "should200OnPOSTWithGraphSON3d0AcceptHeaderDefaultResultToJson":
                 settings.serializers.clear();
                 final Settings.SerializerSettings serializerSettingsV3 = new Settings.SerializerSettings();
-                serializerSettingsV3.className = GraphSONMessageSerializerV3d0.class.getName();
+                serializerSettingsV3.className = GraphSONMessageSerializerV3.class.getName();
                 settings.serializers.add(serializerSettingsV3);
                 break;
             case "should200OnPOSTWithAnyGraphSONAcceptHeaderDefaultResultToJson":
                 settings.serializers.clear();
                 final Settings.SerializerSettings serializerSettingsUntypedV1 = new Settings.SerializerSettings();
-                serializerSettingsUntypedV1.className = GraphSONUntypedMessageSerializerV1d0.class.getName();
+                serializerSettingsUntypedV1.className = GraphSONUntypedMessageSerializerV1.class.getName();
                 settings.serializers.add(serializerSettingsUntypedV1);
                 final Settings.SerializerSettings serializerSettingsTypedV1 = new Settings.SerializerSettings();
-                serializerSettingsTypedV1.className = GraphSONMessageSerializerGremlinV1d0.class.getName();
+                serializerSettingsTypedV1.className = GraphSONMessageSerializerV1.class.getName();
                 settings.serializers.add(serializerSettingsTypedV1);
                 final Settings.SerializerSettings serializerSettingsUntypedV2 = new Settings.SerializerSettings();
-                serializerSettingsUntypedV2.className = GraphSONUntypedMessageSerializerV2d0.class.getName();
+                serializerSettingsUntypedV2.className = GraphSONUntypedMessageSerializerV2.class.getName();
                 settings.serializers.add(serializerSettingsUntypedV2);
                 final Settings.SerializerSettings serializerSettingsTypedV2 = new Settings.SerializerSettings();
-                serializerSettingsTypedV2.className = GraphSONMessageSerializerV2d0.class.getName();
+                serializerSettingsTypedV2.className = GraphSONMessageSerializerV2.class.getName();
                 settings.serializers.add(serializerSettingsTypedV2);
+                final Settings.SerializerSettings serializerSettingsUntypedV3 = new Settings.SerializerSettings();
+                serializerSettingsUntypedV3.className = GraphSONUntypedMessageSerializerV3.class.getName();
+                settings.serializers.add(serializerSettingsUntypedV3);
                 final Settings.SerializerSettings serializerSettingsTypedV3 = new Settings.SerializerSettings();
-                serializerSettingsTypedV3.className = GraphSONMessageSerializerV3d0.class.getName();
+                serializerSettingsTypedV3.className = GraphSONMessageSerializerV3.class.getName();
                 settings.serializers.add(serializerSettingsTypedV3);
                 break;
             case "should401OnGETWithNoAuthorizationHeader":
@@ -399,7 +403,7 @@
     public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResultGraphBinary() throws Exception {
         final CloseableHttpClient httpclient = HttpClients.createDefault();
         final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=gclassic.V()"));
-        final String mime = SerTokens.MIME_GRAPHBINARY_V1D0;
+        final String mime = SerTokens.MIME_GRAPHBINARY_V1;
         httpget.addHeader("Accept", mime);
 
         try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -420,7 +424,7 @@
     public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResultGraphBinaryToString() throws Exception {
         final CloseableHttpClient httpclient = HttpClients.createDefault();
         final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=gclassic.V()"));
-        final String mime = SerTokens.MIME_GRAPHBINARY_V1D0 + "-stringd";
+        final String mime = SerTokens.MIME_GRAPHBINARY_V1 + "-stringd";
         httpget.addHeader("Accept", mime);
 
         try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
@@ -571,7 +575,6 @@
 
     @Test
     public void should200OnPOSTTransactionalGraph() throws Exception {
-        assumeNeo4jIsPresent();
 
         final CloseableHttpClient httpclient = HttpClients.createDefault();
         final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
@@ -604,7 +607,6 @@
 
     @Test
     public void should200OnPOSTTransactionalGraphInStrictMode() throws Exception {
-        assumeNeo4jIsPresent();
 
         final CloseableHttpClient httpclient = HttpClients.createDefault();
         final HttpPost httppost = new HttpPost(TestClientFactory.createURLString());
@@ -955,12 +957,12 @@
 
         final HttpPost httppost1Untyped = new HttpPost(TestClientFactory.createURLString());
         httppost1Untyped.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
-        httppost1Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V1D0_UNTYPED);
+        httppost1Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V1_UNTYPED);
         httppost1Untyped.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
 
         try (final CloseableHttpResponse response = httpclient.execute(httppost1Untyped)) {
             assertEquals(200, response.getStatusLine().getStatusCode());
-            assertEquals(SerTokens.MIME_GRAPHSON_V1D0_UNTYPED, response.getEntity().getContentType().getValue());
+            assertEquals(SerTokens.MIME_GRAPHSON_V1_UNTYPED, response.getEntity().getContentType().getValue());
             final String json = EntityUtils.toString(response.getEntity());
             final JsonNode node = mapper.readTree(json);
             assertEquals(0, node.get("result").get("data").get(0).asInt());
@@ -968,12 +970,12 @@
 
         final HttpPost httppost2 = new HttpPost(TestClientFactory.createURLString());
         httppost2.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
-        httppost2.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V2D0);
+        httppost2.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V2);
         httppost2.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
 
         try (final CloseableHttpResponse response = httpclient.execute(httppost2)) {
             assertEquals(200, response.getStatusLine().getStatusCode());
-            assertEquals(SerTokens.MIME_GRAPHSON_V2D0, response.getEntity().getContentType().getValue());
+            assertEquals(SerTokens.MIME_GRAPHSON_V2, response.getEntity().getContentType().getValue());
             final String json = EntityUtils.toString(response.getEntity());
             final JsonNode node = mapper.readTree(json);
             assertEquals(0, node.get("result").get("data").get(0).get(GraphSONTokens.VALUEPROP).asInt());
@@ -981,12 +983,12 @@
 
         final HttpPost httppost2Untyped = new HttpPost(TestClientFactory.createURLString());
         httppost2Untyped.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
-        httppost2Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V2D0_UNTYPED);
+        httppost2Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V2_UNTYPED);
         httppost2Untyped.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
 
         try (final CloseableHttpResponse response = httpclient.execute(httppost2Untyped)) {
             assertEquals(200, response.getStatusLine().getStatusCode());
-            assertEquals(SerTokens.MIME_GRAPHSON_V2D0_UNTYPED, response.getEntity().getContentType().getValue());
+            assertEquals(SerTokens.MIME_GRAPHSON_V2_UNTYPED, response.getEntity().getContentType().getValue());
             final String json = EntityUtils.toString(response.getEntity());
             final JsonNode node = mapper.readTree(json);
             assertEquals(0, node.get("result").get("data").get(0).asInt());
@@ -994,16 +996,29 @@
 
         final HttpPost httppost3 = new HttpPost(TestClientFactory.createURLString());
         httppost3.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
-        httppost3.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V3D0);
+        httppost3.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V3);
         httppost3.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
 
         try (final CloseableHttpResponse response = httpclient.execute(httppost3)) {
             assertEquals(200, response.getStatusLine().getStatusCode());
-            assertEquals(SerTokens.MIME_GRAPHSON_V3D0, response.getEntity().getContentType().getValue());
+            assertEquals(SerTokens.MIME_GRAPHSON_V3, response.getEntity().getContentType().getValue());
             final String json = EntityUtils.toString(response.getEntity());
             final JsonNode node = mapper.readTree(json);
             assertEquals(0, node.get("result").get("data").get(GraphSONTokens.VALUEPROP).get(0).get(GraphSONTokens.VALUEPROP).asInt());
         }
+
+        final HttpPost httppost3Untyped = new HttpPost(TestClientFactory.createURLString());
+        httppost3Untyped.setHeader(HttpHeaders.CONTENT_TYPE, SerTokens.MIME_JSON);
+        httppost3Untyped.setHeader(HttpHeaders.ACCEPT, SerTokens.MIME_GRAPHSON_V3_UNTYPED);
+        httppost3Untyped.setEntity(new StringEntity("{\"gremlin\":\"1-1\"}", Consts.UTF_8));
+
+        try (final CloseableHttpResponse response = httpclient.execute(httppost3Untyped)) {
+            assertEquals(200, response.getStatusLine().getStatusCode());
+            assertEquals(SerTokens.MIME_GRAPHSON_V3_UNTYPED, response.getEntity().getContentType().getValue());
+            final String json = EntityUtils.toString(response.getEntity());
+            final JsonNode node = mapper.readTree(json);
+            assertEquals(0, node.get("result").get("data").get(0).asInt());
+        }
     }
 
     @Test
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 152778e..0112131 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -38,13 +38,13 @@
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.Result;
 import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
 import org.apache.tinkerpop.gremlin.driver.UserAgent;
 import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
@@ -92,7 +92,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_EVAL_TIMEOUT;
+import static org.apache.tinkerpop.gremlin.util.Tokens.ARGS_EVAL_TIMEOUT;
 import static org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin.Compilation.COMPILE_STATIC;
 import static org.apache.tinkerpop.gremlin.process.remote.RemoteConnection.GREMLIN_REMOTE;
 import static org.apache.tinkerpop.gremlin.process.remote.RemoteConnection.GREMLIN_REMOTE_CONNECTION_CLASS;
@@ -254,7 +254,7 @@
                 break;
             case "shouldRespondToTimeoutCancelledWsRequest":
             case "shouldRespondToTimeoutCancelledSessionRequest":
-                tryIncludeNeo4jGraph(settings);
+                useTinkerTransactionGraph(settings);
                 settings.evaluationTimeout = 5000;
                 settings.gremlinPool = POOL_SIZE_FOR_TIMEOUT_TESTS;
                 settings.channelizer = WebSocketChannelizer.class.getName();
@@ -265,7 +265,7 @@
                 settings.channelizer = UnifiedChannelizer.class.getName();
                 break;
             case "shouldRespondToTimeoutCancelledMultiTaskUnifiedRequest":
-                tryIncludeNeo4jGraph(settings);
+                useTinkerTransactionGraph(settings);
                 settings.evaluationTimeout = 30000;
                 settings.sessionLifetimeTimeout = 5000; // This needs to be shorter because of the delay in scheduling session task.
                 settings.gremlinPool = POOL_SIZE_FOR_TIMEOUT_TESTS;
@@ -1015,11 +1015,11 @@
 
     @Test
     public void shouldReceiveFailureOnBadGraphSONSerialization() throws Exception {
-        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
+        final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3).create();
         final Client client = cluster.connect();
 
         try {
-            client.submit("def class C { def C getC(){return this}}; new C()").all().join();
+            client.submit("class C { def C getC(){return this}}; new C()").all().join();
             fail("Should throw an exception.");
         } catch (RuntimeException re) {
             final Throwable root = ExceptionHelper.getRootCause(re);
@@ -1185,7 +1185,7 @@
 
     @Test
     public void shouldProvideBetterExceptionForMethodCodeTooLarge() {
-        final int numberOfParameters = 4000;
+        final int numberOfParameters = 6000;
         final Map<String,Object> b = new HashMap<>();
 
         // generate a script with a ton of bindings usage to generate a "code too large" exception
@@ -1247,7 +1247,6 @@
         // Don't test with UnifiedChannelizer since we only want to test the case where a task is cancelled before
         // running which is handled by shouldRespondToTimeoutCancelledMultiTaskUnifiedRequest.
         assumeThat("Must use OpProcessor", isUsingUnifiedChannelizer(), is(false));
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -1274,7 +1273,6 @@
      */
     @Test(timeout = 180000) // Add timeout in case the test hangs.
     public void shouldRespondToTimeoutCancelledMultiTaskUnifiedRequest() throws Exception {
-        assumeNeo4jIsPresent();
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
         final GraphTraversalSource gtx = g.tx().begin();
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
new file mode 100644
index 0000000..ebe6dfd
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSerializationIntegrateTest.java
@@ -0,0 +1,227 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server;
+
+import org.apache.tinkerpop.gremlin.driver.Client;
+import org.apache.tinkerpop.gremlin.driver.Cluster;
+import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
+import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractMessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class GremlinServerSerializationIntegrateTest extends AbstractGremlinServerIntegrationTest {
+
+    private AbstractMessageSerializer serializer;
+    private Cluster cluster = null;
+    private Client client = null;
+    private GraphTraversalSource g = null;
+
+    public GremlinServerSerializationIntegrateTest(AbstractMessageSerializer serializer) {
+        this.serializer = serializer;
+    }
+
+    @Parameterized.Parameters
+    public static Collection serializers() {
+        return Arrays.asList(new Object[][]{
+                {new GraphBinaryMessageSerializerV1()},
+                {new GraphSONMessageSerializerV3()},
+                {new GraphSONMessageSerializerV2()}
+        });
+    }
+
+    @Before
+    public void openConnection() {
+        cluster = TestClientFactory.build().serializer(serializer).create();
+        client = cluster.connect();
+
+        // VertexProperty related test tun on crew graph
+        final String remoteTraversalSourceName = name.getMethodName().contains("VertexProperty") ? "gcrew" : "gmodern";
+
+        g = AnonymousTraversalSource.traversal().withRemote(
+                DriverRemoteConnection.using(cluster, remoteTraversalSourceName));
+    }
+
+    @After
+    public void closeConnection() {
+        if (cluster != null) cluster.close();
+    }
+
+    @Test
+    public void shouldDeserializeVertexPropertiesForScripts() {
+        final Vertex vertex = client.submit("gmodern.V(1)").one().getVertex();
+
+        assertVertexWithProperties(vertex);
+    }
+
+    @Test
+    public void shouldSkipVertexPropertiesForScripts() {
+        final Vertex vertex = client.submit("gmodern.with('materializeProperties', 'tokens').V(1)").one().getVertex();
+
+        assertVertexWithoutProperties(vertex);
+    }
+
+    @Test
+    public void shouldDeserializeVertexPropertiesForBytecode() {
+        final Vertex vertex = g.V(1).next();
+
+        assertVertexWithProperties(vertex);
+    }
+
+    @Test
+    public void shouldSkipVertexPropertiesForBytecode() {
+        final Vertex vertex = g.with("materializeProperties", "tokens").V(1).next();
+
+        assertVertexWithoutProperties(vertex);
+    }
+
+    @Test
+    public void shouldDeserializeEdgePropertiesForScripts() {
+        final Edge edge = client.submit("gmodern.E(7)").one().getEdge();
+
+        assertEdgeWithProperties(edge);
+    }
+
+    @Test
+    public void shouldSkipEdgePropertiesForScripts() {
+        final Edge edge = client.submit("gmodern.with('materializeProperties', 'tokens').E(7)").one().getEdge();
+
+        assertEdgeWithoutProperties(edge);
+    }
+
+    @Test
+    public void shouldDeserializeEdgePropertiesForBytecode() {
+        final Edge edge = g.E(7).next();
+
+        assertEdgeWithProperties(edge);
+    }
+
+    @Test
+    public void shouldSkipEdgePropertiesForBytecode() {
+        final Edge edge = g.with("materializeProperties", "tokens").E(7).next();
+
+        assertEdgeWithoutProperties(edge);
+    }
+
+    @Test
+    public void shouldDeserializeVertexPropertyPropertiesForScripts() {
+        final Vertex vertex = client.submit("gcrew.V(7)").one().getVertex();
+
+        assertVertexWithVertexProperties(vertex);
+    }
+
+    @Test
+    public void shouldSkipVertexPropertyPropertiesForScripts() {
+        final Vertex vertex = client.submit("gcrew.with('materializeProperties', 'tokens').V(7)").one().getVertex();
+
+        assertVertexWithoutVertexProperties(vertex);
+    }
+
+    @Test
+    public void shouldDeserializeVertexPropertyPropertiesForBytecode() {
+        final Vertex vertex = g.V(7).next();
+
+        assertVertexWithVertexProperties(vertex);
+    }
+
+    @Test
+    public void shouldSkipVertexPropertyPropertiesForBytecode() {
+        final Vertex vertex = g.with("materializeProperties", "tokens").V(7).next();
+
+        assertVertexWithoutVertexProperties(vertex);
+    }
+
+    // asserted vertex 7 from crew graph
+    private void assertVertexWithVertexProperties(final Vertex vertex) {
+        assertEquals(7, vertex.id());
+        assertEquals("person", vertex.label());
+
+        assertEquals(4, IteratorUtils.count(vertex.properties()));
+        assertEquals(3, IteratorUtils.count(vertex.properties("location")));
+        final VertexProperty vertexProperty = vertex.properties("location").next();
+        assertEquals("centreville", vertexProperty.value());
+        assertEquals(2, IteratorUtils.count(vertexProperty.properties()));
+        final Property vertexPropertyPropertyStartTime = vertexProperty.property("startTime");
+        assertEquals(1990, vertexPropertyPropertyStartTime.value());
+        final Property vertexPropertyPropertyEndTime = vertexProperty.property("endTime");
+        assertEquals(2000, vertexPropertyPropertyEndTime.value());
+    }
+
+    // asserted vertex 7 from crew graph
+    private void assertVertexWithoutVertexProperties(final Vertex vertex) {
+        assertEquals(7, vertex.id());
+        assertEquals("person", vertex.label());
+
+        assertEquals(0, IteratorUtils.count(vertex.properties()));
+    }
+
+    // asserted vertex 1 from modern graph
+    private void assertVertexWithoutProperties(final Vertex vertex) {
+        assertEquals(1, vertex.id());
+        assertEquals("person", vertex.label());
+
+        assertEquals(Collections.emptyIterator(), vertex.properties());
+    }
+
+    // asserted vertex 1 from modern graph
+    private void assertVertexWithProperties(final Vertex vertex) {
+        assertEquals(1, vertex.id());
+        assertEquals("person", vertex.label());
+
+        assertEquals(2, IteratorUtils.count(vertex.properties()));
+        assertEquals("marko", vertex.property("name").value());
+        assertEquals(29, vertex.property("age").value());
+    }
+
+    // asserted edge 7 from modern graph
+    private void assertEdgeWithoutProperties(final Edge edge) {
+        assertEquals(7, edge.id());
+        assertEquals("knows", edge.label());
+
+        assertEquals(Collections.emptyIterator(), edge.properties());
+    }
+
+    // asserted edge 7 from modern graph
+    private void assertEdgeWithProperties(final Edge edge) {
+        assertEquals(7, edge.id());
+        assertEquals("knows", edge.label());
+
+        assertEquals(1, IteratorUtils.count(edge.properties()));
+        assertEquals(0.5, edge.property("weight").value());
+    }
+}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
index b951d88..2b6c25f 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
@@ -28,11 +28,11 @@
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.Result;
 import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
 import org.apache.tinkerpop.gremlin.server.channel.UnifiedChannelizer;
 import org.apache.tinkerpop.gremlin.server.op.session.Session;
@@ -131,7 +131,7 @@
             case "shouldExecuteInSessionWithTransactionManagement":
             case "shouldRollbackOnEvalExceptionForManagedTransaction":
             case "shouldNotExecuteQueuedRequestsIfOneInFrontOfItFails":
-                tryIncludeNeo4jGraph(settings);
+                useTinkerTransactionGraph(settings);
                 break;
             case "shouldEnsureSessionBindingsAreThreadSafe":
                 settings.threadPoolWorker = 2;
@@ -165,7 +165,6 @@
 
     @Test
     public void shouldBlowTheSessionQueueSize() throws Exception {
-        assumeNeo4jIsPresent();
         assumeThat(isUsingUnifiedChannelizer(), is(true));
 
         final Cluster cluster = TestClientFactory.open();
@@ -207,7 +206,6 @@
 
     @Test
     public void shouldNotExecuteQueuedRequestsIfOneInFrontOfItFails() throws Exception {
-        assumeNeo4jIsPresent();
         assumeThat(isUsingUnifiedChannelizer(), is(true));
 
         final Cluster cluster = TestClientFactory.open();
@@ -259,7 +257,6 @@
 
     @Test
     public void shouldCloseSessionOnClientClose() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster1 = TestClientFactory.open();
         final Client client1 = cluster1.connect(name.getMethodName());
@@ -307,7 +304,6 @@
 
     @Test
     public void shouldCloseSessionOnClientCloseWithStateMaintainedBetweenExceptions() throws Exception {
-        assumeNeo4jIsPresent();
         assumeThat("Must use UnifiedChannelizer", isUsingUnifiedChannelizer(), is(true));
 
         final Cluster cluster1 = TestClientFactory.open();
@@ -416,7 +412,6 @@
 
     @Test
     public void shouldRollbackOnEvalExceptionForManagedTransaction() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.open();
         final Client.SessionSettings sessionSettings = Client.SessionSettings.build().
@@ -576,7 +571,6 @@
     @Test
     @SuppressWarnings("unchecked")
     public void shouldExecuteInSessionAndSessionlessWithoutOpeningTransactionWithSingleClient() throws Exception {
-        assumeNeo4jIsPresent();
 
         try (final SimpleClient client = TestClientFactory.createWebSocketClient()) {
 
@@ -643,7 +637,6 @@
     @Test
     @SuppressWarnings("unchecked")
     public void shouldExecuteInSessionWithTransactionManagement() throws Exception {
-        assumeNeo4jIsPresent();
 
         try (final SimpleClient client = TestClientFactory.createWebSocketClient()) {
             final RequestMessage addRequest = RequestMessage.build(Tokens.OPS_EVAL)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
index 8c40e1f..ba2a238 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
@@ -24,14 +24,14 @@
 import io.netty.handler.ssl.SslProvider;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import io.netty.handler.ssl.util.SelfSignedCertificate;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
 import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.junit.Test;
 
 import javax.net.ssl.SSLException;
@@ -42,7 +42,6 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
index 08b50db..cf22cf9 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionTxIntegrateTest.java
@@ -56,8 +56,7 @@
     public Settings overrideSettings(final Settings settings) {
         final String nameOfTest = name.getMethodName();
 
-        deleteDirectory(new File("/tmp/neo4j"));
-        settings.graphs.put("graph", "conf/neo4j-empty.properties");
+        settings.graphs.put("graph", "conf/tinkertransactiongraph-empty.properties");
 
         switch (nameOfTest) {
             case "shouldExecuteBytecodeInSession":
@@ -83,7 +82,6 @@
     @Test
     @Ignore("TINKERPOP-2832")
     public void shouldTimeoutTxBytecode() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -116,7 +114,6 @@
 
     @Test
     public void shouldCommitTxBytecodeInSession() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -150,7 +147,6 @@
 
     @Test
     public void shouldCommitTxBytecodeInSessionWithExplicitTransactionObject() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -171,7 +167,6 @@
 
     @Test
     public void shouldRollbackTxBytecodeInSession() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -201,7 +196,6 @@
 
     @Test
     public void shouldCommitTxBytecodeInSessionOnCloseOfGtx() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -231,7 +225,6 @@
 
     @Test
     public void shouldCommitTxBytecodeInSessionOnCloseTx() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -261,7 +254,6 @@
 
     @Test
     public void shouldOpenAndCloseObsceneAmountOfSessions() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -294,7 +286,6 @@
 
     @Test
     public void shouldCommitTxBytecodeInSessionReusingGtxAcrossThreads() throws Exception {
-        assumeNeo4jIsPresent();
 
         final ExecutorService service = Executors.newFixedThreadPool(2);
 
@@ -327,7 +318,6 @@
 
     @Test
     public void shouldSpawnMultipleTraversalSourceInSameTransaction() throws Exception {
-        assumeNeo4jIsPresent();
 
         final Cluster cluster = TestClientFactory.build().create();
         final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -376,8 +366,6 @@
 
     @Test
     public void shouldCommitRollbackInScriptUsingGremlinLang() throws Exception {
-        assumeNeo4jIsPresent();
-
         final Cluster cluster = TestClientFactory.open();
         final Client.SessionSettings sessionSettings = Client.SessionSettings.build().
                 sessionId(name.getMethodName()).
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java
index 30b06b7..2d08b77 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/HttpDriverIntegrateTest.java
@@ -27,12 +27,11 @@
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
 import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
+import org.apache.tinkerpop.gremlin.util.ser.Serializers;
 import org.junit.Test;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.core.AllOf.allOf;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
@@ -50,7 +49,7 @@
     public void shouldSubmitScriptWithGraphSON() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHSON_V3D0)
+                .serializer(Serializers.GRAPHSON_V3)
                 .create();
         try {
             final Client client = cluster.connect();
@@ -66,7 +65,7 @@
     public void shouldSubmitScriptWithGraphBinary() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHBINARY_V1D0)
+                .serializer(Serializers.GRAPHBINARY_V1)
                 .create();
         try {
             final Client client = cluster.connect();
@@ -82,7 +81,7 @@
     public void shouldSubmitBytecodeWithGraphSON() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHSON_V3D0)
+                .serializer(Serializers.GRAPHSON_V3)
                 .create();
         try {
             final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -99,7 +98,7 @@
     public void shouldGetErrorForBytecodeWithUntypedGraphSON() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHSON_V2D0_UNTYPED)
+                .serializer(Serializers.GRAPHSON_V2_UNTYPED)
                 .create();
         try {
             final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -117,7 +116,7 @@
     public void shouldSubmitBytecodeWithGraphBinary() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHBINARY_V1D0)
+                .serializer(Serializers.GRAPHBINARY_V1)
                 .create();
         try {
             final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -135,7 +134,7 @@
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
                 .minConnectionPoolSize(1).maxConnectionPoolSize(1)
-                .serializer(Serializers.GRAPHBINARY_V1D0)
+                .serializer(Serializers.GRAPHBINARY_V1)
                 .create();
         try {
             for (int ix = 0; ix < 100; ix++) {
@@ -154,7 +153,7 @@
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
                 .minConnectionPoolSize(1).maxConnectionPoolSize(8)
-                .serializer(Serializers.GRAPHBINARY_V1D0)
+                .serializer(Serializers.GRAPHBINARY_V1)
                 .create();
         try {
             for (int ix = 0; ix < 100; ix++) {
@@ -172,7 +171,7 @@
     public void shouldFailToUseSession() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHBINARY_V1D0)
+                .serializer(Serializers.GRAPHBINARY_V1)
                 .create();
         try {
             final Client client = cluster.connect("shouldFailToUseSession");
@@ -190,7 +189,7 @@
     public void shouldFailToUseTx() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHBINARY_V1D0)
+                .serializer(Serializers.GRAPHBINARY_V1)
                 .create();
         try {
             final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -210,7 +209,7 @@
     public void shouldDeserializeErrorWithGraphBinary() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHBINARY_V1D0)
+                .serializer(Serializers.GRAPHBINARY_V1)
                 .create();
         try {
             final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "doesNotExist"));
@@ -227,7 +226,7 @@
     public void shouldDeserializeErrorWithGraphSON() throws Exception {
         final Cluster cluster = TestClientFactory.build()
                 .channelizer(Channelizer.HttpChannelizer.class)
-                .serializer(Serializers.GRAPHSON_V3D0)
+                .serializer(Serializers.GRAPHSON_V3)
                 .create();
         try {
             final GraphTraversalSource g = traversal().withRemote(DriverRemoteConnection.using(cluster, "doesNotExist"));
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
index b517585..a2554a2 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/TestClientFactory.java
@@ -39,7 +39,7 @@
     }
 
     public static Cluster.Builder build(final String address) {
-        return Cluster.build(address).port(45940);
+        return Cluster.build(address).port(PORT);
     }
 
     public static Cluster open() {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java
index 3944812..e8c686c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AllowListAuthorizer.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tinkerpop.gremlin.server.authz;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
@@ -147,7 +147,7 @@
      * {@link AuthorizationException} if this is not the case.
      *
      * @param user {@link AuthenticatedUser} that needs authorization.
-     * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.driver.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
+     * @param msg {@link RequestMessage} in which the {@link org.apache.tinkerpop.gremlin.util.Tokens}.ARGS_GREMLIN argument can contain an arbitrary succession of script statements.
      */
     public void authorize(final AuthenticatedUser user, final RequestMessage msg) throws AuthorizationException {
         if (!usernamesSandbox.contains(user.getName())) {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java
index 1b30c24..b8ec8b7 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/authz/AuthorizerTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tinkerpop.gremlin.server.authz;
 
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.verification.VertexProgramRestrictionStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java
index 6b911d9..51aacf2 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/handler/HttpHandlerUtilTest.java
@@ -29,13 +29,13 @@
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.codec.http.QueryStringEncoder;
 import io.netty.util.CharsetUtil;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
-import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -54,7 +54,7 @@
 
     private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
     private final GraphBinaryMessageSerializerV1 graphBinarySerializer = new GraphBinaryMessageSerializerV1();
-    public final GraphSONMessageSerializerV3d0 graphSONSerializer = new GraphSONMessageSerializerV3d0();
+    public final GraphSONMessageSerializerV3 graphSONSerializer = new GraphSONMessageSerializerV3();
 
     @Test
     public void shouldFailWhenIncorrectSerializerUsed() throws SerializationException {
@@ -67,13 +67,13 @@
         final ByteBuf buffer = graphSONSerializer.serializeRequestAsBinary(request, allocator);
 
         final HttpHeaders headers = new DefaultHttpHeaders();
-        headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V1D0);
+        headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V1);
 
         final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
                 buffer, headers, new DefaultHttpHeaders());
 
         final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
-        serializers.put(SerTokens.MIME_GRAPHBINARY_V1D0, graphBinarySerializer);
+        serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
 
         try {
             HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
@@ -94,13 +94,13 @@
         final ByteBuf buffer = graphBinarySerializer.serializeRequestAsBinary(request, allocator);
 
         final HttpHeaders headers = new DefaultHttpHeaders();
-        headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V1D0);
+        headers.add(HttpHeaderNames.CONTENT_TYPE, SerTokens.MIME_GRAPHBINARY_V1);
 
         final FullHttpRequest httpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "some uri",
                 buffer, headers, new DefaultHttpHeaders());
 
         final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
-        serializers.put(SerTokens.MIME_GRAPHBINARY_V1D0, graphBinarySerializer);
+        serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
 
         final RequestMessage deserialized = HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
         assertThat(request, samePropertyValuesAs(deserialized));
@@ -123,7 +123,7 @@
                 buffer, headers, new DefaultHttpHeaders());
 
         final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
-        serializers.put(SerTokens.MIME_GRAPHBINARY_V1D0, graphBinarySerializer);
+        serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
 
         final RequestMessage deserialized = HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
         assertEquals(gremlin, deserialized.getArgs().get(Tokens.ARGS_GREMLIN));
@@ -154,7 +154,7 @@
                     encoder.toString(), buffer, headers, new DefaultHttpHeaders());
 
             final Map<String, MessageSerializer<?>> serializers = new HashMap<>();
-            serializers.put(SerTokens.MIME_GRAPHBINARY_V1D0, graphBinarySerializer);
+            serializers.put(SerTokens.MIME_GRAPHBINARY_V1, graphBinarySerializer);
 
             final RequestMessage deserialized = HttpHandlerUtil.getRequestMessageFromHttpRequest(httpRequest, serializers);
             assertEquals(gremlin, deserialized.getArgs().get(Tokens.ARGS_GREMLIN));
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java
index 6d6f2d1..34fbd99 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/GraphManagerNotificationsTest.java
@@ -22,7 +22,7 @@
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.driver.RequestOptions;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.util.Tokens;
 import org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest;
 import org.apache.tinkerpop.gremlin.server.Settings;
 import org.apache.tinkerpop.gremlin.server.TestClientFactory;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java
index 211d2aa..94bd6fb 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/notifications/ProviderGraphManagerHelper.java
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.server.Settings;
 import org.apache.tinkerpop.gremlin.server.util.DefaultGraphManager;
 
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
index aa3fd73..42852f4 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
@@ -19,10 +19,10 @@
 package org.apache.tinkerpop.gremlin.server.op;
 
 import io.netty.channel.ChannelHandlerContext;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.Context;
 import org.apache.tinkerpop.gremlin.server.Settings;
@@ -38,7 +38,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 
 public class AbstractEvalOpProcessorTest {
 
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
index eaba1c6..0117562 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
@@ -18,9 +18,9 @@
  */
 package org.apache.tinkerpop.gremlin.server.op;
 
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.server.Context;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/CheckedGraphManagerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/CheckedGraphManagerTest.java
index 53900fc..5cd49c8 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/CheckedGraphManagerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/CheckedGraphManagerTest.java
@@ -66,7 +66,7 @@
     public void justAGraphFails() {
         settings.graphs.put("invalid", "conf/invalidPath");
         final GraphManager manager = new CheckedGraphManager(settings);
-        assertThat(manager.getGraphNames(), hasSize(6));
+        assertThat(manager.getGraphNames(), hasSize(7));
     }
 
     /**
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManagerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManagerTest.java
index 6c0e8b0..daf04bc 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManagerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManagerTest.java
@@ -22,6 +22,7 @@
 import org.apache.tinkerpop.gremlin.server.Settings;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerTransactionGraph;
 import org.junit.Test;
 
 import javax.script.Bindings;
@@ -47,7 +48,7 @@
         final Set<String> graphNames = graphManager.getGraphNames();
 
         assertNotNull(graphNames);
-        assertEquals(6, graphNames.size());
+        assertEquals(7, graphNames.size());
 
         assertThat(graphNames.contains("graph"), is(true));
         assertThat(graphNames.contains("classic"), is(true));
@@ -55,7 +56,9 @@
         assertThat(graphNames.contains("crew"), is(true));
         assertThat(graphNames.contains("sink"), is(true));
         assertThat(graphNames.contains("grateful"), is(true));
+        assertThat(graphNames.contains("tx"), is(true));
         assertThat(graphManager.getGraph("graph"), instanceOf(TinkerGraph.class));
+        assertThat(graphManager.getGraph("tx"), instanceOf(TinkerTransactionGraph.class));
     }
 
     @Test
@@ -65,14 +68,16 @@
         final Bindings bindings = graphManager.getAsBindings();
 
         assertNotNull(bindings);
-        assertEquals(6, bindings.size());
+        assertEquals(7, bindings.size());
         assertThat(bindings.containsKey("graph"), is(true));
         assertThat(bindings.containsKey("classic"), is(true));
         assertThat(bindings.containsKey("modern"), is(true));
         assertThat(bindings.containsKey("crew"), is(true));
         assertThat(bindings.containsKey("sink"), is(true));
         assertThat(bindings.containsKey("grateful"), is(true));
+        assertThat(bindings.containsKey("tx"), is(true));
         assertThat(bindings.get("graph"), instanceOf(TinkerGraph.class));
+        assertThat(bindings.get("tx"), instanceOf(TinkerTransactionGraph.class));
     }
 
     @Test
@@ -94,7 +99,7 @@
 
         final Set<String> graphNames = graphManager.getGraphNames();
         assertNotNull(graphNames);
-        assertEquals(7, graphNames.size());
+        assertEquals(8, graphNames.size());
         assertThat(graphNames.contains("newGraph"), is(true));
         assertThat(graphNames.contains("graph"), is(true));
         assertThat(graphNames.contains("classic"), is(true));
@@ -102,7 +107,9 @@
         assertThat(graphNames.contains("crew"), is(true));
         assertThat(graphNames.contains("sink"), is(true));
         assertThat(graphNames.contains("grateful"), is(true));
+        assertThat(graphNames.contains("tx"), is(true));
         assertThat(graphManager.getGraph("newGraph"), instanceOf(TinkerGraph.class));
+        assertThat(graphManager.getGraph("tx"), instanceOf(TinkerTransactionGraph.class));
     }
 
     @Test
@@ -113,14 +120,14 @@
         graphManager.putGraph("newGraph", graph);
         final Set<String> graphNames = graphManager.getGraphNames();
         assertNotNull(graphNames);
-        assertEquals(7, graphNames.size());
+        assertEquals(8, graphNames.size());
         assertThat(graphNames.contains("newGraph"), is(true));
         assertThat(graphManager.getGraph("newGraph"), instanceOf(TinkerGraph.class));
 
         graphManager.removeGraph("newGraph");
 
         final Set<String> graphNames2 = graphManager.getGraphNames();
-        assertEquals(6, graphNames2.size());
+        assertEquals(7, graphNames2.size());
         assertThat(graphNames2.contains("newGraph"), is(false));
     }
 
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java
index 803d149..b88daaf 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/TextPlainMessageSerializerTest.java
@@ -19,7 +19,7 @@
 package org.apache.tinkerpop.gremlin.server.util;
 
 import io.netty.buffer.ByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
 import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
 import org.junit.Test;
 
diff --git a/gremlin-server/src/test/resources/conf/remote-objects.yaml b/gremlin-server/src/test/resources/conf/remote-objects.yaml
index b32ba79..f9043f0 100644
--- a/gremlin-server/src/test/resources/conf/remote-objects.yaml
+++ b/gremlin-server/src/test/resources/conf/remote-objects.yaml
@@ -29,4 +29,4 @@
 
 hosts: [localhost]
 port: 45940
-serializer: {  className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
\ No newline at end of file
+serializer: {  className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
\ No newline at end of file
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index 97b8157..1590489 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -38,7 +38,9 @@
   modern: conf/tinkergraph-empty.properties,
   crew: conf/tinkergraph-empty.properties,
   grateful: conf/tinkergraph-empty.properties,
-  sink: conf/tinkergraph-empty.properties}
+  sink: conf/tinkergraph-empty.properties,
+  tx: conf/tinkertransactiongraph-empty.properties
+}
 scriptEngines: {
   gremlin-lang : {},
   gremlin-groovy: {
@@ -48,11 +50,11 @@
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONUntypedMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}
diff --git a/gremlin-server/src/test/scripts/generate-all.groovy b/gremlin-server/src/test/scripts/generate-all.groovy
index a44786d..9578ccb 100644
--- a/gremlin-server/src/test/scripts/generate-all.groovy
+++ b/gremlin-server/src/test/scripts/generate-all.groovy
@@ -36,12 +36,8 @@
     // things now, that test config would have been mixed in with release artifacts and there would have been ugly
     // exclusions to make packaging work properly.
     allowSetOfIdManager = { graph, idManagerFieldName, idManager ->
-        java.lang.reflect.Field idManagerField = graph.class.getDeclaredField(idManagerFieldName)
+        java.lang.reflect.Field idManagerField = graph.class.getSuperclass().getDeclaredField(idManagerFieldName)
         idManagerField.setAccessible(true)
-        java.lang.reflect.Field modifiersField = java.lang.reflect.Field.class.getDeclaredField("modifiers")
-        modifiersField.setAccessible(true)
-        modifiersField.setInt(idManagerField, modifiersField.getModifiers() & ~java.lang.reflect.Modifier.FINAL)
-
         idManagerField.set(graph, idManager)
     }
 
@@ -55,29 +51,22 @@
     TinkerFactory.generateTheCrew(crew)
     TinkerFactory.generateGratefulDead(grateful)
     TinkerFactory.generateKitchenSink(sink)
-
   }
 ] as LifeCycleHook]
 
 // add default TraversalSource instances for each graph instance
-globals << [gclassic : traversal().withEmbedded(classic).withStrategies(ReferenceElementStrategy)]
-globals << [gmodern : traversal().withEmbedded(modern).withStrategies(ReferenceElementStrategy)]
-globals << [g : traversal().withEmbedded(graph).withStrategies(ReferenceElementStrategy)]
-globals << [gcrew : traversal().withEmbedded(crew).withStrategies(ReferenceElementStrategy)]
-globals << [ggraph : traversal().withEmbedded(graph).withStrategies(ReferenceElementStrategy)]
-globals << [ggrateful : traversal().withEmbedded(grateful).withStrategies(ReferenceElementStrategy)]
-globals << [gsink : traversal().withEmbedded(sink).withStrategies(ReferenceElementStrategy)]
-
-// dynamically detect existence of gtx as it may or may not be present depending on the -DincludeNeo4j
-// and the configuration of the particular server instance. with docker/gremlin-server.sh the neo4j
-// "tx" configuration is already present and will therefore be enabled.
-def dynamicGtx = context.getBindings(javax.script.ScriptContext.GLOBAL_SCOPE)["tx"]
-if (dynamicGtx != null)
-    globals << [gtx : traversal().withEmbedded(dynamicGtx).withStrategies(ReferenceElementStrategy)]
+globals << [gclassic : traversal().withEmbedded(classic)]
+globals << [gmodern : traversal().withEmbedded(modern)]
+globals << [g : traversal().withEmbedded(graph)]
+globals << [gcrew : traversal().withEmbedded(crew)]
+globals << [ggraph : traversal().withEmbedded(graph)]
+globals << [ggrateful : traversal().withEmbedded(grateful)]
+globals << [gsink : traversal().withEmbedded(sink)]
+globals << [gtx : traversal().withEmbedded(tx)]
 
 // dynamically detect existence of gimmutable as it is only used in gremlin-go testing suite
 def dynamicGimmutable = context.getBindings(javax.script.ScriptContext.GLOBAL_SCOPE)["immutable"]
 if (dynamicGimmutable != null)
-    globals << [gimmutable : traversal().withEmbedded(dynamicGimmutable).withStrategies(ReferenceElementStrategy)]
+    globals << [gimmutable : traversal().withEmbedded(dynamicGimmutable)]
 
 globals
diff --git a/gremlin-server/src/test/scripts/test-server-start.groovy b/gremlin-server/src/test/scripts/test-server-start.groovy
index 7119d2b..d5eaab0 100644
--- a/gremlin-server/src/test/scripts/test-server-start.groovy
+++ b/gremlin-server/src/test/scripts/test-server-start.groovy
@@ -34,19 +34,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 if (Boolean.parseBoolean(skipTests)) return
-def testTransactions = System.getProperty("includeNeo4j") != null
-
-if (testTransactions) {
-    // clean up prior neo4j instances
-    def tempNeo4jDir = new java.io.File("/tmp/neo4j")
-    if (tempNeo4jDir.exists()) {
-        log.info("Cleaning up prior Neo4j test instances for ${executionName}")
-        org.apache.commons.io.FileUtils.deleteDirectory(tempNeo4jDir)
-    }
-}
 
 log.info("Starting Gremlin Server instances for native testing of ${executionName}")
-log.info("Transactions validated (enabled with -DincludeNeo4j and only available on port 45940): " + testTransactions)
 
 def platformAgnosticBaseDirPath = "${tinkerpopRootDir}".replace("\\", "/")
 def platformAgnosticGremlinServerDir = platformAgnosticBaseDirPath + "/gremlin-server"
@@ -60,7 +49,7 @@
 settings.graphs.crew = platformAgnosticGremlinServerDir + "/src/test/scripts/tinkergraph-empty.properties"
 settings.graphs.grateful = platformAgnosticGremlinServerDir + "/src/test/scripts/tinkergraph-empty.properties"
 settings.graphs.sink = platformAgnosticGremlinServerDir + "/src/test/scripts/tinkergraph-empty.properties"
-if (testTransactions) settings.graphs.tx = platformAgnosticGremlinServerDir + "/src/test/scripts/neo4j-empty.properties"
+settings.graphs.tx = platformAgnosticGremlinServerDir + "/src/test/scripts/tinkertransactiongraph-empty.properties"
 settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files = [platformAgnosticGremlinServerDir + "/src/test/scripts/generate-all.groovy"]
 settings.port = 45940
 
diff --git a/gremlin-server/src/test/scripts/tinkertransactiongraph-empty.properties b/gremlin-server/src/test/scripts/tinkertransactiongraph-empty.properties
new file mode 100644
index 0000000..86103c1
--- /dev/null
+++ b/gremlin-server/src/test/scripts/tinkertransactiongraph-empty.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerTransactionGraph
+gremlin.tinkergraph.vertexIdManager=INTEGER
+gremlin.tinkergraph.edgeIdManager=INTEGER
+gremlin.tinkergraph.vertexPropertyIdManager=LONG
+gremlin.tinkergraph.service=org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerTextSearchFactory
+gremlin.tinkergraph.service=org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerDegreeCentralityFactory
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index a99d993..f793786 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-shaded</artifactId>
     <name>Apache TinkerPop :: Gremlin Shaded</name>
@@ -112,6 +112,13 @@
                             <shadedArtifactAttached>false</shadedArtifactAttached>
                             <minimizeJar>false</minimizeJar>
                             <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                                    <resources>
+                                        <resource>META-INF/licenses/kryo</resource>
+                                        <resource>META-INF/licenses/minlog</resource>
+                                        <resource>META-INF/licenses/bigint</resource>
+                                    </resources>
+                                </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
                                     <resource>META-INF/licenses/kryo</resource>
                                     <file>src/main/static/licenses/kryo</file>
diff --git a/gremlin-shaded/src/main/static/NOTICE b/gremlin-shaded/src/main/static/NOTICE
index aa0c1d9..23fdb19 100644
--- a/gremlin-shaded/src/main/static/NOTICE
+++ b/gremlin-shaded/src/main/static/NOTICE
@@ -7,9 +7,6 @@
 ------------------------------------------------------------------------
 Jackson-Databind, Jackson-Annotation and Jackson-Core 2.15.2
 ------------------------------------------------------------------------
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
 It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
 been in development since 2007.
 It is currently developed by a community of developers.
@@ -35,6 +32,6 @@
         (We only use those portions of the bigint project that can be licensed under 2-clause BSD License.)
 
 ------------------------------------------------------------------------
-Objenesis 2.4
+Objenesis 3.3 - shaded in gremlin-shaded to org.apache.tinkerpop.shaded.objenesis
 ------------------------------------------------------------------------
-Copyright 2006-2016 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+Copyright 2006-2022 Joe Walnes, Henri Tremblay, Leonardo Mesquita
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 5079a15..e2bfcb3 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-test</artifactId>
     <name>Apache TinkerPop :: Gremlin Test</name>
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
index 0c69d5d..be89cee 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
@@ -122,15 +122,15 @@
         public String location() {
             switch (this) {
                 case CLASSIC:
-                    return RESOURCE_PATH_PREFIX + "tinkerpop-classic-v3d0.kryo";
+                    return RESOURCE_PATH_PREFIX + "tinkerpop-classic-v3.kryo";
                 case CREW:
-                    return RESOURCE_PATH_PREFIX + "tinkerpop-crew-v3d0.kryo";
+                    return RESOURCE_PATH_PREFIX + "tinkerpop-crew-v3.kryo";
                 case MODERN:
-                    return RESOURCE_PATH_PREFIX + "tinkerpop-modern-v3d0.kryo";
+                    return RESOURCE_PATH_PREFIX + "tinkerpop-modern-v3.kryo";
                 case GRATEFUL:
-                    return RESOURCE_PATH_PREFIX + "grateful-dead-v3d0.kryo";
+                    return RESOURCE_PATH_PREFIX + "grateful-dead-v3.kryo";
                 case SINK:
-                    return RESOURCE_PATH_PREFIX + "tinkerpop-sink-v3d0.kryo";
+                    return RESOURCE_PATH_PREFIX + "tinkerpop-sink-v3.kryo";
             }
 
             throw new RuntimeException("No file for this GraphData type");
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java
index acda7bd..4b2969e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/algorithm/generator/AbstractGeneratorTest.java
@@ -58,11 +58,23 @@
 
     private boolean sameInVertices(final Vertex v, final List<Vertex> inVertices) {
         return inVertices.stream()
-                .allMatch(inVertex -> IteratorUtils.filter(v.vertices(Direction.IN), hv -> hv.value("oid").equals(inVertex.value("oid"))).hasNext());
+                .allMatch(inVertex ->
+                {
+                    final Iterator<Vertex> itty = v.vertices(Direction.IN);
+                    final boolean result = IteratorUtils.filter(itty, hv -> hv.value("oid").equals(inVertex.value("oid"))).hasNext();
+                    CloseableIterator.closeIterator(itty);
+                    return result;
+                });
     }
 
     private boolean sameOutVertices(final Vertex v, final List<Vertex> outVertices) {
         return outVertices.stream()
-                .allMatch(outVertex -> IteratorUtils.filter(v.vertices(Direction.OUT), hv -> hv.value("oid").equals(outVertex.value("oid"))).hasNext());
+                .allMatch(outVertex ->
+                {
+                    final Iterator<Vertex> itty = v.vertices(Direction.OUT);
+                    final boolean result = IteratorUtils.filter(itty, hv -> hv.value("oid").equals(outVertex.value("oid"))).hasNext();
+                    CloseableIterator.closeIterator(itty);
+                    return result;
+                });
     }
 }
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
index c1d726c..ba28d95 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
@@ -43,6 +43,7 @@
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.DatetimeHelper;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
@@ -68,6 +69,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -129,6 +131,8 @@
         add(Pair.with(Pattern.compile("d\\[(.*)\\]\\.m"), s -> s + "m"));
         add(Pair.with(Pattern.compile("d\\[(.*)\\]\\.n"), s -> s + "n"));
 
+        add(Pair.with(Pattern.compile("dt\\[(.*)\\]"), s -> String.format("datetime('%s')", s)));
+
         add(Pair.with(Pattern.compile("v\\[(.+)\\]\\.id"), s -> world.convertIdToScript(g.V().has("name", s).id().next(), Vertex.class)));
         add(Pair.with(Pattern.compile("v\\[(.+)\\]\\.sid"), s -> world.convertIdToScript(g.V().has("name", s).id().next(), Vertex.class)));
         add(Pair.with(Pattern.compile("v\\[(.+)\\]"), s -> {
@@ -183,6 +187,15 @@
             return Stream.of(items).map(String::trim).map(x -> convertToObject(x)).collect(Collectors.toList());
         }));
 
+        add(Pair.with(Pattern.compile("s\\[\\]"), s -> Collections.emptySet()));
+        add(Pair.with(Pattern.compile("s\\[(.*)\\]"), s -> {
+            final String[] items = s.split(",");
+            return Stream.of(items).map(String::trim).map(x -> convertToObject(x)).collect(Collectors.toSet());
+        }));
+
+        // return the string values as is, used to wrap results that may contain other regex patterns
+        add(Pair.with(Pattern.compile("str\\[(.*)\\]"), String::valueOf));
+
         /*
          * TODO FIXME Add same support for other languages (js, python, .net)
          */
@@ -210,6 +223,8 @@
         add(Pair.with(Pattern.compile("d\\[(.*)\\]\\.m"), BigDecimal::new));
         add(Pair.with(Pattern.compile("d\\[(.*)\\]\\.n"), BigInteger::new));
 
+        add(Pair.with(Pattern.compile("dt\\[(.*)\\]"), s -> DatetimeHelper.parse(s)));
+
         add(Pair.with(Pattern.compile("v\\[(.+)\\]\\.id"), s -> g.V().has("name", s).id().next()));
         add(Pair.with(Pattern.compile("v\\[(.+)\\]\\.sid"), s -> g.V().has("name", s).id().next().toString()));
         add(Pair.with(Pattern.compile("v\\[(.+)\\]"), s -> g.V().has("name", s).next()));
@@ -221,13 +236,8 @@
         add(Pair.with(Pattern.compile("D\\[(.*)\\]"), Direction::valueOf));
         add(Pair.with(Pattern.compile("M\\[(.*)\\]"), Merge::valueOf));
 
-        add(Pair.with(Pattern.compile("c\\[(.*)\\]"), s -> Collections.emptySet()));
-        add(Pair.with(Pattern.compile("s\\[\\]"), s -> {
-            throw new AssumptionViolatedException("This test uses a empty Set as a parameter which is not supported by gremlin-language");
-        }));
-        add(Pair.with(Pattern.compile("s\\[(.*)\\]"), s -> {
-            final String[] items = s.split(",");
-            return Stream.of(items).map(String::trim).map(x -> convertToObject(x)).collect(Collectors.toSet());
+        add(Pair.with(Pattern.compile("c\\[(.*)\\]"), s -> {
+            throw new AssumptionViolatedException("This test uses a lambda as a parameter which is not supported by gremlin-language");
         }));
 
         add(Pair.with(Pattern.compile("(null)"), s -> null));
@@ -509,7 +519,7 @@
             final Matcher matcher = pattern.matcher((String) v);
             if (matcher.find()) {
                 final Function<String,Object> converter = matcherConverter.getValue1();
-                return converter.apply(matcher.group(1));
+                return converter.apply(matcher.groupCount() == 0 ? "" : matcher.group(1));
             }
         }
 
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java
index 65de0e7..838a618 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/TestFiles.java
@@ -38,28 +38,28 @@
     static {
         try {
             final List<String> kryoResources = Arrays.asList(
-                    "tinkerpop-modern-v3d0.kryo",
-                    "grateful-dead-v3d0.kryo",
-                    "tinkerpop-classic-v3d0.kryo",
-                    "tinkerpop-crew-v3d0.kryo",
-                    "tinkerpop-sink-v3d0.kryo");
+                    "tinkerpop-modern-v3.kryo",
+                    "grateful-dead-v3.kryo",
+                    "tinkerpop-classic-v3.kryo",
+                    "tinkerpop-crew-v3.kryo",
+                    "tinkerpop-sink-v3.kryo");
             for (final String fileName : kryoResources) {
                 PATHS.put(fileName,
                         Storage.toPath(TestHelper.generateTempFileFromResource(GryoResourceAccess.class, fileName, "")));
             }
 
             final List<String> graphsonResources = Arrays.asList(
-                    "tinkerpop-modern-typed-v2d0.json",
-                    "tinkerpop-modern-v3d0.json",
-                    "grateful-dead-typed-v2d0.json",
-                    "grateful-dead-v3d0.json",
-                    "tinkerpop-classic-typed-v2d0.json",
-                    "tinkerpop-classic-v3d0.json",
-                    "tinkerpop-classic-byteid-v3d0.json",
-                    "tinkerpop-classic-byteid-typed-v2d0.json",
-                    "tinkerpop-crew-typed-v2d0.json",
-                    "tinkerpop-crew-v3d0.json",
-                    "tinkerpop-sink-v3d0.json");
+                    "tinkerpop-modern-typed-v2.json",
+                    "tinkerpop-modern-v3.json",
+                    "grateful-dead-typed-v2.json",
+                    "grateful-dead-v3.json",
+                    "tinkerpop-classic-typed-v2.json",
+                    "tinkerpop-classic-v3.json",
+                    "tinkerpop-classic-byteid-v3.json",
+                    "tinkerpop-classic-byteid-typed-v2.json",
+                    "tinkerpop-crew-typed-v2.json",
+                    "tinkerpop-crew-v3.json",
+                    "tinkerpop-sink-v3.json");
             for (final String fileName : graphsonResources) {
                 PATHS.put(fileName,
                         Storage.toPath(TestHelper.generateTempFileFromResource(GraphSONResourceAccess.class, fileName, "")));
@@ -82,7 +82,7 @@
     }
 
     public static String getInputLocation(final LoadGraphWith.GraphData graphData, final boolean useGraphSON) {
-        final String type = useGraphSON ? "-v3d0.json" : "-v3d0.kryo";
+        final String type = useGraphSON ? "-v3.json" : "-v3.kryo";
 
         if (graphData.equals(LoadGraphWith.GraphData.GRATEFUL))
             return PATHS.get("grateful-dead" + type);
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java
index df7c95c..e99812a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/OrderabilityTest.java
@@ -27,7 +27,7 @@
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.util.tools.CollectionFactory;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -39,8 +39,6 @@
 
 import java.util.Arrays;
 import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -55,10 +53,10 @@
         Date date = new Date();
         List list1 = Arrays.asList(1, 2, 3);
         List list2 = Arrays.asList(1, 2, 3, 4);
-        Set set1 = CollectionFactory.asSet(list1);
-        Set set2 = CollectionFactory.asSet(list2);
-        Map map1 = CollectionFactory.asMap(1, 11, 2, 22, 3, false, 4, 44);
-        Map map2 = CollectionFactory.asMap(1, 11, 2, 22, 33);
+        Set set1 = CollectionUtil.asSet(list1);
+        Set set2 = CollectionUtil.asSet(list2);
+        Map map1 = CollectionUtil.asMap(1, 11, 2, 22, 3, false, 4, 44);
+        Map map2 = CollectionUtil.asMap(1, 11, 2, 22, 33);
 
         Object[] unordered = { map2, 1, map1, "foo", null, list1, date, set1, list2, true, uuid, "bar", 2.0, false, set2 };
     }
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeTest.java
new file mode 100644
index 0000000..61ca5f6
--- /dev/null
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/EdgeTest.java
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+
+import org.apache.tinkerpop.gremlin.FeatureRequirement;
+import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
+import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Valentyn Kahamlyk
+ */
+@RunWith(GremlinProcessRunner.class)
+public abstract class EdgeTest extends AbstractGremlinProcessTest {
+
+    public abstract Traversal<Vertex, Edge> get_g_V_EX11X(final Object e11Id);
+
+    public abstract Traversal<Edge, Edge> get_g_EX11X_E(final Object e11Id);
+
+    public abstract Traversal<Vertex, Edge> get_g_V_EXnullX();
+
+    public abstract Traversal<Integer, Edge> get_g_injectX1X_EX11_nullX(final Object e11Id);
+
+    public abstract Traversal<Integer, Edge> get_g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX();
+
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_V_EX11X() {
+        final Object edgeId = convertToEdgeId("josh", "created", "lop");
+        final Traversal<Vertex, Edge> traversal = get_g_V_EX11X(edgeId);
+        printTraversalForm(traversal);
+        int counter = 0;
+        final Set<Edge> edges = new HashSet<>();
+        while (traversal.hasNext()) {
+            counter++;
+            edges.add(traversal.next());
+        }
+        assertEquals(6, edges.size());
+        assertEquals(6, counter);
+    }
+
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_EX11X_E() {
+        final Object edgeId = convertToEdgeId("josh", "created", "lop");
+        final Traversal<Edge, Edge> traversal = get_g_EX11X_E(edgeId);
+        printTraversalForm(traversal);
+        int counter = 0;
+        final Set<Edge> edges = new HashSet<>();
+        while (traversal.hasNext()) {
+            counter++;
+            edges.add(traversal.next());
+        }
+        assertEquals(6, edges.size());
+        assertEquals(6, counter);
+    }
+
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_V_EXnullX() {
+        final Traversal<Vertex, Edge> traversal = get_g_V_EXnullX();
+        printTraversalForm(traversal);
+        int counter = 0;
+        final Set<Edge> edges = new HashSet<>();
+        while (traversal.hasNext()) {
+            counter++;
+            edges.add(traversal.next());
+        }
+        assertEquals(0, edges.size());
+        assertEquals(0, counter);
+    }
+
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_injectX1X_EX11_nullX() {
+        final Object edgeId = convertToEdgeId("josh", "created", "lop");
+        final Traversal<Integer, Edge> traversal = get_g_injectX1X_EX11_nullX(edgeId);
+        printTraversalForm(traversal);
+        int counter = 0;
+        final Set<Edge> edges = new HashSet<>();
+        while (traversal.hasNext()) {
+            counter++;
+            edges.add(traversal.next());
+        }
+        assertEquals(1, edges.size());
+        assertEquals(1, counter);
+    }
+
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX() {
+        final Traversal<Integer, Edge> traversal = get_g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX();
+        printTraversalForm(traversal);
+        int counter = 0;
+        final Set<Edge> edges = new HashSet<>();
+        while (traversal.hasNext()) {
+            counter++;
+            edges.add(traversal.next());
+        }
+        assertEquals(1, edges.size());
+        assertEquals(1, counter);
+    }
+
+    public static class Traversals extends EdgeTest {
+
+        @Override
+        public Traversal<Vertex, Edge> get_g_V_EX11X(final Object e11Id) { return g.V().E(e11Id); }
+
+        @Override
+        public Traversal<Edge, Edge> get_g_EX11X_E(final Object e11Id) {
+            return g.E(e11Id).E();
+        }
+
+        @Override
+        public Traversal<Vertex, Edge> get_g_V_EXnullX() { return g.V().E(null); }
+
+        @Override
+        public Traversal<Integer, Edge> get_g_injectX1X_EX11_nullX(final Object e11Id) { return g.inject(1).E(e11Id,null); }
+
+        @Override
+        public Traversal<Integer, Edge> get_g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX() {
+            return g.inject(1).coalesce(__.E().hasLabel("tests"), __.addE("tests").from(__.V().has("name","josh")).to(__.V().has("name","vadas")));
+        }
+    }
+}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
index c308a9d..226c0f3 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
@@ -37,7 +37,7 @@
 import org.junit.runner.RunWith;
 
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringEndsWith.endsWith;
 import static org.junit.Assert.assertEquals;
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexTest.java
index f7c0b16..9185d3a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexTest.java
@@ -33,7 +33,7 @@
 import org.junit.runner.RunWith;
 
 import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReadTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReadTest.java
index c3b53c4..e572cf9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReadTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReadTest.java
@@ -59,7 +59,7 @@
     @Test
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_READ)
     public void g_io_readXkryoX() throws IOException {
-        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GryoResourceAccess.class, "tinkerpop-modern-v3d0.kryo", "").getAbsolutePath().replace('\\', '/');
+        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GryoResourceAccess.class, "tinkerpop-modern-v3.kryo", "").getAbsolutePath().replace('\\', '/');
         final Traversal<Object,Object> traversal = get_g_io_readXkryoX(fileToRead);
         printTraversalForm(traversal);
         traversal.iterate();
@@ -75,7 +75,7 @@
     @Test
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_READ)
     public void g_io_read_withXreader_gryoX() throws IOException {
-        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GryoResourceAccess.class, "tinkerpop-modern-v3d0.kryo", "").getAbsolutePath().replace('\\', '/');
+        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GryoResourceAccess.class, "tinkerpop-modern-v3.kryo", "").getAbsolutePath().replace('\\', '/');
         final Traversal<Object,Object> traversal = get_g_io_read_withXreader_gryoX(fileToRead);
         printTraversalForm(traversal);
         traversal.iterate();
@@ -91,7 +91,7 @@
     @Test
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_READ)
     public void g_io_readXjsonX() throws IOException {
-        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GraphSONResourceAccess.class, "tinkerpop-modern-v3d0.json", "").getAbsolutePath().replace('\\', '/');
+        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GraphSONResourceAccess.class, "tinkerpop-modern-v3.json", "").getAbsolutePath().replace('\\', '/');
         final Traversal<Object,Object> traversal = get_g_io_readXjsonX(fileToRead);
         printTraversalForm(traversal);
         traversal.iterate();
@@ -107,7 +107,7 @@
     @Test
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_READ)
     public void g_io_read_withXreader_graphsonX() throws IOException {
-        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GraphSONResourceAccess.class, "tinkerpop-modern-v3d0.json", "").getAbsolutePath().replace('\\', '/');
+        final String fileToRead = TestHelper.generateTempFileFromResource(ReadTest.class, GraphSONResourceAccess.class, "tinkerpop-modern-v3.json", "").getAbsolutePath().replace('\\', '/');
         final Traversal<Object,Object> traversal = get_g_io_read_withXreader_graphsonX(fileToRead);
         printTraversalForm(traversal);
         traversal.iterate();
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/WriteTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/WriteTest.java
index cfd9e09..1c0a58a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/WriteTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/WriteTest.java
@@ -58,7 +58,7 @@
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_WRITE)
     public void g_io_writeXkryoX() throws IOException {
-        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class, "tinkerpop-modern-v3d0", ".kryo").getAbsolutePath().replace('\\', '/');
+        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class, "tinkerpop-modern-v3", ".kryo").getAbsolutePath().replace('\\', '/');
 
         final File f = new File(fileToWrite);
         assertThat(f.length() == 0, is(true));
@@ -74,7 +74,7 @@
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_WRITE)
     public void g_io_write_withXwrite_gryoX() throws IOException {
-        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class, "tinkerpop-modern-v3d0", ".kryo").getAbsolutePath().replace('\\', '/');
+        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class, "tinkerpop-modern-v3", ".kryo").getAbsolutePath().replace('\\', '/');
 
         final File f = new File(fileToWrite);
         assertThat(f.length() == 0, is(true));
@@ -90,7 +90,7 @@
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_WRITE)
     public void g_io_writeXjsonX() throws IOException {
-        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class,"tinkerpop-modern-v3d0", ".json").getAbsolutePath().replace('\\', '/');
+        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class,"tinkerpop-modern-v3", ".json").getAbsolutePath().replace('\\', '/');
 
         final File f = new File(fileToWrite);
         assertThat(f.length() == 0, is(true));
@@ -106,7 +106,7 @@
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_IO_WRITE)
     public void g_io_write_withXwriter_graphsonX() throws IOException {
-        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class,"tinkerpop-modern-v3d0", ".json").getAbsolutePath().replace('\\', '/');
+        final String fileToWrite = TestHelper.generateTempFile(WriteTest.class,"tinkerpop-modern-v3", ".json").getAbsolutePath().replace('\\', '/');
 
         final File f = new File(fileToWrite);
         assertThat(f.length() == 0, is(true));
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
index 8381a76..93ca377 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
@@ -121,7 +121,8 @@
          */
         @Test
         @FeatureRequirement(featureClass = GraphFeatures.class, feature = FEATURE_TRANSACTIONS, supported = false)
-        public void shouldSupportTransactionsIfAGraphConstructsATx() throws Exception {
+        @FeatureRequirement(featureClass = GraphFeatures.class, feature = FEATURE_THREADED_TRANSACTIONS, supported = false)
+        public void shouldSupportTransactionsIfAGraphConstructsATx() {
             try {
                 graph.tx();
                 fail(String.format(INVALID_FEATURE_SPECIFICATION, GraphFeatures.class.getSimpleName(), FEATURE_TRANSACTIONS));
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
index 6d2cb35..f1f6bb9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
@@ -919,7 +919,7 @@
         int counter = 0;
         for (Vertex v : vertices) {
             counter = counter + 1;
-            v.remove();
+            graph.vertices(v.id()).next().remove();
 
             if ((counter + 1) % 2 == 0) {
                 final int currentCounter = counter;
@@ -976,8 +976,8 @@
     @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
     @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
     public void shouldEvaluateConnectivityPatterns() {
-        final Vertex a;
-        final Vertex b;
+        Vertex a;
+        Vertex b;
         final Vertex c;
         final Vertex d;
         if (graph.features().vertex().supportsUserSuppliedIds()) {
@@ -1011,10 +1011,10 @@
         });
 
         if (graph.features().vertex().supportsUserSuppliedIds()) {
-            final Vertex va = graph.vertices(graphProvider.convertId("1", Vertex.class)).next();
-            final Vertex vb = graph.vertices(graphProvider.convertId("2", Vertex.class)).next();
-            final Vertex vc = graph.vertices(graphProvider.convertId("3", Vertex.class)).next();
-            final Vertex vd = graph.vertices(graphProvider.convertId("4", Vertex.class)).next();
+            Vertex va = graph.vertices(graphProvider.convertId("1", Vertex.class)).next();
+            Vertex vb = graph.vertices(graphProvider.convertId("2", Vertex.class)).next();
+            Vertex vc = graph.vertices(graphProvider.convertId("3", Vertex.class)).next();
+            Vertex vd = graph.vertices(graphProvider.convertId("4", Vertex.class)).next();
 
             assertEquals(a, va);
             assertEquals(b, vb);
@@ -1032,6 +1032,14 @@
 
             final Edge i = a.addEdge(graphProvider.convertLabel("hates"), b);
 
+            a = graph.vertices(a.id()).next();
+            b = graph.vertices(b.id()).next();
+
+            va = graph.vertices(graphProvider.convertId("1", Vertex.class)).next();
+            vb = graph.vertices(graphProvider.convertId("2", Vertex.class)).next();
+            vc = graph.vertices(graphProvider.convertId("3", Vertex.class)).next();
+            vd = graph.vertices(graphProvider.convertId("4", Vertex.class)).next();
+
             assertEquals(1l, IteratorUtils.count(va.edges(Direction.IN)));
             assertEquals(2l, IteratorUtils.count(va.edges(Direction.OUT)));
             assertEquals(2l, IteratorUtils.count(vb.edges(Direction.IN)));
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index 9612b64..9ddcf23 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -68,7 +68,7 @@
  */
 @RunWith(Enclosed.class)
 public class SerializationTest {
-    public static class GryoV1d0Test extends AbstractGremlinTest {
+    public static class GryoV1Test extends AbstractGremlinTest {
         @Test
         @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
         public void shouldSerializeVertexAsDetached() throws Exception {
@@ -255,7 +255,7 @@
         }
     }
 
-    public static class GryoV3d0Test extends AbstractGremlinTest {
+    public static class GryoV3Test extends AbstractGremlinTest {
         @Test
         @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
         public void shouldSerializeVertexAsDetached() throws Exception {
@@ -442,7 +442,7 @@
         }
     }
 
-    public static class GraphSONV1d0Test extends AbstractGremlinTest {
+    public static class GraphSONV1Test extends AbstractGremlinTest {
         private final TypeReference<HashMap<String, Object>> mapTypeReference = new TypeReference<HashMap<String, Object>>() {
         };
 
@@ -623,7 +623,7 @@
         }
     }
 
-    public static class GraphSONV2d0Test extends AbstractGremlinTest {
+    public static class GraphSONV2Test extends AbstractGremlinTest {
         private final TypeReference<HashMap<String, Object>> mapTypeReference = new TypeReference<HashMap<String, Object>>() {
         };
 
@@ -825,7 +825,7 @@
         }
     }
 
-    public static class GraphSONV3d0Test extends AbstractGremlinTest {
+    public static class GraphSONV3Test extends AbstractGremlinTest {
         private final TypeReference<HashMap<String, Object>> mapTypeReference = new TypeReference<HashMap<String, Object>>() {
         };
 
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
index 26f5b1b..7e808d1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
@@ -105,6 +105,7 @@
             SerializationTest.class,
             StarGraphTest.class,
             TransactionTest.class,
+            TransactionMultiThreadedTest.class,
             VertexTest.class
     };
 
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionMultiThreadedTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionMultiThreadedTest.java
new file mode 100644
index 0000000..fa3de5c
--- /dev/null
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionMultiThreadedTest.java
@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure;
+
+import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
+import org.apache.tinkerpop.gremlin.FeatureRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.junit.Test;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES;
+import static org.apache.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.FEATURE_ADD_PROPERTY;
+import static org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS;
+import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES;
+import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_REMOVE_VERTICES;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Tests for graphs that has multithreaded access
+ */
+public class TransactionMultiThreadedTest extends AbstractGremlinTest {
+
+    ///// vertex tests
+
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_TRANSACTIONS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES)
+    public void shouldCommit() throws InterruptedException {
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().next();
+        gtx.addV().next();
+
+        assertEquals(2, (long) gtx.V().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(2L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 2, 0);
+    }
+
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_TRANSACTIONS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_REMOVE_VERTICES)
+    public void shouldDeleteVertexOnCommit() throws InterruptedException {
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        gtx.tx().commit();
+
+        assertEquals(1, (long) gtx.V().count().next());
+
+        gtx.V(v1.id()).drop().iterate();
+        assertEquals(0, (long) gtx.V().count().next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+
+        gtx.tx().commit();
+
+        assertEquals(0, (long) gtx.V().count().next());
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+    }
+
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_TRANSACTIONS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_REMOVE_VERTICES)
+    @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_ADD_EDGES)
+    public void shouldDeleteRelatedEdgesOnVertexDelete() throws InterruptedException {
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("tests").from(v1).to(v2).next();
+
+        gtx.tx().commit();
+
+        assertEquals(2L, (long) gtx.V().count().next());
+        assertEquals(1L, (long) gtx.E().count().next());
+
+        gtx.V(v1.id()).drop().iterate();
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(1L, (long) gtx3.V().count().next());
+        assertEquals(0L, (long) gtx3.E().count().next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+    }
+
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_TRANSACTIONS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_PROPERTY)
+    public void shouldChangeVertexProperty() {
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        // create vertex with test property
+        final Vertex v1 = gtx.addV().property("test", 1).next();
+        gtx.tx().commit();
+
+        assertEquals(1, gtx.V(v1.id()).values("test").next());
+
+        // change test property
+        gtx.V(v1.id()).property("test", 2).iterate();
+        gtx.tx().commit();
+
+        // should be only 1 vertex with updated property
+        assertEquals(1L, (long) gtx.V().count().next());
+        assertEquals(2, gtx.V(v1.id()).values("test").next());
+    }
+
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_TRANSACTIONS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES)
+    public void shouldRollbackAddedVertex() throws InterruptedException {
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().next();
+        gtx.addV().next();
+
+        assertEquals(2, (long) gtx.V().count().next());
+
+        // test count in second transaction before commit
+        countElementsInNewThreadTx(g, 0, 0);
+
+        gtx.tx().rollback();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+    }
+
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_TRANSACTIONS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES)
+    @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_ADD_EDGES)
+    public void shouldCommitEdge() throws InterruptedException {
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("tests").from(v1).to(v2).next();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(1, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(2L, (long) gtx3.V().count().next());
+        assertEquals(1L, (long) gtx3.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 1);
+    }
+
+    @Test
+    @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = FEATURE_TRANSACTIONS)
+    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES)
+    @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_ADD_EDGES)
+    public void shouldRollbackAddedEdge() throws InterruptedException {
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("tests").from(v1).to(v2).next();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(1, (long) gtx.E().count().next());
+
+        // test count in second transaction before commit
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(0L, (long) gtx2.V().count().next());
+            assertEquals(0L, (long) gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().rollback();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.V().count().next());
+        assertEquals(0L, (long) gtx3.E().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+    }
+
+    private void countElementsInNewThreadTx(final GraphTraversalSource g, final long verticesCount, final long edgesCount) throws InterruptedException {
+        final AtomicLong vCount = new AtomicLong(-1);
+        final AtomicLong eCount = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx = g.tx().begin();
+            vCount.set(gtx.V().count().next());
+            eCount.set(gtx.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(verticesCount, vCount.get());
+        assertEquals(edgesCount, eCount.get());
+    }
+}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
index 76db416..29e9aa1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
@@ -23,9 +23,11 @@
 import org.apache.tinkerpop.gremlin.FeatureRequirement;
 import org.apache.tinkerpop.gremlin.FeatureRequirementSet;
 import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.junit.Test;
 
+import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
@@ -332,8 +334,8 @@
     @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
     @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS)
     public void shouldRollbackPropertyAutoTransactionByDefault() {
-        final Vertex v1 = graph.addVertex("name", "marko");
-        final Edge e1 = v1.addEdge("l", v1, "name", "xxx");
+        Vertex v1 = graph.addVertex("name", "marko");
+        Edge e1 = v1.addEdge("l", v1, "name", "xxx");
         assertVertexEdgeCounts(graph, 1, 1);
         assertEquals(v1.id(), graph.vertices(v1.id()).next().id());
         assertEquals(e1.id(), graph.edges(e1.id()).next().id());
@@ -344,6 +346,7 @@
         assertEquals("marko", v1.<String>value("name"));
         assertEquals("marko", graph.vertices(v1.id()).next().<String>value("name"));
 
+        v1 = graph.vertices(v1.id()).next();
         v1.property(VertexProperty.Cardinality.single, "name", "stephen");
 
         assertEquals("stephen", v1.<String>value("name"));
@@ -351,9 +354,11 @@
 
         g.tx().rollback();
 
+        v1 = graph.vertices(v1.id()).next();
         assertEquals("marko", v1.<String>value("name"));
         assertEquals("marko", graph.vertices(v1.id()).next().<String>value("name"));
 
+        e1 = graph.edges(e1.id()).next();
         e1.property("name", "yyy");
 
         assertEquals("yyy", e1.<String>value("name"));
@@ -361,6 +366,7 @@
 
         g.tx().rollback();
 
+        e1 = graph.edges(e1.id()).next();
         assertEquals("xxx", e1.<String>value("name"));
         assertEquals("xxx", graph.edges(e1.id()).next().<String>value("name"));
 
@@ -405,8 +411,10 @@
         t.start();
         t.join();
 
+        final Iterator<Vertex> vertices = graph.vertices(vid.get().id());
         // this was committed
-        assertThat(graph.vertices(vid.get().id()).hasNext(), is(true));
+        assertThat(vertices.hasNext(), is(true));
+        CloseableIterator.closeIterator(vertices);
 
         try {
             // this was not
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
index 2bad1a9..9765280 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
@@ -547,32 +547,36 @@
                 assertEquals(0, IteratorUtils.count(stephen.properties("blah")));
             });
 
-            stephen.remove();
+            final Vertex marko2 = graph.vertices(marko.id()).next();
+            final Vertex stephen2 = graph.vertices(stephen.id()).next();
+            stephen2.remove();
             tryCommit(graph, graph -> {
                 assertVertexEdgeCounts(graph, 1, 0);
-                assertEquals(2, IteratorUtils.count(marko.properties("name")));
-                assertEquals(2, IteratorUtils.count(marko.properties()));
-                assertEquals(0, IteratorUtils.count(marko.properties("blah")));
+                assertEquals(2, IteratorUtils.count(marko2.properties("name")));
+                assertEquals(2, IteratorUtils.count(marko2.properties()));
+                assertEquals(0, IteratorUtils.count(marko2.properties("blah")));
             });
 
+            final Vertex marko3 = graph.vertices(marko.id()).next();
             for (int i = 0; i < 100; i++) {
-                marko.property(VertexProperty.Cardinality.list, "name", "Remove-" + String.valueOf(i));
+                marko3.property(VertexProperty.Cardinality.list, "name", "Remove-" + String.valueOf(i));
             }
             tryCommit(graph, graph -> {
                 assertVertexEdgeCounts(graph, 1, 0);
-                assertEquals(102, IteratorUtils.count(marko.properties("name")));
-                assertEquals(102, IteratorUtils.count(marko.properties()));
-                assertEquals(0, IteratorUtils.count(marko.properties("blah")));
+                assertEquals(102, IteratorUtils.count(marko3.properties("name")));
+                assertEquals(102, IteratorUtils.count(marko3.properties()));
+                assertEquals(0, IteratorUtils.count(marko3.properties("blah")));
             });
 
             g.V().properties("name").has(T.value, P.test((a, b) -> ((String) a).startsWith((String) b), "Remove-")).forEachRemaining(Property::remove);
+            final Vertex marko4 = graph.vertices(marko.id()).next();
             tryCommit(graph, graph -> {
                 assertVertexEdgeCounts(graph, 1, 0);
-                assertEquals(2, IteratorUtils.count(marko.properties("name")));
-                assertEquals(2, IteratorUtils.count(marko.properties()));
-                assertEquals(0, IteratorUtils.count(marko.properties("blah")));
+                assertEquals(2, IteratorUtils.count(marko4.properties("name")));
+                assertEquals(2, IteratorUtils.count(marko4.properties()));
+                assertEquals(0, IteratorUtils.count(marko4.properties("blah")));
             });
-            marko.remove();
+            marko4.remove();
             tryCommit(graph, getAssertVertexEdgeCounts(0, 0));
         }
     }
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
index a0e3f7a..e347b86 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
@@ -566,7 +566,7 @@
             final List<Vertex> vertices = new ArrayList<>();
             IteratorUtils.fill(graph.vertices(), vertices);
             for (Vertex v : vertices) {
-                v.remove();
+                graph.vertices(v.id()).next().remove();
                 tryCommit(graph);
             }
 
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
index cb5f3c8..1b86f4b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
@@ -57,22 +57,22 @@
 
     @Parameterized.Parameters(name = "{0}")
     public static Iterable<Object[]> data() {
-        final SimpleModule moduleV1d0 = new SimpleModule();
-        moduleV1d0.addSerializer(CustomId.class, new CustomId.CustomIdJacksonSerializerV1d0());
+        final SimpleModule moduleV1 = new SimpleModule();
+        moduleV1.addSerializer(CustomId.class, new CustomId.CustomIdJacksonSerializerV1());
 
-        final SimpleModule moduleV2d0 = new CustomId.CustomIdTinkerPopJacksonModuleV2d0();
-        final SimpleModule modulev3d0 = new CustomId.CustomIdTinkerPopJacksonModuleV3d0();
+        final SimpleModule moduleV2 = new CustomId.CustomIdTinkerPopJacksonModuleV2();
+        final SimpleModule modulev3 = new CustomId.CustomIdTinkerPopJacksonModuleV3();
 
         return Arrays.asList(new Object[][]{
                 {"graphson-v1-embedded", true,
-                        (Function<Graph, GraphReader>) g -> g.io(GraphSONIo.build(GraphSONVersion.V1_0)).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
-                        (Function<Graph, GraphWriter>) g -> g.io(GraphSONIo.build(GraphSONVersion.V1_0)).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
+                        (Function<Graph, GraphReader>) g -> g.io(GraphSONIo.build(GraphSONVersion.V1_0)).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
+                        (Function<Graph, GraphWriter>) g -> g.io(GraphSONIo.build(GraphSONVersion.V1_0)).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
                 {"graphson-v2-embedded", true,
-                        (Function<Graph, GraphReader>) g -> g.io(GraphSONIo.build(GraphSONVersion.V2_0)).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
-                        (Function<Graph, GraphWriter>) g -> g.io(GraphSONIo.build(GraphSONVersion.V2_0)).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
+                        (Function<Graph, GraphReader>) g -> g.io(GraphSONIo.build(GraphSONVersion.V2_0)).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
+                        (Function<Graph, GraphWriter>) g -> g.io(GraphSONIo.build(GraphSONVersion.V2_0)).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
                 {"graphson-v3", true,
-                        (Function<Graph, GraphReader>) g -> g.io(GraphSONIo.build(GraphSONVersion.V3_0)).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().addCustomModule(modulev3d0).create()).create(),
-                        (Function<Graph, GraphWriter>) g -> g.io(GraphSONIo.build(GraphSONVersion.V3_0)).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().addCustomModule(modulev3d0).create()).create()},
+                        (Function<Graph, GraphReader>) g -> g.io(GraphSONIo.build(GraphSONVersion.V3_0)).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().addCustomModule(modulev3).create()).create(),
+                        (Function<Graph, GraphWriter>) g -> g.io(GraphSONIo.build(GraphSONVersion.V3_0)).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().addCustomModule(modulev3).create()).create()},
                 {"gryo-v1", true,
                         (Function<Graph, GraphReader>) g -> g.io(GryoIo.build(GryoVersion.V1_0)).reader().mapper(g.io(GryoIo.build(GryoVersion.V1_0)).mapper().version(GryoVersion.V1_0).addCustom(CustomId.class).create()).create(),
                         (Function<Graph, GraphWriter>) g -> g.io(GryoIo.build(GryoVersion.V1_0)).writer().mapper(g.io(GryoIo.build(GryoVersion.V1_0)).mapper().version(GryoVersion.V1_0).addCustom(CustomId.class).create()).create()},
@@ -138,6 +138,8 @@
     @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ANY_IDS)
     public void shouldProperlySerializeCustomId() throws Exception {
         graph.addVertex(T.id, new CustomId("vertex", UUID.fromString("AF4B5965-B176-4552-B3C1-FBBE2F52C305")));
+        if (graph.features().graph().supportsTransactions())
+            graph.tx().commit();
 
         final GraphWriter writer = writerMaker.apply(graph);
         final GraphReader reader = readerMaker.apply(graph);
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java
index b3ef335..19c8c80 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java
@@ -53,9 +53,9 @@
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][]{
                 {"graphml", IoCore.graphml(), false, true, ".xml"},
-                {"graphsonv1d0", GraphSONIo.build(GraphSONVersion.V1_0), true, true, ".json"},
-                {"graphsonv2d0", GraphSONIo.build(GraphSONVersion.V2_0), true, true, ".json"},
-                {"graphsonv3d0", GraphSONIo.build(GraphSONVersion.V3_0), true, true, ".json"},
+                {"graphsonv1", GraphSONIo.build(GraphSONVersion.V1_0), true, true, ".json"},
+                {"graphsonv2", GraphSONIo.build(GraphSONVersion.V2_0), true, true, ".json"},
+                {"graphsonv3", GraphSONIo.build(GraphSONVersion.V3_0), true, true, ".json"},
                 {"gryo-v3", GryoIo.build(GryoVersion.V1_0), false, false, ".kryo"},
                 {"gryo-v3", GryoIo.build(GryoVersion.V3_0), false, false, ".kryo"}
         });
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
index 24b2414..82828c4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
@@ -92,7 +92,6 @@
 import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_STRING_VALUES;
 import static org.apache.tinkerpop.gremlin.structure.io.IoCore.graphson;
 import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -312,6 +311,8 @@
                 writer.writeGraph(out, graph);
 
                 graph.vertices().forEachRemaining(Element::remove);
+                if (graph.features().graph().supportsTransactions())
+                    graph.tx().commit();
                 try (final InputStream stream = new ByteArrayInputStream(((ByteArrayOutputStream) out).toByteArray())) {
                     reader.readGraph(stream, graph);
                 }
@@ -534,7 +535,7 @@
                 final GraphSONWriter w = graph.io(graphson).writer().mapper(mapper).create();
                 w.writeGraph(bos, graph);
 
-                final String expected = streamToString(getResourceAsStream(GraphSONResourceAccess.class, "tinkerpop-classic-normalized-v1d0.json"));
+                final String expected = streamToString(getResourceAsStream(GraphSONResourceAccess.class, "tinkerpop-classic-normalized-v1.json"));
                 assertEquals(expected.replace("\n", "").replace("\r", ""), bos.toString().replace("\n", "").replace("\r", ""));
             }
         }
@@ -576,7 +577,7 @@
             graph.addVertex(T.id, new CustomId("vertex", id));
 
             final SimpleModule module = new SimpleModule();
-            module.addSerializer(CustomId.class, new CustomId.CustomIdJacksonSerializerV1d0());
+            module.addSerializer(CustomId.class, new CustomId.CustomIdJacksonSerializerV1());
             final GraphWriter writer = graph.io(graphson).writer().mapper(
                     graph.io(graphson).mapper().version(GraphSONVersion.V1_0).addCustomModule(module).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create();
 
@@ -657,7 +658,7 @@
         }
     }
 
-    public static final class GraphSONV2D0Test extends AbstractGremlinTest {
+    public static final class GraphSONV2Test extends AbstractGremlinTest {
         private Io.Builder<GraphSONIo> graphson;
 
         @Before
@@ -683,7 +684,7 @@
                 final GraphSONWriter w = graph.io(graphson).writer().mapper(mapper).create();
                 w.writeGraph(bos, graph);
 
-                final String expected = streamToString(getResourceAsStream(GraphSONResourceAccess.class, "tinkerpop-classic-normalized-v2d0.json"));
+                final String expected = streamToString(getResourceAsStream(GraphSONResourceAccess.class, "tinkerpop-classic-normalized-v2.json"));
                 assertEquals(expected.replace("\n", "").replace("\r", ""), bos.toString().replace("\n", "").replace("\r", ""));
             }
         }
@@ -724,7 +725,7 @@
             final UUID id = UUID.fromString("AF4B5965-B176-4552-B3C1-FBBE2F52C305");
             graph.addVertex(T.id, new CustomId("vertex", id));
 
-            final SimpleModule module = new CustomId.CustomIdTinkerPopJacksonModuleV2d0();
+            final SimpleModule module = new CustomId.CustomIdTinkerPopJacksonModuleV2();
             final GraphWriter writer = graph.io(graphson).writer().mapper(
                     graph.io(graphson).mapper().version(GraphSONVersion.V2_0).addCustomModule(module).create()).create();
 
@@ -780,7 +781,7 @@
         }
     }
 
-    public static final class GraphSONV3D0Test extends AbstractGremlinTest {
+    public static final class GraphSONV3Test extends AbstractGremlinTest {
         private Io.Builder<GraphSONIo> graphson;
 
         @Before
@@ -806,7 +807,7 @@
                 final GraphSONWriter w = graph.io(graphson).writer().mapper(mapper).create();
                 w.writeGraph(bos, graph);
 
-                final String expected = streamToString(getResourceAsStream(GraphSONResourceAccess.class, "tinkerpop-classic-normalized-v3d0.json"));
+                final String expected = streamToString(getResourceAsStream(GraphSONResourceAccess.class, "tinkerpop-classic-normalized-v3.json"));
                 assertEquals(expected.replace("\n", "").replace("\r", ""), bos.toString().replace("\n", "").replace("\r", ""));
             }
         }
@@ -847,7 +848,7 @@
             final UUID id = UUID.fromString("AF4B5965-B176-4552-B3C1-FBBE2F52C305");
             graph.addVertex(T.id, new CustomId("vertex", id));
 
-            final SimpleModule module = new CustomId.CustomIdTinkerPopJacksonModuleV3d0();
+            final SimpleModule module = new CustomId.CustomIdTinkerPopJacksonModuleV3();
             final GraphWriter writer = graph.io(graphson).writer().mapper(
                     graph.io(graphson).mapper().version(GraphSONVersion.V3_0).addCustomModule(module).create()).create();
 
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/util/CustomId.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/util/CustomId.java
index 0ab3b90..85b116d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/util/CustomId.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/util/CustomId.java
@@ -19,8 +19,6 @@
 package org.apache.tinkerpop.gremlin.structure.io.util;
 
 import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.Io;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
@@ -36,13 +34,11 @@
 import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
 import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
 import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.javatuples.Pair;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -95,8 +91,8 @@
         return cluster + ":" + elementId;
     }
 
-    public static class CustomIdJacksonSerializerV1d0 extends StdSerializer<CustomId> {
-        public CustomIdJacksonSerializerV1d0() {
+    public static class CustomIdJacksonSerializerV1 extends StdSerializer<CustomId> {
+        public CustomIdJacksonSerializerV1() {
             super(CustomId.class);
         }
 
@@ -124,8 +120,8 @@
         }
     }
 
-    public static class CustomIdJacksonSerializerV2d0 extends StdSerializer<CustomId> {
-        public CustomIdJacksonSerializerV2d0() {
+    public static class CustomIdJacksonSerializerV2 extends StdSerializer<CustomId> {
+        public CustomIdJacksonSerializerV2() {
             super(CustomId.class);
         }
 
@@ -154,8 +150,8 @@
         }
     }
 
-    public static class CustomIdJacksonDeserializerV2d0 extends AbstractObjectDeserializer<CustomId> {
-        public CustomIdJacksonDeserializerV2d0() {
+    public static class CustomIdJacksonDeserializerV2 extends AbstractObjectDeserializer<CustomId> {
+        public CustomIdJacksonDeserializerV2() {
             super(CustomId.class);
         }
 
@@ -165,17 +161,17 @@
         }
     }
 
-    public static class CustomIdTinkerPopJacksonModuleV2d0 extends TinkerPopJacksonModule {
+    public static class CustomIdTinkerPopJacksonModuleV2 extends TinkerPopJacksonModule {
 
         private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
                 new LinkedHashMap<Class, String>() {{
                     put(CustomId.class, "id");
                 }});
 
-        public CustomIdTinkerPopJacksonModuleV2d0() {
+        public CustomIdTinkerPopJacksonModuleV2() {
             super("custom");
-            addSerializer(CustomId.class, new CustomIdJacksonSerializerV2d0());
-            addDeserializer(CustomId.class, new CustomIdJacksonDeserializerV2d0());
+            addSerializer(CustomId.class, new CustomIdJacksonSerializerV2());
+            addDeserializer(CustomId.class, new CustomIdJacksonDeserializerV2());
         }
 
         @Override
@@ -189,8 +185,8 @@
         }
     }
 
-    public static class CustomIdJacksonSerializerV3d0 extends StdScalarSerializer<CustomId> {
-        public CustomIdJacksonSerializerV3d0() {
+    public static class CustomIdJacksonSerializerV3 extends StdScalarSerializer<CustomId> {
+        public CustomIdJacksonSerializerV3() {
             super(CustomId.class);
         }
 
@@ -204,8 +200,8 @@
         }
     }
 
-    public static class CustomIdJacksonDeserializerV3d0 extends StdDeserializer<CustomId> {
-        public CustomIdJacksonDeserializerV3d0() {
+    public static class CustomIdJacksonDeserializerV3 extends StdDeserializer<CustomId> {
+        public CustomIdJacksonDeserializerV3() {
             super(CustomId.class);
         }
 
@@ -221,17 +217,17 @@
         }
     }
 
-    public static class CustomIdTinkerPopJacksonModuleV3d0 extends TinkerPopJacksonModule {
+    public static class CustomIdTinkerPopJacksonModuleV3 extends TinkerPopJacksonModule {
 
         private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
                 new LinkedHashMap<Class, String>() {{
                     put(CustomId.class, "id");
                 }});
 
-        public CustomIdTinkerPopJacksonModuleV3d0() {
+        public CustomIdTinkerPopJacksonModuleV3() {
             super("custom");
-            addSerializer(CustomId.class, new CustomIdJacksonSerializerV3d0());
-            addDeserializer(CustomId.class, new CustomIdJacksonDeserializerV3d0());
+            addSerializer(CustomId.class, new CustomIdJacksonSerializerV3());
+            addDeserializer(CustomId.class, new CustomIdJacksonDeserializerV3());
         }
 
         @Override
@@ -251,7 +247,7 @@
 
         private CustomIdIoRegistry() {
             register(GryoIo.class, CustomId.class, null);
-            register(GraphSONIo.class, null, new CustomIdTinkerPopJacksonModuleV3d0());
+            register(GraphSONIo.class, null, new CustomIdTinkerPopJacksonModuleV3());
         }
 
         public static CustomIdIoRegistry instance() {
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v2d0.json
deleted file mode 100644
index 5163a63..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed-v2d0.json
+++ /dev/null
@@ -1,808 +0,0 @@
-{"id":{"@type":"g:Int32","@value":1},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3059},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":276},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3704},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4383},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":0},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7612},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7611},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"HEY BO DIDDLEY"}],"songType":[{"id":{"@type":"g:Int64","@value":2},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":2},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":0},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":323},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6190},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6191},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7666},"inV":{"@type":"g:Int32","@value":525}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7665},"inV":{"@type":"g:Int32","@value":525}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"IM A MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":5},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":4},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":3},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2051},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1412},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6669},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":526},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":910},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1166},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6286},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":273},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":40}}},{"id":{"@type":"g:Int32","@value":2194},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1684},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1941},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3221},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2712},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6425},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5787},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5148},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6692},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6310},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6448},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2225},"outV":{"@type":"g:Int32","@value":226},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5042},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4789},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1464},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2232},"outV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4665},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2235},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":163}}},{"id":{"@type":"g:Int32","@value":6208},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":706},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":835},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5188},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1862},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1735},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6343},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4937},"outV":{"@type":"g:Int32","@value":277},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3276},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3149},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1358},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":4304},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1105},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":722},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4182},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1499},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2397},"outV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":351},"outV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6623},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2018},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7011},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5348},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2278},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1255},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3048},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5867},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":116}}},{"id":{"@type":"g:Int32","@value":364},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":492},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3948},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4335},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3312},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5745},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4596},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5367},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":633},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":891},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5375},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6143},"outV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3712},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3713},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3714},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3715},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3716},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3717},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3718},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3719},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3720},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3721},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":54}}},{"id":{"@type":"g:Int32","@value":3722},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":3723},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3724},"inV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3725},"inV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3726},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3727},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":37}}},{"id":{"@type":"g:Int32","@value":3728},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3729},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3730},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3731},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3732},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3733},"inV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3734},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3735},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3736},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3737},"inV":{"@type":"g:Int32","@value":320},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3738},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3739},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3740},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3741},"inV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3742},"inV":{"@type":"g:Int32","@value":315},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3743},"inV":{"@type":"g:Int32","@value":261},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3744},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3745},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3746},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3747},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3748},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3749},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3750},"inV":{"@type":"g:Int32","@value":309},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3751},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3752},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3753},"inV":{"@type":"g:Int32","@value":321},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3754},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3755},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3756},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3757},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3758},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3759},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3760},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3761},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3762},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3763},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3764},"inV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3765},"inV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3766},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3767},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3768},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3769},"inV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3770},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3771},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3772},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3773},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3774},"inV":{"@type":"g:Int32","@value":240},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3775},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3776},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3777},"inV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3694},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":57}}},{"id":{"@type":"g:Int32","@value":3695},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":3696},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3697},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3698},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3699},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3700},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3701},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3702},"inV":{"@type":"g:Int32","@value":317},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3703},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3704},"inV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3705},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3706},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3707},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3708},"inV":{"@type":"g:Int32","@value":318},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3709},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":3710},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3711},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":15}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7808},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7807},"inV":{"@type":"g:Int32","@value":671}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"NOT FADE AWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":8},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":531}}]}}
-{"id":{"@type":"g:Int32","@value":4},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":128},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1664},"outV":{"@type":"g:Int32","@value":267},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":899},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1667},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":4099},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1156},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":773},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6534},"outV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1032},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6664},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5129},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5387},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5517},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5006},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6030},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2063},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":915},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6940},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2464},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5795},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3620},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4772},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":2982},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3367},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2345},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2861},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1840},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5425},"outV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":180},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":46}}},{"id":{"@type":"g:Int32","@value":2613},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5434},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5562},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1469},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":446},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2494},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3266},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":326},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":583},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6855},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":73},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4425},"outV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1613},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4941},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6350},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3535},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":980},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1494},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5206},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5847},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6490},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2781},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5600},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":353},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5474},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1891},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":3811},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5989},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4327},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2538},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3050},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4970},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2283},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":236},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6126},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5232},"outV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4594},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1652},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4084},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":629},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3701},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5621},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7029},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5238},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2684},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3325},"outV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5120},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5121},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5122},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5123},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5071},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5072},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":5073},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5074},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5075},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":63}}},{"id":{"@type":"g:Int32","@value":5076},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5077},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5078},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5079},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":5080},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5081},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5082},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5083},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5084},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5085},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5086},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5087},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5088},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5089},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5090},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":77}}},{"id":{"@type":"g:Int32","@value":5091},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5092},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5093},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5094},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5095},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5096},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5097},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5098},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5099},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5100},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5101},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5102},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5103},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5104},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5105},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5106},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5107},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5108},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5109},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5110},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5111},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5112},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5113},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5114},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5115},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5116},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5117},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5118},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5119},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7064},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7063},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":9},"value":"BERTHA"}],"songType":[{"id":{"@type":"g:Int64","@value":11},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":10},"value":{"@type":"g:Int32","@value":394}}]}}
-{"id":{"@type":"g:Int32","@value":5},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":194},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":962},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5446},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6344},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1738},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6666},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1867},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":4300},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":847},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2832},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6032},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1170},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5330},"outV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1491},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1429},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3033},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6298},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1373},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4447},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5151},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5343},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6431},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1953},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1634},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2274},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":100},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":933},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2021},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6694},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4009},"outV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":682},"outV":{"@type":"g:Int32","@value":219},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3694},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":57}}},{"id":{"@type":"g:Int32","@value":4718},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3055},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2480},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2736},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5426},"outV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6899},"outV":{"@type":"g:Int32","@value":147},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5879},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":6201},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5370},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":700},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2236},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4604},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5759},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":273},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":40}}},{"id":{"@type":"g:Int32","@value":274},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":275},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":40}}},{"id":{"@type":"g:Int32","@value":276},"inV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":277},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":278},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":279},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":280},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":281},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":282},"inV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":283},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":284},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":285},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":286},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":287},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":288},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":289},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":290},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":291},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":292},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":293},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":294},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":295},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":296},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":297},"inV":{"@type":"g:Int32","@value":161},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":298},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":299},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":300},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":301},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":302},"inV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":303},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":304},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":305},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":306},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":307},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":308},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":309},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":310},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":311},"inV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7582},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7581},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":12},"value":"GOING DOWN THE ROAD FEELING BAD"}],"songType":[{"id":{"@type":"g:Int64","@value":14},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":13},"value":{"@type":"g:Int32","@value":293}}]}}
-{"id":{"@type":"g:Int32","@value":6},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2023},"outV":{"@type":"g:Int32","@value":282},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2406},"inV":{"@type":"g:Int32","@value":293},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2407},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7782},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7781},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":15},"value":"MONA"}],"songType":[{"id":{"@type":"g:Int64","@value":17},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":16},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":7},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2607},"outV":{"@type":"g:Int32","@value":295},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":8},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":18},"value":"WHERE HAVE THE HEROES GONE"}],"songType":[{"id":{"@type":"g:Int64","@value":20},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":19},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":8},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4705},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":7},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5901},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2976},"inV":{"@type":"g:Int32","@value":302},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2977},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2978},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7814},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7813},"inV":{"@type":"g:Int32","@value":674}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":21},"value":"OH BOY"}],"songType":[{"id":{"@type":"g:Int64","@value":23},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":22},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":9},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3776},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":65},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1923},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5956},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3077},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5832},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1161},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2699},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6539},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6667},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2578},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":787},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3542},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2775},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2840},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4953},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1572},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":229},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4264},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4969},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3498},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5226},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5548},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2990},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3950},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2488},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6776},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3641},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1532},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1853},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":638},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6335},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":13},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":14},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":16},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":17},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":18},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":19},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":20},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":21},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":22},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":23},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":24},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":25},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":26},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":27},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":28},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":29},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":30},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":31},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":32},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":33},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":34},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":35},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":36},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":37},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":38},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":39},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7190},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7189},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":24},"value":"HERE COMES SUNSHINE"}],"songType":[{"id":{"@type":"g:Int64","@value":26},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":25},"value":{"@type":"g:Int32","@value":65}}]}}
-{"id":{"@type":"g:Int32","@value":10},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3841},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1027},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3335},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4103},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6279},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4233},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4878},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5264},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2196},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":151},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1571},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3619},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3237},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4647},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4521},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1195},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6444},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6956},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":687},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4784},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6064},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1714},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3890},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":55},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5175},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1337},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1083},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4155},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6077},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5441},"outV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1987},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1860},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2116},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3269},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":454},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3142},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2505},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6603},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6859},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":717},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1360},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3026},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5972},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5077},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2392},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1250},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4706},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6755},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":485},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2917},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3559},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3436},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3820},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4463},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":880},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6256},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3698},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2035},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2291},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3317},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2806},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2427},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6782},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4351},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4235},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4236},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4237},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4238},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4239},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4240},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":4241},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4242},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4243},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4244},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4245},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4246},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4247},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4248},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4249},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4250},"inV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4251},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4252},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4253},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4254},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4255},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4256},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4257},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4258},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4259},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4260},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4261},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4262},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4263},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4264},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4265},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4266},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4267},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4268},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4269},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4270},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4271},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4272},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4273},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4274},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4275},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4276},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4277},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4278},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4279},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4280},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4281},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4282},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4283},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4284},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4285},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4286},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4287},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4288},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4289},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4290},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4291},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4292},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4293},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4294},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7460},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7459},"inV":{"@type":"g:Int32","@value":471}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":27},"value":"BEAT IT ON DOWN THE LINE"}],"songType":[{"id":{"@type":"g:Int64","@value":29},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":28},"value":{"@type":"g:Int32","@value":325}}]}}
-{"id":{"@type":"g:Int32","@value":11},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1088},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6273},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1989},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4552},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":521},"outV":{"@type":"g:Int32","@value":205},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":714},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3146},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4876},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2190},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4496},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2513},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4053},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5078},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1309},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4769},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5025},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3554},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1064},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2920},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6056},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":41},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3434},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6442},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1775},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3888},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":626},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1396},"outV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4020},"outV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6772},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3637},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6072},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4157},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":972},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":973},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":974},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":975},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":976},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":977},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":978},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":979},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":980},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":981},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":982},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":983},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":984},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":985},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":986},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":987},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":988},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":989},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":990},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":991},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":992},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":993},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":994},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":995},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":996},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":997},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":998},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":999},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1000},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7072},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7071},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":30},"value":"BLACK THROATED WIND"}],"songType":[{"id":{"@type":"g:Int64","@value":32},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":31},"value":{"@type":"g:Int32","@value":158}}]}}
-{"id":{"@type":"g:Int32","@value":12},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3072},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2433},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1410},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3331},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4227},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1028},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4102},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6281},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":652},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5388},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":525},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3726},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":783},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3855},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1938},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3986},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":916},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1172},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6935},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3225},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5017},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":155},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2203},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4893},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4640},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5665},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1702},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2598},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5286},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3879},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4007},"outV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":424},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4522},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5034},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4779},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6576},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6835},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6455},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":824},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5304},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1722},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6074},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4284},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2109},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":703},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5440},"outV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5952},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1858},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1347},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1605},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4165},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3654},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4038},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6598},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3271},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3527},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1096},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":3144},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":1993},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6985},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6730},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3019},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3788},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5072},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":2515},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1365},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2647},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":730},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2780},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":482},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3810},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":7013},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4072},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2281},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2668},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3565},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1262},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2031},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6769},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1779},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4468},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1909},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2934},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3446},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":381},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6656},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6657},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6658},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6659},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6660},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6661},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6662},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6663},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":167}}},{"id":{"@type":"g:Int32","@value":6664},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6665},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6666},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6667},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6668},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6669},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6670},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6671},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6672},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6673},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6674},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6675},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6676},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6677},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6678},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6679},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6680},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6681},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6682},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6683},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6684},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6685},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6686},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6687},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":83}}},{"id":{"@type":"g:Int32","@value":6688},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6689},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6690},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6691},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6645},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6646},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6647},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6648},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6649},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6650},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6651},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6652},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6653},"inV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6654},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6655},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7776},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7775},"inV":{"@type":"g:Int32","@value":659}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":33},"value":"ME AND MY UNCLE"}],"songType":[{"id":{"@type":"g:Int64","@value":35},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":34},"value":{"@type":"g:Int32","@value":616}}]}}
-{"id":{"@type":"g:Int32","@value":13},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4865},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1026},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3330},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5636},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":775},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1799},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6407},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4874},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4108},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5132},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2830},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3857},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":6931},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":533},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6165},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4630},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5142},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":283},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1567},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1823},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3359},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3617},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3108},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3878},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2347},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6443},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":47}}},{"id":{"@type":"g:Int32","@value":6700},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5682},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":53},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":823},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":4151},"outV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5943},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2617},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3386},"outV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4411},"outV":{"@type":"g:Int32","@value":327},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1852},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6206},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1087},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2111},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4159},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":6723},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6984},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3145},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4947},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5203},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1366},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1622},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2908},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1885},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4959},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3435},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6763},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5741},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":366},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":38}}},{"id":{"@type":"g:Int32","@value":2926},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":623},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4721},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2165},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":886},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3703},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":7031},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1411},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3974},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6278},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":912},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":59}}},{"id":{"@type":"g:Int32","@value":2192},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4759},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1179},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5789},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4257},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6561},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4771},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1454},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6073},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5306},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4027},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1725},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":960},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1985},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6594},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6342},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":455},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3277},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5837},"outV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":208},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2256},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":721},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2771},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5076},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2519},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4312},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2268},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2014},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3552},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":481},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1764},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1258},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1518},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4846},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4593},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":244},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1780},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4344},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2044},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5374},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":5886},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":15}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2688},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2689},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2690},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":2691},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2692},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2693},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2694},"inV":{"@type":"g:Int32","@value":296},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2695},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2696},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2697},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2698},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2699},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2700},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2701},"inV":{"@type":"g:Int32","@value":195},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2702},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2703},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2704},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2705},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2706},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2707},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2708},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2709},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2710},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2711},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2712},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2713},"inV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2714},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2715},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":2716},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2717},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2718},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":42}}},{"id":{"@type":"g:Int32","@value":2719},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2720},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2721},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2722},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2723},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2724},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2725},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2726},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2727},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2728},"inV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2729},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2730},"inV":{"@type":"g:Int32","@value":246},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2731},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":2732},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2733},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2734},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2735},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2736},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2737},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2738},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2739},"inV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2740},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2741},"inV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2742},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2743},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2744},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2745},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2746},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2747},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2748},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2749},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2750},"inV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2751},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2752},"inV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2753},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2660},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2661},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2662},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":157}}},{"id":{"@type":"g:Int32","@value":2663},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2664},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":2665},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2666},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2667},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2668},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2669},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2670},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2671},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2672},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2673},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2674},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2675},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2676},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2677},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2678},"inV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2679},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2680},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2681},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2682},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2683},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2684},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2685},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2686},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":86}}},{"id":{"@type":"g:Int32","@value":2687},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":12}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7292},"inV":{"@type":"g:Int32","@value":359}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7291},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":36},"value":"PLAYING IN THE BAND"}],"songType":[{"id":{"@type":"g:Int64","@value":38},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":37},"value":{"@type":"g:Int32","@value":582}}]}}
-{"id":{"@type":"g:Int32","@value":14},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6784},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5251},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4229},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4745},"outV":{"@type":"g:Int32","@value":294},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6283},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4364},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4109},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6544},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4881},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":6034},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":531},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3219},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4758},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4247},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4631},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3866},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1947},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1436},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2844},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6685},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1183},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":160},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4517},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6954},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1451},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1582},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3892},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2107},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5820},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6463},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":1090},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1731},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6083},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4037},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2375},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4169},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":36}}},{"id":{"@type":"g:Int32","@value":5578},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":716},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5964},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":845},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5709},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5838},"outV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1232},"outV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6993},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3666},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3156},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3796},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6742},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2523},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":864},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3556},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":102},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5096},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":489},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1257},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":2030},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2159},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2803},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2935},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2426},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3962},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4474},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":123},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4092},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5628},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1021},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":3455},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":12}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2981},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2982},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2983},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2984},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":55}}},{"id":{"@type":"g:Int32","@value":2985},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2986},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2987},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2988},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":2989},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2990},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2991},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":2992},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2993},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2994},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":2995},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2996},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2997},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2998},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2999},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3000},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3001},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":3002},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3003},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3004},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3005},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3006},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3007},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3008},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3009},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3010},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3011},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3012},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3013},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3014},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3015},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3016},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3017},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3018},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3019},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3020},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":3021},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3022},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3023},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3024},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3025},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3026},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3027},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3028},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3029},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3030},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3031},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3032},"inV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3033},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3034},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":3035},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3036},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3037},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3038},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3039},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3040},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3041},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3042},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3043},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3044},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3045},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3046},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3047},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7232},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7231},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":39},"value":"LOOKS LIKE RAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":41},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":40},"value":{"@type":"g:Int32","@value":417}}]}}
-{"id":{"@type":"g:Int32","@value":15},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1152},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":769},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5379},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3844},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1414},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6663},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":167}}},{"id":{"@type":"g:Int32","@value":4872},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4105},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4622},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2833},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2195},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5141},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3224},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1945},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5024},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2597},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":1062},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4776},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5032},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6698},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3885},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1712},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5301},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1847},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4153},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1339},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6075},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":60},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2108},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6460},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3653},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3147},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6731},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1101},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4052},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2518},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":476},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1372},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1245},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5085},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2272},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4577},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5735},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3432},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":746},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3562},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2411},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2924},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4467},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":376},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5242},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6267},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2685},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":7}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2816},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2817},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2818},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2819},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2820},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2821},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2822},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2823},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2824},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2825},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2826},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2827},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2828},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2755},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2756},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":2757},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2758},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2759},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2760},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2761},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":2762},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2763},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2764},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2765},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2766},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2767},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":2768},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":2769},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2770},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2771},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2772},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":2773},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2774},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2775},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2776},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2777},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2778},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2779},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2780},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2781},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2782},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2783},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2784},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2785},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2786},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2787},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2788},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2789},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2790},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2791},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2792},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2793},"inV":{"@type":"g:Int32","@value":294},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2794},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2795},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2796},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2797},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2798},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2799},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2800},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2801},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2802},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2803},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2804},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2805},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2806},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2807},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":2808},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2809},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2810},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2811},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2812},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2813},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2814},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2815},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7472},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7471},"inV":{"@type":"g:Int32","@value":479}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":42},"value":"BIG RIVER"}],"songType":[{"id":{"@type":"g:Int64","@value":44},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":43},"value":{"@type":"g:Int32","@value":397}}]}}
-{"id":{"@type":"g:Int32","@value":16},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7008},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6467},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4101},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5637},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6341},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5382},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3273},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6537},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3882},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1260},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4172},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6285},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":368},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4464},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":468},"outV":{"@type":"g:Int32","@value":195},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5303},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":472},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2521},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5081},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5146},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1405},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1854},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1950},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2169},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2170},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":46}}},{"id":{"@type":"g:Int32","@value":2171},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2172},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2173},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":45},"value":"WEATHER REPORT SUITE"}],"songType":[{"id":{"@type":"g:Int64","@value":47},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":46},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":17},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5955},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":43}}},{"id":{"@type":"g:Int32","@value":5702},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2696},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6538},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1163},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":13},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":402},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5011},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6675},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1877},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2522},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":475},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3803},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":540},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2588},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3996},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":990},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1570},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2275},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4262},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2795},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6955},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2413},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4077},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2991},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4912},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3639},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6583},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":58},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":635},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5244},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":2942},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6847},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2112},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2113},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2114},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2115},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2116},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2117},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":2118},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":2119},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2120},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2121},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":2122},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2123},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2124},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2125},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2126},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2127},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2128},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2129},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2130},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2131},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2132},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2133},"inV":{"@type":"g:Int32","@value":244},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2134},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2135},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2136},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2137},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2138},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2139},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2140},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2141},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2142},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2103},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2104},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2105},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2106},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2107},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":2108},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2109},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":2110},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2111},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7364},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7363},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":48},"value":"THEY LOVE EACH OTHER"}],"songType":[{"id":{"@type":"g:Int64","@value":50},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":49},"value":{"@type":"g:Int32","@value":227}}]}}
-{"id":{"@type":"g:Int32","@value":18},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1024},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4097},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6276},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2309},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3333},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4231},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4360},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3849},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5257},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5385},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2189},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":14},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":654},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5010},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6546},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4885},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1814},"outV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1943},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5145},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6688},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4642},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2852},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4260},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3238},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6695},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3880},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":425},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1193},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2601},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4524},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":45},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4015},"outV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":560},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5299},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6579},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1716},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4404},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5429},"outV":{"@type":"g:Int32","@value":315},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4150},"outV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2103},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4152},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":6456},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1849},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":827},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6715},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6205},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1086},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5439},"outV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6080},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1986},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3270},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5192},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3017},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1356},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3148},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":4044},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5073},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4692},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5716},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2517},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5973},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3671},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":473},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":729},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5850},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1244},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3807},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3553},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":866},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5602},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":355},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3431},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4967},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7016},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1642},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2029},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6765},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6384},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2802},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3315},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4851},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3064},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1401},"outV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2683},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4476},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2431},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1536},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1537},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":1538},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1539},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1540},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1541},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1542},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1543},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1544},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1545},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":1546},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1547},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1548},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1549},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":1550},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1551},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1552},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1553},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1554},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1555},"inV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1556},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1557},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1558},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1559},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1560},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1561},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1562},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1563},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1564},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":1565},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1566},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1567},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1568},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1569},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1570},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1571},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1572},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1573},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1574},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1575},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1576},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1577},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1578},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1579},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1580},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1581},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1582},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1583},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1584},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1585},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1586},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1587},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1588},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1589},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1590},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1591},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1592},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1593},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1594},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1595},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1596},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1597},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1598},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1599},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1600},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1601},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1602},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1603},"inV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1604},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1605},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1606},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1607},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1608},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1609},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1610},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1611},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1612},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1535},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7554},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7553},"inV":{"@type":"g:Int32","@value":528}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":51},"value":"EL PASO"}],"songType":[{"id":{"@type":"g:Int64","@value":53},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":52},"value":{"@type":"g:Int32","@value":388}}]}}
-{"id":{"@type":"g:Int32","@value":19},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1537},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3969},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6657},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4098},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6532},"outV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1159},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":6152},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":394},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":522},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5130},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3467},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":15},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":272},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4880},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5267},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4245},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":790},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2841},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3097},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":411},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2335},"outV":{"@type":"g:Int32","@value":290},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5535},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1825},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3874},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4770},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6308},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2086},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2215},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5801},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":42},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3628},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2989},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5167},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6831},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2354},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5938},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":951},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3511},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1848},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":314},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2621},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1472},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6081},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":6978},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2755},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5701},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3275},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4171},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":206},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4558},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5200},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5457},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":979},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1620},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5590},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3799},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4450},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4962},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6370},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1763},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2405},"outV":{"@type":"g:Int32","@value":45},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2279},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2408},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5864},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2666},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1900},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":3564},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5102},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1776},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4976},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2546},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":627},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4083},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4470},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5622},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6391},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6394},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4349},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":126},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3139},"inV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":402}}},{"id":{"@type":"g:Int32","@value":3140},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3141},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7100},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7099},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":54},"value":"CHINA CAT SUNFLOWER"}],"songType":[{"id":{"@type":"g:Int64","@value":56},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":55},"value":{"@type":"g:Int32","@value":554}}]}}
-{"id":{"@type":"g:Int32","@value":20},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5376},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6592},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2115},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6084},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4170},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2955},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1100},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1164},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2061},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":718},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6543},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6735},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":16},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1809},"outV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3282},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3609},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1818},"outV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4894},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":479},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2527},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2027},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3883},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2287},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4783},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3442},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4340},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5300},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5047},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":56},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5699},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5700},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5701},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5702},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5703},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5704},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5705},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5706},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5707},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5708},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5709},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5710},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5711},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5712},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5713},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5714},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5715},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5716},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5717},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5718},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5719},"inV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5720},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5721},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5722},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5723},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5724},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5725},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5726},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5727},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5728},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7854},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7853},"inV":{"@type":"g:Int32","@value":699}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":57},"value":"THE RACE IS ON"}],"songType":[{"id":{"@type":"g:Int64","@value":59},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":58},"value":{"@type":"g:Int32","@value":59}}]}}
-{"id":{"@type":"g:Int32","@value":21},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5634},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5384},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":777},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":907},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3981},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6413},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3088},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":17},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5137},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4754},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1427},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3859},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4888},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6555},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1949},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3234},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6179},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":932},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2471},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4519},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4775},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1577},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4650},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5035},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":44},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1711},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":816},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5680},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":945},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3633},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6705},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6450},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6195},"outV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1845},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3896},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5305},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6202},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1981},"outV":{"@type":"g:Int32","@value":281},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4030},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3263},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1089},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2113},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6722},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2371},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2500},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5060},"outV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5957},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6981},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4166},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":713},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3789},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6605},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5070},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2512},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2896},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":467},"outV":{"@type":"g:Int32","@value":194},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2645},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":470},"outV":{"@type":"g:Int32","@value":195},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1240},"outV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1368},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1752},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2904},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6105},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1242},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5212},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3038},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2271},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5855},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2016},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4451},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":484},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2788},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3433},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5738},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5866},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":96}}},{"id":{"@type":"g:Int32","@value":4588},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":238},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2670},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4462},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7022},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5359},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6768},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2162},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3190},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2040},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3705},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3322},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5114},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4347},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4859},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1148},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6268},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":51}}},{"id":{"@type":"g:Int32","@value":637},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":382},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6319},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6320},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":72}}},{"id":{"@type":"g:Int32","@value":6321},"inV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":6322},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":48}}},{"id":{"@type":"g:Int32","@value":6323},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6324},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6325},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6326},"inV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6327},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6328},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6329},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6330},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6331},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6332},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6333},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":6334},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":6335},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6336},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":6337},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6338},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6339},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6340},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6341},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6342},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6343},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6344},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6345},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6346},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6347},"inV":{"@type":"g:Int32","@value":338},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6348},"inV":{"@type":"g:Int32","@value":281},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6349},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6350},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6351},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6352},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6353},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6354},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6355},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6356},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6357},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6358},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6359},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6360},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6361},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6362},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6363},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":6364},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":6365},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6366},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6367},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6368},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6369},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6370},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6371},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6372},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6373},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6374},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6375},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6376},"inV":{"@type":"g:Int32","@value":286},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6377},"inV":{"@type":"g:Int32","@value":329},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6378},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7378},"inV":{"@type":"g:Int32","@value":426}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7377},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":60},"value":"TRUCKING"}],"songType":[{"id":{"@type":"g:Int64","@value":62},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":61},"value":{"@type":"g:Int32","@value":519}}]}}
-{"id":{"@type":"g:Int32","@value":22},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6082},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":708},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2693},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3274},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5196},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":720},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5136},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":18},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4886},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1367},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1944},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5080},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1243},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":477},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2525},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4961},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7009},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3555},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":807},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2919},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4465},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6451},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5942},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2105},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6265},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3900},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4156},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5632},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5633},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5634},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5635},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5636},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5637},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5638},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5639},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5640},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5641},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5642},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5643},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5644},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5645},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5646},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5647},"inV":{"@type":"g:Int32","@value":142},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5648},"inV":{"@type":"g:Int32","@value":302},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5649},"inV":{"@type":"g:Int32","@value":301},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5621},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5622},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5623},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5624},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5625},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5626},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5627},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5628},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5629},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5630},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5631},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7774},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7773},"inV":{"@type":"g:Int32","@value":658}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":63},"value":"ME AND BOBBY MCGEE"}],"songType":[{"id":{"@type":"g:Int64","@value":65},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":64},"value":{"@type":"g:Int32","@value":118}}]}}
-{"id":{"@type":"g:Int32","@value":23},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4354},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1928},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4234},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":143},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6031},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":19},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5140},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1046},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3862},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4889},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1562},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4773},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5029},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6949},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3884},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":943},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":48},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1457},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":568},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":696},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4281},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1210},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2362},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":3772},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6461},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2110},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4162},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1859},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1092},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1990},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2760},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6602},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6733},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6861},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1490},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5075},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":63}}},{"id":{"@type":"g:Int32","@value":2520},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":361},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5739},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6380},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":59}}},{"id":{"@type":"g:Int32","@value":1647},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1264},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2672},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3440},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2929},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3569},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4469},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6266},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":767},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":11}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":640},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":641},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":642},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":643},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":644},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":645},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":646},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":647},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":648},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":649},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":650},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":651},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":652},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":653},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":654},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":655},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":656},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":657},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":658},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":659},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":660},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":661},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":662},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":663},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":664},"inV":{"@type":"g:Int32","@value":45},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":665},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":666},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":667},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":668},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":669},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":670},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":671},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":672},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":673},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":674},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":675},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":676},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":677},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":678},"inV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":679},"inV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":680},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":681},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":608},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":609},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":610},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":611},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":612},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":613},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":614},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":615},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":616},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":617},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":618},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":619},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":620},"inV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":621},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":622},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":623},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":624},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":625},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":626},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":627},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":628},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":629},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":630},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":631},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":632},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":633},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":634},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":635},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":636},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":637},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":638},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":639},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":66},"value":"GREATEST STORY"}],"songType":[{"id":{"@type":"g:Int64","@value":68},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":67},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":24},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4226},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1155},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3079},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3338},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6282},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":785},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2705},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5139},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":20},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6806},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4887},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5272},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4121},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6687},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":83}}},{"id":{"@type":"g:Int32","@value":674},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5027},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":167},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2602},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":130}}},{"id":{"@type":"g:Int32","@value":4778},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3243},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5036},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6446},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2223},"outV":{"@type":"g:Int32","@value":226},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":688},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3889},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4146},"outV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6071},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1592},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1720},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4537},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6714},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1085},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":2112},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4032},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":449},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":705},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4167},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2507},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6606},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5074},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6227},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4950},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":471},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":728},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":94},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":992},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2916},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4073},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3437},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1263},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3568},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4466},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1781},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3194},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2429},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3617},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3618},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3619},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3620},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3621},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":3622},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3623},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3624},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3625},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3626},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3627},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3628},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3629},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3630},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3631},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3632},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3633},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3634},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3635},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3636},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3637},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3638},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3639},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3640},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3641},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3642},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3643},"inV":{"@type":"g:Int32","@value":316},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3644},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3645},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":3646},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3647},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3648},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3649},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3650},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3651},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3652},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3653},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3654},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3655},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3656},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3657},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3658},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3659},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3660},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3661},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3662},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3663},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3664},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3665},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":3666},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3667},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3668},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3669},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3670},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3671},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3672},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3673},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3674},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3675},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3676},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3677},"inV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3678},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3679},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3680},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3681},"inV":{"@type":"g:Int32","@value":299},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3682},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3683},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3684},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3685},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3686},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3687},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3688},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3689},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3690},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3691},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3692},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3693},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7244},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7243},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":69},"value":"MEXICALI BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":71},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":70},"value":{"@type":"g:Int32","@value":435}}]}}
-{"id":{"@type":"g:Int32","@value":25},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6400},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2053},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6533},"outV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3078},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5383},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3720},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6409},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1547},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4875},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2700},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6671},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":913},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":786},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4627},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":21},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5144},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":87}}},{"id":{"@type":"g:Int32","@value":284},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":2851},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5031},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6701},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1966},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6449},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3891},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6323},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1721},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4410},"outV":{"@type":"g:Int32","@value":327},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6076},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6718},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1856},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":54}}},{"id":{"@type":"g:Int32","@value":3265},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4677},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6597},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":711},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1097},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4298},"outV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4303},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4178},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":213},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":469},"outV":{"@type":"g:Int32","@value":195},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1369},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":77}}},{"id":{"@type":"g:Int32","@value":5083},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2012},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2396},"outV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2524},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":350},"outV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5731},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3944},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":491},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":369},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4337},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6902},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2169},"outV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2937},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5371},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6270},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2304},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2305},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2306},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2307},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2308},"inV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2309},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2310},"inV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2311},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":71}}},{"id":{"@type":"g:Int32","@value":2312},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2313},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2314},"inV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2315},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2316},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2317},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2318},"inV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2319},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2320},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2321},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2322},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2323},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2324},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2325},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2326},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2327},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2328},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2329},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2330},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2331},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2332},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2333},"inV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2334},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2261},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2262},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2263},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2264},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2265},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":2266},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2267},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2268},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2269},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2270},"inV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2271},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2272},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2273},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2274},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2275},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2276},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2277},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2278},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2279},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2280},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2281},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2282},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2283},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2284},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2285},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2286},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2287},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2288},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2289},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":2290},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2291},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2292},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2293},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2294},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2295},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2296},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2297},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2298},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2299},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2300},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2301},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2302},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2303},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":7}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7440},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7439},"inV":{"@type":"g:Int32","@value":458}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":72},"value":"AROUND AND AROUND"}],"songType":[{"id":{"@type":"g:Int64","@value":74},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":73},"value":{"@type":"g:Int32","@value":418}}]}}
-{"id":{"@type":"g:Int32","@value":26},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":768},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1665},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3073},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2050},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5378},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1417},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4746},"outV":{"@type":"g:Int32","@value":294},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6410},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4107},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":268},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3216},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":274},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2835},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4500},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":22},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":662},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1559},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":920},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4633},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2458},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4892},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4765},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":6818},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4004},"outV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6948},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2213},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5030},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":554},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5676},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":686},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":175},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3887},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4529},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6065},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5043},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2356},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":821},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3383},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3256},"outV":{"@type":"g:Int32","@value":285},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1726},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6462},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4290},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1476},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3268},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3013},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3143},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4168},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4041},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6986},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":77},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1997},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5326},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1103},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6609},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2516},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6101},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2262},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4311},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5079},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":474},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2651},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":863},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6751},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":7007},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3425},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5218},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":357},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5733},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2791},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4583},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2664},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1385},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6379},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":58}}},{"id":{"@type":"g:Int32","@value":3438},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":42}}},{"id":{"@type":"g:Int32","@value":1903},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5231},"outV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3571},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3699},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":885},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1653},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1014},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1659},"outV":{"@type":"g:Int32","@value":263},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6140},"outV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1277},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2941},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4350},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1152},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1153},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1154},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1155},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1156},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1157},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1158},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1159},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":1160},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1161},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1162},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1163},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":1164},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1165},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1166},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1167},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1168},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1169},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1170},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1171},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1172},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1173},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1174},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1175},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1176},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1177},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1178},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1179},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1180},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1181},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1182},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1183},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1184},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":1185},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1186},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1187},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1188},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1189},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1190},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1191},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1192},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1193},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1194},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1195},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1196},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1197},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1198},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1199},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1200},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1201},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1202},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1203},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1204},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1205},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1206},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1207},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1208},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1209},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1210},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1211},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1212},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1213},"inV":{"@type":"g:Int32","@value":156},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1214},"inV":{"@type":"g:Int32","@value":247},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1215},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1216},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1217},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1218},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1219},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1220},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1221},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1222},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1223},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1224},"inV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1225},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1226},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1227},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1228},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1142},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1143},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1144},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1145},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1146},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":1147},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1148},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1149},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1150},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":41}}},{"id":{"@type":"g:Int32","@value":1151},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7848},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7847},"inV":{"@type":"g:Int32","@value":458}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":75},"value":"PROMISED LAND"}],"songType":[{"id":{"@type":"g:Int64","@value":77},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":76},"value":{"@type":"g:Int32","@value":427}}]}}
-{"id":{"@type":"g:Int32","@value":27},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3712},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4992},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5504},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5633},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2434},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6658},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1796},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":134},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1030},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2184},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6792},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":906},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2698},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":523},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4236},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":781},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5518},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1558},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":23},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3608},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1946},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2586},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4123},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5663},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2080},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5796},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6437},"outV":{"@type":"g:Int32","@value":318},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3366},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":423},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6059},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5932},"outV":{"@type":"g:Int32","@value":314},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5165},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4654},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4911},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4016},"outV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3634},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2996},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6324},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6836},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4149},"outV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6584},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5954},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":707},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5443},"outV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3524},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":837},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1992},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2761},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":1354},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1359},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5712},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3793},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":6230},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":88},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4569},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2906},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3418},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5469},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5854},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":480},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4066},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4707},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":612},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2277},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3301},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1895},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4968},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3177},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5609},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":874},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2157},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3057},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3314},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1783},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5239},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":2936},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1149},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3967},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1280},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1281},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1282},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1283},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1284},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1285},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1286},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1287},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1288},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1289},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1290},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1291},"inV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1292},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1293},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1294},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1295},"inV":{"@type":"g:Int32","@value":253},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1296},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1297},"inV":{"@type":"g:Int32","@value":221},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1298},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1299},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1300},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1301},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1302},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1303},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1304},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1305},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1306},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1307},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1308},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1309},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1310},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1311},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1312},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1313},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1241},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1242},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1243},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1244},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1245},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1246},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1247},"inV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1248},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1249},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1250},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1251},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1252},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1253},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1254},"inV":{"@type":"g:Int32","@value":226},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1255},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1256},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1257},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":1258},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1259},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1260},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1261},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1262},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":1263},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1264},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1265},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1266},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1267},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1268},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1269},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":1270},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1271},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1272},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1273},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1274},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1275},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1276},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1277},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1278},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1279},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7296},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7295},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":78},"value":"RAMBLE ON ROSE"}],"songType":[{"id":{"@type":"g:Int64","@value":80},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":79},"value":{"@type":"g:Int32","@value":316}}]}}
-{"id":{"@type":"g:Int32","@value":28},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1443},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4387},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3044},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3204},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5829},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6182},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4615},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3496},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":457},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2473},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2825},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5227},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5419},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2636},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4012},"outV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2576},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1971},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4563},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":852},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6518},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":24},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4735},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1760},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1761},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1762},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1763},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1764},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1765},"inV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1766},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1767},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1768},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1769},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1770},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1771},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1772},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1750},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1751},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1752},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1753},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1754},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1755},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1756},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1757},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1758},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1759},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":81},"value":"LONG WAY TO GO HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":83},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":82},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":29},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":386},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4681},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3914},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1871},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":43}}},{"id":{"@type":"g:Int32","@value":2639},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3856},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5904},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":6424},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":6616},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":25},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":217},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6297},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5595},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1437},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5406},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6366},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":931},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2019},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4003},"outV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5156},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":3494},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3942},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2344},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":811},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1963},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1388},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":54}}},{"id":{"@type":"g:Int32","@value":301},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2735},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6706},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6196},"outV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5365},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":950},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4728},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5753},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":7033},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2555},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6395},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5694},"outV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":895},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2047},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":7}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2240},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2241},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2242},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2243},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2244},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2245},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2246},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2247},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2248},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2249},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2250},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":46}}},{"id":{"@type":"g:Int32","@value":2251},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2252},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2253},"inV":{"@type":"g:Int32","@value":264},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2254},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2255},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2256},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2257},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2258},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2259},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2260},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2235},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":163}}},{"id":{"@type":"g:Int32","@value":2236},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2237},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2238},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2239},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7368},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7367},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":84},"value":"THROWING STONES"}],"songType":[{"id":{"@type":"g:Int64","@value":86},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":85},"value":{"@type":"g:Int32","@value":265}}]}}
-{"id":{"@type":"g:Int32","@value":30},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2503},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2378},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6027},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":846},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3343},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2000},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4368},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2961},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1298},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3602},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3731},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3927},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6872},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6233},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":26},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2138},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2202},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1052},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1440},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":673},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5666},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":166},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1126},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3430},"outV":{"@type":"g:Int32","@value":312},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4134},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3242},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4843},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5611},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5996},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":879},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1839},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4656},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6641},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5108},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1206},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1463},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3192},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6392},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6968},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1786},"outV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4542},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4992},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4993},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4994},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4995},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4996},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4997},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4998},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4999},"inV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5000},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5001},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5002},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5003},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5004},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5005},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5006},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5007},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5008},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5009},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5010},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5011},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5012},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5013},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5014},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5015},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5016},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5017},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5018},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5019},"inV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5020},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5021},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5022},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5023},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5024},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5025},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5026},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5027},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4985},"inV":{"@type":"g:Int32","@value":333},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4986},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4987},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":4988},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4989},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4990},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4991},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8000},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7999},"inV":{"@type":"g:Int32","@value":785}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":87},"value":"WALKING BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":89},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":88},"value":{"@type":"g:Int32","@value":139}}]}}
-{"id":{"@type":"g:Int32","@value":31},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2496},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3201},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4547},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":265},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1677},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2386},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4050},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1619},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2582},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6294},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2967},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6871},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1304},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":27},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2139},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6365},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":222},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":671},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3871},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3935},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1059},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3308},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5612},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4141},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6957},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1136},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4657},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3506},"outV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4914},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":755},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4019},"outV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5109},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6517},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1081},"outV":{"@type":"g:Int32","@value":243},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6010},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1789},"outV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3773},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3135},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1344},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1345},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1346},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1347},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1348},"inV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1349},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1350},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1351},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1352},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1353},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1354},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1355},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1356},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1316},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1317},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1318},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1319},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1320},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1321},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1322},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1323},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1324},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1325},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1326},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1327},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1328},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1329},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1330},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1331},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1332},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1333},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1334},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1335},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1336},"inV":{"@type":"g:Int32","@value":256},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1337},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1338},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1339},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1340},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1341},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1342},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1343},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8004},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8003},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":90},"value":"WANG DANG DOODLE"}],"songType":[{"id":{"@type":"g:Int64","@value":92},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":91},"value":{"@type":"g:Int32","@value":95}}]}}
-{"id":{"@type":"g:Int32","@value":32},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3461},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1798},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1674},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2186},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5516},"outV":{"@type":"g:Int32","@value":328},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3086},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":656},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4114},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":917},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6933},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3226},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4634},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":28},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":157},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2717},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":287},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4511},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4900},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":805},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2221},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1583},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":179},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":949},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1461},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2357},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5557},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5430},"outV":{"@type":"g:Int32","@value":315},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":439},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":567},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4792},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1728},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5313},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3907},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2118},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":3014},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6089},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1994},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6477},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3662},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1104},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":5585},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6353},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3285},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4183},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5975},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2648},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3160},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1628},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":862},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4702},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5088},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5856},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2529},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6881},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":738},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2146},"outV":{"@type":"g:Int32","@value":228},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2148},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":105},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2928},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4080},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1266},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":500},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3572},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":373},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1013},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2809},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3961},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4346},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1788},"outV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2303},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":7}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5248},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":5249},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5250},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5251},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5252},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5253},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5254},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5255},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":5256},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5257},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5258},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5259},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5260},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5261},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5262},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5263},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5264},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5265},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5266},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5267},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5268},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5269},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5270},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5271},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5272},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5273},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5274},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5275},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5276},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5277},"inV":{"@type":"g:Int32","@value":306},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5278},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5279},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5280},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5281},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5282},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5283},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5284},"inV":{"@type":"g:Int32","@value":267},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5285},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5286},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5287},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5288},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5289},"inV":{"@type":"g:Int32","@value":253},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5290},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5291},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5292},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5293},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5294},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5295},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5296},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5297},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5237},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5238},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5239},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":5240},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5241},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":5242},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5243},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":5244},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5245},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":5246},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5247},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7800},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7799},"inV":{"@type":"g:Int32","@value":478}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":93},"value":"NEW MINGLEWOOD BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":95},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":94},"value":{"@type":"g:Int32","@value":435}}]}}
-{"id":{"@type":"g:Int32","@value":33},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4385},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5121},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3939},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6213},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4936},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6292},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4437},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4731},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6363},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":892},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4668},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":29},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4605},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2142},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5918},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3199},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4672},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4673},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4674},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4675},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4676},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4677},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4678},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4679},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4680},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4681},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4682},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4683},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4684},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4685},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4686},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4687},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4688},"inV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4689},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4690},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4691},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4692},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4693},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4694},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7928},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7927},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":96},"value":"SPOONFUL"}],"songType":[{"id":{"@type":"g:Int64","@value":98},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":97},"value":{"@type":"g:Int32","@value":52}}]}}
-{"id":{"@type":"g:Int32","@value":34},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1217},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4481},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2887},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3785},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2570},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1229},"outV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6990},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":83},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3603},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1749},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6869},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":854},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1750},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2903},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1048},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3928},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4377},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5531},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":30},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4448},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3493},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5669},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5478},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5416},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1323},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4139},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6892},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6127},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1137},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2481},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1459},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6004},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3189},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4662},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6520},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6393},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4925},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1919},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":8}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":320},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":321},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":322},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":323},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":324},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":325},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":326},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":327},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":328},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":329},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":330},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":331},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":332},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":333},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":334},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":335},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":336},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":337},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":338},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":339},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":340},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":341},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":342},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":343},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":344},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":345},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":346},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":347},"inV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":312},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":313},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":314},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":315},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":316},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":317},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":318},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":319},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7388},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7387},"inV":{"@type":"g:Int32","@value":428}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":99},"value":"VICTIM OR THE CRIME"}],"songType":[{"id":{"@type":"g:Int64","@value":101},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":100},"value":{"@type":"g:Int32","@value":96}}]}}
-{"id":{"@type":"g:Int32","@value":35},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4738},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5858},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4389},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6821},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3047},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":905},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1001},"outV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6186},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1227},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5835},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":108},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1485},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":462},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3214},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6991},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":339},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6136},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6521},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":858},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":31},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4864},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4865},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4866},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4867},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4868},"inV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4869},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4853},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4854},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4855},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4856},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4857},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4858},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4859},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4860},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4861},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4862},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4863},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7396},"inV":{"@type":"g:Int32","@value":430}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7395},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":102},"value":"WAY TO GO HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":104},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":103},"value":{"@type":"g:Int32","@value":92}}]}}
-{"id":{"@type":"g:Int32","@value":36},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2881},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3522},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1219},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1479},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5896},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":396},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2640},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":849},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6418},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4371},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4755},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2580},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4564},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2391},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3864},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1435},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6813},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6559},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":32},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1760},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6562},"outV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":140}}},{"id":{"@type":"g:Int32","@value":3492},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5221},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5415},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6504},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":106},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6382},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4853},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6133},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4663},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6967},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1914},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3390},"outV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7038},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6146},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6147},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":6148},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6149},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":41}}},{"id":{"@type":"g:Int32","@value":6150},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6151},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6152},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6153},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":6154},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6155},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6156},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6157},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6158},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6159},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6160},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6161},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6162},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":6163},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6164},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6165},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6166},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6167},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6168},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6169},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6170},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6171},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6172},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6173},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6174},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6175},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6176},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6177},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6178},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6179},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6180},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6181},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6182},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6183},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6184},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6185},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6186},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6187},"inV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6188},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6189},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7312},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7311},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":105},"value":"SAINT OF CIRCUMSTANCE"}],"songType":[{"id":{"@type":"g:Int64","@value":107},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":106},"value":{"@type":"g:Int32","@value":222}}]}}
-{"id":{"@type":"g:Int32","@value":37},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2624},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":33},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2659},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1445},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3046},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3209},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6378},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":107},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6188},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1006},"outV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1486},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5487},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4049},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":340},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6135},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6522},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":860},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5438},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4671},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4748},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4749},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4750},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4751},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4752},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4753},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4754},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4755},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4756},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4757},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4758},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4759},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4760},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4761},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4762},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4763},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4764},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7318},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7317},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":108},"value":"SAMBA IN THE RAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":110},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":109},"value":{"@type":"g:Int32","@value":38}}]}}
-{"id":{"@type":"g:Int32","@value":38},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3584},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6016},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1282},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6916},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5125},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":262},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1673},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3339},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2316},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4372},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2965},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5402},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":34},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3746},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3107},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":804},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4644},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":938},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":300},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1837},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6318},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":692},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4917},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5558},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6582},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2489},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":2365},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3517},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5437},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":577},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5698},"outV":{"@type":"g:Int32","@value":156},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":836},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5828},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4809},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4938},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1996},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5453},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3918},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4432},"outV":{"@type":"g:Int32","@value":308},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5201},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6481},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6098},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2260},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3287},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1624},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5849},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6745},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1501},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":97},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4198},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5222},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":877},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1646},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4974},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6894},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6640},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1905},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6385},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2550},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3958},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1020},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5117},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6526},"outV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":402},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":403},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":404},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":405},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":406},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":407},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":408},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":409},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":410},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":411},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":412},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":413},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":414},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":415},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":416},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":417},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":418},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":419},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":420},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":421},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":422},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":423},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":424},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":425},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":426},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":427},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":428},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":429},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":430},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":431},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":432},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":433},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":434},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":435},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":436},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":437},"inV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":438},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":439},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":440},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":441},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":442},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":443},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":444},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":445},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":446},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":447},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":448},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":449},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":450},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":451},"inV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":452},"inV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":453},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":454},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7162},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7161},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":111},"value":"FEEL LIKE A STRANGER"}],"songType":[{"id":{"@type":"g:Int64","@value":113},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":112},"value":{"@type":"g:Int32","@value":207}}]}}
-{"id":{"@type":"g:Int32","@value":39},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4096},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6275},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":644},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":772},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3589},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7045},"outV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4871},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1548},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":141},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5389},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2703},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":528},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1042},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2451},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3989},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3872},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6176},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5281},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6689},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":35},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6569},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2605},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4782},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":435},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5814},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1207},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2104},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1850},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":59},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":315},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4283},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5948},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5183},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5057},"outV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3140},"outV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2504},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5704},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6729},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4173},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2894},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2769},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":211},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":986},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3802},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5598},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1119},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3680},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6240},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3041},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5217},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5857},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":483},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4964},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3173},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4582},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6502},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1256},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7019},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3311},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2160},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3443},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4852},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5493},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5113},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2940},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5629},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4223},"outV":{"@type":"g:Int32","@value":324},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6784},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6785},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6786},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6787},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6788},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6789},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6790},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6791},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6792},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6793},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6794},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6795},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6796},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6797},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6798},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6799},"inV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6800},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6801},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6802},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6803},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6804},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6805},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6806},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6807},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6808},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6809},"inV":{"@type":"g:Int32","@value":221},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6810},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6811},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6812},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6813},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6814},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6815},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6816},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6817},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6818},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6819},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6820},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6821},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6822},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6763},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6764},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6765},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6766},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6767},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6768},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6769},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6770},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6771},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6772},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6773},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6774},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6775},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6776},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6777},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6778},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6779},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6780},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6781},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6782},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6783},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":5}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7120},"inV":{"@type":"g:Int32","@value":362}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7119},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":114},"value":"CUMBERLAND BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":116},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":115},"value":{"@type":"g:Int32","@value":223}}]}}
-{"id":{"@type":"g:Int32","@value":40},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5120},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4930},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":36},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1060},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":453},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4550},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1704},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4616},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":681},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1482},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3502},"outV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1139},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5492},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4021},"outV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1753},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2969},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1306},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4667},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6011},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2141},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6877},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6975},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4390},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4391},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4392},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4393},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4394},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4395},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4396},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4397},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4398},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4399},"inV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4400},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4401},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4402},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4403},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4404},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4405},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4406},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7882},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7881},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":117},"value":"THE SAME THING"}],"songType":[{"id":{"@type":"g:Int64","@value":119},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":118},"value":{"@type":"g:Int32","@value":45}}]}}
-{"id":{"@type":"g:Int32","@value":41},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1220},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1484},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2637},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2893},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4749},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":399},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":855},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1751},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4384},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1442},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6820},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":37},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3877},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5480},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5418},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":939},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4971},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1004},"outV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6189},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4215},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6713},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4858},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3388},"outV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4028},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4670},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4734},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1824},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1825},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1826},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1827},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1828},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1829},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1830},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1831},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1832},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1833},"inV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1834},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1835},"inV":{"@type":"g:Int32","@value":274},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1836},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1819},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":38}}},{"id":{"@type":"g:Int32","@value":1820},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1821},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1822},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1823},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":120},"value":"CORINA"}],"songType":[{"id":{"@type":"g:Int64","@value":122},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":121},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":42},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3457},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6786},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6019},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4484},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5000},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1033},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3082},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1804},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4111},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":152},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2328},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":669},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1181},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2205},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4895},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":4514},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2596},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":38},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6057},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3247},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4274},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1590},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6966},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":187},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3902},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3016},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6473},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5325},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2131},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3667},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4693},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":601},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":731},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3163},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4190},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6880},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6753},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1123},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4835},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5092},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":871},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4711},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5486},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1395},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1523},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":502},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6006},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1271},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1785},"outV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3582},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5570},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5571},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5572},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5573},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5574},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5575},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5576},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5577},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5578},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5579},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5580},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5581},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5582},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5583},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5584},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5585},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5586},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5587},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5588},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5589},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5590},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5591},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5592},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5593},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5594},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5595},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5596},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5597},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5598},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5599},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5600},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5601},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5602},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5603},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5604},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5605},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5606},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5607},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5608},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5609},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5610},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5611},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5612},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5613},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5614},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5615},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5616},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5617},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5618},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5619},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5620},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7686},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7685},"inV":{"@type":"g:Int32","@value":615}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":123},"value":"ITS ALL OVER NOW"}],"songType":[{"id":{"@type":"g:Int64","@value":125},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":124},"value":{"@type":"g:Int32","@value":160}}]}}
-{"id":{"@type":"g:Int32","@value":43},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3936},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6819},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4580},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1061},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4934},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6054},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":39},"outV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4551},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1448},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4493},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3504},"outV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3250},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1397},"outV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":759},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2650},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4026},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4219},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1308},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3198},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5517},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5518},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5519},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5520},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5521},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5522},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5523},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5524},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5525},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5526},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5527},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5528},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5529},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5530},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5531},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5532},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5533},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5534},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5535},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7156},"inV":{"@type":"g:Int32","@value":373}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7155},"inV":{"@type":"g:Int32","@value":372}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":126},"value":"ETERNITY"}],"songType":[{"id":{"@type":"g:Int64","@value":128},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":127},"value":{"@type":"g:Int32","@value":44}}]}}
-{"id":{"@type":"g:Int32","@value":44},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2402},"outV":{"@type":"g:Int32","@value":45},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":40},"inV":{"@type":"g:Int32","@value":45},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7586},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7585},"inV":{"@type":"g:Int32","@value":551}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":129},"value":"GOOD GOLLY MISS MOLLY"}],"songType":[{"id":{"@type":"g:Int64","@value":131},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":130},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":45},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":40},"outV":{"@type":"g:Int32","@value":44},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":664},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6856},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2402},"inV":{"@type":"g:Int32","@value":44},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2403},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2404},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2405},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":132},"value":"DEVIL WITH A BLUE DRESS"}],"songType":[{"id":{"@type":"g:Int64","@value":134},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":133},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":46},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1540},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2052},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6917},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4230},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6024},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4873},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2572},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6540},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6672},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1043},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3991},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2200},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2968},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2330},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5530},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3484},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1446},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4263},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3624},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4138},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":172},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3757},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3118},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6447},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2992},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5169},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5681},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6578},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4659},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2485},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4533},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1209},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6716},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4158},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2753},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3521},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2114},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6085},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2886},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5321},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5961},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1099},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1483},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2763},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":589},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3406},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3922},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6866},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":342},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":982},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":859},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4830},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1505},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5604},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5477},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6631},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1261},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3823},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4720},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6896},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1655},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6775},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1918},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":41},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":42},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":43},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":44},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":45},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":46},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":47},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":48},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":49},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":50},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":51},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":52},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":53},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":54},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":55},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":56},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":57},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":58},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":59},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":60},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":61},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":62},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":63},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":64},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":65},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":66},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":67},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":68},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":69},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":70},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":71},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":72},"inV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":73},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":74},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":75},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":76},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":77},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":78},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":79},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":80},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":81},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":82},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":83},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":84},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":85},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":86},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":87},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":88},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":89},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":90},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":91},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":92},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":93},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":94},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":95},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":96},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":97},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":98},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":99},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":100},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":101},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":102},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":103},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":104},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":105},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":106},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":107},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":108},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":109},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":110},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":111},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":112},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7080},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7079},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":135},"value":"BOX OF RAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":137},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":136},"value":{"@type":"g:Int32","@value":161}}]}}
-{"id":{"@type":"g:Int32","@value":47},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5953},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6596},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1541},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":630},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":43},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2509},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6445},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5711},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5029},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5030},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5031},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5032},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5033},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5034},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5035},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5036},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7972},"inV":{"@type":"g:Int32","@value":457}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7971},"inV":{"@type":"g:Int32","@value":769}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":138},"value":"TOMORROW IS FOREVER"}],"songType":[{"id":{"@type":"g:Int64","@value":140},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":139},"value":{"@type":"g:Int32","@value":10}}]}}
-{"id":{"@type":"g:Int32","@value":48},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2953},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3657},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3979},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5515},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5583},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":977},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5329},"outV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4690},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4243},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5525},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5782},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1879},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1688},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2776},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3352},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3801},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5466},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":539},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5979},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6684},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4062},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2912},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2084},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3172},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6052},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1318},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1191},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":6247},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4459},"outV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3053},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":46},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":750},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2414},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":432},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1585},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2553},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5241},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":6777},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4987},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":636},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4924},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6846},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":127},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4097},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4098},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4099},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4100},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4101},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4102},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":4103},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4104},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4105},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4106},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4107},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4108},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4109},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4110},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4111},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4112},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4113},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4114},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4115},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4116},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4117},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4118},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4119},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4120},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4121},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4122},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4123},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4124},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4125},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4126},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4127},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4128},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4129},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4130},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4131},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4132},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4133},"inV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4134},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4135},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4136},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4137},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4138},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4139},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4140},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4141},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4142},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4143},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4144},"inV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4145},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7090},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7089},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":141},"value":"CANDYMAN"}],"songType":[{"id":{"@type":"g:Int64","@value":143},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":142},"value":{"@type":"g:Int32","@value":277}}]}}
-{"id":{"@type":"g:Int32","@value":49},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6656},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1283},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2179},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2054},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5894},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1927},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5768},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":778},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3980},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4748},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6798},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6162},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":2839},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3863},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5399},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6554},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1563},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4891},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5532},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4254},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4641},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5537},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6305},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":418},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3236},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1447},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1831},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4397},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6573},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":47},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5423},"outV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6194},"outV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6964},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5686},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6070},"outV":{"@type":"g:Int32","@value":296},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":183},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":952},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5945},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6330},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":571},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1724},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1471},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3648},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6465},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2758},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6600},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6857},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":842},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4682},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5450},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":460},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3020},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":6734},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":341},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5082},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":989},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4061},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4446},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":356},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2404},"outV":{"@type":"g:Int32","@value":45},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":614},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2921},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4585},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":66}}},{"id":{"@type":"g:Int32","@value":3563},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1772},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3052},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2669},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5744},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7024},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":246},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1145},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3323},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":509},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6398},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6272},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6273},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6274},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6275},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6276},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6277},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":168}}},{"id":{"@type":"g:Int32","@value":6278},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6279},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6280},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6281},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6282},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6283},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6284},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6285},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6286},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6287},"inV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6288},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6289},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6290},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6291},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6292},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6293},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6294},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6295},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6296},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6297},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6298},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6299},"inV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6300},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6301},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6302},"inV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6303},"inV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6304},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6264},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":6265},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6266},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6267},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6268},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":51}}},{"id":{"@type":"g:Int32","@value":6269},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6270},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6271},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7182},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7181},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":144},"value":"HES GONE"}],"songType":[{"id":{"@type":"g:Int64","@value":146},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":145},"value":{"@type":"g:Int32","@value":328}}]}}
-{"id":{"@type":"g:Int32","@value":50},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5377},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":258},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2307},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4100},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4359},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5128},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4877},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3342},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3087},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1808},"outV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4632},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":796},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6686},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":289},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6946},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1316},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5159},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3881},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1838},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":559},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6191},"outV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1584},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":49},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6452},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1078},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1846},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2106},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4154},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":1093},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5191},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6728},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2377},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4427},"outV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2892},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4940},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3150},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1362},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1623},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":7004},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":869},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4453},"outV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2150},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4966},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":615},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5223},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1896},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6764},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1645},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3439},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5233},"outV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":372},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":7030},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4983},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4473},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2939},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2428},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6525},"outV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":897},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1668},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6022},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2183},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4232},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6280},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2188},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5260},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6545},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4242},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3988},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":149},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3740},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4510},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5791},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2209},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1186},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2981},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2727},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6313},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":689},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5555},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1718},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4793},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":1467},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6079},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2498},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1988},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3272},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2508},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5071},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6358},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":987},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":478},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1502},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3551},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1253},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5863},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6889},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6387},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6643},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1015},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5933},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5934},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":5935},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5936},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5937},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5938},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5939},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5940},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":5941},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5942},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5943},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5944},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5945},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5946},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5947},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5948},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5949},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5950},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5951},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5952},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5953},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5954},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5955},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":43}}},{"id":{"@type":"g:Int32","@value":5956},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5957},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5958},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5959},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5960},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5961},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5962},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5963},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5964},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5965},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5966},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5967},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5968},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5969},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5970},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5971},"inV":{"@type":"g:Int32","@value":324},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5972},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5973},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5974},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5975},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5976},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5977},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5978},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5979},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5980},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5981},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5982},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5983},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5984},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5985},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5986},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5987},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5988},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5989},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5990},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5991},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5992},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5993},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5994},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5995},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5996},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5997},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5998},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5999},"inV":{"@type":"g:Int32","@value":243},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6000},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6001},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6002},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6003},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6004},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6005},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6006},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6007},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6008},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6009},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6010},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6011},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7208},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7207},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":147},"value":"JACK STRAW"}],"songType":[{"id":{"@type":"g:Int64","@value":149},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":148},"value":{"@type":"g:Int32","@value":473}}]}}
-{"id":{"@type":"g:Int32","@value":51},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4993},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5505},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2692},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1160},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3336},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1292},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2957},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3469},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5773},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3982},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6542},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6674},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3347},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2069},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2842},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3610},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2587},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1564},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":4259},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":550},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5542},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1705},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6825},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6574},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2993},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5041},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":50},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1332},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5174},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1719},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":440},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3645},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":6337},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5699},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5577},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3403},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4557},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5966},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5331},"outV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2772},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":4565},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5463},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1370},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5084},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6237},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2273},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4070},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4458},"outV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2417},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3825},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6774},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4471},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1400},"outV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":634},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5245},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":27}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3878},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3879},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3880},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3881},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3882},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3883},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3884},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3885},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3886},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3887},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3888},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3889},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3890},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3891},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3892},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3893},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3894},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3895},"inV":{"@type":"g:Int32","@value":195},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3896},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3897},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3898},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3899},"inV":{"@type":"g:Int32","@value":290},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3900},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3901},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3902},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3903},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3904},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3905},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3906},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3907},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3908},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3909},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3910},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3911},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3912},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3913},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3914},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3915},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3916},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3917},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3918},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3919},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3920},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3921},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3922},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3923},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3924},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3925},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3926},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3927},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3928},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3929},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3930},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3931},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3932},"inV":{"@type":"g:Int32","@value":285},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3933},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3934},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3935},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3936},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3937},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3938},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3939},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3940},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3941},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7308},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7307},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":150},"value":"ROW JIMMY"}],"songType":[{"id":{"@type":"g:Int64","@value":152},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":151},"value":{"@type":"g:Int32","@value":274}}]}}
-{"id":{"@type":"g:Int32","@value":52},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":51},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2997},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5734},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2695},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5959},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5705},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2779},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3644},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6670},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4226},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4227},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4228},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4229},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4230},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4231},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4232},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4233},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4234},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7392},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7391},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":153},"value":"WAVE THAT FLAG"}],"songType":[{"id":{"@type":"g:Int64","@value":155},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":154},"value":{"@type":"g:Int32","@value":15}}]}}
-{"id":{"@type":"g:Int32","@value":53},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4289},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3650},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3076},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":709},"outV":{"@type":"g:Int32","@value":221},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4549},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1543},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2185},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2187},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":974},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4430},"outV":{"@type":"g:Int32","@value":299},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3407},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3791},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":784},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1040},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2450},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6228},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6166},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5271},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2264},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5592},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2075},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3934},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2911},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":419},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4323},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1317},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2983},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4777},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":875},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5803},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":684},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5935},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":370},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6066},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5491},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":52},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":116},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5172},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2677},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1782},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3510},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6587},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6651},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6844},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2814},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3966},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":639},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6720},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6721},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6722},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6723},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6724},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6725},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6726},"inV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6727},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6728},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6729},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6730},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6731},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6732},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6733},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6734},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6735},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6736},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6737},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6738},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6739},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6740},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6741},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6742},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6743},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6744},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6745},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6746},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6747},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6748},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6749},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6750},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6751},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6752},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6753},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6754},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6755},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6756},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6757},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6758},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6759},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6760},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6761},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6714},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6715},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6716},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6717},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6718},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6719},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7470},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7469},"inV":{"@type":"g:Int32","@value":478}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":156},"value":"BIG RAILROAD BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":158},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":157},"value":{"@type":"g:Int32","@value":175}}]}}
-{"id":{"@type":"g:Int32","@value":54},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3586},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5510},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3463},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5255},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":904},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1035},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1549},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":5391},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5777},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":404},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2068},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":4244},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4884},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":789},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3350},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5527},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4508},"outV":{"@type":"g:Int32","@value":244},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2589},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5661},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6047},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1698},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2853},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3621},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":5671},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":171},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4396},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5166},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6830},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":561},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4785},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2994},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":54},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6328},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3514},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5946},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":1084},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3401},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1355},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3790},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":975},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2767},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":2128},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5586},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2900},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5464},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2266},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4058},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4570},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2652},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3933},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4960},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6241},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1893},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2412},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":1008},"outV":{"@type":"g:Int32","@value":237},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2674},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3956},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4597},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":118},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3319},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1144},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6648},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4986},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3195},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5627},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4152},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":4153},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4154},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4155},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4156},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4157},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4158},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4159},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4160},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4161},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4162},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4163},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4164},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4165},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4166},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4167},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4168},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4169},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":36}}},{"id":{"@type":"g:Int32","@value":4170},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4171},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4172},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4173},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4174},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4175},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4176},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4177},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4178},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4179},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":4180},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":4181},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":4182},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4183},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":4184},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4185},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4186},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4187},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4188},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4189},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4190},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4191},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4192},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4193},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4194},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4195},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4196},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4197},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4198},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4199},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4200},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4201},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4202},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4203},"inV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4204},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4205},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4206},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4207},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4208},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4209},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4210},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4211},"inV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4212},"inV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4213},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4214},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4215},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4216},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4217},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4218},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4219},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4220},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4221},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4222},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":159},"value":"TENNESSE JED"}],"songType":[{"id":{"@type":"g:Int64","@value":161},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":160},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":55},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6464},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5736},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5960},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4265},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3886},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5710},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4472},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":57},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":793},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2777},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4890},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1565},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3646},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6544},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6545},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6546},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6547},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6548},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6537},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6538},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6539},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6540},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6541},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6542},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6543},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8042},"inV":{"@type":"g:Int32","@value":457}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8041},"inV":{"@type":"g:Int32","@value":804}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":162},"value":"YOU AINT WOMAN ENOUGH"}],"songType":[{"id":{"@type":"g:Int64","@value":164},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":163},"value":{"@type":"g:Int32","@value":15}}]}}
-{"id":{"@type":"g:Int32","@value":56},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2177},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4353},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":133},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5509},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5640},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5002},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4235},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":1171},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6676},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1557},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":150},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":408},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2074},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5786},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2971},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4129},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3622},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":2599},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":553},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1706},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6828},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3376},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4017},"outV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5937},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":6962},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2999},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6332},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":61},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5571},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2756},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":6468},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1349},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5703},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":976},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3409},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5460},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3797},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":2134},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6242},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4069},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4965},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":749},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":624},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3184},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1777},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1140},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3060},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1910},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2424},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":2681},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5243},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":4478},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3584},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3585},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3586},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3587},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3588},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3589},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3590},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3591},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3592},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3593},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3594},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3595},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3596},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3597},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3598},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3599},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3600},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3601},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3602},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3603},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3604},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3605},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3606},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3607},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3608},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3609},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3610},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3611},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3612},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3613},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3614},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3615},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3616},"inV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3551},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3552},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3553},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3554},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3555},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3556},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":3557},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3558},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3559},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3560},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3561},"inV":{"@type":"g:Int32","@value":315},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3562},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3563},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3564},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3565},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3566},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3567},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3568},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3569},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3570},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3571},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3572},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3573},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3574},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3575},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3576},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3577},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3578},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3579},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3580},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3581},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":3582},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3583},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7236},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7235},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":165},"value":"LOSER"}],"songType":[{"id":{"@type":"g:Int64","@value":167},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":166},"value":{"@type":"g:Int32","@value":345}}]}}
-{"id":{"@type":"g:Int32","@value":57},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5635},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6147},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":5254},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1546},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3595},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1934},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5521},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2707},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3987},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6038},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2585},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3355},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":412},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4253},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1312},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":162},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6564},"outV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2984},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":55}}},{"id":{"@type":"g:Int32","@value":6824},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2090},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1708},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2860},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3248},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3632},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2609},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6708},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5173},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1723},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":957},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5949},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":62},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2240},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4546},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1095},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5575},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":972},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2764},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3405},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4175},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5455},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4571},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6235},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2269},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4445},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3294},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3806},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4320},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6372},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2149},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7017},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":618},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2410},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":4078},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4849},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4595},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1908},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":119},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6647},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3706},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6778},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1147},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6141},"outV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3070},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3326},"outV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1791},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2560},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2561},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2562},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2563},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2564},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2565},"inV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2566},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2567},"inV":{"@type":"g:Int32","@value":243},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2568},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2569},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2570},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2571},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2572},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2573},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2574},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2575},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2576},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2577},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2578},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2579},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2580},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2581},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2582},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2583},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2504},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2505},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2506},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2507},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":2508},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2509},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2510},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2511},"inV":{"@type":"g:Int32","@value":205},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2512},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2513},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2514},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2515},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2516},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2517},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2518},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2519},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2520},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2521},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2522},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2523},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2524},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2525},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2526},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2527},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2528},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2529},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2530},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2531},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2532},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":2533},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2534},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2535},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2536},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2537},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":2538},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2539},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2540},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2541},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2542},"inV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2543},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2544},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2545},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2546},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":2547},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2548},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2549},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2550},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2551},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2552},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2553},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2554},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2555},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2556},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2557},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2558},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2559},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7126},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7125},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":168},"value":"DEAL"}],"songType":[{"id":{"@type":"g:Int64","@value":170},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":169},"value":{"@type":"g:Int32","@value":423}}]}}
-{"id":{"@type":"g:Int32","@value":58},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":901},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2439},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6535},"outV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3592},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1545},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4237},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1039},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3983},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6547},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5654},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2071},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6043},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6811},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5276},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1311},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4127},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1701},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4649},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5545},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":426},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6834},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5171},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3380},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5045},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2998},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3638},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3257},"outV":{"@type":"g:Int32","@value":306},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2618},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5950},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":63},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4420},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":330},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3402},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5707},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2766},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":6222},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":3919},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5456},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3795},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2132},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":981},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4567},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6999},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4056},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4696},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5593},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6361},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2655},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":611},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4326},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":744},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3181},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":115},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6388},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1142},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6646},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5623},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":764},"outV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4094},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5502},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3456},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3457},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3458},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3459},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3460},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3461},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3462},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3463},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3464},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3465},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3466},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3467},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3468},"inV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3469},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3470},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3471},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3472},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3473},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3474},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3475},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3476},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3477},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3478},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3479},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3480},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3481},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3482},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3483},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3484},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3485},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3486},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3487},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3488},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3489},"inV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3490},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3491},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3492},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3493},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3494},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3495},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3496},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3497},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3498},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3499},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3500},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3431},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3432},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3433},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3434},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3435},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3436},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3437},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3438},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":42}}},{"id":{"@type":"g:Int32","@value":3439},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3440},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3441},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3442},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3443},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3444},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3445},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3446},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3447},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3448},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3449},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3450},"inV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3451},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3452},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3453},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3454},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3455},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":12}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":171},"value":"BIRD SONG"}],"songType":[{"id":{"@type":"g:Int64","@value":173},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":172},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":59},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1536},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5252},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5126},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3083},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5644},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5772},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1805},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4239},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3346},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2197},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":409},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":921},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2593},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6947},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4006},"outV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":551},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3623},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2858},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3759},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6319},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6832},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":67}}},{"id":{"@type":"g:Int32","@value":5940},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":1717},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":64},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4800},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":961},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3012},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5574},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5708},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6732},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":973},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2765},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6221},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3278},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6607},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5844},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6102},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5208},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1884},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6497},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5476},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":619},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2284},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2541},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4589},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2673},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3441},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1778},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5234},"outV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6771},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2423},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6649},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1150},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":41}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1083},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1084},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1085},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":1086},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":1087},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1088},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1089},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1090},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1091},"inV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1092},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1093},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":1094},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1095},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1096},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":1097},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1098},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1099},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1100},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1101},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1102},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1103},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1104},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":1105},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1106},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1107},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1108},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1109},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1110},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1111},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1112},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1113},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1114},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1115},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1116},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1117},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1118},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1119},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1120},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1121},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1122},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1123},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1124},"inV":{"@type":"g:Int32","@value":244},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1125},"inV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1126},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":1127},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1128},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1129},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1130},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1131},"inV":{"@type":"g:Int32","@value":228},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1132},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1133},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1134},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1135},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1136},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1137},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1138},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1139},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1140},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7346},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7345},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":174},"value":"SUGAREE"}],"songType":[{"id":{"@type":"g:Int64","@value":176},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":175},"value":{"@type":"g:Int32","@value":357}}]}}
-{"id":{"@type":"g:Int32","@value":60},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":902},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2569},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3210},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5135},"outV":{"@type":"g:Int32","@value":334},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4752},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5651},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5781},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6553},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":667},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2715},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5405},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2590},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3358},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5534},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6174},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3487},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5921},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1828},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1329},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1202},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1458},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6963},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5689},"outV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3387},"outV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":317},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":66},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2883},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6851},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1604},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3141},"outV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":202},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1747},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2899},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4823},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1755},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1883},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3035},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6368},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5601},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5475},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2792},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6508},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6125},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2166},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2422},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6007},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5112},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4861},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4606},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":5}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3841},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3842},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3843},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3844},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3845},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3846},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3847},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3848},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3849},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3850},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3851},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3852},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3853},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3854},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3855},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3856},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3857},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":3858},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3859},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3860},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3861},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3862},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3863},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3864},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3865},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3866},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3867},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3868},"inV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3869},"inV":{"@type":"g:Int32","@value":280},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3870},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3871},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3872},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3873},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3874},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3875},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3876},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3877},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":11}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7114},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7113},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":177},"value":"CRAZY FINGERS"}],"songType":[{"id":{"@type":"g:Int64","@value":179},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":178},"value":{"@type":"g:Int32","@value":144}}]}}
-{"id":{"@type":"g:Int32","@value":61},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1633},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":67},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1315},"outV":{"@type":"g:Int32","@value":161},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2372},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3302},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6918},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6184},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4011},"outV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5068},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3117},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":946},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4818},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2579},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4502},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3738},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6619},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2876},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4348},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6429},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5856},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5857},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5858},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5842},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5843},"inV":{"@type":"g:Int32","@value":336},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5844},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5845},"inV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5846},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5847},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5848},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5849},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5850},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5851},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5852},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5853},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5854},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5855},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":180},"value":"MIDNIGHT HOUR"}],"songType":[{"id":{"@type":"g:Int64","@value":182},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":181},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":62},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":256},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1920},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2817},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6913},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4996},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1678},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5134},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3599},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4495},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5397},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3479},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2459},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6557},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3102},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6177},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1826},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3748},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2089},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2734},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5552},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6577},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5170},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1204},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4532},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6969},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2875},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":828},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1340},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4412},"outV":{"@type":"g:Int32","@value":327},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5821},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2366},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2495},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6207},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4416},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1473},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":68},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6980},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4805},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":968},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":586},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":971},"outV":{"@type":"g:Int32","@value":233},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1995},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5327},"outV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":336},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6864},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2257},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6357},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4438},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5846},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1626},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5210},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6108},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5341},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3040},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3298},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3815},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1641},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5481},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6506},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6252},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4977},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2164},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2552},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5881},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1658},"outV":{"@type":"g:Int32","@value":262},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6015},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4352},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4353},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4354},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4355},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4356},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4357},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4358},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4359},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4360},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4361},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4362},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4363},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4364},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4365},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4366},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4367},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4368},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4369},"inV":{"@type":"g:Int32","@value":203},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4370},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4371},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4372},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4373},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4374},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4375},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4376},"inV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4377},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4378},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4379},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4380},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4381},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4382},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4383},"inV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4384},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4385},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4386},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4387},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4388},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4389},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4332},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4333},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4334},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4335},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4336},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4337},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4338},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4339},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4340},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4341},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4342},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4343},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4344},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4345},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4346},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4347},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4348},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4349},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4350},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4351},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7674},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7673},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":183},"value":"IKO IKO"}],"songType":[{"id":{"@type":"g:Int64","@value":185},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":184},"value":{"@type":"g:Int32","@value":185}}]}}
-{"id":{"@type":"g:Int32","@value":63},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1346},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5442},"outV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":69},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4293},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":137},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3529},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":650},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5195},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5774},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":2448},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5588},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3349},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3669},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2135},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6488},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4441},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5274},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3422},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1700},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4068},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":422},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1192},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2346},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2796},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2094},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":881},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6258},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1591},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2297},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5498},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5755},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4991},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3216},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3217},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3218},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3219},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3220},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3221},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3222},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3223},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3224},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3225},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3226},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3227},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3228},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3229},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3230},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3231},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3232},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3233},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3234},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3235},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3236},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3237},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3238},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3239},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3240},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3241},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3242},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3243},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3244},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3245},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3246},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3247},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3248},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3249},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3250},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3251},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3252},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7192},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7191},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":186},"value":"HIGH TIME"}],"songType":[{"id":{"@type":"g:Int64","@value":188},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":187},"value":{"@type":"g:Int32","@value":133}}]}}
-{"id":{"@type":"g:Int32","@value":64},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2560},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2944},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2818},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4357},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4487},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6023},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1289},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3593},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3466},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6922},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1037},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3341},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2062},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1680},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2321},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":658},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1811},"outV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2452},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3736},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":159},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3239},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3114},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1841},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":306},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4915},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1076},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4535},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1208},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5432},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":698},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2491},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6972},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2880},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2369},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":70},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5066},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":588},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1741},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3917},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":463},"outV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4817},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4949},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6229},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1495},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5209},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5339},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5852},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6621},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3678},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1631},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3296},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3814},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6503},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1128},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4328},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4201},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":747},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3179},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6124},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5229},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5615},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1648},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5236},"outV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5364},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4982},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":887},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1916},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":253},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3327},"outV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6527},"outV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6823},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6824},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6825},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6826},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6827},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6828},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6829},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6830},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6831},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6832},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":67}}},{"id":{"@type":"g:Int32","@value":6833},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6834},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6835},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6836},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6837},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6838},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6839},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6840},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6841},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6842},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6843},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6844},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6845},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6846},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6847},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6848},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6849},"inV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6850},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6851},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6852},"inV":{"@type":"g:Int32","@value":299},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6853},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6854},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6855},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6856},"inV":{"@type":"g:Int32","@value":45},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6857},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6858},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6859},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6860},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6861},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6862},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6863},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6864},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6865},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6866},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6867},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6868},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6869},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6870},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6871},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6872},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6873},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6874},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6875},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6876},"inV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6877},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6878},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6879},"inV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6880},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6881},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6882},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6883},"inV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7186},"inV":{"@type":"g:Int32","@value":381}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7185},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":189},"value":"HELL IN A BUCKET"}],"songType":[{"id":{"@type":"g:Int64","@value":191},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":190},"value":{"@type":"g:Int32","@value":216}}]}}
-{"id":{"@type":"g:Int32","@value":65},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2625},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2945},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4801},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3971},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4356},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1669},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":71},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5127},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2312},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3021},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6158},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6611},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3284},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5848},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3098},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6362},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1627},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6107},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6491},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2460},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7005},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5280},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":801},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5026},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":292},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5988},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6951},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1644},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2732},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1902},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2545},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4082},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":565},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5559},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":380},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2492},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6524},"outV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1534},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6379},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":58}}},{"id":{"@type":"g:Int32","@value":6380},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":59}}},{"id":{"@type":"g:Int32","@value":6381},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6382},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6383},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6384},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6385},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6386},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6387},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6388},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6389},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6390},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6391},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6392},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7048},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7047},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":192},"value":"ALABAMA GETAWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":194},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":193},"value":{"@type":"g:Int32","@value":141}}]}}
-{"id":{"@type":"g:Int32","@value":66},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4503},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4743},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":72},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3032},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1977},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3550},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4000},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4001},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4002},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4003},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4004},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3998},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3999},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7992},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7991},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":195},"value":"VISIONS OF JOHANNA"}],"songType":[{"id":{"@type":"g:Int64","@value":197},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":196},"value":{"@type":"g:Int32","@value":8}}]}}
-{"id":{"@type":"g:Int32","@value":67},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1632},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2882},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5762},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2568},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6505},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":74},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1643},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1389},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":210},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1682},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6707},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2740},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5912},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":5817},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1498},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6427},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":3036},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3997},"outV":{"@type":"g:Int32","@value":247},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5213},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5567},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6175},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6367},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":960},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":961},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":962},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":963},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":964},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":965},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":966},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":967},"inV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":968},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":969},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":970},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":941},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":942},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":943},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":944},"inV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":945},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":946},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":947},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":948},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":949},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":950},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":951},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":952},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":953},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":954},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":955},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":956},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":957},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":958},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":959},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":198},"value":"GIMME SOME LOVIN"}],"songType":[{"id":{"@type":"g:Int64","@value":200},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":199},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":68},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":898},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4355},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":132},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6404},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3973},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5253},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":646},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3718},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":398},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4116},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1174},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":153},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1817},"outV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4635},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2206},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6560},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4898},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":6050},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":421},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5670},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2088},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2603},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3244},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4527},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6580},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4279},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5309},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6845},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1598},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3518},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4798},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1983},"outV":{"@type":"g:Int32","@value":253},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3904},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6976},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4417},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2117},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":5190},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6086},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6471},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3656},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":75},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3531},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5581},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1999},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2897},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1106},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3410},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":723},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3155},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4051},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4180},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2646},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7002},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4699},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2526},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5471},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5983},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5089},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6754},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2152},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1513},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3819},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2797},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2925},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":497},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1265},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2034},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":760},"outV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3449},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1018},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5500},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3581},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":4479},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6783},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":5}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2432},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2433},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2434},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2435},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2436},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2437},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2438},"inV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2439},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2440},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2441},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2442},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2443},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2444},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2445},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2446},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2447},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2448},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2449},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2450},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2451},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2452},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2453},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2454},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":2455},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2456},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2457},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2458},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2459},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2460},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2461},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2462},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2463},"inV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2464},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2465},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2466},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2467},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2468},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2469},"inV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2470},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2471},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2472},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2473},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2474},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2475},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2476},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2477},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2478},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2479},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2480},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2481},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2482},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2483},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2484},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2485},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2486},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2487},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2488},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2408},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2409},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2410},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":2411},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2412},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":2413},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2414},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2415},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":2416},"inV":{"@type":"g:Int32","@value":294},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2417},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2418},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2419},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2420},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2421},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2422},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2423},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2424},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":2425},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2426},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2427},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2428},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2429},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2430},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2431},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7094},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7093},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":201},"value":"CASSIDY"}],"songType":[{"id":{"@type":"g:Int64","@value":203},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":202},"value":{"@type":"g:Int32","@value":334}}]}}
-{"id":{"@type":"g:Int32","@value":69},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1025},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6401},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":642},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4611},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5767},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":67}}},{"id":{"@type":"g:Int32","@value":3208},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4367},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1168},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2704},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":403},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6679},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6168},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":1439},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2336},"outV":{"@type":"g:Int32","@value":290},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2594},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":547},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5667},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3364},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":934},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1958},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1576},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4648},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4267},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2220},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6961},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4786},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3125},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":184},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2361},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3898},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6843},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3006},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5062},"outV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":76},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":848},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":337},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5970},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1748},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5204},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6487},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5465},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1882},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1121},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2786},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5743},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6895},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":240},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2418},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4085},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6901},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5110},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4856},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2174},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5376},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5377},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5378},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5379},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5380},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5381},"inV":{"@type":"g:Int32","@value":290},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5382},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5383},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5384},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":5385},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5386},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5387},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5388},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5389},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5390},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5391},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5392},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5393},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5394},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5395},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5396},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":59}}},{"id":{"@type":"g:Int32","@value":5397},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5398},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5399},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5400},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5401},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5402},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5403},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5404},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5405},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5406},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5407},"inV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5408},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5409},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5410},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5411},"inV":{"@type":"g:Int32","@value":286},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5412},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5413},"inV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5414},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5415},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5416},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5417},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5418},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5419},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5420},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5374},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":5375},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7324},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7323},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":204},"value":"SHIP OF FOOLS"}],"songType":[{"id":{"@type":"g:Int64","@value":206},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":205},"value":{"@type":"g:Int32","@value":225}}]}}
-{"id":{"@type":"g:Int32","@value":70},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2055},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5895},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":51}}},{"id":{"@type":"g:Int32","@value":3853},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6797},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3728},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6423},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":6296},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1433},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6938},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5150},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":799},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4512},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5408},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1187},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":295},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6311},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1964},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4653},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3374},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":819},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2742},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1480},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5449},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":970},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5194},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3915},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5836},"outV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":78},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1870},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2383},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6354},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6617},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3164},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4189},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2143},"outV":{"@type":"g:Int32","@value":286},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5984},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6498},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2020},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6120},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1897},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1387},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2539},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":4716},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":58}}},{"id":{"@type":"g:Int32","@value":2033},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4081},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4338},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":378},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3578},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1275},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7035},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":252},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5372},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5757},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2175},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":178},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":179},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":180},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":46}}},{"id":{"@type":"g:Int32","@value":181},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":182},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":183},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":184},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":185},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":186},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":187},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":188},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":189},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":190},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":191},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":192},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":193},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":194},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":195},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":196},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":197},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":198},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":199},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":200},"inV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":201},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":202},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":203},"inV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":204},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":205},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":206},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":207},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":208},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":209},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":210},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":211},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":212},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":213},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":214},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":215},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":216},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":217},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":218},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":219},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":220},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":221},"inV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":222},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":223},"inV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":224},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":225},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":226},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":227},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":228},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":229},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7196},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7195},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":207},"value":"I NEED A MIRACLE"}],"songType":[{"id":{"@type":"g:Int64","@value":209},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":208},"value":{"@type":"g:Int32","@value":271}}]}}
-{"id":{"@type":"g:Int32","@value":71},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3520},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":328},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4490},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3597},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":79},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6802},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2643},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":661},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1302},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2966},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3478},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5655},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1689},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2137},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3930},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2207},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1057},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4130},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5285},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3240},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6761},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2154},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4204},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1133},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4018},"outV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6002},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":884},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2744},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3833},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4921},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3196},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4540},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4029},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":510},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1470},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5160},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5161},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5162},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5163},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5164},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5165},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5166},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5167},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5168},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5169},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5170},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5171},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5172},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5173},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5174},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5175},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5176},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5177},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5178},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5179},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5180},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5181},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5182},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5183},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7530},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7529},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":210},"value":"DESOLATION ROW"}],"songType":[{"id":{"@type":"g:Int64","@value":212},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":211},"value":{"@type":"g:Int32","@value":58}}]}}
-{"id":{"@type":"g:Int32","@value":72},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2946},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5638},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2313},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5386},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6157},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5519},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":788},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5269},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6549},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2454},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":4246},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4504},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1561},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3099},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":2076},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6044},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":413},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3745},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2978},"outV":{"@type":"g:Int32","@value":8},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6563},"outV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2729},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5162},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6827},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2988},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":1200},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2864},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5808},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5936},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2610},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3379},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":566},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2358},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3640},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":319},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4802},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5320},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":80},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6225},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":978},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2898},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3794},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5587},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5333},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5462},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6614},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4057},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2778},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2654},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":608},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3429},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":358},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1259},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4844},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6766},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1904},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2548},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6645},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4087},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":121},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4222},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6911},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6071},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6072},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6073},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6074},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6075},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6076},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6077},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6078},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6079},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6080},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6081},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":6082},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6083},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6084},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6085},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6086},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6087},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6088},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6089},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6090},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6091},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6092},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6093},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6094},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6095},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6096},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6097},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6098},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6099},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6100},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6101},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6102},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6103},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6104},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6105},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6106},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6107},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6108},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6109},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6110},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":6111},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6112},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6113},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6114},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6115},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6116},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6117},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6118},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6119},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6120},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6121},"inV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6122},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6123},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6124},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6125},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6126},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6127},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6128},"inV":{"@type":"g:Int32","@value":337},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6129},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6130},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6131},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6132},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6133},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6134},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6135},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6136},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6137},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6138},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6139},"inV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7536},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7535},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":213},"value":"DONT EASE ME IN"}],"songType":[{"id":{"@type":"g:Int64","@value":215},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":214},"value":{"@type":"g:Int32","@value":316}}]}}
-{"id":{"@type":"g:Int32","@value":73},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":131},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3459},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3587},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1286},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6791},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":651},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2445},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5266},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":6164},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5015},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":154},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4122},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2079},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":416},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6565},"outV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5543},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5804},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6060},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6829},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4398},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3375},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1201},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2866},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4276},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1593},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1338},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6589},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2125},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3023},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":81},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3665},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":5589},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3798},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":6104},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5721},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6489},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5467},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6747},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6236},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4573},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":865},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":994},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4709},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3175},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2153},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5994},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1901},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2547},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2807},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":4088},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5499},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":508},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3964},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1024},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1025},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1026},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1027},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1028},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1029},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1030},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1031},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1032},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1033},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1034},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1035},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1036},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1037},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1038},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1039},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1040},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1041},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1042},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1043},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1044},"inV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1045},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1046},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1047},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1048},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1049},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1050},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1051},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1052},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1053},"inV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1054},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1055},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1056},"inV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1057},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1058},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1059},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1060},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1061},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1062},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1063},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1064},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1065},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1066},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1009},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1010},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":1011},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1012},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1013},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1014},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1015},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1016},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":1017},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1018},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1019},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":1020},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1021},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":1022},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1023},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7054},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7053},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":216},"value":"ALTHEA"}],"songType":[{"id":{"@type":"g:Int64","@value":218},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":217},"value":{"@type":"g:Int32","@value":272}}]}}
-{"id":{"@type":"g:Int32","@value":74},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3968},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3205},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1158},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1542},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4742},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1034},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6154},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":653},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5390},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2575},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6290},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5268},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":277},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6421},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4760},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5656},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3865},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1820},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6942},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4767},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3490},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":549},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2477},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":942},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2353},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5811},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3384},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6712},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6329},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":701},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2622},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2879},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":193},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1857},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1477},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1991},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6983},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":841},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6858},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6604},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":461},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":82},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":338},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1238},"outV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2009},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3037},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1246},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1376},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5216},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2785},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6499},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5861},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3049},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6122},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":235},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3696},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5752},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4603},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2300},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2686},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":86}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":384},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":385},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":386},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":387},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":388},"inV":{"@type":"g:Int32","@value":182},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":389},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":390},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":391},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":392},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":393},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":394},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":395},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":396},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":397},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":398},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":399},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":400},"inV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":401},"inV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":353},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":354},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":355},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":356},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":357},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":358},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":359},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":360},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":361},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":362},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":363},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":364},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":365},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":366},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":38}}},{"id":{"@type":"g:Int32","@value":367},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":368},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":369},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":370},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":371},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":372},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":373},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":374},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":375},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":88}}},{"id":{"@type":"g:Int32","@value":376},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":377},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":378},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":379},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":380},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":381},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":382},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":383},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7384},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7383},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":219},"value":"UNCLE JOHNS BAND"}],"songType":[{"id":{"@type":"g:Int64","@value":221},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":220},"value":{"@type":"g:Int32","@value":332}}]}}
-{"id":{"@type":"g:Int32","@value":75},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2819},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5283},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5603},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3684},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2373},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3525},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1606},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4998},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":7046},"outV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5160},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5995},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":140},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3822},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6223},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6863},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3408},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":84},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1205},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2743},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":955},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5660},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1917},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2077},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2462},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2196},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2197},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2198},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2199},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2200},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2201},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2202},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2203},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2204},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2205},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2206},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2207},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2208},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2209},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2210},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2211},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2212},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2213},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2214},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2215},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2216},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2217},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2218},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2219},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2220},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2221},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2222},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7414},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7413},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":222},"value":"WHEN PUSH COMES TO SHOVE"}],"songType":[{"id":{"@type":"g:Int64","@value":224},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":223},"value":{"@type":"g:Int32","@value":58}}]}}
-{"id":{"@type":"g:Int32","@value":76},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":385},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3460},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6405},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1800},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3976},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4104},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4363},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4619},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1422},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6800},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5393},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3220},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3860},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4629},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2711},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2201},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":538},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1178},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":923},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6941},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":4899},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3369},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5673},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6314},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2859},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2348},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":2476},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":431},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6575},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":817},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":38}}},{"id":{"@type":"g:Int32","@value":5553},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2611},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4536},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5184},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":5059},"outV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6470},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":1737},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1865},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6092},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4302},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1616},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1234},"outV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1108},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3028},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":85},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6743},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1880},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6874},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3291},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5981},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2399},"outV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3168},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1380},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2532},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":1637},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4197},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5094},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":487},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6888},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5485},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4975},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5871},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2163},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2932},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":245},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5237},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2038},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6903},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1272},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5756},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2302},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5765},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5766},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5767},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":67}}},{"id":{"@type":"g:Int32","@value":5768},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":5769},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5770},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5771},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5772},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5773},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5774},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5775},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5776},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5777},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5778},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5779},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5780},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5781},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5782},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5783},"inV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5784},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5785},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5786},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5787},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5788},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5789},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5790},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5791},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5792},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":36}}},{"id":{"@type":"g:Int32","@value":5793},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5794},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5795},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5796},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5797},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5798},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5799},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5800},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5801},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5802},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5803},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5804},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5805},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5806},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5807},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5808},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5809},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5810},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5811},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5812},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5813},"inV":{"@type":"g:Int32","@value":286},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5814},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5815},"inV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5816},"inV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5817},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5818},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5819},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5820},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5821},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5822},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5823},"inV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5824},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5825},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5826},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5827},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5828},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5829},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5830},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5831},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5832},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5833},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5834},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5835},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7884},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7883},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":225},"value":"SAMSON AND DELILAH"}],"songType":[{"id":{"@type":"g:Int64","@value":227},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":226},"value":{"@type":"g:Int32","@value":364}}]}}
-{"id":{"@type":"g:Int32","@value":77},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4480},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":7040},"outV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4545},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":514},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3780},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4039},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2959},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1296},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3600},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2001},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2067},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5652},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":86},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3926},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1047},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6807},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4379},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1692},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2140},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2467},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2980},"outV":{"@type":"g:Int32","@value":265},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6758},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4136},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5290},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2219},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1132},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3245},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5677},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4208},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6001},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6193},"outV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3826},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3188},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":758},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2045},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3391},"outV":{"@type":"g:Int32","@value":309},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3394},"inV":{"@type":"g:Int32","@value":271},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3395},"inV":{"@type":"g:Int32","@value":311},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3396},"inV":{"@type":"g:Int32","@value":260},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3397},"inV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3398},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3399},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3400},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3401},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3402},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3403},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3404},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3405},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3406},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3407},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3408},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3409},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3410},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3411},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3412},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3413},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3414},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3415},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3416},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3417},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3418},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3419},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3420},"inV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3421},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3422},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3423},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3424},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3425},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3426},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3427},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3428},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3429},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":228},"value":"STUCK INSIDE OF MOBILE"}],"songType":[{"id":{"@type":"g:Int64","@value":230},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":229},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":78},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1153},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":771},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5508},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6021},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":136},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6408},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5131},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1676},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6035},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3093},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5013},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2199},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5275},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2972},"outV":{"@type":"g:Int32","@value":255},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5790},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4768},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2087},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2350},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":436},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":564},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2868},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4534},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":695},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1079},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5560},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1352},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6217},"outV":{"@type":"g:Int32","@value":336},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5199},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":209},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":465},"outV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4946},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1363},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6099},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6867},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4310},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":87},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3415},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6232},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1625},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3673},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5851},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6492},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1888},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3808},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5986},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":739},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3300},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":616},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":362},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4972},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3697},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1522},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2549},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1654},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2808},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6904},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":250},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2298},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5116},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2944},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2945},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2946},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2947},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2948},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2949},"inV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2950},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2951},"inV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2952},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2953},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2954},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2955},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2956},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2957},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2958},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2959},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2960},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2961},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2962},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2963},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2964},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2965},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2966},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2967},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2968},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2969},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2970},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2971},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2916},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2917},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2918},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2919},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2920},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2921},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2922},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2923},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2924},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2925},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2926},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2927},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2928},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2929},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2930},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2931},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2932},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2933},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2934},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2935},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2936},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2937},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2938},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2939},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2940},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2941},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2942},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2943},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7506},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7505},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":231},"value":"COLD RAIN AND SNOW"}],"songType":[{"id":{"@type":"g:Int64","@value":233},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":232},"value":{"@type":"g:Int32","@value":241}}]}}
-{"id":{"@type":"g:Int32","@value":79},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3136},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4929},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5122},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4548},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4485},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1223},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2634},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3787},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3533},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":270},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1230},"outV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2574},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2962},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4948},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1301},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3606},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":89},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3931},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5659},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":606},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4382},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6048},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1441},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6817},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2914},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3491},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4135},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6759},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5228},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4973},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5613},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4210},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6642},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":756},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1657},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5177},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6137},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":890},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3770},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6971},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4031},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5453},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5454},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5455},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5456},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5457},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5458},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5459},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5460},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5461},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5462},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5463},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5464},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5465},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5466},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5467},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5468},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5469},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5470},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5471},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5472},"inV":{"@type":"g:Int32","@value":285},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5473},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5474},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5475},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5476},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5477},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5478},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5479},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5480},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5481},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5482},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5483},"inV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5484},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5485},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5486},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5487},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5488},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5489},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5490},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5491},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5492},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7290},"inV":{"@type":"g:Int32","@value":408}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7289},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":234},"value":"PICASSO MOON"}],"songType":[{"id":{"@type":"g:Int64","@value":236},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":235},"value":{"@type":"g:Int32","@value":77}}]}}
-{"id":{"@type":"g:Int32","@value":80},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1344},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1793},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5569},"outV":{"@type":"g:Int32","@value":316},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":130},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3010},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4995},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5507},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":517},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4806},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4362},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4426},"outV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5259},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4238},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5967},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3280},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":530},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1556},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4313},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":90},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6682},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3101},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5597},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2078},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5727},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4704},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1185},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3809},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4065},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":802},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5028},"outV":{"@type":"g:Int32","@value":303},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":998},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3174},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2343},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4395},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2285},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4845},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6381},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":430},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2930},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2675},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":632},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2425},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3321},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5049},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3642},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6586},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6842},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6780},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":711},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":712},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":713},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":714},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":715},"inV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":716},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":717},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":718},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":719},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":720},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":721},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":722},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":723},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":724},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":725},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":726},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":727},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":728},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":729},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":730},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":731},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":732},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":733},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":734},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":735},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":736},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":737},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":738},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":739},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":740},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":741},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":742},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":743},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":744},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":745},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":746},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":747},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":748},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":749},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":750},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":751},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":752},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":753},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":754},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":755},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":756},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":757},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":758},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":759},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7128},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7127},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":237},"value":"DIRE WOLF"}],"songType":[{"id":{"@type":"g:Int64","@value":239},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":238},"value":{"@type":"g:Int32","@value":226}}]}}
-{"id":{"@type":"g:Int32","@value":81},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1921},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2885},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4613},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6025},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2573},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2254},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4751},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1873},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5458},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3412},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6868},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":215},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":91},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1438},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1758},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3488},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4832},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5668},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6181},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3305},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1707},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3760},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6129},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1330},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5554},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":691},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3124},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4661},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4725},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2487},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5176},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6008},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":313},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":6970},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1211},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2749},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2623},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1472},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1473},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1474},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1475},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1476},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1477},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1478},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1479},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1480},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1481},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1482},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1483},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1484},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1485},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1486},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1487},"inV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1488},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1489},"inV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1451},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1452},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1453},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1454},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1455},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1456},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1457},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1458},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1459},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1460},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1461},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1462},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1463},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1464},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1465},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1466},"inV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1467},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1468},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1469},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1470},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1471},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7166},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7165},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":240},"value":"FOOLISH HEART"}],"songType":[{"id":{"@type":"g:Int64","@value":242},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":241},"value":{"@type":"g:Int32","@value":87}}]}}
-{"id":{"@type":"g:Int32","@value":82},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6146},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":261},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1797},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3975},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3080},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5897},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5771},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5645},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2706},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3481},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6681},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":795},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2845},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":1184},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":1824},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3362},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2595},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6312},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1578},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":427},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3755},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4269},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":558},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1456},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6833},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5683},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3255},"outV":{"@type":"g:Int32","@value":285},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":312},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3004},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":190},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5570},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3652},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3909},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":844},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2381},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5197},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4174},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3151},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6736},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5713},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5969},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1618},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6483},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1878},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":6360},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1754},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":92},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6110},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":4319},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2400},"outV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2784},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5344},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1122},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2915},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5479},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2537},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":1002},"outV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5100},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3567},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2288},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4592},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2161},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4979},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2421},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5240},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4475},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6781},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4095},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1728},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1729},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1730},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1731},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1732},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1733},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1734},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1735},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1736},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":239}}},{"id":{"@type":"g:Int32","@value":1737},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1738},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1739},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1740},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1741},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1742},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1743},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1744},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1745},"inV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1746},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1747},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1748},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1749},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1711},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1712},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1713},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1714},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1715},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1716},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1717},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1718},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1719},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1720},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1721},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1722},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1723},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1724},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1725},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1726},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1727},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7320},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7319},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":243},"value":"SCARLET BEGONIAS"}],"songType":[{"id":{"@type":"g:Int64","@value":245},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":244},"value":{"@type":"g:Int32","@value":316}}]}}
-{"id":{"@type":"g:Int32","@value":83},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2690},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3203},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3716},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5641},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1162},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6668},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":269},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4365},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2960},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6160},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4753},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6289},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5778},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2837},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":280},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2584},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5403},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6814},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1951},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1568},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":417},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4651},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":812},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6317},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2482},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1460},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6069},"outV":{"@type":"g:Int32","@value":296},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2620},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6204},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1855},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3008},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":322},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6338},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3651},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4680},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6475},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":205},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5965},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1742},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1233},"outV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5714},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3162},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1371},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2011},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4315},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":93},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1886},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2782},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4833},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1762},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5219},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":868},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2276},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2533},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":486},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4584},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":177}}},{"id":{"@type":"g:Int32","@value":5865},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1005},"outV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6893},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7021},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6132},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4857},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4218},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2173},"outV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3071},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1408},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1409},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1410},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1411},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1412},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1413},"inV":{"@type":"g:Int32","@value":195},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1414},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1415},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1416},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1417},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1418},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":211}}},{"id":{"@type":"g:Int32","@value":1419},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1420},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1421},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1422},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1423},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1424},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1425},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1426},"inV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1427},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1428},"inV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1429},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1430},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1431},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1432},"inV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1433},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1434},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1435},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1436},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1437},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1438},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1439},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1440},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1441},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1442},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1443},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1444},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1445},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1446},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1447},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1448},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1449},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1450},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1403},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1404},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":1405},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1406},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1407},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":9}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7158},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7157},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":246},"value":"EYES OF THE WORLD"}],"songType":[{"id":{"@type":"g:Int64","@value":248},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":247},"value":{"@type":"g:Int32","@value":381}}]}}
-{"id":{"@type":"g:Int32","@value":84},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2306},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6148},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1670},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3464},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":267},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2059},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1806},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":144},"outV":{"@type":"g:Int32","@value":107},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6416},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3092},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":800},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1188},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2726},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5802},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3372},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2351},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":690},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2867},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":570},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3771},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":189},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2493},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5565},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4808},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6088},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6474},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3532},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":464},"outV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1617},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4945},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5202},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6355},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3288},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3416},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3674},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6875},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5853},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5982},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":95},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6629},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1899},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6891},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":878},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2543},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5104},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5616},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4980},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4086},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4600},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1530},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6012},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":893},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6909},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5887},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6928},"inV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6929},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6930},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6931},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6932},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6933},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6934},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6935},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6936},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6937},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6938},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6939},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6940},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6941},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":6942},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6943},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6944},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6945},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6946},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6947},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6948},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6949},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6950},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6951},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6952},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6953},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6954},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6955},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6956},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6957},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6958},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6959},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6960},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6961},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6962},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6963},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6964},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6965},"inV":{"@type":"g:Int32","@value":312},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6966},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6967},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6968},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6969},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6970},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6971},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6972},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6973},"inV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6974},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6975},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6976},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6977},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7322},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7321},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":249},"value":"SHAKEDOWN STREET"}],"songType":[{"id":{"@type":"g:Int64","@value":251},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":250},"value":{"@type":"g:Int32","@value":163}}]}}
-{"id":{"@type":"g:Int32","@value":85},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6528},"outV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2180},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3972},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4869},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1801},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4361},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2954},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3852},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1423},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":914},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4115},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6291},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4756},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5396},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":59}}},{"id":{"@type":"g:Int32","@value":6036},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6805},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3227},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6556},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4637},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5664},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4516},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2341},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2725},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6950},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2216},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4904},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6568},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":555},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6316},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":813},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":68}}},{"id":{"@type":"g:Int32","@value":5678},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6703},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":304},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3378},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1216},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5058},"outV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5315},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1478},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5193},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2122},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4042},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3022},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6094},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1744},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5840},"outV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6992},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6739},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":724},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6484},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":4566},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3159},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4184},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1114},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6618},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1757},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2909},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4317},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":96},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2403},"outV":{"@type":"g:Int32","@value":45},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4837},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5093},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1894},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4074},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":494},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1270},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2168},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":377},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1017},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3577},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2043},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4608},"inV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4609},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4610},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4611},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4612},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4613},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4614},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4615},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4616},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4617},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4618},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4619},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4584},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":177}}},{"id":{"@type":"g:Int32","@value":4585},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":66}}},{"id":{"@type":"g:Int32","@value":4586},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":36}}},{"id":{"@type":"g:Int32","@value":4587},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4588},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4589},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4590},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4591},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":4592},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4593},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4594},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4595},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4596},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4597},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4598},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4599},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4600},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4601},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4602},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4603},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4604},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4605},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4606},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4607},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7154},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7153},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":252},"value":"ESTIMATED PROPHET"}],"songType":[{"id":{"@type":"g:Int64","@value":254},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":253},"value":{"@type":"g:Int32","@value":390}}]}}
-{"id":{"@type":"g:Int32","@value":86},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1520},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3761},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":98},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4834},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5826},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2388},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3126},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":600},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2329},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6633},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":445},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6815},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4938},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4939},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4940},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4941},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4942},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4943},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4944},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4945},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4946},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4947},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4948},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4949},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4950},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4951},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4952},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4953},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4954},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8012},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8011},"inV":{"@type":"g:Int32","@value":490}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":255},"value":"THE WEIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":257},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":256},"value":{"@type":"g:Int32","@value":41}}]}}
-{"id":{"@type":"g:Int32","@value":87},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6914},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":135},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2319},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1686},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3734},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6040},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3483},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6171},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":672},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2468},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3109},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5925},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5161},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":810},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5421},"outV":{"@type":"g:Int32","@value":335},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1075},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":693},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2871},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6840},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5433},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2619},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2237},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":318},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1215},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4287},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5696},"outV":{"@type":"g:Int32","@value":330},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2499},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":198},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":584},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1739},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4813},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":466},"outV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1875},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3029},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5207},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4954},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5338},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3293},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4957},"outV":{"@type":"g:Int32","@value":332},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6493},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1630},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1503},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6112},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6369},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6626},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":99},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4324},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4708},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6885},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1639},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5224},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5614},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4978},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":888},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1913},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2557},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5373},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":254},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6014},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":10}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2340},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2341},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2342},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2343},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2344},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2345},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2346},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2347},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2348},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":2349},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2350},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2351},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2352},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2353},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2354},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2355},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2356},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2357},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2358},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2359},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2360},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2361},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2362},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":2363},"inV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2364},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2365},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2366},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2367},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2368},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2369},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2370},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2371},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2372},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2373},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2374},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2375},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2376},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2377},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2378},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2379},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2380},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2381},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2382},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2383},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2384},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2385},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2386},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2387},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2388},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2389},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2390},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2391},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2392},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2393},"inV":{"@type":"g:Int32","@value":291},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2394},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7376},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7375},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":258},"value":"TOUCH OF GREY"}],"songType":[{"id":{"@type":"g:Int64","@value":260},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":259},"value":{"@type":"g:Int32","@value":213}}]}}
-{"id":{"@type":"g:Int32","@value":88},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1280},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2561},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3585},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3970},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2948},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":6020},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4358},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":263},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2058},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6795},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3854},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":655},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2449},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4498},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4120},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1694},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5278},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3233},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":164},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":420},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6953},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1199},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4655},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4913},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2355},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5812},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1462},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4022},"outV":{"@type":"g:Int32","@value":191},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3513},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4282},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4539},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":958},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5568},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1602},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3782},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5319},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3912},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2126},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1743},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5459},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3670},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6103},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4824},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4952},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1116},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6748},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3171},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5987},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":740},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":101},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4199},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5105},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2036},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":117},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1016},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":3448},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1402},"outV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":507},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1787},"outV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2812},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3790},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":3791},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3792},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":3793},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3794},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3795},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3796},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3797},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3798},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":3799},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3800},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3801},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3802},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3803},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3804},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3805},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3806},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3807},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3808},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3809},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3810},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3811},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3812},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3813},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3814},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3815},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3816},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":3817},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3818},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3819},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3820},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3821},"inV":{"@type":"g:Int32","@value":322},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3822},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3823},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3824},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3825},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3826},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3827},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3828},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3829},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3830},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3831},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3832},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3833},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3834},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3835},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3836},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3837},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3838},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7740},"inV":{"@type":"g:Int32","@value":553}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7739},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":261},"value":"LITTLE RED ROOSTER"}],"songType":[{"id":{"@type":"g:Int64","@value":263},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":262},"value":{"@type":"g:Int32","@value":272}}]}}
-{"id":{"@type":"g:Int32","@value":89},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1984},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":770},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1475},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":324},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4612},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6661},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2762},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2571},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4683},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1167},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1552},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1936},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1361},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2836},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6613},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2006},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1434},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":219},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4252},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4380},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1251},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1827},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3875},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4963},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5859},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":103},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3112},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2985},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5417},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2282},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5674},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4715},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":625},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":562},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5939},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3316},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3636},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6068},"outV":{"@type":"g:Int32","@value":296},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3894},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6327},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5624},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2171},"outV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2748},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5180},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6078},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6974},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6719},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7006},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":7007},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7008},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7009},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7010},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":7011},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7012},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":7013},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7014},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":7015},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7016},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":7017},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7018},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7019},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7020},"inV":{"@type":"g:Int32","@value":296},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":7021},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":7022},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7023},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7024},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7025},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7026},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7027},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7028},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7029},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7030},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7031},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":7032},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7033},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7034},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7035},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7036},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7037},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7038},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7039},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7122},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7121},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":264},"value":"DARK STAR"}],"songType":[{"id":{"@type":"g:Int64","@value":266},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":265},"value":{"@type":"g:Int32","@value":219}}]}}
-{"id":{"@type":"g:Int32","@value":90},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6530},"outV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":260},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5158},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6886},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":104},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3304},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3754},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6026},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2060},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6636},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1517},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6513},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1074},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1651},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":597},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4981},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":694},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4951},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3128},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4828},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1695},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2496},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2497},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2498},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2499},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2500},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2501},"inV":{"@type":"g:Int32","@value":291},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2502},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2503},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2489},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":2490},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2491},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2492},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2493},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2494},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2495},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":267},"value":"LET THE GOOD TIMES ROLL"}],"songType":[{"id":{"@type":"g:Int64","@value":269},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":268},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":91},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1792},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2181},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":391},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3207},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":648},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3977},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6153},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":6414},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3096},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5400},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4764},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6812},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":541},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1821},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":798},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2718},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":42}}},{"id":{"@type":"g:Int32","@value":3870},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6558},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":415},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5792},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":36}}},{"id":{"@type":"g:Int32","@value":4646},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3368},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6572},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6958},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1455},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2865},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":818},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5685},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2359},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":185},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4794},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5316},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6853},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":334},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6351},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2641},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6738},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6485},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3034},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":1115},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1759},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3167},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4063},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2144},"outV":{"@type":"g:Int32","@value":286},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4193},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4321},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4449},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3683},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1892},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6119},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":872},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1384},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2540},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":109},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4591},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":2801},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":499},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5882},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":7034},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2301},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4862},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1279},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":910},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":911},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":912},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":59}}},{"id":{"@type":"g:Int32","@value":913},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":914},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":915},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":916},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":917},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":918},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":919},"inV":{"@type":"g:Int32","@value":230},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":920},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":921},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":922},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":923},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":924},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":925},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":192}}},{"id":{"@type":"g:Int32","@value":926},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":927},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":928},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":929},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":930},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":931},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":932},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":933},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":934},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":935},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":936},"inV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":937},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":938},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":939},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":940},"inV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7360},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7359},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":270},"value":"TERRAPIN STATION"}],"songType":[{"id":{"@type":"g:Int64","@value":272},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":271},"value":{"@type":"g:Int32","@value":302}}]}}
-{"id":{"@type":"g:Int32","@value":92},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":320},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4864},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4609},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1474},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2627},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4739},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5351},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5927},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":392},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":969},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":458},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":110},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1967},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6512},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2963},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":309},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2905},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3545},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2747},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":220},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":4381},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2048},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2049},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2050},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2051},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2052},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2053},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2054},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2055},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2056},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2057},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2058},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2059},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2060},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2061},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2062},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2063},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2038},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2039},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2040},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2041},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2042},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2043},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2044},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2045},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2046},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2047},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":7}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7338},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7337},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":273},"value":"STANDING ON THE MOON"}],"songType":[{"id":{"@type":"g:Int64","@value":275},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":274},"value":{"@type":"g:Int32","@value":75}}]}}
-{"id":{"@type":"g:Int32","@value":93},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1524},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1924},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4836},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2583},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2056},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1228},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5549},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2334},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3310},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":111},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3951},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6884},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6885},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6886},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6887},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6888},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6889},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6890},"inV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6891},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6892},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6893},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6894},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6895},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6896},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7858},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7857},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":276},"value":"RAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":278},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":277},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":94},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2688},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6336},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":2626},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6210},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6466},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":195},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":4675},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3846},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5958},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5639},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1544},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6536},"outV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2249},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5706},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1933},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":84}}},{"id":{"@type":"g:Int32","@value":3085},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6161},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3539},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6419},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1364},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2773},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4439},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2843},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5340},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":4255},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5793},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":610},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1890},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7010},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1320},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5037},"outV":{"@type":"g:Int32","@value":276},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4334},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":303},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3631},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":112},"outV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4722},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6770},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":947},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5363},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5877},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":4599},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4855},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1403},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1531},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3709},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":1151},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1856},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":54}}},{"id":{"@type":"g:Int32","@value":1857},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1858},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1859},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1860},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1861},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":1862},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1863},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1864},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1865},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1866},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1867},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1868},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1869},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":1870},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1871},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":43}}},{"id":{"@type":"g:Int32","@value":1872},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":1873},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1874},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1875},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1845},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1846},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1847},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1848},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1849},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1850},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1851},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":80}}},{"id":{"@type":"g:Int32","@value":1852},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1853},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1854},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1855},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7340},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7339},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":279},"value":"STELLA BLUE"}],"songType":[{"id":{"@type":"g:Int64","@value":281},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":280},"value":{"@type":"g:Int32","@value":328}}]}}
-{"id":{"@type":"g:Int32","@value":95},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1979},"outV":{"@type":"g:Int32","@value":280},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":113},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8016},"inV":{"@type":"g:Int32","@value":533}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8015},"inV":{"@type":"g:Int32","@value":791}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":282},"value":"WHATS GOING ON"}],"songType":[{"id":{"@type":"g:Int64","@value":284},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":283},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":96},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2049},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3842},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6531},"outV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6149},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":41}}},{"id":{"@type":"g:Int32","@value":6277},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":168}}},{"id":{"@type":"g:Int32","@value":520},"outV":{"@type":"g:Int32","@value":203},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1418},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":211}}},{"id":{"@type":"g:Int32","@value":3211},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5133},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1937},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":3089},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6930},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2323},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6420},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6804},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6551},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5784},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4762},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1819},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":38}}},{"id":{"@type":"g:Int32","@value":5404},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":285},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":925},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":192}}},{"id":{"@type":"g:Int32","@value":545},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2337},"outV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2977},"outV":{"@type":"g:Int32","@value":8},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3235},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4643},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2340},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6309},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6566},"outV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2855},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":6567},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4392},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1194},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6699},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1068},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1452},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":941},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2478},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5422},"outV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5168},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6320},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":72}}},{"id":{"@type":"g:Int32","@value":1844},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":181},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3381},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2231},"outV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6199},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5690},"outV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1980},"outV":{"@type":"g:Int32","@value":281},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":447},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4672},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":834},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":3778},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2243},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6979},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5447},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6599},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":456},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5064},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4299},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3534},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6482},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4436},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5332},"outV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3030},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1239},"outV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3417},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":348},"outV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5214},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":607},"outV":{"@type":"g:Int32","@value":182},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2656},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1761},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2017},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5729},"outV":{"@type":"g:Int32","@value":274},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1378},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2147},"outV":{"@type":"g:Int32","@value":228},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2662},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":157}}},{"id":{"@type":"g:Int32","@value":7014},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":2407},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4455},"outV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4586},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":36}}},{"id":{"@type":"g:Int32","@value":5099},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":239},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":113},"outV":{"@type":"g:Int32","@value":95},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":375},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":88}}},{"id":{"@type":"g:Int32","@value":2167},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2551},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5751},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":3324},"outV":{"@type":"g:Int32","@value":230},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4860},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3710},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6142},"outV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5888},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5889},"inV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5890},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5891},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5892},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5893},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5894},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5895},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":51}}},{"id":{"@type":"g:Int32","@value":5896},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5897},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5898},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":5899},"inV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5900},"inV":{"@type":"g:Int32","@value":281},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5901},"inV":{"@type":"g:Int32","@value":8},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5902},"inV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5903},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5904},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":5905},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5906},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5907},"inV":{"@type":"g:Int32","@value":233},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5908},"inV":{"@type":"g:Int32","@value":323},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5909},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5910},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5911},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5912},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":5913},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5914},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5915},"inV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5916},"inV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5917},"inV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5918},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5919},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5920},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5921},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5922},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5923},"inV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":5924},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5925},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5926},"inV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5927},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5928},"inV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":324}}},{"id":{"@type":"g:Int32","@value":5929},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5930},"inV":{"@type":"g:Int32","@value":279},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5931},"inV":{"@type":"g:Int32","@value":304},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5859},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5860},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":219}}},{"id":{"@type":"g:Int32","@value":5861},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":5862},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5863},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5864},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5865},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5866},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":96}}},{"id":{"@type":"g:Int32","@value":5867},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":116}}},{"id":{"@type":"g:Int32","@value":5868},"inV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5869},"inV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5870},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":159}}},{"id":{"@type":"g:Int32","@value":5871},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5872},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5873},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5874},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":41}}},{"id":{"@type":"g:Int32","@value":5875},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5876},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5877},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":5878},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5879},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":5880},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5881},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5882},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5883},"inV":{"@type":"g:Int32","@value":327},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5884},"inV":{"@type":"g:Int32","@value":147},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5885},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":5886},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5887},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7138},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7137},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":285},"value":"DRUMS"}],"songType":[{"id":{"@type":"g:Int64","@value":287},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":286},"value":{"@type":"g:Int32","@value":1386}}]}}
-{"id":{"@type":"g:Int32","@value":97},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3840},"outV":{"@type":"g:Int32","@value":261},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3523},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3590},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1287},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3978},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6218},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5067},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1036},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3916},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6796},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1998},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3470},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4366},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2129},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2453},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6041},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4507},"outV":{"@type":"g:Int32","@value":244},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":158},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4126},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6752},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6116},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6500},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1319},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":745},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2217},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3178},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3818},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4202},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1197},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5997},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6959},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2352},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5424},"outV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4530},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5106},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4916},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2037},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3382},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4988},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2813},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2943},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":128},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":129},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":130},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":131},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":132},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":133},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":134},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":135},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":136},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":137},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":138},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":139},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":140},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":141},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":142},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":143},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":114},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":115},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":116},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":117},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":118},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":119},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":120},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":121},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":122},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":123},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":124},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":125},"inV":{"@type":"g:Int32","@value":102},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":126},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":127},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7266},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7265},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":288},"value":"MY BROTHER ESAU"}],"songType":[{"id":{"@type":"g:Int64","@value":290},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":289},"value":{"@type":"g:Int32","@value":104}}]}}
-{"id":{"@type":"g:Int32","@value":98},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3649},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5249},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":643},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3588},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":839},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1351},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1416},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5769},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5643},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6925},"outV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1102},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5968},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1169},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4177},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5715},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1876},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4628},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6677},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4695},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":536},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3992},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7000},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6106},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5599},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2848},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3361},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2787},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1574},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4268},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6253},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4079},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":433},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":114},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2290},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1715},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2099},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2419},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5876},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2938},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3002},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3515},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6779},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4990},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4415},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":512},"inV":{"@type":"g:Int32","@value":200},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":513},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":514},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":515},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":516},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":517},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":518},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":471},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":472},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":473},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":474},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":475},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":476},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":477},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":478},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":479},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":480},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":481},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":482},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":483},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":484},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":485},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":486},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":487},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":488},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":489},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":490},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":491},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":492},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":493},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":494},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":495},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":496},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":497},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":498},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":499},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":500},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":501},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":502},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":503},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":504},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":505},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":506},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":507},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":508},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":509},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":510},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":511},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7204},"inV":{"@type":"g:Int32","@value":339}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7203},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":291},"value":"IT MUST HAVE BEEN THE ROSES"}],"songType":[{"id":{"@type":"g:Int64","@value":293},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":292},"value":{"@type":"g:Int32","@value":159}}]}}
-{"id":{"@type":"g:Int32","@value":99},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6789},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":199},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3404},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1038},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4305},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5779},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1173},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2710},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2455},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6169},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":922},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5594},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6234},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":797},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3357},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6750},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1887},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3679},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3104},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5473},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3938},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5282},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2854},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5992},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2794},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6826},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5163},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":434},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4788},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2293},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3509},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":120},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3001},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":4286},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5184},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":5185},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5186},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5187},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5188},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5189},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5190},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5191},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5192},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5193},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5194},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5195},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5196},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5197},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5198},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5199},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5200},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":5201},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5202},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5203},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5204},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5205},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5206},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5207},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5208},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5209},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5210},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5211},"inV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5212},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5213},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5214},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5215},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5216},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5217},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5218},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5219},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5220},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5221},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7246},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7245},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":294},"value":"MIGHT AS WELL"}],"songType":[{"id":{"@type":"g:Int64","@value":296},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":295},"value":{"@type":"g:Int32","@value":111}}]}}
-{"id":{"@type":"g:Int32","@value":100},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1538},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":1794},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2178},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3332},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2950},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5766},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1031},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5258},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4240},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5009},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6033},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5523},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3348},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5658},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4124},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2591},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":544},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1699},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2083},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5541},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3625},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4393},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6839},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3000},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":186},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1341},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":448},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5572},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5700},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":329},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2768},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3792},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":2130},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2003},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5461},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2263},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1881},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4059},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4316},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4574},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4958},"outV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":991},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":867},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1635},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3941},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3176},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6249},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2667},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1774},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2415},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6767},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3313},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":628},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3957},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5878},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":122},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1146},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5626},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6650},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5503},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4870},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4871},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4872},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4873},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4874},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4875},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4876},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4877},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4878},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":4879},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4880},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4881},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":4882},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4883},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4884},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4885},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4886},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4887},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":4888},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4889},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4890},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4891},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4892},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4893},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4894},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4895},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":4896},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":4897},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4898},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":4899},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4900},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4901},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4902},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4903},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4904},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4905},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4906},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4907},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4908},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4909},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4910},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4911},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4912},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4913},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4914},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4915},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4916},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4917},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4918},"inV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4919},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4920},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4921},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4922},"inV":{"@type":"g:Int32","@value":283},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4923},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4924},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4925},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4926},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4927},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4928},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4929},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4930},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4931},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4932},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4933},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4934},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4935},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4936},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7084},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7083},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":297},"value":"BROWN EYED WOMEN"}],"songType":[{"id":{"@type":"g:Int64","@value":299},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":298},"value":{"@type":"g:Int32","@value":347}}]}}
-{"id":{"@type":"g:Int32","@value":101},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3848},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":395},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1421},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":145},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4497},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3218},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4626},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6803},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2457},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3356},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":928},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2208},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4128},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4896},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6049},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5410},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1586},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4531},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3254},"outV":{"@type":"g:Int32","@value":285},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":832},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5312},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3009},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4036},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5189},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2374},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2631},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3913},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":6346},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2123},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6480},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6097},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3154},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6226},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4181},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":2902},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3414},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1111},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6746},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2398},"outV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2531},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1381},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":870},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3817},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3566},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":495},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5875},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":757},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1269},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":2805},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2170},"outV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":46}}},{"id":{"@type":"g:Int32","@value":1019},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":3963},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":124},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3453},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2830},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2831},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2832},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2833},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2834},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2835},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2836},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2837},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2838},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2839},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2840},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2841},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2842},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2843},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2844},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2845},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":2846},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2847},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2848},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2849},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2850},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2851},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2852},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2853},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2854},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2855},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":2856},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2857},"inV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2858},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2859},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":2860},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":2861},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2862},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2863},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2864},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2865},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2866},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2867},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2868},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2869},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2870},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2871},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2872},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2873},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2874},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2875},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2876},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2877},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2878},"inV":{"@type":"g:Int32","@value":299},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2879},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2880},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2881},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2882},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2883},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2884},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2885},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2886},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2887},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2888},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2889},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2890},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2891},"inV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2892},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2893},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2894},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2895},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2896},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7226},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7225},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":300},"value":"LET IT GROW"}],"songType":[{"id":{"@type":"g:Int64","@value":302},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":301},"value":{"@type":"g:Int32","@value":276}}]}}
-{"id":{"@type":"g:Int32","@value":102},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1426},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3468},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":125},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3677},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5917},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5407},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5424},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5425},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5426},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5422},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5423},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":303},"value":"MAYBE YOU KNOW HOW I FEEL"}],"songType":[{"id":{"@type":"g:Int64","@value":305},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":304},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":103},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2176},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2816},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":129},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":259},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2436},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3717},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2952},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4488},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6793},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1802},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4106},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1419},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1675},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4621},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3217},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6417},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3475},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":148},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2198},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5398},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3353},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3998},"outV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6046},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2719},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":546},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1957},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4518},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4902},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2097},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2612},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1589},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2230},"outV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4790},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4024},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5566},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3007},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3903},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6848},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1729},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5186},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5061},"outV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2630},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4294},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6982},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2119},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5323},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4306},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4179},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":6100},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":725},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1621},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6741},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1110},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3161},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4064},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3299},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4579},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5091},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6243},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2536},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1514},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":876},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":493},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4848},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5235},"outV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1012},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3573},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":374},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2295},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3959},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1660},"outV":{"@type":"g:Int32","@value":263},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1278},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5247},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1920},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1921},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1922},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1923},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1924},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1925},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1926},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1876},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1877},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1878},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":1879},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1880},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1881},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1882},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1883},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1884},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1885},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1886},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1887},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1888},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1889},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1890},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1891},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":1892},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1893},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1894},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1895},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1896},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1897},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1898},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1899},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1900},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":1901},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1902},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1903},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1904},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1905},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1906},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1907},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1908},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1909},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1910},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1911},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1912},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1913},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1914},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1915},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1916},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1917},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1918},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1919},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":8}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7264},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7263},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":306},"value":"THE MUSIC NEVER STOPPED"}],"songType":[{"id":{"@type":"g:Int64","@value":308},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":307},"value":{"@type":"g:Int32","@value":234}}]}}
-{"id":{"@type":"g:Int32","@value":104},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5248},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":1157},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1925},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4997},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":649},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":138},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5775},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3985},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4241},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5650},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":406},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":6678},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3351},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5529},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":542},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5540},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1067},"outV":{"@type":"g:Int32","@value":240},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1580},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1709},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4014},"outV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5934},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":5039},"outV":{"@type":"g:Int32","@value":291},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4402},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1331},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3003},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6459},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1727},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2757},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":5573},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3655},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3530},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4687},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4816},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2901},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6870},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6231},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2267},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7003},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":988},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4060},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5724},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5470},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3813},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4325},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2663},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4200},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2409},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2032},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5873},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6131},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3068},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3200},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3201},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3202},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3142},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3143},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3144},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3145},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3146},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3147},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3148},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":3149},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3150},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3151},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3152},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3153},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3154},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3155},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3156},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3157},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3158},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3159},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3160},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3161},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3162},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3163},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3164},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3165},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3166},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3167},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3168},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3169},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3170},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3171},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3172},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3173},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3174},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3175},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3176},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3177},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3178},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3179},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3180},"inV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3181},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3182},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3183},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3184},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3185},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3186},"inV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3187},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3188},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3189},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3190},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3191},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3192},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3193},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3194},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3195},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3196},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3197},"inV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3198},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3199},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7172},"inV":{"@type":"g:Int32","@value":376}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7171},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":309},"value":"FRIEND OF THE DEVIL"}],"songType":[{"id":{"@type":"g:Int64","@value":311},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":310},"value":{"@type":"g:Int32","@value":304}}]}}
-{"id":{"@type":"g:Int32","@value":105},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2432},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6593},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6854},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5511},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3018},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":139},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5003},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4428},"outV":{"@type":"g:Int32","@value":299},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5580},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5261},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":3663},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4691},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3413},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2070},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3990},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":663},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6039},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6810},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5662},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4575},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2913},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5985},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6690},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":163},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6244},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1189},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1000},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2024},"outV":{"@type":"g:Int32","@value":283},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3816},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5544},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4075},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2604},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":557},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1326},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5038},"outV":{"@type":"g:Int32","@value":291},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4271},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5488},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":178},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1587},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4403},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2804},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":438},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3385},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5182},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4510},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4511},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4512},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4513},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4514},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4515},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4516},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4517},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4518},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4519},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4520},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4521},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4522},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":4523},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4524},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4525},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4526},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4527},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4528},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4529},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4530},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4531},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4532},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4533},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4534},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4535},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4536},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4537},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4538},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4539},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4540},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4541},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4542},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4543},"inV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4544},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4545},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4546},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4547},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4548},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4549},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4550},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4551},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4552},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4553},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4554},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4555},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4556},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4557},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4558},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7332},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7331},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":312},"value":"STAGGER LEE"}],"songType":[{"id":{"@type":"g:Int64","@value":314},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":313},"value":{"@type":"g:Int32","@value":146}}]}}
-{"id":{"@type":"g:Int32","@value":106},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4994},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2947},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6788},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1288},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":843},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2444},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":142},"outV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1615},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3024},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3921},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3411},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4373},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6486},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3800},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5273},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":410},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6172},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6045},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2975},"outV":{"@type":"g:Int32","@value":200},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":161},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5409},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3170},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4196},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3685},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5605},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2214},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2342},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6250},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4652},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4910},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":751},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6960},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3377},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5810},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4277},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2810},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4090},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1595},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1023},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3583},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3968},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3969},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3970},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3971},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3972},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3973},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3974},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3975},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3976},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3977},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3978},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3979},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3980},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3981},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3982},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3983},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3984},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3985},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3986},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3987},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3988},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3989},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3990},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3991},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3992},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3993},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3994},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3995},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3996},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3956},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3957},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3958},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3959},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3960},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3961},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3962},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3963},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3964},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3965},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3966},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3967},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7160},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7159},"inV":{"@type":"g:Int32","@value":352}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":315},"value":"FAR FROM ME"}],"songType":[{"id":{"@type":"g:Int64","@value":317},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":316},"value":{"@type":"g:Int32","@value":74}}]}}
-{"id":{"@type":"g:Int32","@value":107},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":231},"outV":{"@type":"g:Int32","@value":142},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":144},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":318},"value":"BANKS OF OHIO"}],"songType":[{"id":{"@type":"g:Int64","@value":320},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":319},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":108},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4288},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5250},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3400},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3594},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4811},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6220},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2829},"outV":{"@type":"g:Int32","@value":298},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5582},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6927},"outV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":659},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2456},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3995},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3676},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5538},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3812},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5800},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4329},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5993},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":428},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1581},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1198},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2798},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3508},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6838},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4989},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3839},"outV":{"@type":"g:Int32","@value":261},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":145},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":146},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":147},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":148},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":149},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":150},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":151},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":152},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":153},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":154},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":155},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":156},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":157},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":158},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":159},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":160},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":161},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":162},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":163},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":164},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":165},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":166},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":167},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":168},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":169},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":170},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":171},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":172},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":173},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":174},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":175},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":176},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":177},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7136},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7135},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":321},"value":"DUPREES DIAMOND BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":323},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":322},"value":{"@type":"g:Int32","@value":80}}]}}
-{"id":{"@type":"g:Int32","@value":109},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2305},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1795},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6787},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3908},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5893},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3337},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3658},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2124},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6093},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4112},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":146},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":726},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3094},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5270},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1112},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4185},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6939},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3165},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3229},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2530},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2723},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4515},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3365},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":873},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4906},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6315},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2799},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1009},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4273},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":498},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1267},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3447},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3575},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":829},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4096},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4058},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4059},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4060},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4061},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4062},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4063},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4064},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4065},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4066},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4067},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4068},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4069},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4070},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4071},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4072},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4073},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4074},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4075},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4076},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4077},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4078},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4079},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4080},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4081},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4082},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4083},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4084},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4085},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4086},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4087},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4088},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4089},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4090},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4091},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4092},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4093},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4094},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4095},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7288},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7287},"inV":{"@type":"g:Int32","@value":407}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":324},"value":"PASSENGER"}],"songType":[{"id":{"@type":"g:Int64","@value":326},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":325},"value":{"@type":"g:Int32","@value":98}}]}}
-{"id":{"@type":"g:Int32","@value":110},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2368},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3713},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3843},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1733},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3910},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5256},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1866},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1803},"outV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1420},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1679},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4623},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3152},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5392},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3473},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":147},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2709},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1175},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3223},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5976},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4825},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1629},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3360},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4192},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1377},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3297},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4513},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5794},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":548},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1638},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2856},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4905},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6697},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":490},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3116},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5101},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2544},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1073},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6897},"outV":{"@type":"g:Int32","@value":147},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3576},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1273},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6841},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6905},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":826},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":959},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4299},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":4300},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4301},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4302},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4303},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4304},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4305},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4306},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4307},"inV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4308},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4309},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4310},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4311},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4312},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4313},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4314},"inV":{"@type":"g:Int32","@value":147},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4315},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4316},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4317},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4318},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4319},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4320},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4321},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4322},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4323},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4324},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4325},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4326},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4327},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4328},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4329},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4330},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4331},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":327},"value":"DANCIN IN THE STREETS"}],"songType":[{"id":{"@type":"g:Int64","@value":329},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":328},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":111},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1120},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3169},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1666},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4804},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2440},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2127},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3279},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1810},"outV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5749},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":504},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1816},"outV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":761},"outV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":156},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3100},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4285},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":574},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":735},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5311},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6111},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4704},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4705},"inV":{"@type":"g:Int32","@value":8},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4706},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4707},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4708},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4709},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4710},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4711},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4695},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4696},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4697},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4698},"inV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4699},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4700},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4701},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4702},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4703},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7822},"inV":{"@type":"g:Int32","@value":507}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7821},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":330},"value":"ON THE ROAD AGAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":332},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":331},"value":{"@type":"g:Int32","@value":38}}]}}
-{"id":{"@type":"g:Int32","@value":112},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2304},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6785},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3458},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1029},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1285},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":647},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6929},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4118},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5018},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1180},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4638},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3999},"outV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5279},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3232},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":165},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4901},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4520},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":429},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2222},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4272},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5302},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5687},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1597},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6590},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3519},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3905},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5185},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6850},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4424},"outV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6472},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2121},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":6091},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3661},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4047},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1107},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":2387},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3157},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":727},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5977},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6749},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5086},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4191},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2528},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4576},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2923},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2420},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1911},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3832},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3579},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":7}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2592},"inV":{"@type":"g:Int32","@value":294},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2593},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2594},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2595},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2596},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2597},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":2598},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2599},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2600},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2601},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2602},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":130}}},{"id":{"@type":"g:Int32","@value":2603},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2604},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2605},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2606},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2584},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2585},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2586},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2587},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2588},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2589},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2590},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2591},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7762},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7761},"inV":{"@type":"g:Int32","@value":650}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":333},"value":"MAMA TRIED"}],"songType":[{"id":{"@type":"g:Int64","@value":335},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":334},"value":{"@type":"g:Int32","@value":302}}]}}
-{"id":{"@type":"g:Int32","@value":113},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4676},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5924},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6293},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5414},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3591},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":168},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6987},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6364},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":4013},"outV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6430},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4879},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4448},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4449},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4450},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4451},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4435},"inV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4436},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":4437},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4438},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4439},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4440},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4441},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4442},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4443},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4444},"inV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4445},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4446},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4447},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7920},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7919},"inV":{"@type":"g:Int32","@value":737}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":336},"value":"SMOKESTACK LIGHTNING"}],"songType":[{"id":{"@type":"g:Int64","@value":338},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":337},"value":{"@type":"g:Int32","@value":60}}]}}
-{"id":{"@type":"g:Int32","@value":114},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4225},"outV":{"@type":"g:Int32","@value":317},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4482},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1415},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":776},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3340},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4625},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":275},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":40}}},{"id":{"@type":"g:Int32","@value":1942},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1303},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1687},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":926},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3486},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2720},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3873},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6945},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4002},"outV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5154},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2211},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":169},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5546},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2360},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4920},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3259},"outV":{"@type":"g:Int32","@value":146},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":572},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":702},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3262},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1218},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2244},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":2884},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1861},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4423},"outV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3786},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5069},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6349},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6608},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":2002},"outV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1492},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2265},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":1375},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6113},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6757},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":359},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3946},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5610},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":237},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3054},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":40}}},{"id":{"@type":"g:Int32","@value":5742},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6510},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3695},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":6383},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5107},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6900},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4213},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4342},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2041},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6013},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6397},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4765},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":4766},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4767},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4768},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4769},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4770},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4771},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4772},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":25}}},{"id":{"@type":"g:Int32","@value":4773},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4774},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4775},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4776},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4777},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4778},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4779},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4780},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4781},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4782},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4783},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4784},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4785},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4786},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4787},"inV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4788},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4789},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4790},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4791},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4792},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4793},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":4794},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4795},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4796},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4797},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4798},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4799},"inV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4800},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4801},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4802},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4803},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4804},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4805},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4806},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4807},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":4808},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4809},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4810},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4811},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4812},"inV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4813},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4814},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4815},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4816},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4817},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4818},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4819},"inV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4820},"inV":{"@type":"g:Int32","@value":299},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4821},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4822},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4823},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4824},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4825},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4826},"inV":{"@type":"g:Int32","@value":330},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4827},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4828},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4829},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4830},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4831},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4832},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4833},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4834},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4835},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4836},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4837},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4838},"inV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4839},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4840},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4841},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4842},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4843},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7276},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7275},"inV":{"@type":"g:Int32","@value":351}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":339},"value":"ONE MORE SATURDAY NIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":341},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":340},"value":{"@type":"g:Int32","@value":340}}]}}
-{"id":{"@type":"g:Int32","@value":115},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4034},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4292},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4933},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":327},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1290},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3471},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2644},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3607},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5911},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1054},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5023},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1507},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3940},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":999},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5287},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5608},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6760},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":170},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3690},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4394},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4140},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3503},"outV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6511},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3185},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4214},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1912},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3836},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1342},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2815},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6032},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6033},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6034},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6035},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6036},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6037},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6038},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6039},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6040},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6041},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6042},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6043},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6044},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6045},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6046},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6047},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6048},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6049},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6050},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6051},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6052},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6053},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6054},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6055},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6056},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6057},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6058},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6059},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6060},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6061},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6062},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6063},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6064},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6065},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6066},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":342},"value":"TOM THUMB BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":344},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":343},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":116},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3456},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4679},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":840},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3596},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5903},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1425},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3923},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6422},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3672},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1050},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":668},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5468},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5596},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2461},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6495},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":929},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1697},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":290},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2210},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1511},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1129},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4331},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1196},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":173},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":752},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5809},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4660},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1333},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6389},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4278},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":441},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":697},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4538},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4093},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6592},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6593},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6567},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6568},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6569},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6570},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6571},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6572},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6573},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6574},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6575},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6576},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6577},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6578},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6579},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6580},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6581},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6582},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6583},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6584},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6585},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6586},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6587},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6588},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6589},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6590},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6591},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":345},"value":"GOOD TIME BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":347},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":346},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":117},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":513},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2821},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4486},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":903},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1294},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5007},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3984},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3601},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1045},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2581},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5653},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":665},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3482},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2204},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4509},"outV":{"@type":"g:Int32","@value":244},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5919},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6816},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4131},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5672},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3241},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6058},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1324},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":174},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4658},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6581},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4025},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4923},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4541},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1982},"outV":{"@type":"g:Int32","@value":253},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3779},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4291},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":710},"outV":{"@type":"g:Int32","@value":221},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3528},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":331},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5324},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3920},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4694},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2649},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4572},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2910},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3691},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4206},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5998},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":754},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":882},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4850},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1399},"outV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3191},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5115},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6218},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6219},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6220},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6221},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6222},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":33}}},{"id":{"@type":"g:Int32","@value":6223},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6224},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6225},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6226},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6227},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6228},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6229},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6230},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6231},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6232},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6233},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6234},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6235},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6236},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6237},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6238},"inV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6239},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6240},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6241},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6242},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6243},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6244},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6245},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6246},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6247},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6248},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6249},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6250},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6251},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6252},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6253},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6254},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6255},"inV":{"@type":"g:Int32","@value":285},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6256},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6257},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6258},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6259},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6260},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6261},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6262},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8020},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8019},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":348},"value":"WHEN I PAINT MY MASTERPIECE"}],"songType":[{"id":{"@type":"g:Int64","@value":350},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":349},"value":{"@type":"g:Int32","@value":144}}]}}
-{"id":{"@type":"g:Int32","@value":118},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5824},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2081},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2465},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4483},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2888},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5293},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1134},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5454},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":176},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5008},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6515},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3193},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1468},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5725},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5119},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6239},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2912},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2913},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2914},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2915},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2897},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2898},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2899},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2900},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2901},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2902},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2903},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2904},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2905},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2906},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2907},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2908},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2909},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2910},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2911},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7210},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7209},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":351},"value":"JUST A LITTLE LIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":353},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":352},"value":{"@type":"g:Int32","@value":21}}]}}
-{"id":{"@type":"g:Int32","@value":119},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":177},"outV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4055},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4506},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3500},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4556},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4221},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5533},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3838},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2479},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4848},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4849},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4850},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4851},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4852},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4844},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4845},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4846},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4847},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7098},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7097},"inV":{"@type":"g:Int32","@value":354}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":354},"value":"CHILDHOODS END"}],"songType":[{"id":{"@type":"g:Int64","@value":356},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":355},"value":{"@type":"g:Int32","@value":11}}]}}
-{"id":{"@type":"g:Int32","@value":120},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":257},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6017},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6403},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4164},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6724},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2246},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1671},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2311},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":71}}},{"id":{"@type":"g:Int32","@value":712},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2057},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1869},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":1550},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2638},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2191},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6352},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5395},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6612},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6937},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5980},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5149},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":288},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5090},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":77}}},{"id":{"@type":"g:Int32","@value":2534},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5798},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1959},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4903},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":232},"outV":{"@type":"g:Int32","@value":144},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3945},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6441},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":234},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1386},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":1898},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3756},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3373},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3630},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4590},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":815},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2671},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5872},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":182},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3062},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6710},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":889},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1465},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6906},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6396},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":766},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5631},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":522},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":523},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":524},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":525},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":526},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":527},"inV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":528},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":529},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":530},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":531},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":532},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":533},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":534},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":535},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":536},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":537},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":538},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":539},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":540},"inV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":541},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":542},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":543},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":544},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":545},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":546},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":547},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":548},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":549},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":550},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":551},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":552},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":553},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":554},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":555},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":556},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":557},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":558},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":559},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":560},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":561},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":562},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":563},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":564},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":565},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":566},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":567},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":568},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":569},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":570},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":571},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":572},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":573},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":574},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":575},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":576},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":577},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":578},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":579},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":580},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":581},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":582},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":583},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":584},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":585},"inV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":586},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":587},"inV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":588},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":589},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":590},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":591},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":592},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":593},"inV":{"@type":"g:Int32","@value":144},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":594},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":595},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":596},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":597},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":598},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":599},"inV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":600},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":601},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":602},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":603},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":604},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":605},"inV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":606},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7588},"inV":{"@type":"g:Int32","@value":553}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7587},"inV":{"@type":"g:Int32","@value":552}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":357},"value":"GOOD LOVING"}],"songType":[{"id":{"@type":"g:Int64","@value":359},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":358},"value":{"@type":"g:Int32","@value":428}}]}}
-{"id":{"@type":"g:Int32","@value":121},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1730},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3906},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3011},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5187},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5317},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6790},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2120},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5576},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3465},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3850},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4110},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5263},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5776},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3153},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5394},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3668},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6740},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1109},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4188},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6109},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3231},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5087},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4897},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4710},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":743},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2535},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":488},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4076},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2927},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4528},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4275},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1268},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3574},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":188},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3965},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1022},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1599},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6762},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":111}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7220},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7219},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":360},"value":"LAZY LIGHTNING"}],"songType":[{"id":{"@type":"g:Int64","@value":362},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":361},"value":{"@type":"g:Int32","@value":111}}]}}
-{"id":{"@type":"g:Int32","@value":122},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":704},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6721},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1539},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3267},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4870},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2759},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5642},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":529},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":1681},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2834},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6163},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6548},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2261},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":278},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4248},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4766},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":5153},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2661},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3557},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5097},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5737},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2986},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2475},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3051},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":365},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":621},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3629},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4148},"outV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3897},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3707},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5947},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4732},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":191},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":768},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":769},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":770},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":771},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":772},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":773},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":774},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":775},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":776},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":777},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":778},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":779},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":780},"inV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":781},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":782},"inV":{"@type":"g:Int32","@value":226},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":783},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":784},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":785},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":786},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":787},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":788},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":789},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":790},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":791},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":792},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":793},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":794},"inV":{"@type":"g:Int32","@value":195},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":795},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":796},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":797},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":798},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":799},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":800},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":801},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":802},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":803},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":804},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":805},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":806},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":807},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":808},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":809},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":810},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":811},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":812},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":766},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":767},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":11}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7092},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7091},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":363},"value":"CASEY JONES"}],"songType":[{"id":{"@type":"g:Int64","@value":365},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":364},"value":{"@type":"g:Int32","@value":312}}]}}
-{"id":{"@type":"g:Int32","@value":123},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":192},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5730},"outV":{"@type":"g:Int32","@value":274},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":966},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":393},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":937},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2665},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3371},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4747},"outV":{"@type":"g:Int32","@value":241},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1836},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6190},"outV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6096},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3729},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6673},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3858},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1907},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":569},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3289},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6301},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5822},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6943},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6305},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6306},"inV":{"@type":"g:Int32","@value":282},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6307},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6308},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6309},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6310},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6311},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6312},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6313},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6314},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6315},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6316},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6317},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6318},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7206},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7205},"inV":{"@type":"g:Int32","@value":384}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":366},"value":"JAM"}],"songType":[{"id":{"@type":"g:Int64","@value":368},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":367},"value":{"@type":"g:Int32","@value":24}}]}}
-{"id":{"@type":"g:Int32","@value":124},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4928},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6912},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1345},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":196},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":580},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4807},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":2826},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2317},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1236},"outV":{"@type":"g:Int32","@value":249},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2004},"outV":{"@type":"g:Int32","@value":251},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5335},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3611},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1500},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3105},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":1058},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6051},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1636},"outV":{"@type":"g:Int32","@value":260},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6884},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4391},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6634},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":299},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2096},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3955},"outV":{"@type":"g:Int32","@value":322},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5561},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3261},"outV":{"@type":"g:Int32","@value":287},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":511},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3711},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":15}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1665},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1666},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1667},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1668},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1669},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1670},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1671},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1672},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1673},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1674},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1675},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1676},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1677},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1678},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1679},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1680},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1681},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1682},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1683},"inV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1684},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1685},"inV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1686},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1687},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1688},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1689},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1690},"inV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1691},"inV":{"@type":"g:Int32","@value":270},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1692},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1693},"inV":{"@type":"g:Int32","@value":271},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1694},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1695},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1696},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1697},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1698},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1699},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1700},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1701},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1702},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1703},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1704},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1705},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1706},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1707},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1708},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1709},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1710},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":369},"value":"BABY BLUE"}],"songType":[{"id":{"@type":"g:Int64","@value":371},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":370},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":125},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":640},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4673},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6145},"outV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6209},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":197},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":27}}},{"id":{"@type":"g:Int32","@value":2245},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3721},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":54}}},{"id":{"@type":"g:Int32","@value":5963},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6155},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":911},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6224},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3540},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6932},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6037},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1431},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4440},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5337},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":6426},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1948},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":3103},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4639},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3618},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2724},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1573},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2789},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":294},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4266},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3570},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":371},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4339},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1334},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5366},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5497},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":956},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5885},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":6333},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":32}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5152},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5153},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5154},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5155},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":5156},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":5157},"inV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5158},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5159},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5136},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5137},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5138},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5139},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5140},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5141},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5142},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5143},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5144},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":87}}},{"id":{"@type":"g:Int32","@value":5145},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5146},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5147},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":69}}},{"id":{"@type":"g:Int32","@value":5148},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5149},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":5150},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5151},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":6}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7070},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7069},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":372},"value":"BLACK PETER"}],"songType":[{"id":{"@type":"g:Int64","@value":374},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":373},"value":{"@type":"g:Int32","@value":343}}]}}
-{"id":{"@type":"g:Int32","@value":126},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":200},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4203},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6926},"outV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":7}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5537},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5538},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5539},"inV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5540},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5541},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5542},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5543},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5544},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5545},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":375},"value":"AINT SUPERSTITIOUS"}],"songType":[{"id":{"@type":"g:Int64","@value":377},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":376},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":127},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1408},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5056},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2563},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3715},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6339},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":964},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2628},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6212},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2247},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":201},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1929},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":459},"outV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5906},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":532},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3541},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":918},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":792},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4442},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7006},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":354},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6434},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":291},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5347},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":1321},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6571},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":685},"outV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6067},"outV":{"@type":"g:Int32","@value":296},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2292},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4724},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4343},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5111},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2682},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2874},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3069},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6594},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6595},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":6596},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6597},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":6598},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6599},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6600},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6601},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6602},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6603},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6604},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6605},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6606},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6607},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6608},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6609},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6610},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6611},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6612},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6613},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6614},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6615},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6616},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":6617},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6618},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6619},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6620},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6621},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6622},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6623},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6624},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6625},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6626},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6627},"inV":{"@type":"g:Int32","@value":321},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6628},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6629},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6630},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6631},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6632},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6633},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6634},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6635},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6636},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6637},"inV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6638},"inV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6639},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6640},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6641},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6642},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6643},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7786},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7785},"inV":{"@type":"g:Int32","@value":662}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":378},"value":"MORNING DEW"}],"songType":[{"id":{"@type":"g:Int64","@value":380},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":379},"value":{"@type":"g:Int32","@value":254}}]}}
-{"id":{"@type":"g:Int32","@value":128},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":944},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1603},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2739},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5815},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":203},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3741},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5063},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5064},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5065},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5066},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5067},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5068},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5069},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5070},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7898},"inV":{"@type":"g:Int32","@value":726}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7897},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":381},"value":"SHE BELONGS TO ME"}],"songType":[{"id":{"@type":"g:Int64","@value":383},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":382},"value":{"@type":"g:Int32","@value":10}}]}}
-{"id":{"@type":"g:Int32","@value":129},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":641},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6178},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":387},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6469},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2441},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1962},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5354},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2731},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":29}}},{"id":{"@type":"g:Int32","@value":204},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4719},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5103},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6415},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5905},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":7025},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3730},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6995},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3543},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5051},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1404},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":4636},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2846},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5760},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5761},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5762},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5763},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5764},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5731},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5732},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":5733},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5734},"inV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5735},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5736},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5737},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5738},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5739},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5740},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5741},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5742},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5743},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5744},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5745},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5746},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5747},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5748},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5749},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5750},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5751},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5752},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5753},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5754},"inV":{"@type":"g:Int32","@value":183},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5755},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5756},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5757},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5758},"inV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5759},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":6}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7102},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7101},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":384},"value":"CHINA DOLL"}],"songType":[{"id":{"@type":"g:Int64","@value":386},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":385},"value":{"@type":"g:Int32","@value":114}}]}}
-{"id":{"@type":"g:Int32","@value":130},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1409},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2689},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4737},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4674},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6915},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6150},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3847},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1930},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":143}}},{"id":{"@type":"g:Int32","@value":3722},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":5452},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6284},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6412},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4301},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":207},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5780},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2838},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3544},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6552},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2010},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2401},"outV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5345},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2339},"outV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6307},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":293},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1830},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":363},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5740},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2286},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5874},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":41}}},{"id":{"@type":"g:Int32","@value":7028},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6200},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":954},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2172},"outV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2238},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6334},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":5055},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6655},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1357},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":81}}},{"id":{"@type":"g:Int32","@value":1358},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1359},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1360},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1361},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1362},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1363},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1364},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1365},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1366},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":1367},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1368},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1369},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":77}}},{"id":{"@type":"g:Int32","@value":1370},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1371},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1372},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1373},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1374},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1375},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1376},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1377},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1378},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1379},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1380},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1381},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1382},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1383},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1384},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1385},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1386},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":1387},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1388},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":54}}},{"id":{"@type":"g:Int32","@value":1389},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1390},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1391},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1392},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1393},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1394},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1395},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7406},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7405},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":387},"value":"WHARF RAT"}],"songType":[{"id":{"@type":"g:Int64","@value":389},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":388},"value":{"@type":"g:Int32","@value":394}}]}}
-{"id":{"@type":"g:Int32","@value":131},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2657},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6691},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1509},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2566},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1063},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3751},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2824},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3689},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2606},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3249},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":212},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3830},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1915},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4220},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1662},"outV":{"@type":"g:Int32","@value":264},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5504},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5505},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5506},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5507},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5508},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5509},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5510},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5511},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5512},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5513},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5514},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5515},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5493},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5494},"inV":{"@type":"g:Int32","@value":287},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5495},"inV":{"@type":"g:Int32","@value":266},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5496},"inV":{"@type":"g:Int32","@value":250},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5497},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5498},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5499},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5500},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5501},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5502},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5503},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7760},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7759},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":390},"value":"MAGGIES FARM"}],"songType":[{"id":{"@type":"g:Int64","@value":392},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":391},"value":{"@type":"g:Int32","@value":43}}]}}
-{"id":{"@type":"g:Int32","@value":132},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1968},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5761},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6433},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":596},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":214},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4296},"outV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5352},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5914},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5359},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5360},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5361},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5362},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5363},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5364},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5365},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5366},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5367},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5368},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5369},"inV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5370},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5371},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5372},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5373},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7614},"inV":{"@type":"g:Int32","@value":461}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7613},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":393},"value":"HEY JUDE"}],"songType":[{"id":{"@type":"g:Int64","@value":395},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":394},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":133},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6625},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":579},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1732},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2182},"outV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1864},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3306},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2315},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3084},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2733},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2255},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1392},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":279},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5143},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":216},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5880},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2042},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2556},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6912},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6913},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6914},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6915},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6916},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6917},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6918},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6919},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6920},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6921},"inV":{"@type":"g:Int32","@value":335},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6922},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6900},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6901},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6902},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6903},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6904},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6905},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6906},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6907},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6908},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6909},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6910},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6911},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7348},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7347},"inV":{"@type":"g:Int32","@value":367}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":396},"value":"SUNSHINE DAYDREAM"}],"songType":[{"id":{"@type":"g:Int64","@value":398},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":397},"value":{"@type":"g:Int32","@value":31}}]}}
-{"id":{"@type":"g:Int32","@value":134},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2241},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5763},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3719},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5451},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5328},"outV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2708},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4308},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1176},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5336},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":218},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6170},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3549},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2015},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4005},"outV":{"@type":"g:Int32","@value":323},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":296},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1960},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4712},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":45}}},{"id":{"@type":"g:Int32","@value":4333},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5870},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":159}}},{"id":{"@type":"g:Int32","@value":2863},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1141},"outV":{"@type":"g:Int32","@value":246},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4791},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":953},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4602},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5818},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7036},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5693},"outV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6401},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6402},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":6403},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6404},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6405},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6406},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6407},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":6408},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6409},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6410},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6411},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6412},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6413},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":6414},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6415},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6416},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6417},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6418},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6419},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6420},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6421},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6422},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6423},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":6424},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":6425},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6426},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6427},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":6428},"inV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6429},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6430},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6431},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6432},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":6433},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6434},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6435},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6436},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7412},"inV":{"@type":"g:Int32","@value":375}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7411},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":399},"value":"THE WHEEL"}],"songType":[{"id":{"@type":"g:Int64","@value":401},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":400},"value":{"@type":"g:Int32","@value":258}}]}}
-{"id":{"@type":"g:Int32","@value":135},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1969},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5926},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5369},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":221},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4295},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4296},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4297},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4298},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7524},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7523},"inV":{"@type":"g:Int32","@value":511}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":402},"value":"DEATH DONT HAVE NO MERCY"}],"songType":[{"id":{"@type":"g:Int64","@value":404},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":403},"value":{"@type":"g:Int32","@value":49}}]}}
-{"id":{"@type":"g:Int32","@value":136},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2752},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3538},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4211},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2469},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5353},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1053},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":223},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6400},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6393},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6394},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6395},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6396},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6397},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6398},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6399},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7334},"inV":{"@type":"g:Int32","@value":416}},{"id":{"@type":"g:Int32","@value":7930},"inV":{"@type":"g:Int32","@value":416}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7333},"inV":{"@type":"g:Int32","@value":416}},{"id":{"@type":"g:Int32","@value":7929},"inV":{"@type":"g:Int32","@value":743}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":405},"value":"STANDER ON THE MOUNTAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":407},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":406},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":137},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6977},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3202},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5830},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4617},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1611},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2828},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3212},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4686},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5524},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":853},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4761},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1756},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5021},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":224},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3424},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4578},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6435},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":677},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1703},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6183},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3499},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5355},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5294},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6062},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6257},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2098},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5618},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1972},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2614},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3834},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1343},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2630},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2631},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2632},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2633},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2634},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2635},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2636},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2637},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2638},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2639},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2640},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2641},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2642},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2643},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2644},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2645},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2646},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2647},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2648},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2649},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2650},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2651},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2652},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2653},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2654},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2655},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2656},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2657},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2658},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2659},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7328},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7327},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":408},"value":"SO MANY ROADS"}],"songType":[{"id":{"@type":"g:Int64","@value":410},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":409},"value":{"@type":"g:Int32","@value":55}}]}}
-{"id":{"@type":"g:Int32","@value":138},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":225},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1973},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2615},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1834},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3546},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1771},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4733},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5357},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3942},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3943},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3944},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3945},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3946},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3947},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3948},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3949},"inV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3950},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3951},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":411},"value":"THE DAYS BETWEEN"}],"songType":[{"id":{"@type":"g:Int64","@value":413},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":412},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":139},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6304},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2145},"outV":{"@type":"g:Int32","@value":286},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":226},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4726},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6214},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6375},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4456},"outV":{"@type":"g:Int32","@value":329},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3548},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6988},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":455},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":456},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":457},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":458},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":459},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":460},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":461},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":462},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7954},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7953},"inV":{"@type":"g:Int32","@value":758}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":414},"value":"THAT WOULD BE SOMETHING"}],"songType":[{"id":{"@type":"g:Int64","@value":416},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":415},"value":{"@type":"g:Int32","@value":17}}]}}
-{"id":{"@type":"g:Int32","@value":140},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":227},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6436},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2629},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1832},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1770},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1516},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5358},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5839},"outV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2258},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3762},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6773},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":310},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":598},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1974},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6262},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7032},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3130},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4730},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3547},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":896},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":897},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":898},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":899},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":885},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":886},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":887},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":888},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":889},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":890},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":891},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":892},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":893},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":894},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":895},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7058},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7057},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":417},"value":"ATTICS OF MY LIFE"}],"songType":[{"id":{"@type":"g:Int64","@value":419},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":418},"value":{"@type":"g:Int32","@value":48}}]}}
-{"id":{"@type":"g:Int32","@value":141},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":609},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2721},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4610},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1379},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5891},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":228},"outV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3845},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4678},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7015},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3723},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6159},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3474},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4723},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1940},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6359},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":537},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3065},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5785},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4443},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":414},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6692},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6693},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6694},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6695},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6696},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6697},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6698},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6699},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6700},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6701},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6702},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6703},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6704},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6705},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6706},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6707},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6708},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6709},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6710},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6711},"inV":{"@type":"g:Int32","@value":238},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6712},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6713},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7108},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7107},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":420},"value":"COMES A TIME"}],"songType":[{"id":{"@type":"g:Int64","@value":422},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":421},"value":{"@type":"g:Int32","@value":66}}]}}
-{"id":{"@type":"g:Int32","@value":142},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5428},"outV":{"@type":"g:Int32","@value":143},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5647},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":230},"inV":{"@type":"g:Int32","@value":143},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":231},"inV":{"@type":"g:Int32","@value":107},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":423},"value":"CHILDREN OF THE EIGHTIES"}],"songType":[{"id":{"@type":"g:Int64","@value":425},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":424},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":143},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3345},"outV":{"@type":"g:Int32","@value":301},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":230},"outV":{"@type":"g:Int32","@value":142},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5427},"inV":{"@type":"g:Int32","@value":300},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5428},"inV":{"@type":"g:Int32","@value":142},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7752},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7751},"inV":{"@type":"g:Int32","@value":469}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":426},"value":"LUCIFERS EYES"}],"songType":[{"id":{"@type":"g:Int64","@value":428},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":427},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":144},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":593},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":232},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7722},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7721},"inV":{"@type":"g:Int32","@value":629}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":429},"value":"LA BAMBA"}],"songType":[{"id":{"@type":"g:Int64","@value":431},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":430},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":145},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6326},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3063},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3258},"outV":{"@type":"g:Int32","@value":146},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3724},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5868},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":527},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6287},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":240},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":241},"inV":{"@type":"g:Int32","@value":147},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":242},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":243},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":233},"inV":{"@type":"g:Int32","@value":146},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":234},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":235},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":236},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":237},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":238},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":239},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7096},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7095},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":432},"value":"CAUTION"}],"songType":[{"id":{"@type":"g:Int64","@value":434},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":433},"value":{"@type":"g:Int32","@value":56}}]}}
-{"id":{"@type":"g:Int32","@value":146},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":233},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3258},"inV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3259},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8024},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8023},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":435},"value":"WHO DO YOU LOVE"}],"songType":[{"id":{"@type":"g:Int64","@value":437},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":436},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":147},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":241},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4314},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5884},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6897},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6898},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6899},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":438},"value":"MOJO"}],"songType":[{"id":{"@type":"g:Int64","@value":440},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":439},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":148},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5632},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6402},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":5445},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":1863},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2248},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6601},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4685},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1553},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5138},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3732},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2774},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6550},"outV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2716},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2013},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1182},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1822},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2847},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2338},"outV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5860},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":219}}},{"id":{"@type":"g:Int32","@value":1382},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":935},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":360},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1769},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4714},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":55}}},{"id":{"@type":"g:Int32","@value":4587},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4336},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5040},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6704},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":242},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6322},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":48}}},{"id":{"@type":"g:Int32","@value":6898},"outV":{"@type":"g:Int32","@value":147},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7027},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":948},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3061},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6264},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":22}}},{"id":{"@type":"g:Int32","@value":6203},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6652},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1406},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1927},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1928},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1929},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":1930},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":143}}},{"id":{"@type":"g:Int32","@value":1931},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1932},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1933},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":84}}},{"id":{"@type":"g:Int32","@value":1934},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1935},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1936},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1937},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":1938},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1939},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1940},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1941},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1942},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1943},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1944},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1945},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1946},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1947},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1948},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":35}}},{"id":{"@type":"g:Int32","@value":1949},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1950},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1951},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1952},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1953},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1954},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1955},"inV":{"@type":"g:Int32","@value":276},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1956},"inV":{"@type":"g:Int32","@value":219},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1957},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1958},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1959},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1960},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1961},"inV":{"@type":"g:Int32","@value":277},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1962},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1963},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1964},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1965},"inV":{"@type":"g:Int32","@value":278},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1966},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1967},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1968},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1969},"inV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1970},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1971},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1972},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1973},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1974},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1975},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1976},"inV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1977},"inV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7284},"inV":{"@type":"g:Int32","@value":405}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7283},"inV":{"@type":"g:Int32","@value":351}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":441},"value":"THE OTHER ONE"}],"songType":[{"id":{"@type":"g:Int64","@value":443},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":442},"value":{"@type":"g:Int32","@value":583}}]}}
-{"id":{"@type":"g:Int32","@value":149},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1952},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2850},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7026},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":243},"outV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5044},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6340},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6438},"outV":{"@type":"g:Int32","@value":338},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6167},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4729},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5898},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":6411},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1374},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2016},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2017},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2018},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2019},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2020},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2021},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2022},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2006},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2007},"inV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2008},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2009},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2010},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2011},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2012},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2013},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2014},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2015},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7330},"inV":{"@type":"g:Int32","@value":384}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7329},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":444},"value":"SPANISH JAM"}],"songType":[{"id":{"@type":"g:Int64","@value":446},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":445},"value":{"@type":"g:Int32","@value":41}}]}}
-{"id":{"@type":"g:Int32","@value":150},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1508},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":6628},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":965},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3749},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6919},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5512},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4330},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6123},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6507},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":591},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5360},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5617},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3122},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5522},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":307},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6259},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2326},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5334},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3031},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4827},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5819},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2877},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":256},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":257},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":258},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":259},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":260},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":261},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":262},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":263},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":264},"inV":{"@type":"g:Int32","@value":156},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":265},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":266},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":267},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":268},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":269},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":270},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":271},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":272},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":244},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":245},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":246},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":247},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":248},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":249},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":250},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":251},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":252},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":253},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":254},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":255},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7066},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7065},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":447},"value":"BIRDSONG"}],"songType":[{"id":{"@type":"g:Int64","@value":449},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":448},"value":{"@type":"g:Int32","@value":296}}]}}
-{"id":{"@type":"g:Int32","@value":151},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2497},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5697},"outV":{"@type":"g:Int32","@value":156},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6018},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5827},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3303},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3752},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5001},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2890},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1515},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6219},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2382},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2958},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4942},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6003},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3828},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":247},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":666},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6042},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1212},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2046},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2148},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2149},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2150},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2151},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2152},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2153},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2154},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2155},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2156},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2157},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2158},"inV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2159},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2160},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2161},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2162},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2163},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2164},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2165},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2166},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2167},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2168},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7618},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7617},"inV":{"@type":"g:Int32","@value":570}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":450},"value":"HEY POCKY WAY"}],"songType":[{"id":{"@type":"g:Int64","@value":452},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":451},"value":{"@type":"g:Int32","@value":25}}]}}
-{"id":{"@type":"g:Int32","@value":152},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1248},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3328},"outV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4160},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6720},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2820},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2470},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2151},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3626},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4010},"outV":{"@type":"g:Int32","@value":320},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4460},"outV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":622},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1551},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2384},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1650},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4882},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6453},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":248},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4280},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2073},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3290},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3805},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1984},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1985},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1986},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1987},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1988},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1989},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1990},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1991},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1992},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1993},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1994},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1995},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1996},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1997},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1998},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1999},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2000},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2001},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2002},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2003},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7464},"inV":{"@type":"g:Int32","@value":474}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7463},"inV":{"@type":"g:Int32","@value":473}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":453},"value":"BIG BOSS MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":455},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":454},"value":{"@type":"g:Int32","@value":71}}]}}
-{"id":{"@type":"g:Int32","@value":153},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":896},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2048},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4228},"outV":{"@type":"g:Int32","@value":52},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5380},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":774},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6406},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6151},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6541},"outV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1935},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2831},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4624},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3222},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6934},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":281},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5147},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":69}}},{"id":{"@type":"g:Int32","@value":924},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1696},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4000},"outV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4256},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3363},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6693},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1190},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":552},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5033},"outV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2987},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2224},"outV":{"@type":"g:Int32","@value":226},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4147},"outV":{"@type":"g:Int32","@value":218},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":820},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5941},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6197},"outV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1080},"outV":{"@type":"g:Int32","@value":243},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6458},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":699},"outV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":1851},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":80}}},{"id":{"@type":"g:Int32","@value":5691},"outV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6331},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3901},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4797},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6717},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3264},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6595},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":4297},"outV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5065},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1098},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2506},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2635},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2252},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1357},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":81}}},{"id":{"@type":"g:Int32","@value":1614},"outV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":719},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4176},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1746},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4309},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1241},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6114},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5220},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5732},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":7012},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5349},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4454},"outV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5862},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3943},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2922},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5098},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4332},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1007},"outV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1649},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2289},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":3700},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3318},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5368},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":249},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6269},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":383},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1407},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2687},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6399},"outV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3072},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3073},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3074},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3075},"inV":{"@type":"g:Int32","@value":263},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3076},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3077},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3078},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3079},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3080},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3081},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3082},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3083},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3084},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3085},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3086},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3087},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3088},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3089},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3090},"inV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3091},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3092},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3093},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3094},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3095},"inV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3096},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3097},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3098},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3099},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3100},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3101},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3102},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3103},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3104},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3105},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":3106},"inV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3107},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3108},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3109},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":17}}},{"id":{"@type":"g:Int32","@value":3110},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3111},"inV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3112},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3113},"inV":{"@type":"g:Int32","@value":303},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3114},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3115},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3116},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3117},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3118},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3119},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3120},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3121},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3122},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3123},"inV":{"@type":"g:Int32","@value":264},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3124},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3125},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3126},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":3127},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3128},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3129},"inV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3130},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3131},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3132},"inV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3133},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3134},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3135},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3136},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3137},"inV":{"@type":"g:Int32","@value":292},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3048},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3049},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3050},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":3051},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":3052},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3053},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3054},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":40}}},{"id":{"@type":"g:Int32","@value":3055},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3056},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3057},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3058},"inV":{"@type":"g:Int32","@value":206},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3059},"inV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3060},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3061},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3062},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3063},"inV":{"@type":"g:Int32","@value":145},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3064},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3065},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3066},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3067},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3068},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3069},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3070},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3071},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":5}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7344},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7343},"inV":{"@type":"g:Int32","@value":367}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":456},"value":"SUGAR MAGNOLIA"}],"songType":[{"id":{"@type":"g:Int64","@value":458},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":457},"value":{"@type":"g:Int32","@value":594}}]}}
-{"id":{"@type":"g:Int32","@value":154},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2562},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5890},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5124},"outV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5444},"outV":{"@type":"g:Int32","@value":288},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1672},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5770},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3659},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1868},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6156},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6860},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3091},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6356},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":405},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":3286},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5978},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3867},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6944},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2722},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4322},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1383},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":808},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6696},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3370},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2862},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4270},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1906},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":563},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2229},"outV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":97}}},{"id":{"@type":"g:Int32","@value":2296},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4601},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2490},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":251},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4796},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5564},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2239},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4620},"inV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4621},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4622},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4623},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4624},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4625},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4626},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4627},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4628},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4629},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4630},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4631},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4632},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4633},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4634},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":4635},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4636},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4637},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":4638},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":4639},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4640},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4641},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4642},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4643},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4644},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4645},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4646},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4647},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4648},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4649},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4650},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4651},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4652},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4653},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4654},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4655},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":4656},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":4657},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4658},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4659},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4660},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4661},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4662},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4663},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4664},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4665},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4666},"inV":{"@type":"g:Int32","@value":239},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4667},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4668},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4669},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4670},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4671},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7170},"inV":{"@type":"g:Int32","@value":375}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7169},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":459},"value":"FRANKLINS TOWER"}],"songType":[{"id":{"@type":"g:Int64","@value":461},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":460},"value":{"@type":"g:Int32","@value":221}}]}}
-{"id":{"@type":"g:Int32","@value":155},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4067},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6115},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5797},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3015},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2156},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3660},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":814},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":592},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3120},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2869},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1113},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4186},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":732},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1276},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3292},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":255},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3330},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3331},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3332},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3333},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3334},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3335},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3336},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3337},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3338},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3339},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3340},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3341},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3342},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3343},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":462},"value":"FUNICULI FUNICULA"}],"songType":[{"id":{"@type":"g:Int64","@value":464},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":463},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":156},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":264},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1213},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5697},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5698},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7494},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7493},"inV":{"@type":"g:Int32","@value":493}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":465},"value":"CALIFORNIA EARTHQUAKE"}],"songType":[{"id":{"@type":"g:Int64","@value":467},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":466},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":157},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3537},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3074},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6630},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":791},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":266},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2746},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4780},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3309},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3758},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":367},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1519},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":684},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":685},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":686},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":687},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":688},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":689},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":690},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":691},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":692},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":693},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":694},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":695},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":696},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":697},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":698},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":468},"value":"WE BID YOU GOODNIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":470},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":469},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":158},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3200},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4736},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1922},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4866},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6822},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4935},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4553},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4043},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":908},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4492},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6061},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4142},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":271},"outV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2895},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4847},"outV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1488},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4560},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3252},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4216},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2653},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1310},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3615},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2624},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2625},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2626},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2627},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2628},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2629},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2608},"inV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2609},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2610},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2611},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2612},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2613},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2614},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2615},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2616},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2617},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2618},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2619},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2620},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2621},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2622},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2623},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7142},"inV":{"@type":"g:Int32","@value":368}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7141},"inV":{"@type":"g:Int32","@value":367}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":471},"value":"EASY ANSWERS"}],"songType":[{"id":{"@type":"g:Int64","@value":473},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":472},"value":{"@type":"g:Int32","@value":44}}]}}
-{"id":{"@type":"g:Int32","@value":159},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4787},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":282},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5899},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4620},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":349},"outV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5688},"inV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5689},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5690},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5691},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5692},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5693},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5694},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7076},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7075},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":474},"value":"BLUES FOR ALLAH"}],"songType":[{"id":{"@type":"g:Int64","@value":476},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":475},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":160},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6529},"outV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4803},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6662},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2376},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6090},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2251},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1932},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3727},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":37}}},{"id":{"@type":"g:Int32","@value":2770},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5842},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1497},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":286},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1569},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4258},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":613},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6632},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7018},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1390},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3056},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":5298},"outV":{"@type":"g:Int32","@value":321},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6386},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3635},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5556},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1143},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2680},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5625},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1082},"outV":{"@type":"g:Int32","@value":243},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2299},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6908},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":573},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":18}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3262},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3263},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3264},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3265},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3266},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3267},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3268},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3269},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3270},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3271},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3272},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":3273},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3274},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3275},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3276},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3277},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3278},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3279},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3280},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3281},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3282},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3283},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3284},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3285},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3286},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3287},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":3288},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":3289},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3290},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3291},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3292},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3293},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3294},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3295},"inV":{"@type":"g:Int32","@value":214},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3296},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3297},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3298},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3299},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3300},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3301},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3302},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3303},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3304},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3305},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3306},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3307},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3308},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3309},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3310},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7082},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7081},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":477},"value":"BROKEDOWN PALACE"}],"songType":[{"id":{"@type":"g:Int64","@value":479},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":478},"value":{"@type":"g:Int32","@value":215}}]}}
-{"id":{"@type":"g:Int32","@value":161},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4452},"outV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":297},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1314},"inV":{"@type":"g:Int32","@value":255},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1315},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7604},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7603},"inV":{"@type":"g:Int32","@value":562}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":480},"value":"HARD TO HANDLE"}],"songType":[{"id":{"@type":"g:Int64","@value":482},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":481},"value":{"@type":"g:Int32","@value":105}}]}}
-{"id":{"@type":"g:Int32","@value":162},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":576},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5152},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1874},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3106},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6615},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":809},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5913},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":298},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6907},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4814},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5568},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5555},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5556},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5557},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5558},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5559},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5560},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5561},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5562},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5563},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5564},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5565},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5566},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5567},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":483},"value":"SATISFACTION"}],"songType":[{"id":{"@type":"g:Int64","@value":485},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":484},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":163},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4918},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2973},"outV":{"@type":"g:Int32","@value":255},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":302},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5758},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4452},"inV":{"@type":"g:Int32","@value":161},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4453},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4454},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4455},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7444},"inV":{"@type":"g:Int32","@value":461}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7443},"inV":{"@type":"g:Int32","@value":460}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":486},"value":"BABY WHAT YOU WANT ME TO DO"}],"songType":[{"id":{"@type":"g:Int64","@value":488},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":487},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":164},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4740},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5764},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4295},"outV":{"@type":"g:Int32","@value":135},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2633},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2250},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":46}}},{"id":{"@type":"g:Int32","@value":779},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":524},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1872},"outV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":2322},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2389},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3735},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6622},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":5536},"outV":{"@type":"g:Int32","@value":333},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4001},"outV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5155},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":3947},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5356},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1453},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1070},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1391},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":305},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5361},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6709},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2039},"outV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":6585},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3066},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":894},"outV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6910},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2751},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1490},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1491},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1492},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1493},"inV":{"@type":"g:Int32","@value":255},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1494},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1495},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":1496},"inV":{"@type":"g:Int32","@value":211},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1497},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":19}}},{"id":{"@type":"g:Int32","@value":1498},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1499},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1500},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":1501},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1502},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1503},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1504},"inV":{"@type":"g:Int32","@value":212},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1505},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1506},"inV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1507},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1508},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":1509},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1510},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":1511},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1512},"inV":{"@type":"g:Int32","@value":243},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1513},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1514},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1515},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1516},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1517},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1518},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1519},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1520},"inV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1521},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1522},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1523},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1524},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1525},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1526},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1527},"inV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1528},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1529},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1530},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1531},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1532},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1533},"inV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1534},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7978},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7977},"inV":{"@type":"g:Int32","@value":771}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":489},"value":"TURN ON YOUR LOVE LIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":491},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":490},"value":{"@type":"g:Int32","@value":341}}]}}
-{"id":{"@type":"g:Int32","@value":165},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5760},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6432},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":5922},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":963},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":5448},"outV":{"@type":"g:Int32","@value":231},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6440},"outV":{"@type":"g:Int32","@value":284},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4713},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":2380},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1393},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2642},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5362},"outV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":595},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":308},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2325},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4374},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6263},"outV":{"@type":"g:Int32","@value":310},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6620},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7039},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5333},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5334},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5335},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5336},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5337},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":23}}},{"id":{"@type":"g:Int32","@value":5338},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5339},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5340},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":28}}},{"id":{"@type":"g:Int32","@value":5341},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5342},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5343},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5344},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5345},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5346},"inV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5347},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":5348},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5349},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5350},"inV":{"@type":"g:Int32","@value":232},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5351},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5352},"inV":{"@type":"g:Int32","@value":132},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5353},"inV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5354},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5355},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5356},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5357},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5358},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7428},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7427},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":492},"value":"ALL ALONG THE WATCHTOWER"}],"songType":[{"id":{"@type":"g:Int64","@value":494},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":493},"value":{"@type":"g:Int32","@value":123}}]}}
-{"id":{"@type":"g:Int32","@value":166},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4033},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1765},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":311},"outV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4984},"outV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2314},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3949},"outV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4494},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5552},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5553},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5554},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5546},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5547},"inV":{"@type":"g:Int32","@value":262},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5548},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5549},"inV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5550},"inV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5551},"inV":{"@type":"g:Int32","@value":236},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7704},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7703},"inV":{"@type":"g:Int32","@value":458}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":495},"value":"JOHNNY B GOODE"}],"songType":[{"id":{"@type":"g:Int64","@value":497},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":496},"value":{"@type":"g:Int32","@value":284}}]}}
-{"id":{"@type":"g:Int32","@value":167},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2466},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2085},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3781},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2889},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1130},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1327},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4944},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":850},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6130},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6514},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6808},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1049},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3929},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6873},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":316},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3485},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4607},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4927},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5666},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5667},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5668},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5669},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5670},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5671},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5672},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5673},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5674},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5675},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5676},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5677},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5678},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5679},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5680},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5681},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5682},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5683},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5684},"inV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5685},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5686},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5687},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7074},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7073},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":498},"value":"BLOW AWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":500},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":499},"value":{"@type":"g:Int32","@value":23}}]}}
-{"id":{"@type":"g:Int32","@value":168},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":321},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5825},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6245},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2822},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1607},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3688},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5005},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5684},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2745},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":442},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3994},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3419},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6588},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3778},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3779},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3780},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3781},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3782},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3783},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3784},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3785},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3786},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3787},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3788},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3789},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7086},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7085},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":501},"value":"BUILT TO LAST"}],"songType":[{"id":{"@type":"g:Int64","@value":503},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":502},"value":{"@type":"g:Int32","@value":18}}]}}
-{"id":{"@type":"g:Int32","@value":169},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2082},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":325},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5607},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3784},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4137},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5291},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1135},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1328},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4209},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1299},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2964},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6516},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3605},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6005},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1051},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5118},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3039},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5664},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5665},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5650},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5651},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5652},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5653},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5654},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5655},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5656},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5657},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5658},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5659},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5660},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5661},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5662},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5663},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":504},"value":"WE CAN RUN BUT WE CANT HIDE"}],"songType":[{"id":{"@type":"g:Int64","@value":506},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":505},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":170},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":578},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2691},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":645},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":838},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3399},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":332},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5004},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2446},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5198},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5717},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6997},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":407},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2072},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6680},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3675},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4700},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1117},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6494},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":993},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6053},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2790},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5606},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6246},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1575},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5807},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6000},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1713},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5048},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5178},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3451},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4413},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5312},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5313},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5314},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5315},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5316},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5317},"inV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5318},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5319},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5320},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5321},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5322},"inV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5323},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5324},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5325},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5326},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5299},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5300},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5301},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5302},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5303},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5304},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5305},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5306},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5307},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5308},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5309},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5310},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5311},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7372},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7371},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":507},"value":"TO LAY ME DOWN"}],"songType":[{"id":{"@type":"g:Int64","@value":509},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":508},"value":{"@type":"g:Int32","@value":63}}]}}
-{"id":{"@type":"g:Int32","@value":171},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5888},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6144},"outV":{"@type":"g:Int32","@value":289},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6865},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4821},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1736},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":239}}},{"id":{"@type":"g:Int32","@value":1449},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2233},"outV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2956},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5484},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":333},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2367},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5215},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":832},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":833},"inV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":834},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":20}}},{"id":{"@type":"g:Int32","@value":835},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":836},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":837},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":838},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":839},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":840},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":841},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":842},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":843},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":844},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":845},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":846},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":847},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":848},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":849},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":850},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":851},"inV":{"@type":"g:Int32","@value":228},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":852},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":853},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":854},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":855},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":856},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":857},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":858},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":859},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":860},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":813},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":68}}},{"id":{"@type":"g:Int32","@value":814},"inV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":815},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":816},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":817},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":38}}},{"id":{"@type":"g:Int32","@value":818},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":819},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":820},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":821},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":822},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":823},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":824},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":825},"inV":{"@type":"g:Int32","@value":196},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":826},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":827},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":828},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":829},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":830},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":831},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7164},"inV":{"@type":"g:Int32","@value":347}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7163},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":510},"value":"FIRE ON THE MOUNTAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":512},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":511},"value":{"@type":"g:Int32","@value":253}}]}}
-{"id":{"@type":"g:Int32","@value":172},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3043},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3876},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4388},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3206},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1767},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4489},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4618},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5482},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5420},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":397},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":335},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4727},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":856},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5436},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6560},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6561},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6549},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6550},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6551},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6552},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6553},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6554},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6555},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6556},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6557},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6558},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6559},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7394},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7393},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":513},"value":"WAVE TO THE WIND"}],"songType":[{"id":{"@type":"g:Int64","@value":515},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":514},"value":{"@type":"g:Int32","@value":21}}]}}
-{"id":{"@type":"g:Int32","@value":173},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":900},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1350},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5833},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5514},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1612},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4561},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4689},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":343},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4505},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5022},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6878},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5728},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1313},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":995},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":676},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3428},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1829},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3045},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6373},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1766},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6055},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1065},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4457},"outV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6185},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3692},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4143},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5295},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4401},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5490},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5619},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6260},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2101},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2616},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3835},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4032},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4033},"inV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4034},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4035},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4036},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4037},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4038},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4039},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4040},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4041},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4042},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4043},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4044},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4045},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4046},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4047},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4048},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4049},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4050},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4051},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4052},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4053},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4054},"inV":{"@type":"g:Int32","@value":298},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4055},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4056},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4057},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4024},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4025},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4026},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":4027},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4028},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4029},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4030},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4031},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":516},"value":"LAZY RIVER"}],"songType":[{"id":{"@type":"g:Int64","@value":518},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":517},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":174},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5297},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2483},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3251},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4501},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":344},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1610},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5834},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3213},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3613},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4669},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4046},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4750},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":900},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":901},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":902},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":903},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":904},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":905},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":906},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":907},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":908},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":909},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7200},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7199},"inV":{"@type":"g:Int32","@value":383}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":519},"value":"IF THE SHOE FITS"}],"songType":[{"id":{"@type":"g:Int64","@value":521},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":520},"value":{"@type":"g:Int32","@value":17}}]}}
-{"id":{"@type":"g:Int32","@value":175},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3042},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3426},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":675},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4931},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6371},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6180},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1608},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2472},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3497},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1226},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4684},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":909},"outV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6254},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4048},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5489},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4854},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":345},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3389},"outV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5181},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6978},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6979},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6980},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6981},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6982},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6983},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6984},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6985},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6986},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6987},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6988},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6989},"inV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6990},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6991},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6992},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6993},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7272},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7271},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":522},"value":"NEW SPEEDWAY BOOGIE"}],"songType":[{"id":{"@type":"g:Int64","@value":524},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":523},"value":{"@type":"g:Int32","@value":55}}]}}
-{"id":{"@type":"g:Int32","@value":176},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2658},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2486},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4744},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1225},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":346},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1450},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6138},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4763},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1001},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1002},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1003},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1004},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1005},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1006},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1007},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7382},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7381},"inV":{"@type":"g:Int32","@value":401}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":525},"value":"UNBROKEN CHAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":527},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":526},"value":{"@type":"g:Int32","@value":10}}]}}
-{"id":{"@type":"g:Int32","@value":177},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1489},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1224},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":347},"outV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6139},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6523},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3215},"outV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3386},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3387},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3388},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3389},"inV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3390},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7690},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7689},"inV":{"@type":"g:Int32","@value":592}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":528},"value":"ITS ALL TOO MUCH"}],"songType":[{"id":{"@type":"g:Int64","@value":530},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":529},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":178},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5688},"outV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2713},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5869},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":352},"inV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":348},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":349},"inV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":350},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":351},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":531},"value":"STRONGER THAN DIRT"}],"songType":[{"id":{"@type":"g:Int64","@value":533},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":532},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":179},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":352},"outV":{"@type":"g:Int32","@value":178},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4307},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5783},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1976},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2857},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2400},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2401},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2395},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2396},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2397},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2398},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2399},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":534},"value":"COSMIC CHARLIE"}],"songType":[{"id":{"@type":"g:Int64","@value":536},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":535},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":180},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1600},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":803},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":581},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":741},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2437},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5990},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4810},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3283},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6837},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5718},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4089},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":379},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2811},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5563},"outV":{"@type":"g:Int32","@value":162},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3804},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5054},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2025},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2026},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2027},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2028},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2029},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2030},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2031},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2032},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2033},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2034},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2035},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2036},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2037},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7528},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7527},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":537},"value":"DEEP ELEM BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":539},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":538},"value":{"@type":"g:Int32","@value":45}}]}}
-{"id":{"@type":"g:Int32","@value":181},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":384},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1281},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6211},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5892},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":3462},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5318},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3911},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2443},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3851},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4429},"outV":{"@type":"g:Int32","@value":299},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6478},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6095},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1424},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6744},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5401},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":861},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4125},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1118},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3230},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":927},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4195},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4645},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":742},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5095},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6952},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6570},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2349},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4525},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4909},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6702},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3183},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1010},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":2933},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3960},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":505},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4345},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2554},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":830},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":10}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6562},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":140}}},{"id":{"@type":"g:Int32","@value":6563},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6564},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6565},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6566},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7238},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7237},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":540},"value":"LOST SAILOR"}],"songType":[{"id":{"@type":"g:Int64","@value":542},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":541},"value":{"@type":"g:Int32","@value":145}}]}}
-{"id":{"@type":"g:Int32","@value":182},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":388},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":607},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7278},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7277},"inV":{"@type":"g:Int32","@value":352}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":543},"value":"ONLY A FOOL"}],"songType":[{"id":{"@type":"g:Int64","@value":545},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":544},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":183},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2737},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":930},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":389},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1430},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5910},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6295},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1322},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5754},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1740},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6173},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1238},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1239},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1240},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7132},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7131},"inV":{"@type":"g:Int32","@value":352}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":546},"value":"DONT NEED LOVE"}],"songType":[{"id":{"@type":"g:Int64","@value":548},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":547},"value":{"@type":"g:Int32","@value":16}}]}}
-{"id":{"@type":"g:Int32","@value":184},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1284},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5412},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6756},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":390},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4614},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6762},"outV":{"@type":"g:Int32","@value":121},"properties":{"weight":{"@type":"g:Int32","@value":111}}},{"id":{"@type":"g:Int32","@value":5164},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3182},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3477},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3861},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3512},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4568},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2714},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3346},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3347},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3348},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3349},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3350},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3351},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3352},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3353},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3354},"inV":{"@type":"g:Int32","@value":294},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3355},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":21}}},{"id":{"@type":"g:Int32","@value":3356},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3357},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3358},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3359},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3360},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3361},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3362},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3363},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3364},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3365},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3366},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3367},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3368},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3369},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3370},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3371},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3372},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3373},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3374},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3375},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":3376},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3377},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3378},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3379},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3380},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3381},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3382},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3383},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3384},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3385},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7352},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7351},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":549},"value":"SUPPLICATION"}],"songType":[{"id":{"@type":"g:Int64","@value":551},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":550},"value":{"@type":"g:Int32","@value":113}}]}}
-{"id":{"@type":"g:Int32","@value":185},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":400},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3765},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4838},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1527},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3129},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2333},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6637},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4023},"inV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":12}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7442},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7441},"inV":{"@type":"g:Int32","@value":459}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":552},"value":"BABA ORILEY"}],"songType":[{"id":{"@type":"g:Int64","@value":554},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":553},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":186},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":401},"outV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3138},"outV":{"@type":"g:Int32","@value":304},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5928},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":324}}},{"id":{"@type":"g:Int32","@value":1833},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1978},"outV":{"@type":"g:Int32","@value":279},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":940},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6303},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4736},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4737},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4738},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4739},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4740},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4741},"inV":{"@type":"g:Int32","@value":258},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4742},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4743},"inV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4744},"inV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4712},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":45}}},{"id":{"@type":"g:Int32","@value":4713},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":31}}},{"id":{"@type":"g:Int32","@value":4714},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":55}}},{"id":{"@type":"g:Int32","@value":4715},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4716},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":58}}},{"id":{"@type":"g:Int32","@value":4717},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":58}}},{"id":{"@type":"g:Int32","@value":4718},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4719},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4720},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4721},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4722},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4723},"inV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4724},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4725},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4726},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4727},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4728},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4729},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4730},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4731},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4732},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4733},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4734},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4735},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":555},"value":"SPACE"}],"songType":[{"id":{"@type":"g:Int64","@value":557},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":556},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":187},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3139},"outV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":402}}},{"id":{"@type":"g:Int32","@value":437},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2007},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3868},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2750},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6441},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6442},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6443},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":47}}},{"id":{"@type":"g:Int32","@value":6444},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6445},"inV":{"@type":"g:Int32","@value":47},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6446},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6447},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6448},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6449},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":6450},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6451},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6452},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6453},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6454},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6455},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":6456},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6457},"inV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6458},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6459},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6460},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6461},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6462},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6463},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":26}}},{"id":{"@type":"g:Int32","@value":6464},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6465},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6466},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6467},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6468},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6469},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6470},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":32}}},{"id":{"@type":"g:Int32","@value":6471},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6472},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6473},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6474},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6475},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6476},"inV":{"@type":"g:Int32","@value":208},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6477},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6478},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6479},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6480},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6481},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":6482},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6483},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6484},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":34}}},{"id":{"@type":"g:Int32","@value":6485},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6486},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6487},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":16}}},{"id":{"@type":"g:Int32","@value":6488},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6489},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6490},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6491},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6492},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6493},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6494},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6495},"inV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6496},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6497},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6498},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6499},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6500},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6501},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6502},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6503},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6504},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6505},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6506},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6507},"inV":{"@type":"g:Int32","@value":150},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6508},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6509},"inV":{"@type":"g:Int32","@value":257},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6510},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6511},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6512},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6513},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6514},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6515},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6516},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6517},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6518},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6519},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6520},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6521},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6522},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6523},"inV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7646},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7645},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":558},"value":"I KNOW YOU RIDER"}],"songType":[{"id":{"@type":"g:Int64","@value":560},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":559},"value":{"@type":"g:Int32","@value":550}}]}}
-{"id":{"@type":"g:Int32","@value":188},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4544},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":2754},"outV":{"@type":"g:Int32","@value":297},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":515},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4035},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3398},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2823},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3783},"outV":{"@type":"g:Int32","@value":168},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2632},"outV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4491},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6923},"outV":{"@type":"g:Int32","@value":270},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4943},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1300},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3604},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5012},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3925},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2136},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3993},"outV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5657},"outV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2970},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2907},"outV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":670},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1055},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4132},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3686},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2218},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2155},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5292},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1325},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3501},"outV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3246},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4207},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5679},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4400},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":753},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":883},"outV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3187},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":3827},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1398},"outV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6390},"outV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4407},"outV":{"@type":"g:Int32","@value":271},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4664},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":443},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5501},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4926},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2064},"inV":{"@type":"g:Int32","@value":284},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2065},"inV":{"@type":"g:Int32","@value":271},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2066},"inV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2067},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2068},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":2069},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2070},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2071},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":2072},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2073},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2074},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2075},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2076},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2077},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2078},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2079},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2080},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":2081},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2082},"inV":{"@type":"g:Int32","@value":169},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2083},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2084},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2085},"inV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2086},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2087},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2088},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2089},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2090},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2091},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2092},"inV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2093},"inV":{"@type":"g:Int32","@value":189},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2094},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2095},"inV":{"@type":"g:Int32","@value":285},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2096},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2097},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2098},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2099},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2100},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2101},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2102},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":561},"value":"QUEEN JANE"}],"songType":[{"id":{"@type":"g:Int64","@value":563},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":562},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":189},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2435},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6087},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6479},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3025},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5265},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6737},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4119},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5591},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5016},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3228},"outV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":733},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3166},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4194},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4908},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2093},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5805},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4526},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1138},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1011},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":2931},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3831},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4091},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":444},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1596},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3580},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":831},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":864},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":865},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":866},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":867},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":868},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":869},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":870},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":871},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":872},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":873},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":874},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":875},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":876},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":877},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":878},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":879},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":880},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":881},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":882},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":883},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":884},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":861},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":862},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":863},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7144},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7143},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":564},"value":"EASY TO LOVE YOU"}],"songType":[{"id":{"@type":"g:Int64","@value":566},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":565},"value":{"@type":"g:Int32","@value":45}}]}}
-{"id":{"@type":"g:Int32","@value":190},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":450},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6882},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4581},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2102},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2502},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4406},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":680},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6009},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2827},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1396},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1397},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1398},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1399},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1400},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1401},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1402},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":567},"value":"WEST LA FADEAWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":569},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":568},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":191},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4688},"outV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":451},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":678},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5019},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6879},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4018},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4019},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4020},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4021},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4022},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":570},"value":"JACK A ROE"}],"songType":[{"id":{"@type":"g:Int64","@value":572},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":571},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":192},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":452},"outV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1348},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":679},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5483},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4399},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3504},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3505},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3506},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3501},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3502},"inV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3503},"inV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":573},"value":"PEGGY O"}],"songType":[{"id":{"@type":"g:Int64","@value":575},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":574},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":193},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1077},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3769},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3132},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":605},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6638},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":464},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":465},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":466},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":463},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7380},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7379},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":576},"value":"US BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":578},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":577},"value":{"@type":"g:Int32","@value":323}}]}}
-{"id":{"@type":"g:Int32","@value":194},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5841},"outV":{"@type":"g:Int32","@value":326},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":467},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7850},"inV":{"@type":"g:Int32","@value":462}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7849},"inV":{"@type":"g:Int32","@value":462}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":579},"value":"PROUD MARY"}],"songType":[{"id":{"@type":"g:Int64","@value":581},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":580},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":195},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1413},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3895},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":794},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2701},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":468},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":469},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":470},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7224},"inV":{"@type":"g:Int32","@value":391}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7223},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":582},"value":"LET ME SING YOUR BLUES AWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":584},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":583},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":196},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4071},"outV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2600},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1579},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":496},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2800},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5584},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4113},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3158},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4598},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5974},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":825},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4187},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5788},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2430},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":543},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1792},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1793},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1794},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1795},"inV":{"@type":"g:Int32","@value":109},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1796},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1797},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1798},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1799},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1800},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1801},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1802},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1803},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1804},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1805},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1806},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1791},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7350},"inV":{"@type":"g:Int32","@value":377}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7349},"inV":{"@type":"g:Int32","@value":377}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":585},"value":"SUNRISE"}],"songType":[{"id":{"@type":"g:Int64","@value":587},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":586},"value":{"@type":"g:Int32","@value":30}}]}}
-{"id":{"@type":"g:Int32","@value":197},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":737},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":806},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4422},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2025},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2442},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5747},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1812},"outV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":501},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6198},"outV":{"@type":"g:Int32","@value":220},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4378},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5722},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":763},"outV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5310},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4703},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6994},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6995},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6996},"inV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6997},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6998},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6999},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":7000},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":7001},"inV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7002},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7003},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7004},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7005},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7784},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7783},"inV":{"@type":"g:Int32","@value":471}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":588},"value":"MONKEY AND THE ENGINEER"}],"songType":[{"id":{"@type":"g:Int64","@value":590},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":589},"value":{"@type":"g:Int32","@value":32}}]}}
-{"id":{"@type":"g:Int32","@value":198},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3281},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5314},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6994},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4341},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":503},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1815},"outV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4697},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":762},"outV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2028},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3452},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":734},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4416},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4417},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4418},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4419},"inV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4420},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4421},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4422},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4413},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4414},"inV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4415},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7516},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7515},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":591},"value":"DARK HOLLOW"}],"songType":[{"id":{"@type":"g:Int64","@value":593},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":592},"value":{"@type":"g:Int32","@value":29}}]}}
-{"id":{"@type":"g:Int32","@value":199},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1601},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4421},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5046},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5750},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6998},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5720},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2873},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":506},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4701},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3454},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2447},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1808},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1809},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1810},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1811},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1807},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":10}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7812},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7811},"inV":{"@type":"g:Int32","@value":673}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":594},"value":"OH BABE IT AINT NO LIE"}],"songType":[{"id":{"@type":"g:Int64","@value":596},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":595},"value":{"@type":"g:Int32","@value":13}}]}}
-{"id":{"@type":"g:Int32","@value":200},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":512},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2975},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":597},"value":"FRERE JACQUES"}],"songType":[{"id":{"@type":"g:Int64","@value":599},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":598},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":201},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1521},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3763},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":516},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2022},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3127},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5929},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2092},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6300},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4717},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":58}}},{"id":{"@type":"g:Int32","@value":7037},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3531},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3532},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3533},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3534},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3535},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3536},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3537},"inV":{"@type":"g:Int32","@value":157},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3538},"inV":{"@type":"g:Int32","@value":136},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3539},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":15}}},{"id":{"@type":"g:Int32","@value":3540},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3541},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3542},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3543},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3544},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3545},"inV":{"@type":"g:Int32","@value":92},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3546},"inV":{"@type":"g:Int32","@value":138},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3547},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3548},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3549},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3550},"inV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":600},"value":"THIS COULD BE THE LAST TIME"}],"songType":[{"id":{"@type":"g:Int64","@value":602},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":601},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":202},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5506},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":518},"outV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2697},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6665},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5962},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4555},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1165},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4045},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5646},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4562},"outV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5014},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5526},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1305},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1566},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3614},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2783},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3423},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":997},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4261},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4390},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2280},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6248},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1066},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2474},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2091},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":4781},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6063},"outV":{"@type":"g:Int32","@value":115},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2995},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3829},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3893},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":631},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1335},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5179},"outV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3647},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4480},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4481},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4482},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4483},"inV":{"@type":"g:Int32","@value":118},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4484},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4485},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4486},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4487},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4488},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4489},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4490},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4491},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4492},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4493},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4494},"inV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4495},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4496},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4497},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4498},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4499},"inV":{"@type":"g:Int32","@value":254},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4500},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4501},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4502},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4503},"inV":{"@type":"g:Int32","@value":66},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4504},"inV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4505},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4506},"inV":{"@type":"g:Int32","@value":119},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4462},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4463},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4464},"inV":{"@type":"g:Int32","@value":16},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4465},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4466},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":4467},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4468},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4469},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4470},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4471},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4472},"inV":{"@type":"g:Int32","@value":55},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4473},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4474},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4475},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4476},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4477},"inV":{"@type":"g:Int32","@value":290},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4478},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4479},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":10}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7234},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7233},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":603},"value":"LOOSE LUCY"}],"songType":[{"id":{"@type":"g:Int64","@value":605},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":604},"value":{"@type":"g:Int32","@value":98}}]}}
-{"id":{"@type":"g:Int32","@value":203},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4369},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":519},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":520},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":606},"value":"BANANA BOAT SONG"}],"songType":[{"id":{"@type":"g:Int64","@value":608},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":607},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":204},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3392},"outV":{"@type":"g:Int32","@value":309},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5920},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3121},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":594},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3747},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":14}}},{"id":{"@type":"g:Int32","@value":1510},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":18}}},{"id":{"@type":"g:Int32","@value":519},"outV":{"@type":"g:Int32","@value":203},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2327},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":9}}},{"id":{"@type":"g:Int32","@value":4375},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2379},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4829},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":5342},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6016},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6017},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6018},"inV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6019},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6020},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6021},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6022},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6023},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6024},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6025},"inV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6026},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":6027},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6028},"inV":{"@type":"g:Int32","@value":332},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6029},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6030},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6031},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6012},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6013},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6014},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":6015},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":6}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7720},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7719},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":609},"value":"KNOCKING ON HEAVENS DOOR"}],"songType":[{"id":{"@type":"g:Int64","@value":611},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":610},"value":{"@type":"g:Int32","@value":76}}]}}
-{"id":{"@type":"g:Int32","@value":205},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2511},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":521},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7256},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7255},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":612},"value":"MISTER CHARLIE"}],"songType":[{"id":{"@type":"g:Int64","@value":614},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":613},"value":{"@type":"g:Int32","@value":48}}]}}
-{"id":{"@type":"g:Int32","@value":206},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1249},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1154},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3058},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6660},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":534},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1560},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1931},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":2702},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5951},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7023},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":704},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":705},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":706},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":707},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":708},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":699},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":700},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":701},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":702},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":703},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7912},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7911},"inV":{"@type":"g:Int32","@value":650}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":615},"value":"SING ME BACK HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":617},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":616},"value":{"@type":"g:Int32","@value":39}}]}}
-{"id":{"@type":"g:Int32","@value":207},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4163},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2660},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6725},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3558},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":535},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5944},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":617},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":985},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4559},"outV":{"@type":"g:Int32","@value":305},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6271},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4960},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4961},"inV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4962},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4963},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4964},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4965},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4966},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4967},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4968},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4958},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4959},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":6}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7804},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7803},"inV":{"@type":"g:Int32","@value":670}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":618},"value":"NEXT TIME YOU SEE ME"}],"songType":[{"id":{"@type":"g:Int64","@value":620},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":619},"value":{"@type":"g:Int32","@value":72}}]}}
-{"id":{"@type":"g:Int32","@value":208},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5799},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4523},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4907},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5579},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":556},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":6476},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5262},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3664},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1588},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4117},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":822},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6936},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1274},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2176},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2177},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2178},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2179},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2180},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2181},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2182},"inV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2183},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2184},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2185},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2186},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2174},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2175},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7174},"inV":{"@type":"g:Int32","@value":377}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7173},"inV":{"@type":"g:Int32","@value":377}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":621},"value":"FROM THE HEART OF ME"}],"songType":[{"id":{"@type":"g:Int64","@value":623},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":622},"value":{"@type":"g:Int32","@value":26}}]}}
-{"id":{"@type":"g:Int32","@value":209},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2849},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1954},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4418},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5746},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1813},"outV":{"@type":"g:Int32","@value":273},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3445},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5909},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2008},"outV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6345},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5307},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":765},"outV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":575},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5056},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5040},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5041},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5042},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5043},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5044},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5045},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5046},"inV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5047},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5048},"inV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5049},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5050},"inV":{"@type":"g:Int32","@value":224},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5051},"inV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5052},"inV":{"@type":"g:Int32","@value":222},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5053},"inV":{"@type":"g:Int32","@value":219},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5054},"inV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5055},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7184},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7183},"inV":{"@type":"g:Int32","@value":380}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":624},"value":"HEAVEN HELP THE FOOL"}],"songType":[{"id":{"@type":"g:Int64","@value":626},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":625},"value":{"@type":"g:Int32","@value":17}}]}}
-{"id":{"@type":"g:Int32","@value":210},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6496},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2242},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":582},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":3110},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":12}}},{"id":{"@type":"g:Int32","@value":5991},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6823},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4815},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1072},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2320},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2738},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3027},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":660},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2870},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3739},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2364},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2559},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1632},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1633},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1634},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1635},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1613},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1614},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1615},"inV":{"@type":"g:Int32","@value":106},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1616},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1617},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1618},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1619},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1620},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1621},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1622},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1623},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1624},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1625},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1626},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1627},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1628},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1629},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1630},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1631},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":627},"value":"DAY JOB"}],"songType":[{"id":{"@type":"g:Int64","@value":629},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":628},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":211},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3733},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1496},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":585},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5211},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4812},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2318},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6528},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6529},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6530},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6524},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6525},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6526},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6527},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7862},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7861},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":630},"value":"REVOLUTION"}],"songType":[{"id":{"@type":"g:Int64","@value":632},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":631},"value":{"@type":"g:Int32","@value":11}}]}}
-{"id":{"@type":"g:Int32","@value":212},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1504},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2741},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2949},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3111},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":587},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4423},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4424},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4425},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4426},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4427},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7518},"inV":{"@type":"g:Int32","@value":507}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7517},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":633},"value":"DAY TRIPPER"}],"songType":[{"id":{"@type":"g:Int64","@value":635},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":634},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":213},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3744},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":13}}},{"id":{"@type":"g:Int32","@value":6624},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1506},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2564},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6118},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6920},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":590},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3119},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":2385},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1970},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2324},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":3476},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4822},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1637},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1638},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1639},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":1640},"inV":{"@type":"g:Int32","@value":261},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1641},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1642},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1643},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1644},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1645},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1646},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1647},"inV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1648},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1649},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1650},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1651},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1652},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1653},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1654},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1655},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1656},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1657},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":636},"value":"QUINN THE ESKIMO"}],"songType":[{"id":{"@type":"g:Int64","@value":638},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":637},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":214},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2308},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":3764},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":599},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3095},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2728},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3295},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4799},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5232},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5233},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5234},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5235},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5236},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5231},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8014},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8013},"inV":{"@type":"g:Int32","@value":790}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":639},"value":"WEREWOLVES OF LONDON"}],"songType":[{"id":{"@type":"g:Int64","@value":641},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":640},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":215},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4352},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3714},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4867},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5765},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":8}}},{"id":{"@type":"g:Int32","@value":1734},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3334},"outV":{"@type":"g:Int32","@value":155},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3081},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4939},"outV":{"@type":"g:Int32","@value":86},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":6029},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1231},"outV":{"@type":"g:Int32","@value":248},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3536},"outV":{"@type":"g:Int32","@value":201},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":657},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6610},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5205},"outV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2390},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5528},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1177},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":602},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2395},"outV":{"@type":"g:Int32","@value":179},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6683},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3421},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4318},"outV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5726},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1889},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6117},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6501},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3495},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3687},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6887},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1003},"outV":{"@type":"g:Int32","@value":176},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3307},"outV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5675},"outV":{"@type":"g:Int32","@value":167},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6251},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1710},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5230},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1842},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1525},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2294},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1656},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2872},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":4795},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5692},"outV":{"@type":"g:Int32","@value":159},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3005},"outV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2558},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5246},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6591},"outV":{"@type":"g:Int32","@value":116},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2229},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":97}}},{"id":{"@type":"g:Int32","@value":2230},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2231},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2232},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2233},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2234},"inV":{"@type":"g:Int32","@value":288},"properties":{"weight":{"@type":"g:Int32","@value":8}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7188},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7187},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":642},"value":"HELP ON THE WAY"}],"songType":[{"id":{"@type":"g:Int64","@value":644},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":643},"value":{"@type":"g:Int32","@value":110}}]}}
-{"id":{"@type":"g:Int32","@value":216},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2577},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3766},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4840},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1529},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":603},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2331},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3131},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5550},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6639},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5222},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5223},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5224},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5225},"inV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5226},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5227},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5228},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5229},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5230},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7636},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7635},"inV":{"@type":"g:Int32","@value":583}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":645},"value":"I FOUGHT THE LAW"}],"songType":[{"id":{"@type":"g:Int64","@value":647},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":646},"value":{"@type":"g:Int32","@value":36}}]}}
-{"id":{"@type":"g:Int32","@value":217},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2484},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6134},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1975},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3767},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1784},"outV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4841},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":604},"outV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3133},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5431},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5432},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5433},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5434},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5435},"inV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5436},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5437},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5438},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":648},"value":"LUCY IN THE SKY"}],"songType":[{"id":{"@type":"g:Int64","@value":650},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":649},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":218},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1091},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6726},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4250},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":715},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":620},"outV":{"@type":"g:Int32","@value":23},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6653},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1247},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4146},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4147},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4148},"inV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4149},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4150},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4151},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":651},"value":"TWO SOULS IN COMMUNION"}],"songType":[{"id":{"@type":"g:Int64","@value":653},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":652},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":219},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1956},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5053},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":682},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":683},"inV":{"@type":"g:Int32","@value":220},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7310},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7309},"inV":{"@type":"g:Int32","@value":384}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":654},"value":"SAGE AND SPIRIT"}],"songType":[{"id":{"@type":"g:Int64","@value":656},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":655},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":220},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":683},"outV":{"@type":"g:Int32","@value":219},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6198},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7738},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7737},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":657},"value":"LITTLE SADIE"}],"songType":[{"id":{"@type":"g:Int64","@value":659},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":658},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":221},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1297},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6809},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":709},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":710},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7176},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7175},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":660},"value":"GENTLEMEN START YOUR ENGINES"}],"songType":[{"id":{"@type":"g:Int64","@value":662},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":661},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":222},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":736},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3444},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5748},"outV":{"@type":"g:Int32","@value":129},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1594},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2026},"outV":{"@type":"g:Int32","@value":180},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5723},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5052},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5308},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1807},"outV":{"@type":"g:Int32","@value":199},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":4831},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5124},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5125},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5126},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5127},"inV":{"@type":"g:Int32","@value":65},"properties":{"weight":{"@type":"g:Int32","@value":10}}},{"id":{"@type":"g:Int32","@value":5128},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5129},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5130},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5131},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5132},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5133},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5134},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7304},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7303},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":663},"value":"RIPPLE"}],"songType":[{"id":{"@type":"g:Int64","@value":665},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":664},"value":{"@type":"g:Int32","@value":39}}]}}
-{"id":{"@type":"g:Int32","@value":223},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2370},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3682},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2212},"outV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1127},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5288},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":748},"outV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1293},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4205},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3598},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6862},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3472},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3824},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1041},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6801},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3186},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4370},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1203},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3924},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4919},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3520},"inV":{"@type":"g:Int32","@value":71},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3521},"inV":{"@type":"g:Int32","@value":46},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3522},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3523},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3524},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3525},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3526},"inV":{"@type":"g:Int32","@value":314},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3527},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3528},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3529},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3530},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3507},"inV":{"@type":"g:Int32","@value":245},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3508},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3509},"inV":{"@type":"g:Int32","@value":99},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3510},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3511},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3512},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3513},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3514},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3515},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3516},"inV":{"@type":"g:Int32","@value":313},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3517},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3518},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3519},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7374},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7373},"inV":{"@type":"g:Int32","@value":352}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":666},"value":"TONS OF STEEL"}],"songType":[{"id":{"@type":"g:Int64","@value":668},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":667},"value":{"@type":"g:Int32","@value":29}}]}}
-{"id":{"@type":"g:Int32","@value":224},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7001},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5050},"outV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4414},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":6}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":760},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":761},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":762},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":763},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":764},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":765},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":669},"value":"ROSALIE MCFALL"}],"songType":[{"id":{"@type":"g:Int64","@value":671},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":670},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":225},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1555},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4435},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2678},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":780},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4006},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4007},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4008},"inV":{"@type":"g:Int32","@value":226},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4009},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":672},"value":"TOP OF THE WORLD"}],"songType":[{"id":{"@type":"g:Int64","@value":674},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":673},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":226},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1254},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4008},"outV":{"@type":"g:Int32","@value":225},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":782},"outV":{"@type":"g:Int32","@value":122},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2224},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2225},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2223},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":675},"value":"ROCKIN PNEUMONIA"}],"songType":[{"id":{"@type":"g:Int64","@value":677},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":676},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":227},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6288},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":833},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1394},"outV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1526},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5063},"outV":{"@type":"g:Int32","@value":128},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4842},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6794},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3115},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6635},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5806},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1072},"inV":{"@type":"g:Int32","@value":210},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1073},"inV":{"@type":"g:Int32","@value":110},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1074},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1075},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1076},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1077},"inV":{"@type":"g:Int32","@value":193},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1078},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1079},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1068},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1069},"inV":{"@type":"g:Int32","@value":241},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1070},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1071},"inV":{"@type":"g:Int32","@value":242},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7580},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7579},"inV":{"@type":"g:Int32","@value":549}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":678},"value":"GLORIA"}],"songType":[{"id":{"@type":"g:Int64","@value":680},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":679},"value":{"@type":"g:Int32","@value":15}}]}}
-{"id":{"@type":"g:Int32","@value":228},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":851},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1131},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2146},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2147},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7938},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7937},"inV":{"@type":"g:Int32","@value":749}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":681},"value":"STIR IT UP"}],"songType":[{"id":{"@type":"g:Int64","@value":683},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":682},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":229},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1444},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1221},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4757},"outV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1926},"outV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5431},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6215},"outV":{"@type":"g:Int32","@value":319},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6519},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":857},"outV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":1481},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4863},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3203},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3204},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3205},"inV":{"@type":"g:Int32","@value":74},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3206},"inV":{"@type":"g:Int32","@value":172},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3207},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3208},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3209},"inV":{"@type":"g:Int32","@value":37},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3210},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3211},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3212},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3213},"inV":{"@type":"g:Int32","@value":174},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3214},"inV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3215},"inV":{"@type":"g:Int32","@value":177},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":684},"value":"WOMEN ARE SMARTER"}],"songType":[{"id":{"@type":"g:Int64","@value":686},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":685},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":230},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":919},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3324},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":687},"value":"THE ALHAMBRA"}],"songType":[{"id":{"@type":"g:Int64","@value":689},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":688},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":231},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4608},"outV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1745},"outV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5923},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":30}}},{"id":{"@type":"g:Int32","@value":936},"outV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1432},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5445},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":11}}},{"id":{"@type":"g:Int32","@value":5446},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":5447},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":5448},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":5449},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5450},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5451},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5452},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7198},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7197},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":690},"value":"I WILL TAKE YOU HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":692},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":691},"value":{"@type":"g:Int32","@value":34}}]}}
-{"id":{"@type":"g:Int32","@value":232},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5350},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":967},"outV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4999},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2158},"outV":{"@type":"g:Int32","@value":151},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5823},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6193},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6194},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6195},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6196},"inV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6197},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7062},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7061},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":693},"value":"BELIEVE IT OR NOT"}],"songType":[{"id":{"@type":"g:Int64","@value":695},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":694},"value":{"@type":"g:Int32","@value":7}}]}}
-{"id":{"@type":"g:Int32","@value":233},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5907},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":971},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7476},"inV":{"@type":"g:Int32","@value":481}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7475},"inV":{"@type":"g:Int32","@value":481}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":696},"value":"BLACK QUEEN"}],"songType":[{"id":{"@type":"g:Int64","@value":698},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":697},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":234},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4161},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6274},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1094},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2918},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6727},"outV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3560},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5933},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2514},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4883},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2676},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":983},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6457},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5630},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1776},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":1777},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1778},"inV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1779},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1780},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1781},"inV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1782},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1783},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1773},"inV":{"@type":"g:Int32","@value":237},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1774},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1775},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":4}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7104},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7103},"inV":{"@type":"g:Int32","@value":356}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":699},"value":"CHINATOWN SHUFFLE"}],"songType":[{"id":{"@type":"g:Int64","@value":701},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":700},"value":{"@type":"g:Int32","@value":28}}]}}
-{"id":{"@type":"g:Int32","@value":235},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2679},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":984},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3320},"outV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4249},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3067},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3627},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6654},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1535},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2192},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2193},"inV":{"@type":"g:Int32","@value":252},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2194},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2195},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2187},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2188},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2189},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2190},"inV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2191},"inV":{"@type":"g:Int32","@value":120},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8046},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8045},"inV":{"@type":"g:Int32","@value":807}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":702},"value":"YOU WIN AGAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":704},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":703},"value":{"@type":"g:Int32","@value":25}}]}}
-{"id":{"@type":"g:Int32","@value":236},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5520},"outV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":6}}},{"id":{"@type":"g:Int32","@value":2259},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":996},"outV":{"@type":"g:Int32","@value":11},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6261},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1222},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4839},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1528},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3768},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":2332},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":3134},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5551},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4969},"inV":{"@type":"g:Int32","@value":9},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4970},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4971},"inV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4972},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4973},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4974},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4975},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4976},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4977},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4978},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4979},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4980},"inV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4981},"inV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4982},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4983},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4984},"inV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7228},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7227},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":705},"value":"LIBERTY"}],"songType":[{"id":{"@type":"g:Int64","@value":707},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":706},"value":{"@type":"g:Int32","@value":56}}]}}
-{"id":{"@type":"g:Int32","@value":237},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1773},"outV":{"@type":"g:Int32","@value":234},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1008},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":708},"value":"YOUR LOVE AT HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":710},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":709},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":238},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1044},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2565},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5413},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6711},"outV":{"@type":"g:Int32","@value":141},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5915},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5328},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5329},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5330},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5331},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5332},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5327},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8034},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8033},"inV":{"@type":"g:Int32","@value":799}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":711},"value":"WILLIE AND THE HAND JIVE"}],"songType":[{"id":{"@type":"g:Int64","@value":713},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":712},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":239},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1056},"outV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4666},"outV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6876},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3197},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6973},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5440},"inV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5441},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5442},"inV":{"@type":"g:Int32","@value":63},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5443},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5439},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":714},"value":"IT TAKES A TRAIN TO CRY"}],"songType":[{"id":{"@type":"g:Int64","@value":716},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":715},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":240},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3774},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1067},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7316},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7315},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":717},"value":"SALT LAKE CITY"}],"songType":[{"id":{"@type":"g:Int64","@value":719},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":718},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":241},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1069},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4747},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":720},"value":"LINDA LOU"}],"songType":[{"id":{"@type":"g:Int64","@value":722},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":721},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":242},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6849},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4819},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1428},"outV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1685},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5157},"outV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5916},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1071},"outV":{"@type":"g:Int32","@value":227},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6531},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6532},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6533},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6534},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6535},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6536},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8028},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8027},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":723},"value":"WHY DONT WE DO IT IN THE ROAD"}],"songType":[{"id":{"@type":"g:Int64","@value":725},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":724},"value":{"@type":"g:Int32","@value":7}}]}}
-{"id":{"@type":"g:Int32","@value":243},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2567},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1512},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5999},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1080},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1081},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1082},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":726},"value":"HAPPY BIRTHDAY"}],"songType":[{"id":{"@type":"g:Int64","@value":728},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":727},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":244},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1124},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2133},"outV":{"@type":"g:Int32","@value":17},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4955},"outV":{"@type":"g:Int32","@value":307},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4507},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4508},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4509},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7710},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7709},"inV":{"@type":"g:Int32","@value":598}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":729},"value":"KANSAS CITY"}],"songType":[{"id":{"@type":"g:Int64","@value":731},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":730},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":245},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3507},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5539},"outV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1125},"outV":{"@type":"g:Int32","@value":59},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2951},"outV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1291},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3180},"outV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6799},"outV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6925},"inV":{"@type":"g:Int32","@value":98},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6926},"inV":{"@type":"g:Int32","@value":126},"properties":{"weight":{"@type":"g:Int32","@value":7}}},{"id":{"@type":"g:Int32","@value":6927},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7542},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7541},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":732},"value":"DOWN IN THE BOTTOM"}],"songType":[{"id":{"@type":"g:Int64","@value":734},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":733},"value":{"@type":"g:Int32","@value":9}}]}}
-{"id":{"@type":"g:Int32","@value":246},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2730},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1141},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":735},"value":"HULLY GULLY"}],"songType":[{"id":{"@type":"g:Int64","@value":737},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":736},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":247},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1214},"outV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3997},"inV":{"@type":"g:Int32","@value":67},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7628},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7627},"inV":{"@type":"g:Int32","@value":577}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":738},"value":"HOW LONG BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":740},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":739},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":248},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3489},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4212},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2891},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3420},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1232},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1233},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1234},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1229},"inV":{"@type":"g:Int32","@value":34},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1230},"inV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1231},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":741},"value":"VALLEY ROAD"}],"songType":[{"id":{"@type":"g:Int64","@value":743},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":742},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":249},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3954},"outV":{"@type":"g:Int32","@value":266},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2979},"outV":{"@type":"g:Int32","@value":265},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4461},"outV":{"@type":"g:Int32","@value":311},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1235},"inV":{"@type":"g:Int32","@value":250},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1236},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1237},"inV":{"@type":"g:Int32","@value":251},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7700},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7699},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":744},"value":"JOHN BROWN"}],"songType":[{"id":{"@type":"g:Int64","@value":746},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":745},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":250},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1235},"outV":{"@type":"g:Int32","@value":249},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5496},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3260},"outV":{"@type":"g:Int32","@value":287},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2226},"inV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2227},"inV":{"@type":"g:Int32","@value":265},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2228},"inV":{"@type":"g:Int32","@value":287},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7910},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7909},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":747},"value":"SIMPLE TWIST OF FATE"}],"songType":[{"id":{"@type":"g:Int64","@value":749},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":748},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":251},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3953},"outV":{"@type":"g:Int32","@value":266},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1237},"outV":{"@type":"g:Int32","@value":249},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2004},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2005},"inV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7652},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7651},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":750},"value":"I WANT YOU"}],"songType":[{"id":{"@type":"g:Int64","@value":752},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":751},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":252},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6272},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2193},"outV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1554},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1939},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6659},"outV":{"@type":"g:Int32","@value":12},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1252},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6325},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4774},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6454},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4251},"outV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2510},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3311},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3312},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3313},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3314},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3315},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3316},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3317},"inV":{"@type":"g:Int32","@value":10},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3318},"inV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3319},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3320},"inV":{"@type":"g:Int32","@value":235},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3321},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3322},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3323},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":753},"value":"HURTS ME TOO"}],"songType":[{"id":{"@type":"g:Int64","@value":755},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":754},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":253},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5289},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1295},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1982},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1983},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":756},"value":"ADDAMS FAMILY"}],"songType":[{"id":{"@type":"g:Int64","@value":758},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":757},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":254},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3937},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3427},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4932},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5831},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1768},"outV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4040},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1353},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1609},"outV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5513},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4554},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3693},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5296},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3505},"outV":{"@type":"g:Int32","@value":192},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4499},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2100},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5620},"outV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4405},"outV":{"@type":"g:Int32","@value":40},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4217},"outV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1307},"outV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3612},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5020},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3837},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":2}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4576},"inV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4577},"inV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4578},"inV":{"@type":"g:Int32","@value":137},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4579},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4580},"inV":{"@type":"g:Int32","@value":43},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4581},"inV":{"@type":"g:Int32","@value":190},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4582},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4583},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4560},"inV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":4561},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4562},"inV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4563},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4564},"inV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4565},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4566},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4567},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4568},"inV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4569},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4570},"inV":{"@type":"g:Int32","@value":54},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4571},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4572},"inV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4573},"inV":{"@type":"g:Int32","@value":73},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4574},"inV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4575},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7488},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7487},"inV":{"@type":"g:Int32","@value":490}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":759},"value":"BROKEN ARROW"}],"songType":[{"id":{"@type":"g:Int64","@value":761},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":760},"value":{"@type":"g:Int32","@value":35}}]}}
-{"id":{"@type":"g:Int32","@value":255},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1314},"outV":{"@type":"g:Int32","@value":161},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1493},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2972},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2973},"inV":{"@type":"g:Int32","@value":163},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7952},"inV":{"@type":"g:Int32","@value":757}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7951},"inV":{"@type":"g:Int32","@value":757}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":762},"value":"TELL MAMA"}],"songType":[{"id":{"@type":"g:Int64","@value":764},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":763},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":256},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1336},"outV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6644},"inV":{"@type":"g:Int32","@value":325},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7482},"inV":{"@type":"g:Int32","@value":462}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7481},"inV":{"@type":"g:Int32","@value":462}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":765},"value":"BORN ON THE BAYOU"}],"songType":[{"id":{"@type":"g:Int64","@value":767},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":766},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":257},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4133},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4376},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1466},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6509},"outV":{"@type":"g:Int32","@value":187},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6238},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2463},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5057},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5058},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5059},"inV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5060},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5061},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5062},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7748},"inV":{"@type":"g:Int32","@value":381}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7747},"inV":{"@type":"g:Int32","@value":646}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":768},"value":"LOUIE LOUIE"}],"songType":[{"id":{"@type":"g:Int64","@value":770},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":769},"value":{"@type":"g:Int32","@value":8}}]}}
-{"id":{"@type":"g:Int32","@value":258},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4868},"outV":{"@type":"g:Int32","@value":35},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4741},"outV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6187},"outV":{"@type":"g:Int32","@value":36},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1487},"outV":{"@type":"g:Int32","@value":81},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5840},"inV":{"@type":"g:Int32","@value":85},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5836},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5837},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5838},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5839},"inV":{"@type":"g:Int32","@value":140},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7650},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7649},"inV":{"@type":"g:Int32","@value":592}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":771},"value":"I WANT TO TELL YOU"}],"songType":[{"id":{"@type":"g:Int64","@value":773},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":772},"value":{"@type":"g:Int32","@value":7}}]}}
-{"id":{"@type":"g:Int32","@value":259},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2608},"outV":{"@type":"g:Int32","@value":158},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3777},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1843},"outV":{"@type":"g:Int32","@value":275},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5225},"outV":{"@type":"g:Int32","@value":216},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6890},"outV":{"@type":"g:Int32","@value":93},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5435},"outV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1533},"outV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1784},"inV":{"@type":"g:Int32","@value":217},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1785},"inV":{"@type":"g:Int32","@value":42},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1786},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1787},"inV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1788},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1789},"inV":{"@type":"g:Int32","@value":31},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1790},"inV":{"@type":"g:Int32","@value":272},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7254},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7253},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":774},"value":"MISSISSIPPI HALF-STEP"}],"songType":[{"id":{"@type":"g:Int64","@value":776},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":775},"value":{"@type":"g:Int32","@value":234}}]}}
-{"id":{"@type":"g:Int32","@value":260},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3396},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1636},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7608},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7607},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":777},"value":"HEART OF MINE"}],"songType":[{"id":{"@type":"g:Int64","@value":779},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":778},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":261},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1640},"outV":{"@type":"g:Int32","@value":213},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3743},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3840},"inV":{"@type":"g:Int32","@value":97},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3839},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":780},"value":"ROADRUNNER"}],"songType":[{"id":{"@type":"g:Int64","@value":782},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":781},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":262},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5547},"outV":{"@type":"g:Int32","@value":166},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1658},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":783},"value":"MARDI GRAS PARADE"}],"songType":[{"id":{"@type":"g:Int64","@value":785},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":784},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":263},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6192},"outV":{"@type":"g:Int32","@value":313},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3075},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1659},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1660},"inV":{"@type":"g:Int32","@value":103},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":786},"value":"THATS ALRIGHT MAMA"}],"songType":[{"id":{"@type":"g:Int64","@value":788},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":787},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":264},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3952},"outV":{"@type":"g:Int32","@value":266},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3123},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2253},"outV":{"@type":"g:Int32","@value":29},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1661},"inV":{"@type":"g:Int32","@value":265},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1662},"inV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1663},"inV":{"@type":"g:Int32","@value":266},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7764},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7763},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":789},"value":"MAN OF PEACE"}],"songType":[{"id":{"@type":"g:Int64","@value":791},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":790},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":265},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2227},"outV":{"@type":"g:Int32","@value":250},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1661},"outV":{"@type":"g:Int32","@value":264},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2979},"inV":{"@type":"g:Int32","@value":249},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2980},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":792},"value":"FRANKIE LEE AND JUDAS PRIEST"}],"songType":[{"id":{"@type":"g:Int64","@value":794},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":793},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":266},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5495},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1663},"outV":{"@type":"g:Int32","@value":264},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5695},"outV":{"@type":"g:Int32","@value":330},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3952},"inV":{"@type":"g:Int32","@value":264},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3953},"inV":{"@type":"g:Int32","@value":251},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3954},"inV":{"@type":"g:Int32","@value":249},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7656},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7655},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":795},"value":"ILL BE YOUR BABY TONIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":797},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":796},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":267},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5284},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1664},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7302},"inV":{"@type":"g:Int32","@value":412}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7301},"inV":{"@type":"g:Int32","@value":401}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":798},"value":"REVOLUTIONARY HAMSTRUNG BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":800},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":799},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":268},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5346},"outV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1683},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5845},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2363},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3328},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3329},"inV":{"@type":"g:Int32","@value":307},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3325},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3326},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3327},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":801},"value":"WALKIN THE DOG"}],"songType":[{"id":{"@type":"g:Int64","@value":803},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":802},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":269},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2066},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2226},"outV":{"@type":"g:Int32","@value":250},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2005},"outV":{"@type":"g:Int32","@value":251},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3397},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1690},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5322},"outV":{"@type":"g:Int32","@value":170},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4543},"outV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7040},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":7041},"inV":{"@type":"g:Int32","@value":297},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7042},"inV":{"@type":"g:Int32","@value":330},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7043},"inV":{"@type":"g:Int32","@value":331},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7044},"inV":{"@type":"g:Int32","@value":270},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7045},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7046},"inV":{"@type":"g:Int32","@value":75},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7452},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7451},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":804},"value":"BALLAD OF A THIN MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":806},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":805},"value":{"@type":"g:Int32","@value":8}}]}}
-{"id":{"@type":"g:Int32","@value":270},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7044},"outV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1691},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6923},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6924},"inV":{"@type":"g:Int32","@value":284},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":807},"value":"RAINY DAY WOMAN"}],"songType":[{"id":{"@type":"g:Int64","@value":809},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":808},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":271},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2065},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3394},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1693},"outV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4407},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4408},"inV":{"@type":"g:Int32","@value":310},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4409},"inV":{"@type":"g:Int32","@value":309},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7502},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7501},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":810},"value":"CHIMES OF FREEDOM"}],"songType":[{"id":{"@type":"g:Int64","@value":812},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":811},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":272},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3616},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4144},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6883},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1790},"outV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4457},"inV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4458},"inV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4459},"inV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4460},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7944},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7943},"inV":{"@type":"g:Int32","@value":753}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":813},"value":"TAKE ME TO THE RIVER"}],"songType":[{"id":{"@type":"g:Int64","@value":815},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":814},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":273},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4419},"outV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6996},"outV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":2438},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5719},"outV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3450},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4698},"outV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1812},"inV":{"@type":"g:Int32","@value":197},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":1813},"inV":{"@type":"g:Int32","@value":209},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1814},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1815},"inV":{"@type":"g:Int32","@value":198},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1816},"inV":{"@type":"g:Int32","@value":111},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1817},"inV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1818},"inV":{"@type":"g:Int32","@value":20},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":816},"value":"BEEN ALL AROUND THIS WORLD"}],"songType":[{"id":{"@type":"g:Int64","@value":818},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":817},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":274},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1835},"outV":{"@type":"g:Int32","@value":41},"properties":{"weight":{"@type":"g:Int32","@value":4}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5729},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":5730},"inV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":819},"value":"MATILDA"}],"songType":[{"id":{"@type":"g:Int64","@value":821},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":820},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":275},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4023},"outV":{"@type":"g:Int32","@value":185},"properties":{"weight":{"@type":"g:Int32","@value":12}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1840},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1841},"inV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1842},"inV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1843},"inV":{"@type":"g:Int32","@value":259},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1844},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1837},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":1838},"inV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":1839},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7974},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7973},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":822},"value":"TOMORROW NEVER KNOWS"}],"songType":[{"id":{"@type":"g:Int64","@value":824},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":823},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":276},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1955},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5037},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":825},"value":"ITS A SIN"}],"songType":[{"id":{"@type":"g:Int64","@value":827},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":826},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":277},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1961},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4937},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":828},"value":"CLOSE ENCOUNTERS"}],"songType":[{"id":{"@type":"g:Int64","@value":830},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":829},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":278},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5816},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6121},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6299},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4444},"outV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6428},"outV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1965},"outV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2270},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2337},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2338},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":2339},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7118},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7117},"inV":{"@type":"g:Int32","@value":340}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":831},"value":"CRYPTICAL ENVELOPMENT"}],"songType":[{"id":{"@type":"g:Int64","@value":833},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":832},"value":{"@type":"g:Int32","@value":132}}]}}
-{"id":{"@type":"g:Int32","@value":279},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5930},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1978},"inV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":834},"value":"CHANTING BY THE GYOTO MONKS"}],"songType":[{"id":{"@type":"g:Int64","@value":836},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":835},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":280},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3869},"outV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1979},"inV":{"@type":"g:Int32","@value":95},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":837},"value":"EVERY TIME YOU GO"}],"songType":[{"id":{"@type":"g:Int64","@value":839},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":838},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":281},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5900},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6348},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":1980},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":1981},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7148},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7147},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":840},"value":"THE ELEVEN"}],"songType":[{"id":{"@type":"g:Int64","@value":842},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":841},"value":{"@type":"g:Int32","@value":93}}]}}
-{"id":{"@type":"g:Int32","@value":282},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6306},"outV":{"@type":"g:Int32","@value":123},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2023},"inV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":843},"value":"TAKE IT OFF"}],"songType":[{"id":{"@type":"g:Int64","@value":845},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":844},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":283},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4922},"outV":{"@type":"g:Int32","@value":100},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2024},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7560},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7559},"inV":{"@type":"g:Int32","@value":534}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":846},"value":"FEVER"}],"songType":[{"id":{"@type":"g:Int64","@value":848},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":847},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":284},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2064},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6924},"outV":{"@type":"g:Int32","@value":270},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6439},"inV":{"@type":"g:Int32","@value":310},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6440},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7598},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7597},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":849},"value":"GOTTA SERVE SOMEBODY"}],"songType":[{"id":{"@type":"g:Int64","@value":851},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":850},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":285},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5472},"outV":{"@type":"g:Int32","@value":79},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3932},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2095},"outV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6255},"outV":{"@type":"g:Int32","@value":117},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3254},"inV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3255},"inV":{"@type":"g:Int32","@value":82},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3256},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":852},"value":"RUBIN AND CHERISE"}],"songType":[{"id":{"@type":"g:Int64","@value":854},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":853},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":286},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5411},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5813},"outV":{"@type":"g:Int32","@value":76},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6376},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2144},"inV":{"@type":"g:Int32","@value":91},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2145},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2143},"inV":{"@type":"g:Int32","@value":70},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":855},"value":"I JUST WANNA MAKE LOVE TO YOU"}],"songType":[{"id":{"@type":"g:Int64","@value":857},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":856},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":287},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2228},"outV":{"@type":"g:Int32","@value":250},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5494},"outV":{"@type":"g:Int32","@value":131},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3260},"inV":{"@type":"g:Int32","@value":250},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3261},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8008},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8007},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":858},"value":"WATCHING THE RIVER FLOW"}],"songType":[{"id":{"@type":"g:Int64","@value":860},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":859},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":288},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2234},"outV":{"@type":"g:Int32","@value":215},"properties":{"weight":{"@type":"g:Int32","@value":8}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5444},"inV":{"@type":"g:Int32","@value":154},"properties":{"weight":{"@type":"g:Int32","@value":8}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7326},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7325},"inV":{"@type":"g:Int32","@value":384}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":861},"value":"SLIPKNOT"}],"songType":[{"id":{"@type":"g:Int64","@value":863},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":862},"value":{"@type":"g:Int32","@value":112}}]}}
-{"id":{"@type":"g:Int32","@value":289},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6928},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":5889},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":3090},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":2310},"outV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2542},"outV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6144},"inV":{"@type":"g:Int32","@value":171},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6145},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6140},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6141},"inV":{"@type":"g:Int32","@value":57},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6142},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6143},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":864},"value":"OLLIN ARRAGEED"}],"songType":[{"id":{"@type":"g:Int64","@value":866},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":865},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":290},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5381},"outV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3899},"outV":{"@type":"g:Int32","@value":51},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4477},"outV":{"@type":"g:Int32","@value":202},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2336},"inV":{"@type":"g:Int32","@value":69},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2335},"inV":{"@type":"g:Int32","@value":19},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7258},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7257},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":867},"value":"MONEY MONEY"}],"songType":[{"id":{"@type":"g:Int64","@value":869},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":868},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":291},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2501},"outV":{"@type":"g:Int32","@value":90},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2393},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5038},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5039},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":870},"value":"KING BEE"}],"songType":[{"id":{"@type":"g:Int64","@value":872},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":871},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":292},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3137},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4145},"outV":{"@type":"g:Int32","@value":48},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4386},"outV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5123},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6374},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3480},"outV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2394},"outV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3775},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4016},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4017},"inV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4011},"inV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4012},"inV":{"@type":"g:Int32","@value":28},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4013},"inV":{"@type":"g:Int32","@value":113},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4014},"inV":{"@type":"g:Int32","@value":104},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4015},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7590},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7589},"inV":{"@type":"g:Int32","@value":554}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":873},"value":"GOOD MORNING LITTLE SCHOOL GIRL"}],"songType":[{"id":{"@type":"g:Int64","@value":875},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":874},"value":{"@type":"g:Int32","@value":62}}]}}
-{"id":{"@type":"g:Int32","@value":293},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2406},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3253},"inV":{"@type":"g:Int32","@value":305},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":876},"value":"HOW SWEET IT IS"}],"songType":[{"id":{"@type":"g:Int64","@value":878},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":877},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":294},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2416},"outV":{"@type":"g:Int32","@value":68},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2592},"outV":{"@type":"g:Int32","@value":112},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2793},"outV":{"@type":"g:Int32","@value":15},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":3354},"outV":{"@type":"g:Int32","@value":184},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4745},"inV":{"@type":"g:Int32","@value":14},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":4746},"inV":{"@type":"g:Int32","@value":26},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7252},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7251},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":879},"value":"MISSION IN THE RAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":881},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":880},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":295},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4431},"outV":{"@type":"g:Int32","@value":308},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2607},"inV":{"@type":"g:Int32","@value":7},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":882},"value":"YOU WONT FIND ME"}],"songType":[{"id":{"@type":"g:Int64","@value":884},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":883},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":296},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2694},"outV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":7020},"outV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6067},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6068},"inV":{"@type":"g:Int32","@value":89},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6069},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6070},"inV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7250},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7249},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":885},"value":"MIND LEFT BODY JAM"}],"songType":[{"id":{"@type":"g:Int64","@value":887},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":886},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":297},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7041},"outV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2754},"inV":{"@type":"g:Int32","@value":188},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8030},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8029},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":888},"value":"WICKED MESSENGER"}],"songType":[{"id":{"@type":"g:Int64","@value":890},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":889},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":298},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4054},"outV":{"@type":"g:Int32","@value":173},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2829},"inV":{"@type":"g:Int32","@value":108},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7714},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7713},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":891},"value":"KC MOAN"}],"songType":[{"id":{"@type":"g:Int64","@value":893},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":892},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":299},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3681},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4820},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6852},"outV":{"@type":"g:Int32","@value":64},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2878},"outV":{"@type":"g:Int32","@value":101},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4428},"inV":{"@type":"g:Int32","@value":105},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4429},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":4430},"inV":{"@type":"g:Int32","@value":53},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7716},"inV":{"@type":"g:Int32","@value":628}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7715},"inV":{"@type":"g:Int32","@value":627}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":894},"value":"KEEP ON GROWING"}],"songType":[{"id":{"@type":"g:Int64","@value":896},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":895},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":300},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5427},"outV":{"@type":"g:Int32","@value":143},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2974},"inV":{"@type":"g:Int32","@value":301},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":8006},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8005},"inV":{"@type":"g:Int32","@value":469}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":897},"value":"WARRIORS OF THE SUN"}],"songType":[{"id":{"@type":"g:Int64","@value":899},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":898},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":301},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5649},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":2974},"outV":{"@type":"g:Int32","@value":300},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3344},"inV":{"@type":"g:Int32","@value":308},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3345},"inV":{"@type":"g:Int32","@value":143},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7490},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7489},"inV":{"@type":"g:Int32","@value":491}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":900},"value":"BYE BYE LOVE"}],"songType":[{"id":{"@type":"g:Int64","@value":902},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":901},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":302},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":2976},"outV":{"@type":"g:Int32","@value":8},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5648},"outV":{"@type":"g:Int32","@value":22},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4433},"inV":{"@type":"g:Int32","@value":328},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4434},"inV":{"@type":"g:Int32","@value":308},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":903},"value":"LADY DI"}],"songType":[{"id":{"@type":"g:Int64","@value":905},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":904},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":303},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3113},"outV":{"@type":"g:Int32","@value":153},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5028},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7466},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7465},"inV":{"@type":"g:Int32","@value":475}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":906},"value":"BIG BOY PETE"}],"songType":[{"id":{"@type":"g:Int64","@value":908},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":907},"value":{"@type":"g:Int32","@value":7}}]}}
-{"id":{"@type":"g:Int32","@value":304},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5931},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3138},"inV":{"@type":"g:Int32","@value":186},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":909},"value":"SILENT WAY JAM"}],"songType":[{"id":{"@type":"g:Int64","@value":911},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":910},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":305},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3253},"outV":{"@type":"g:Int32","@value":293},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4559},"inV":{"@type":"g:Int32","@value":207},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":912},"value":"ARE YOU LONELY FOR ME"}],"songType":[{"id":{"@type":"g:Int64","@value":914},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":913},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":306},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5277},"outV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3257},"inV":{"@type":"g:Int32","@value":58},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7758},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7757},"inV":{"@type":"g:Int32","@value":649}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":915},"value":"MACK THE KNIFE"}],"songType":[{"id":{"@type":"g:Int64","@value":917},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":916},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":307},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3329},"outV":{"@type":"g:Int32","@value":268},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4955},"inV":{"@type":"g:Int32","@value":244},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":918},"value":"TORE UP OVER YOU"}],"songType":[{"id":{"@type":"g:Int64","@value":920},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":919},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":308},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3344},"outV":{"@type":"g:Int32","@value":301},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4434},"outV":{"@type":"g:Int32","@value":302},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4432},"inV":{"@type":"g:Int32","@value":38},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4431},"inV":{"@type":"g:Int32","@value":295},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":921},"value":"BARBRY ALLEN"}],"songType":[{"id":{"@type":"g:Int64","@value":923},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":922},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":309},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3750},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4409},"outV":{"@type":"g:Int32","@value":271},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4956},"outV":{"@type":"g:Int32","@value":331},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3392},"inV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3393},"inV":{"@type":"g:Int32","@value":310},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3391},"inV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":924},"value":"SLOW TRAIN COMIN"}],"songType":[{"id":{"@type":"g:Int64","@value":926},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":925},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":310},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3393},"outV":{"@type":"g:Int32","@value":309},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6439},"outV":{"@type":"g:Int32","@value":284},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4408},"outV":{"@type":"g:Int32","@value":271},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6263},"inV":{"@type":"g:Int32","@value":165},"properties":{"weight":{"@type":"g:Int32","@value":3}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7698},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7697},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":927},"value":"JOEY"}],"songType":[{"id":{"@type":"g:Int64","@value":929},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":928},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":311},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3395},"outV":{"@type":"g:Int32","@value":77},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4461},"inV":{"@type":"g:Int32","@value":249},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7970},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7969},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":930},"value":"TOMORROW IS A LONG TIME"}],"songType":[{"id":{"@type":"g:Int64","@value":932},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":931},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":312},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6965},"outV":{"@type":"g:Int32","@value":84},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3430},"inV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7576},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7575},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":933},"value":"GET BACK"}],"songType":[{"id":{"@type":"g:Int64","@value":935},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":934},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":313},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3516},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6192},"inV":{"@type":"g:Int32","@value":263},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7792},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7791},"inV":{"@type":"g:Int32","@value":644}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":936},"value":"MY BABY LEFT ME"}],"songType":[{"id":{"@type":"g:Int64","@value":938},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":937},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":314},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3526},"outV":{"@type":"g:Int32","@value":223},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5932},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":939},"value":"STEP BACK"}],"songType":[{"id":{"@type":"g:Int64","@value":941},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":940},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":315},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3561},"outV":{"@type":"g:Int32","@value":56},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3742},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5429},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5430},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7568},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7567},"inV":{"@type":"g:Int32","@value":540}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":942},"value":"THE FROZEN LOGGER"}],"songType":[{"id":{"@type":"g:Int64","@value":944},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":943},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":316},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3643},"outV":{"@type":"g:Int32","@value":24},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5569},"inV":{"@type":"g:Int32","@value":80},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":945},"value":"SUGAR SHACK"}],"songType":[{"id":{"@type":"g:Int64","@value":947},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":946},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":317},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3702},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4225},"inV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7906},"inV":{"@type":"g:Int32","@value":574}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7905},"inV":{"@type":"g:Int32","@value":730}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":948},"value":"SIDEWALKS OF NEW YORK"}],"songType":[{"id":{"@type":"g:Int64","@value":950},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":949},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":318},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3708},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6437},"inV":{"@type":"g:Int32","@value":27},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":951},"value":"MOUNTAIN JAM"}],"songType":[{"id":{"@type":"g:Int64","@value":953},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":952},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":319},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6321},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":24}}},{"id":{"@type":"g:Int32","@value":3725},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6989},"outV":{"@type":"g:Int32","@value":175},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5902},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6302},"outV":{"@type":"g:Int32","@value":49},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6208},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6209},"inV":{"@type":"g:Int32","@value":125},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6210},"inV":{"@type":"g:Int32","@value":94},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6211},"inV":{"@type":"g:Int32","@value":181},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6212},"inV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6213},"inV":{"@type":"g:Int32","@value":33},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6214},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6215},"inV":{"@type":"g:Int32","@value":229},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6199},"inV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6200},"inV":{"@type":"g:Int32","@value":130},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6201},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Int32","@value":2}}},{"id":{"@type":"g:Int32","@value":6202},"inV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6203},"inV":{"@type":"g:Int32","@value":148},"properties":{"weight":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":6204},"inV":{"@type":"g:Int32","@value":83},"properties":{"weight":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":6205},"inV":{"@type":"g:Int32","@value":18},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6206},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":6207},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7806},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7805},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":954},"value":"NOBODYS FAULT BUT MINE"}],"songType":[{"id":{"@type":"g:Int64","@value":956},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":955},"value":{"@type":"g:Int32","@value":16}}]}}
-{"id":{"@type":"g:Int32","@value":320},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3737},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4010},"inV":{"@type":"g:Int32","@value":152},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7802},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7801},"inV":{"@type":"g:Int32","@value":669}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":957},"value":"NEW ORLEANS"}],"songType":[{"id":{"@type":"g:Int64","@value":959},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":958},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":321},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6627},"outV":{"@type":"g:Int32","@value":127},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":3753},"outV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5298},"inV":{"@type":"g:Int32","@value":160},"properties":{"weight":{"@type":"g:Int32","@value":2}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7474},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7473},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":960},"value":"BLACKBIRD"}],"songType":[{"id":{"@type":"g:Int64","@value":962},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":961},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":322},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3821},"outV":{"@type":"g:Int32","@value":88},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":3955},"inV":{"@type":"g:Int32","@value":124},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":963},"value":"DONT THINK TWICE ITS ALRIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":965},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":964},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":323},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5908},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4005},"inV":{"@type":"g:Int32","@value":134},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7750},"inV":{"@type":"g:Int32","@value":481}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7749},"inV":{"@type":"g:Int32","@value":481}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":966},"value":"LOVE THE ONE YOURE WITH"}],"songType":[{"id":{"@type":"g:Int64","@value":968},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":967},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":324},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5971},"outV":{"@type":"g:Int32","@value":50},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4223},"inV":{"@type":"g:Int32","@value":39},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7732},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7731},"inV":{"@type":"g:Int32","@value":458}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":969},"value":"LET IT ROCK"}],"songType":[{"id":{"@type":"g:Int64","@value":971},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":970},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":325},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6644},"outV":{"@type":"g:Int32","@value":256},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4224},"inV":{"@type":"g:Int32","@value":326},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7602},"inV":{"@type":"g:Int32","@value":462}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7601},"inV":{"@type":"g:Int32","@value":462}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":972},"value":"GREEN RIVER"}],"songType":[{"id":{"@type":"g:Int64","@value":974},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":973},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":326},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4224},"outV":{"@type":"g:Int32","@value":325},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5841},"inV":{"@type":"g:Int32","@value":194},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7446},"inV":{"@type":"g:Int32","@value":462}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7445},"inV":{"@type":"g:Int32","@value":462}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":975},"value":"BAD MOON RISING"}],"songType":[{"id":{"@type":"g:Int64","@value":977},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":976},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":327},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5883},"outV":{"@type":"g:Int32","@value":96},"properties":{"weight":{"@type":"g:Int32","@value":3}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4410},"inV":{"@type":"g:Int32","@value":25},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4411},"inV":{"@type":"g:Int32","@value":13},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4412},"inV":{"@type":"g:Int32","@value":62},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7202},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7201},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":978},"value":"IF I HAD THE WORLD TO GIVE"}],"songType":[{"id":{"@type":"g:Int64","@value":980},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":979},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":328},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4433},"outV":{"@type":"g:Int32","@value":302},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5516},"inV":{"@type":"g:Int32","@value":32},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":981},"value":"THE BOXER"}],"songType":[{"id":{"@type":"g:Int64","@value":983},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":982},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":329},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6377},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4456},"inV":{"@type":"g:Int32","@value":139},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":984},"value":"ROLLIN AND TUMBLIN"}],"songType":[{"id":{"@type":"g:Int64","@value":986},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":985},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":330},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7042},"outV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":4826},"outV":{"@type":"g:Int32","@value":114},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5696},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}},{"id":{"@type":"g:Int32","@value":5695},"inV":{"@type":"g:Int32","@value":266},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7946},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7945},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":987},"value":"TANGLED UP IN BLUE"}],"songType":[{"id":{"@type":"g:Int64","@value":989},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":988},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":331},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":7043},"outV":{"@type":"g:Int32","@value":269},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4956},"inV":{"@type":"g:Int32","@value":309},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7902},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7901},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":990},"value":"SHELTER FROM THE STORM"}],"songType":[{"id":{"@type":"g:Int64","@value":992},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":991},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":332},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6028},"outV":{"@type":"g:Int32","@value":204},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4957},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7622},"inV":{"@type":"g:Int32","@value":574}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7621},"inV":{"@type":"g:Int32","@value":573}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":993},"value":"HIDEAWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":995},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":994},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":333},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":4985},"outV":{"@type":"g:Int32","@value":30},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5536},"inV":{"@type":"g:Int32","@value":164},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":996},"value":"A MIND TO GIVE UP LIVIN"}],"songType":[{"id":{"@type":"g:Int64","@value":998},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":997},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":334},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6216},"outV":{"@type":"g:Int32","@value":337},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5135},"inV":{"@type":"g:Int32","@value":60},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7798},"inV":{"@type":"g:Int32","@value":501}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7797},"inV":{"@type":"g:Int32","@value":501}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":999},"value":"NEIGHBORHOOD GIRLS"}],"songType":[{"id":{"@type":"g:Int64","@value":1001},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1000},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":335},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6921},"outV":{"@type":"g:Int32","@value":133},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5421},"inV":{"@type":"g:Int32","@value":87},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7566},"inV":{"@type":"g:Int32","@value":539}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7565},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1002},"value":"FOREVER YOUNG"}],"songType":[{"id":{"@type":"g:Int64","@value":1004},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1003},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":336},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":5843},"outV":{"@type":"g:Int32","@value":61},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6217},"inV":{"@type":"g:Int32","@value":78},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7594},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7593},"inV":{"@type":"g:Int32","@value":557}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1005},"value":"GOODNIGHT IRENE"}],"songType":[{"id":{"@type":"g:Int64","@value":1007},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1006},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":337},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6128},"outV":{"@type":"g:Int32","@value":72},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6216},"inV":{"@type":"g:Int32","@value":334},"properties":{"weight":{"@type":"g:Int32","@value":1}}}],"sungBy":[{"id":{"@type":"g:Int32","@value":7504},"inV":{"@type":"g:Int32","@value":501}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7503},"inV":{"@type":"g:Int32","@value":500}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1008},"value":"CHINESE BONES"}],"songType":[{"id":{"@type":"g:Int64","@value":1010},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1009},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":338},"label":"song","inE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6347},"outV":{"@type":"g:Int32","@value":21},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"outE":{"followedBy":[{"id":{"@type":"g:Int32","@value":6438},"inV":{"@type":"g:Int32","@value":149},"properties":{"weight":{"@type":"g:Int32","@value":1}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1011},"value":"OTHER ONE JAM"}],"songType":[{"id":{"@type":"g:Int64","@value":1013},"value":""}],"performances":[{"id":{"@type":"g:Int64","@value":1012},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":339},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7408},"outV":{"@type":"g:Int32","@value":436}},{"id":{"@type":"g:Int32","@value":7204},"outV":{"@type":"g:Int32","@value":98}},{"id":{"@type":"g:Int32","@value":7146},"outV":{"@type":"g:Int32","@value":369}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7169},"outV":{"@type":"g:Int32","@value":154}},{"id":{"@type":"g:Int32","@value":7297},"outV":{"@type":"g:Int32","@value":410}},{"id":{"@type":"g:Int32","@value":7171},"outV":{"@type":"g:Int32","@value":104}},{"id":{"@type":"g:Int32","@value":7299},"outV":{"@type":"g:Int32","@value":411}},{"id":{"@type":"g:Int32","@value":7047},"outV":{"@type":"g:Int32","@value":65}},{"id":{"@type":"g:Int32","@value":7303},"outV":{"@type":"g:Int32","@value":222}},{"id":{"@type":"g:Int32","@value":7305},"outV":{"@type":"g:Int32","@value":413}},{"id":{"@type":"g:Int32","@value":7179},"outV":{"@type":"g:Int32","@value":379}},{"id":{"@type":"g:Int32","@value":7307},"outV":{"@type":"g:Int32","@value":51}},{"id":{"@type":"g:Int32","@value":7053},"outV":{"@type":"g:Int32","@value":73}},{"id":{"@type":"g:Int32","@value":7181},"outV":{"@type":"g:Int32","@value":49}},{"id":{"@type":"g:Int32","@value":7055},"outV":{"@type":"g:Int32","@value":346}},{"id":{"@type":"g:Int32","@value":7057},"outV":{"@type":"g:Int32","@value":140}},{"id":{"@type":"g:Int32","@value":7313},"outV":{"@type":"g:Int32","@value":414}},{"id":{"@type":"g:Int32","@value":7187},"outV":{"@type":"g:Int32","@value":215}},{"id":{"@type":"g:Int32","@value":7061},"outV":{"@type":"g:Int32","@value":232}},{"id":{"@type":"g:Int32","@value":7189},"outV":{"@type":"g:Int32","@value":9}},{"id":{"@type":"g:Int32","@value":7317},"outV":{"@type":"g:Int32","@value":37}},{"id":{"@type":"g:Int32","@value":7063},"outV":{"@type":"g:Int32","@value":4}},{"id":{"@type":"g:Int32","@value":7191},"outV":{"@type":"g:Int32","@value":63}},{"id":{"@type":"g:Int32","@value":7319},"outV":{"@type":"g:Int32","@value":82}},{"id":{"@type":"g:Int32","@value":7065},"outV":{"@type":"g:Int32","@value":150}},{"id":{"@type":"g:Int32","@value":7193},"outV":{"@type":"g:Int32","@value":382}},{"id":{"@type":"g:Int32","@value":7321},"outV":{"@type":"g:Int32","@value":84}},{"id":{"@type":"g:Int32","@value":7067},"outV":{"@type":"g:Int32","@value":349}},{"id":{"@type":"g:Int32","@value":7323},"outV":{"@type":"g:Int32","@value":69}},{"id":{"@type":"g:Int32","@value":7069},"outV":{"@type":"g:Int32","@value":125}},{"id":{"@type":"g:Int32","@value":7327},"outV":{"@type":"g:Int32","@value":137}},{"id":{"@type":"g:Int32","@value":7201},"outV":{"@type":"g:Int32","@value":327}},{"id":{"@type":"g:Int32","@value":7075},"outV":{"@type":"g:Int32","@value":159}},{"id":{"@type":"g:Int32","@value":7203},"outV":{"@type":"g:Int32","@value":98}},{"id":{"@type":"g:Int32","@value":7331},"outV":{"@type":"g:Int32","@value":105}},{"id":{"@type":"g:Int32","@value":7079},"outV":{"@type":"g:Int32","@value":46}},{"id":{"@type":"g:Int32","@value":7207},"outV":{"@type":"g:Int32","@value":50}},{"id":{"@type":"g:Int32","@value":7081},"outV":{"@type":"g:Int32","@value":160}},{"id":{"@type":"g:Int32","@value":7337},"outV":{"@type":"g:Int32","@value":92}},{"id":{"@type":"g:Int32","@value":7083},"outV":{"@type":"g:Int32","@value":100}},{"id":{"@type":"g:Int32","@value":7339},"outV":{"@type":"g:Int32","@value":94}},{"id":{"@type":"g:Int32","@value":7085},"outV":{"@type":"g:Int32","@value":168}},{"id":{"@type":"g:Int32","@value":7213},"outV":{"@type":"g:Int32","@value":386}},{"id":{"@type":"g:Int32","@value":7089},"outV":{"@type":"g:Int32","@value":48}},{"id":{"@type":"g:Int32","@value":7217},"outV":{"@type":"g:Int32","@value":389}},{"id":{"@type":"g:Int32","@value":7345},"outV":{"@type":"g:Int32","@value":59}},{"id":{"@type":"g:Int32","@value":7091},"outV":{"@type":"g:Int32","@value":122}},{"id":{"@type":"g:Int32","@value":7221},"outV":{"@type":"g:Int32","@value":390}},{"id":{"@type":"g:Int32","@value":7223},"outV":{"@type":"g:Int32","@value":195}},{"id":{"@type":"g:Int32","@value":7099},"outV":{"@type":"g:Int32","@value":19}},{"id":{"@type":"g:Int32","@value":7227},"outV":{"@type":"g:Int32","@value":236}},{"id":{"@type":"g:Int32","@value":7355},"outV":{"@type":"g:Int32","@value":420}},{"id":{"@type":"g:Int32","@value":7101},"outV":{"@type":"g:Int32","@value":129}},{"id":{"@type":"g:Int32","@value":7359},"outV":{"@type":"g:Int32","@value":91}},{"id":{"@type":"g:Int32","@value":7105},"outV":{"@type":"g:Int32","@value":357}},{"id":{"@type":"g:Int32","@value":7233},"outV":{"@type":"g:Int32","@value":202}},{"id":{"@type":"g:Int32","@value":7107},"outV":{"@type":"g:Int32","@value":141}},{"id":{"@type":"g:Int32","@value":7235},"outV":{"@type":"g:Int32","@value":56}},{"id":{"@type":"g:Int32","@value":7363},"outV":{"@type":"g:Int32","@value":17}},{"id":{"@type":"g:Int32","@value":7109},"outV":{"@type":"g:Int32","@value":358}},{"id":{"@type":"g:Int32","@value":7111},"outV":{"@type":"g:Int32","@value":360}},{"id":{"@type":"g:Int32","@value":7239},"outV":{"@type":"g:Int32","@value":393}},{"id":{"@type":"g:Int32","@value":7113},"outV":{"@type":"g:Int32","@value":60}},{"id":{"@type":"g:Int32","@value":7369},"outV":{"@type":"g:Int32","@value":425}},{"id":{"@type":"g:Int32","@value":7371},"outV":{"@type":"g:Int32","@value":170}},{"id":{"@type":"g:Int32","@value":7245},"outV":{"@type":"g:Int32","@value":99}},{"id":{"@type":"g:Int32","@value":7119},"outV":{"@type":"g:Int32","@value":39}},{"id":{"@type":"g:Int32","@value":7375},"outV":{"@type":"g:Int32","@value":87}},{"id":{"@type":"g:Int32","@value":7121},"outV":{"@type":"g:Int32","@value":89}},{"id":{"@type":"g:Int32","@value":7377},"outV":{"@type":"g:Int32","@value":21}},{"id":{"@type":"g:Int32","@value":7123},"outV":{"@type":"g:Int32","@value":363}},{"id":{"@type":"g:Int32","@value":7251},"outV":{"@type":"g:Int32","@value":294}},{"id":{"@type":"g:Int32","@value":7379},"outV":{"@type":"g:Int32","@value":193}},{"id":{"@type":"g:Int32","@value":7125},"outV":{"@type":"g:Int32","@value":57}},{"id":{"@type":"g:Int32","@value":7253},"outV":{"@type":"g:Int32","@value":259}},{"id":{"@type":"g:Int32","@value":7127},"outV":{"@type":"g:Int32","@value":80}},{"id":{"@type":"g:Int32","@value":7255},"outV":{"@type":"g:Int32","@value":205}},{"id":{"@type":"g:Int32","@value":7383},"outV":{"@type":"g:Int32","@value":74}},{"id":{"@type":"g:Int32","@value":7129},"outV":{"@type":"g:Int32","@value":364}},{"id":{"@type":"g:Int32","@value":7261},"outV":{"@type":"g:Int32","@value":398}},{"id":{"@type":"g:Int32","@value":7135},"outV":{"@type":"g:Int32","@value":108}},{"id":{"@type":"g:Int32","@value":7391},"outV":{"@type":"g:Int32","@value":52}},{"id":{"@type":"g:Int32","@value":7393},"outV":{"@type":"g:Int32","@value":172}},{"id":{"@type":"g:Int32","@value":7395},"outV":{"@type":"g:Int32","@value":35}},{"id":{"@type":"g:Int32","@value":7271},"outV":{"@type":"g:Int32","@value":175}},{"id":{"@type":"g:Int32","@value":7145},"outV":{"@type":"g:Int32","@value":369}},{"id":{"@type":"g:Int32","@value":7147},"outV":{"@type":"g:Int32","@value":281}},{"id":{"@type":"g:Int32","@value":7403},"outV":{"@type":"g:Int32","@value":435}},{"id":{"@type":"g:Int32","@value":7405},"outV":{"@type":"g:Int32","@value":130}},{"id":{"@type":"g:Int32","@value":7407},"outV":{"@type":"g:Int32","@value":436}},{"id":{"@type":"g:Int32","@value":7409},"outV":{"@type":"g:Int32","@value":437}},{"id":{"@type":"g:Int32","@value":7411},"outV":{"@type":"g:Int32","@value":134}},{"id":{"@type":"g:Int32","@value":7157},"outV":{"@type":"g:Int32","@value":83}},{"id":{"@type":"g:Int32","@value":7413},"outV":{"@type":"g:Int32","@value":75}},{"id":{"@type":"g:Int32","@value":7163},"outV":{"@type":"g:Int32","@value":171}},{"id":{"@type":"g:Int32","@value":7291},"outV":{"@type":"g:Int32","@value":13}},{"id":{"@type":"g:Int32","@value":7165},"outV":{"@type":"g:Int32","@value":81}},{"id":{"@type":"g:Int32","@value":7167},"outV":{"@type":"g:Int32","@value":374}},{"id":{"@type":"g:Int32","@value":7295},"outV":{"@type":"g:Int32","@value":27}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1014},"value":"Hunter"}]}}
-{"id":{"@type":"g:Int32","@value":340},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7936},"outV":{"@type":"g:Int32","@value":747}},{"id":{"@type":"g:Int32","@value":7426},"outV":{"@type":"g:Int32","@value":445}},{"id":{"@type":"g:Int32","@value":7682},"outV":{"@type":"g:Int32","@value":612}},{"id":{"@type":"g:Int32","@value":7938},"outV":{"@type":"g:Int32","@value":228}},{"id":{"@type":"g:Int32","@value":7940},"outV":{"@type":"g:Int32","@value":750}},{"id":{"@type":"g:Int32","@value":7942},"outV":{"@type":"g:Int32","@value":752}},{"id":{"@type":"g:Int32","@value":7688},"outV":{"@type":"g:Int32","@value":616}},{"id":{"@type":"g:Int32","@value":7182},"outV":{"@type":"g:Int32","@value":49}},{"id":{"@type":"g:Int32","@value":7950},"outV":{"@type":"g:Int32","@value":756}},{"id":{"@type":"g:Int32","@value":7696},"outV":{"@type":"g:Int32","@value":620}},{"id":{"@type":"g:Int32","@value":7954},"outV":{"@type":"g:Int32","@value":139}},{"id":{"@type":"g:Int32","@value":7188},"outV":{"@type":"g:Int32","@value":215}},{"id":{"@type":"g:Int32","@value":7956},"outV":{"@type":"g:Int32","@value":759}},{"id":{"@type":"g:Int32","@value":7190},"outV":{"@type":"g:Int32","@value":9}},{"id":{"@type":"g:Int32","@value":7958},"outV":{"@type":"g:Int32","@value":761}},{"id":{"@type":"g:Int32","@value":7192},"outV":{"@type":"g:Int32","@value":63}},{"id":{"@type":"g:Int32","@value":7448},"outV":{"@type":"g:Int32","@value":463}},{"id":{"@type":"g:Int32","@value":7964},"outV":{"@type":"g:Int32","@value":766}},{"id":{"@type":"g:Int32","@value":7968},"outV":{"@type":"g:Int32","@value":768}},{"id":{"@type":"g:Int32","@value":7202},"outV":{"@type":"g:Int32","@value":327}},{"id":{"@type":"g:Int32","@value":7462},"outV":{"@type":"g:Int32","@value":472}},{"id":{"@type":"g:Int32","@value":7720},"outV":{"@type":"g:Int32","@value":204}},{"id":{"@type":"g:Int32","@value":7976},"outV":{"@type":"g:Int32","@value":770}},{"id":{"@type":"g:Int32","@value":7722},"outV":{"@type":"g:Int32","@value":144}},{"id":{"@type":"g:Int32","@value":7214},"outV":{"@type":"g:Int32","@value":386}},{"id":{"@type":"g:Int32","@value":7470},"outV":{"@type":"g:Int32","@value":53}},{"id":{"@type":"g:Int32","@value":7218},"outV":{"@type":"g:Int32","@value":389}},{"id":{"@type":"g:Int32","@value":7732},"outV":{"@type":"g:Int32","@value":324}},{"id":{"@type":"g:Int32","@value":7222},"outV":{"@type":"g:Int32","@value":390}},{"id":{"@type":"g:Int32","@value":7480},"outV":{"@type":"g:Int32","@value":485}},{"id":{"@type":"g:Int32","@value":7992},"outV":{"@type":"g:Int32","@value":66}},{"id":{"@type":"g:Int32","@value":7738},"outV":{"@type":"g:Int32","@value":220}},{"id":{"@type":"g:Int32","@value":7228},"outV":{"@type":"g:Int32","@value":236}},{"id":{"@type":"g:Int32","@value":7234},"outV":{"@type":"g:Int32","@value":202}},{"id":{"@type":"g:Int32","@value":7236},"outV":{"@type":"g:Int32","@value":56}},{"id":{"@type":"g:Int32","@value":7494},"outV":{"@type":"g:Int32","@value":156}},{"id":{"@type":"g:Int32","@value":7754},"outV":{"@type":"g:Int32","@value":647}},{"id":{"@type":"g:Int32","@value":7246},"outV":{"@type":"g:Int32","@value":99}},{"id":{"@type":"g:Int32","@value":8014},"outV":{"@type":"g:Int32","@value":214}},{"id":{"@type":"g:Int32","@value":7506},"outV":{"@type":"g:Int32","@value":78}},{"id":{"@type":"g:Int32","@value":7252},"outV":{"@type":"g:Int32","@value":294}},{"id":{"@type":"g:Int32","@value":7254},"outV":{"@type":"g:Int32","@value":259}},{"id":{"@type":"g:Int32","@value":8022},"outV":{"@type":"g:Int32","@value":794}},{"id":{"@type":"g:Int32","@value":7514},"outV":{"@type":"g:Int32","@value":506}},{"id":{"@type":"g:Int32","@value":7772},"outV":{"@type":"g:Int32","@value":656}},{"id":{"@type":"g:Int32","@value":7262},"outV":{"@type":"g:Int32","@value":398}},{"id":{"@type":"g:Int32","@value":7524},"outV":{"@type":"g:Int32","@value":135}},{"id":{"@type":"g:Int32","@value":7780},"outV":{"@type":"g:Int32","@value":661}},{"id":{"@type":"g:Int32","@value":7526},"outV":{"@type":"g:Int32","@value":512}},{"id":{"@type":"g:Int32","@value":7272},"outV":{"@type":"g:Int32","@value":175}},{"id":{"@type":"g:Int32","@value":7528},"outV":{"@type":"g:Int32","@value":180}},{"id":{"@type":"g:Int32","@value":8040},"outV":{"@type":"g:Int32","@value":802}},{"id":{"@type":"g:Int32","@value":7786},"outV":{"@type":"g:Int32","@value":127}},{"id":{"@type":"g:Int32","@value":7790},"outV":{"@type":"g:Int32","@value":664}},{"id":{"@type":"g:Int32","@value":8046},"outV":{"@type":"g:Int32","@value":235}},{"id":{"@type":"g:Int32","@value":7536},"outV":{"@type":"g:Int32","@value":72}},{"id":{"@type":"g:Int32","@value":7792},"outV":{"@type":"g:Int32","@value":313}},{"id":{"@type":"g:Int32","@value":7796},"outV":{"@type":"g:Int32","@value":667}},{"id":{"@type":"g:Int32","@value":7544},"outV":{"@type":"g:Int32","@value":365}},{"id":{"@type":"g:Int32","@value":7546},"outV":{"@type":"g:Int32","@value":521}},{"id":{"@type":"g:Int32","@value":7806},"outV":{"@type":"g:Int32","@value":319}},{"id":{"@type":"g:Int32","@value":7296},"outV":{"@type":"g:Int32","@value":27}},{"id":{"@type":"g:Int32","@value":7300},"outV":{"@type":"g:Int32","@value":411}},{"id":{"@type":"g:Int32","@value":7812},"outV":{"@type":"g:Int32","@value":199}},{"id":{"@type":"g:Int32","@value":7048},"outV":{"@type":"g:Int32","@value":65}},{"id":{"@type":"g:Int32","@value":7304},"outV":{"@type":"g:Int32","@value":222}},{"id":{"@type":"g:Int32","@value":7306},"outV":{"@type":"g:Int32","@value":413}},{"id":{"@type":"g:Int32","@value":7308},"outV":{"@type":"g:Int32","@value":51}},{"id":{"@type":"g:Int32","@value":7054},"outV":{"@type":"g:Int32","@value":73}},{"id":{"@type":"g:Int32","@value":7824},"outV":{"@type":"g:Int32","@value":680}},{"id":{"@type":"g:Int32","@value":7058},"outV":{"@type":"g:Int32","@value":140}},{"id":{"@type":"g:Int32","@value":7572},"outV":{"@type":"g:Int32","@value":543}},{"id":{"@type":"g:Int32","@value":7828},"outV":{"@type":"g:Int32","@value":684}},{"id":{"@type":"g:Int32","@value":7062},"outV":{"@type":"g:Int32","@value":232}},{"id":{"@type":"g:Int32","@value":7830},"outV":{"@type":"g:Int32","@value":685}},{"id":{"@type":"g:Int32","@value":7064},"outV":{"@type":"g:Int32","@value":4}},{"id":{"@type":"g:Int32","@value":7320},"outV":{"@type":"g:Int32","@value":82}},{"id":{"@type":"g:Int32","@value":7066},"outV":{"@type":"g:Int32","@value":150}},{"id":{"@type":"g:Int32","@value":7322},"outV":{"@type":"g:Int32","@value":84}},{"id":{"@type":"g:Int32","@value":7068},"outV":{"@type":"g:Int32","@value":349}},{"id":{"@type":"g:Int32","@value":7324},"outV":{"@type":"g:Int32","@value":69}},{"id":{"@type":"g:Int32","@value":7070},"outV":{"@type":"g:Int32","@value":125}},{"id":{"@type":"g:Int32","@value":7582},"outV":{"@type":"g:Int32","@value":5}},{"id":{"@type":"g:Int32","@value":7838},"outV":{"@type":"g:Int32","@value":692}},{"id":{"@type":"g:Int32","@value":7328},"outV":{"@type":"g:Int32","@value":137}},{"id":{"@type":"g:Int32","@value":7076},"outV":{"@type":"g:Int32","@value":159}},{"id":{"@type":"g:Int32","@value":7332},"outV":{"@type":"g:Int32","@value":105}},{"id":{"@type":"g:Int32","@value":7082},"outV":{"@type":"g:Int32","@value":160}},{"id":{"@type":"g:Int32","@value":7338},"outV":{"@type":"g:Int32","@value":92}},{"id":{"@type":"g:Int32","@value":7594},"outV":{"@type":"g:Int32","@value":336}},{"id":{"@type":"g:Int32","@value":7084},"outV":{"@type":"g:Int32","@value":100}},{"id":{"@type":"g:Int32","@value":7340},"outV":{"@type":"g:Int32","@value":94}},{"id":{"@type":"g:Int32","@value":7086},"outV":{"@type":"g:Int32","@value":168}},{"id":{"@type":"g:Int32","@value":7090},"outV":{"@type":"g:Int32","@value":48}},{"id":{"@type":"g:Int32","@value":7346},"outV":{"@type":"g:Int32","@value":59}},{"id":{"@type":"g:Int32","@value":7092},"outV":{"@type":"g:Int32","@value":122}},{"id":{"@type":"g:Int32","@value":7606},"outV":{"@type":"g:Int32","@value":563}},{"id":{"@type":"g:Int32","@value":7862},"outV":{"@type":"g:Int32","@value":211}},{"id":{"@type":"g:Int32","@value":7866},"outV":{"@type":"g:Int32","@value":705}},{"id":{"@type":"g:Int32","@value":7100},"outV":{"@type":"g:Int32","@value":19}},{"id":{"@type":"g:Int32","@value":7356},"outV":{"@type":"g:Int32","@value":420}},{"id":{"@type":"g:Int32","@value":7612},"outV":{"@type":"g:Int32","@value":1}},{"id":{"@type":"g:Int32","@value":7102},"outV":{"@type":"g:Int32","@value":129}},{"id":{"@type":"g:Int32","@value":7360},"outV":{"@type":"g:Int32","@value":91}},{"id":{"@type":"g:Int32","@value":7616},"outV":{"@type":"g:Int32","@value":568}},{"id":{"@type":"g:Int32","@value":7874},"outV":{"@type":"g:Int32","@value":711}},{"id":{"@type":"g:Int32","@value":7108},"outV":{"@type":"g:Int32","@value":141}},{"id":{"@type":"g:Int32","@value":7364},"outV":{"@type":"g:Int32","@value":17}},{"id":{"@type":"g:Int32","@value":7620},"outV":{"@type":"g:Int32","@value":571}},{"id":{"@type":"g:Int32","@value":7876},"outV":{"@type":"g:Int32","@value":713}},{"id":{"@type":"g:Int32","@value":7878},"outV":{"@type":"g:Int32","@value":715}},{"id":{"@type":"g:Int32","@value":7112},"outV":{"@type":"g:Int32","@value":360}},{"id":{"@type":"g:Int32","@value":7114},"outV":{"@type":"g:Int32","@value":60}},{"id":{"@type":"g:Int32","@value":7370},"outV":{"@type":"g:Int32","@value":425}},{"id":{"@type":"g:Int32","@value":7626},"outV":{"@type":"g:Int32","@value":576}},{"id":{"@type":"g:Int32","@value":7116},"outV":{"@type":"g:Int32","@value":361}},{"id":{"@type":"g:Int32","@value":7372},"outV":{"@type":"g:Int32","@value":170}},{"id":{"@type":"g:Int32","@value":7628},"outV":{"@type":"g:Int32","@value":247}},{"id":{"@type":"g:Int32","@value":7118},"outV":{"@type":"g:Int32","@value":278}},{"id":{"@type":"g:Int32","@value":7630},"outV":{"@type":"g:Int32","@value":578}},{"id":{"@type":"g:Int32","@value":7376},"outV":{"@type":"g:Int32","@value":87}},{"id":{"@type":"g:Int32","@value":7122},"outV":{"@type":"g:Int32","@value":89}},{"id":{"@type":"g:Int32","@value":7124},"outV":{"@type":"g:Int32","@value":363}},{"id":{"@type":"g:Int32","@value":7380},"outV":{"@type":"g:Int32","@value":193}},{"id":{"@type":"g:Int32","@value":7636},"outV":{"@type":"g:Int32","@value":216}},{"id":{"@type":"g:Int32","@value":7126},"outV":{"@type":"g:Int32","@value":57}},{"id":{"@type":"g:Int32","@value":7128},"outV":{"@type":"g:Int32","@value":80}},{"id":{"@type":"g:Int32","@value":7384},"outV":{"@type":"g:Int32","@value":74}},{"id":{"@type":"g:Int32","@value":7130},"outV":{"@type":"g:Int32","@value":364}},{"id":{"@type":"g:Int32","@value":7644},"outV":{"@type":"g:Int32","@value":589}},{"id":{"@type":"g:Int32","@value":7136},"outV":{"@type":"g:Int32","@value":108}},{"id":{"@type":"g:Int32","@value":7392},"outV":{"@type":"g:Int32","@value":52}},{"id":{"@type":"g:Int32","@value":7648},"outV":{"@type":"g:Int32","@value":590}},{"id":{"@type":"g:Int32","@value":7650},"outV":{"@type":"g:Int32","@value":258}},{"id":{"@type":"g:Int32","@value":7654},"outV":{"@type":"g:Int32","@value":593}},{"id":{"@type":"g:Int32","@value":7912},"outV":{"@type":"g:Int32","@value":206}},{"id":{"@type":"g:Int32","@value":7914},"outV":{"@type":"g:Int32","@value":733}},{"id":{"@type":"g:Int32","@value":7404},"outV":{"@type":"g:Int32","@value":435}},{"id":{"@type":"g:Int32","@value":7406},"outV":{"@type":"g:Int32","@value":130}},{"id":{"@type":"g:Int32","@value":7410},"outV":{"@type":"g:Int32","@value":437}},{"id":{"@type":"g:Int32","@value":7668},"outV":{"@type":"g:Int32","@value":603}},{"id":{"@type":"g:Int32","@value":7158},"outV":{"@type":"g:Int32","@value":83}},{"id":{"@type":"g:Int32","@value":7414},"outV":{"@type":"g:Int32","@value":75}},{"id":{"@type":"g:Int32","@value":7674},"outV":{"@type":"g:Int32","@value":62}},{"id":{"@type":"g:Int32","@value":7676},"outV":{"@type":"g:Int32","@value":607}},{"id":{"@type":"g:Int32","@value":7166},"outV":{"@type":"g:Int32","@value":81}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7115},"outV":{"@type":"g:Int32","@value":361}},{"id":{"@type":"g:Int32","@value":7117},"outV":{"@type":"g:Int32","@value":278}},{"id":{"@type":"g:Int32","@value":7087},"outV":{"@type":"g:Int32","@value":355}},{"id":{"@type":"g:Int32","@value":7279},"outV":{"@type":"g:Int32","@value":403}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1015},"value":"Garcia"}]}}
-{"id":{"@type":"g:Int32","@value":341},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7050},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7049},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1016},"value":"ALICE D MILLIONAIRE"}],"songType":[{"id":{"@type":"g:Int64","@value":1018},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1017},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":342},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7138},"outV":{"@type":"g:Int32","@value":96}},{"id":{"@type":"g:Int32","@value":7206},"outV":{"@type":"g:Int32","@value":123}},{"id":{"@type":"g:Int32","@value":7336},"outV":{"@type":"g:Int32","@value":417}},{"id":{"@type":"g:Int32","@value":7050},"outV":{"@type":"g:Int32","@value":341}},{"id":{"@type":"g:Int32","@value":7178},"outV":{"@type":"g:Int32","@value":378}},{"id":{"@type":"g:Int32","@value":7212},"outV":{"@type":"g:Int32","@value":385}},{"id":{"@type":"g:Int32","@value":7088},"outV":{"@type":"g:Int32","@value":355}},{"id":{"@type":"g:Int32","@value":7280},"outV":{"@type":"g:Int32","@value":403}},{"id":{"@type":"g:Int32","@value":7250},"outV":{"@type":"g:Int32","@value":296}},{"id":{"@type":"g:Int32","@value":7060},"outV":{"@type":"g:Int32","@value":348}},{"id":{"@type":"g:Int32","@value":7286},"outV":{"@type":"g:Int32","@value":406}},{"id":{"@type":"g:Int32","@value":7096},"outV":{"@type":"g:Int32","@value":145}},{"id":{"@type":"g:Int32","@value":7416},"outV":{"@type":"g:Int32","@value":438}},{"id":{"@type":"g:Int32","@value":7418},"outV":{"@type":"g:Int32","@value":439}},{"id":{"@type":"g:Int32","@value":7260},"outV":{"@type":"g:Int32","@value":397}},{"id":{"@type":"g:Int32","@value":7134},"outV":{"@type":"g:Int32","@value":365}},{"id":{"@type":"g:Int32","@value":7326},"outV":{"@type":"g:Int32","@value":288}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7137},"outV":{"@type":"g:Int32","@value":96}},{"id":{"@type":"g:Int32","@value":7329},"outV":{"@type":"g:Int32","@value":149}},{"id":{"@type":"g:Int32","@value":7335},"outV":{"@type":"g:Int32","@value":417}},{"id":{"@type":"g:Int32","@value":7049},"outV":{"@type":"g:Int32","@value":341}},{"id":{"@type":"g:Int32","@value":7177},"outV":{"@type":"g:Int32","@value":378}},{"id":{"@type":"g:Int32","@value":7211},"outV":{"@type":"g:Int32","@value":385}},{"id":{"@type":"g:Int32","@value":7249},"outV":{"@type":"g:Int32","@value":296}},{"id":{"@type":"g:Int32","@value":7059},"outV":{"@type":"g:Int32","@value":348}},{"id":{"@type":"g:Int32","@value":7285},"outV":{"@type":"g:Int32","@value":406}},{"id":{"@type":"g:Int32","@value":7095},"outV":{"@type":"g:Int32","@value":145}},{"id":{"@type":"g:Int32","@value":7415},"outV":{"@type":"g:Int32","@value":438}},{"id":{"@type":"g:Int32","@value":7417},"outV":{"@type":"g:Int32","@value":439}},{"id":{"@type":"g:Int32","@value":7259},"outV":{"@type":"g:Int32","@value":397}},{"id":{"@type":"g:Int32","@value":7133},"outV":{"@type":"g:Int32","@value":365}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1019},"value":"Grateful_Dead"}]}}
-{"id":{"@type":"g:Int32","@value":343},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7052},"inV":{"@type":"g:Int32","@value":345}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7051},"inV":{"@type":"g:Int32","@value":344}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1020},"value":"ALLIGATOR"}],"songType":[{"id":{"@type":"g:Int64","@value":1022},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1021},"value":{"@type":"g:Int32","@value":63}}]}}
-{"id":{"@type":"g:Int32","@value":344},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7051},"outV":{"@type":"g:Int32","@value":343}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1023},"value":"Hunter_Pigpen"}]}}
-{"id":{"@type":"g:Int32","@value":345},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7052},"outV":{"@type":"g:Int32","@value":343}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1024},"value":"Lesh_Pigpen"}]}}
-{"id":{"@type":"g:Int32","@value":346},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7056},"inV":{"@type":"g:Int32","@value":347}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7055},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1025},"value":"AT A SIDING"}],"songType":[{"id":{"@type":"g:Int64","@value":1027},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1026},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":347},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7056},"outV":{"@type":"g:Int32","@value":346}},{"id":{"@type":"g:Int32","@value":7164},"outV":{"@type":"g:Int32","@value":171}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1028},"value":"Hart"}]}}
-{"id":{"@type":"g:Int32","@value":348},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7060},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7059},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1029},"value":"BARBED WIRE WHIPPING PARTY"}],"songType":[{"id":{"@type":"g:Int64","@value":1031},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1030},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":349},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7068},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7067},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1032},"value":"BLACK MUDDY RIVER"}],"songType":[{"id":{"@type":"g:Int64","@value":1034},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1033},"value":{"@type":"g:Int32","@value":66}}]}}
-{"id":{"@type":"g:Int32","@value":350},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7237},"outV":{"@type":"g:Int32","@value":181}},{"id":{"@type":"g:Int32","@value":7365},"outV":{"@type":"g:Int32","@value":424}},{"id":{"@type":"g:Int32","@value":7175},"outV":{"@type":"g:Int32","@value":221}},{"id":{"@type":"g:Int32","@value":7367},"outV":{"@type":"g:Int32","@value":29}},{"id":{"@type":"g:Int32","@value":7243},"outV":{"@type":"g:Int32","@value":24}},{"id":{"@type":"g:Int32","@value":7311},"outV":{"@type":"g:Int32","@value":36}},{"id":{"@type":"g:Int32","@value":7185},"outV":{"@type":"g:Int32","@value":64}},{"id":{"@type":"g:Int32","@value":7315},"outV":{"@type":"g:Int32","@value":240}},{"id":{"@type":"g:Int32","@value":7257},"outV":{"@type":"g:Int32","@value":290}},{"id":{"@type":"g:Int32","@value":7195},"outV":{"@type":"g:Int32","@value":70}},{"id":{"@type":"g:Int32","@value":7197},"outV":{"@type":"g:Int32","@value":231}},{"id":{"@type":"g:Int32","@value":7389},"outV":{"@type":"g:Int32","@value":429}},{"id":{"@type":"g:Int32","@value":7071},"outV":{"@type":"g:Int32","@value":11}},{"id":{"@type":"g:Int32","@value":7263},"outV":{"@type":"g:Int32","@value":103}},{"id":{"@type":"g:Int32","@value":7073},"outV":{"@type":"g:Int32","@value":167}},{"id":{"@type":"g:Int32","@value":7265},"outV":{"@type":"g:Int32","@value":97}},{"id":{"@type":"g:Int32","@value":7139},"outV":{"@type":"g:Int32","@value":366}},{"id":{"@type":"g:Int32","@value":7397},"outV":{"@type":"g:Int32","@value":431}},{"id":{"@type":"g:Int32","@value":7143},"outV":{"@type":"g:Int32","@value":189}},{"id":{"@type":"g:Int32","@value":7209},"outV":{"@type":"g:Int32","@value":118}},{"id":{"@type":"g:Int32","@value":7153},"outV":{"@type":"g:Int32","@value":85}},{"id":{"@type":"g:Int32","@value":7219},"outV":{"@type":"g:Int32","@value":121}},{"id":{"@type":"g:Int32","@value":7093},"outV":{"@type":"g:Int32","@value":68}},{"id":{"@type":"g:Int32","@value":7351},"outV":{"@type":"g:Int32","@value":184}},{"id":{"@type":"g:Int32","@value":7161},"outV":{"@type":"g:Int32","@value":38}},{"id":{"@type":"g:Int32","@value":7225},"outV":{"@type":"g:Int32","@value":101}},{"id":{"@type":"g:Int32","@value":7289},"outV":{"@type":"g:Int32","@value":79}},{"id":{"@type":"g:Int32","@value":7231},"outV":{"@type":"g:Int32","@value":14}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1035},"value":"Barlow"}]}}
-{"id":{"@type":"g:Int32","@value":351},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7168},"outV":{"@type":"g:Int32","@value":374}},{"id":{"@type":"g:Int32","@value":7424},"outV":{"@type":"g:Int32","@value":443}},{"id":{"@type":"g:Int32","@value":7428},"outV":{"@type":"g:Int32","@value":165}},{"id":{"@type":"g:Int32","@value":7430},"outV":{"@type":"g:Int32","@value":448}},{"id":{"@type":"g:Int32","@value":7944},"outV":{"@type":"g:Int32","@value":272}},{"id":{"@type":"g:Int32","@value":7184},"outV":{"@type":"g:Int32","@value":209}},{"id":{"@type":"g:Int32","@value":7440},"outV":{"@type":"g:Int32","@value":25}},{"id":{"@type":"g:Int32","@value":7704},"outV":{"@type":"g:Int32","@value":166}},{"id":{"@type":"g:Int32","@value":7194},"outV":{"@type":"g:Int32","@value":382}},{"id":{"@type":"g:Int32","@value":7196},"outV":{"@type":"g:Int32","@value":70}},{"id":{"@type":"g:Int32","@value":7452},"outV":{"@type":"g:Int32","@value":269}},{"id":{"@type":"g:Int32","@value":7710},"outV":{"@type":"g:Int32","@value":244}},{"id":{"@type":"g:Int32","@value":7714},"outV":{"@type":"g:Int32","@value":298}},{"id":{"@type":"g:Int32","@value":7460},"outV":{"@type":"g:Int32","@value":10}},{"id":{"@type":"g:Int32","@value":7208},"outV":{"@type":"g:Int32","@value":50}},{"id":{"@type":"g:Int32","@value":7472},"outV":{"@type":"g:Int32","@value":15}},{"id":{"@type":"g:Int32","@value":7474},"outV":{"@type":"g:Int32","@value":321}},{"id":{"@type":"g:Int32","@value":7730},"outV":{"@type":"g:Int32","@value":634}},{"id":{"@type":"g:Int32","@value":7220},"outV":{"@type":"g:Int32","@value":121}},{"id":{"@type":"g:Int32","@value":7734},"outV":{"@type":"g:Int32","@value":636}},{"id":{"@type":"g:Int32","@value":7226},"outV":{"@type":"g:Int32","@value":101}},{"id":{"@type":"g:Int32","@value":7994},"outV":{"@type":"g:Int32","@value":780}},{"id":{"@type":"g:Int32","@value":7996},"outV":{"@type":"g:Int32","@value":782}},{"id":{"@type":"g:Int32","@value":7230},"outV":{"@type":"g:Int32","@value":392}},{"id":{"@type":"g:Int32","@value":7742},"outV":{"@type":"g:Int32","@value":639}},{"id":{"@type":"g:Int32","@value":7232},"outV":{"@type":"g:Int32","@value":14}},{"id":{"@type":"g:Int32","@value":8002},"outV":{"@type":"g:Int32","@value":786}},{"id":{"@type":"g:Int32","@value":7492},"outV":{"@type":"g:Int32","@value":492}},{"id":{"@type":"g:Int32","@value":8004},"outV":{"@type":"g:Int32","@value":31}},{"id":{"@type":"g:Int32","@value":7238},"outV":{"@type":"g:Int32","@value":181}},{"id":{"@type":"g:Int32","@value":7496},"outV":{"@type":"g:Int32","@value":494}},{"id":{"@type":"g:Int32","@value":7244},"outV":{"@type":"g:Int32","@value":24}},{"id":{"@type":"g:Int32","@value":7762},"outV":{"@type":"g:Int32","@value":112}},{"id":{"@type":"g:Int32","@value":8020},"outV":{"@type":"g:Int32","@value":117}},{"id":{"@type":"g:Int32","@value":7512},"outV":{"@type":"g:Int32","@value":504}},{"id":{"@type":"g:Int32","@value":7258},"outV":{"@type":"g:Int32","@value":290}},{"id":{"@type":"g:Int32","@value":7516},"outV":{"@type":"g:Int32","@value":198}},{"id":{"@type":"g:Int32","@value":7774},"outV":{"@type":"g:Int32","@value":22}},{"id":{"@type":"g:Int32","@value":7264},"outV":{"@type":"g:Int32","@value":103}},{"id":{"@type":"g:Int32","@value":7776},"outV":{"@type":"g:Int32","@value":12}},{"id":{"@type":"g:Int32","@value":7266},"outV":{"@type":"g:Int32","@value":97}},{"id":{"@type":"g:Int32","@value":7778},"outV":{"@type":"g:Int32","@value":660}},{"id":{"@type":"g:Int32","@value":8034},"outV":{"@type":"g:Int32","@value":238}},{"id":{"@type":"g:Int32","@value":8036},"outV":{"@type":"g:Int32","@value":800}},{"id":{"@type":"g:Int32","@value":7782},"outV":{"@type":"g:Int32","@value":6}},{"id":{"@type":"g:Int32","@value":7784},"outV":{"@type":"g:Int32","@value":197}},{"id":{"@type":"g:Int32","@value":7530},"outV":{"@type":"g:Int32","@value":71}},{"id":{"@type":"g:Int32","@value":7276},"outV":{"@type":"g:Int32","@value":114}},{"id":{"@type":"g:Int32","@value":8048},"outV":{"@type":"g:Int32","@value":808}},{"id":{"@type":"g:Int32","@value":7542},"outV":{"@type":"g:Int32","@value":245}},{"id":{"@type":"g:Int32","@value":7800},"outV":{"@type":"g:Int32","@value":32}},{"id":{"@type":"g:Int32","@value":7802},"outV":{"@type":"g:Int32","@value":320}},{"id":{"@type":"g:Int32","@value":7808},"outV":{"@type":"g:Int32","@value":3}},{"id":{"@type":"g:Int32","@value":7554},"outV":{"@type":"g:Int32","@value":18}},{"id":{"@type":"g:Int32","@value":7814},"outV":{"@type":"g:Int32","@value":8}},{"id":{"@type":"g:Int32","@value":7560},"outV":{"@type":"g:Int32","@value":283}},{"id":{"@type":"g:Int32","@value":7818},"outV":{"@type":"g:Int32","@value":676}},{"id":{"@type":"g:Int32","@value":7820},"outV":{"@type":"g:Int32","@value":678}},{"id":{"@type":"g:Int32","@value":7310},"outV":{"@type":"g:Int32","@value":219}},{"id":{"@type":"g:Int32","@value":7312},"outV":{"@type":"g:Int32","@value":36}},{"id":{"@type":"g:Int32","@value":7568},"outV":{"@type":"g:Int32","@value":315}},{"id":{"@type":"g:Int32","@value":7570},"outV":{"@type":"g:Int32","@value":541}},{"id":{"@type":"g:Int32","@value":7316},"outV":{"@type":"g:Int32","@value":240}},{"id":{"@type":"g:Int32","@value":7574},"outV":{"@type":"g:Int32","@value":545}},{"id":{"@type":"g:Int32","@value":7576},"outV":{"@type":"g:Int32","@value":312}},{"id":{"@type":"g:Int32","@value":7580},"outV":{"@type":"g:Int32","@value":227}},{"id":{"@type":"g:Int32","@value":7072},"outV":{"@type":"g:Int32","@value":11}},{"id":{"@type":"g:Int32","@value":7078},"outV":{"@type":"g:Int32","@value":353}},{"id":{"@type":"g:Int32","@value":7848},"outV":{"@type":"g:Int32","@value":26}},{"id":{"@type":"g:Int32","@value":7596},"outV":{"@type":"g:Int32","@value":558}},{"id":{"@type":"g:Int32","@value":7852},"outV":{"@type":"g:Int32","@value":698}},{"id":{"@type":"g:Int32","@value":7854},"outV":{"@type":"g:Int32","@value":20}},{"id":{"@type":"g:Int32","@value":7344},"outV":{"@type":"g:Int32","@value":153}},{"id":{"@type":"g:Int32","@value":7600},"outV":{"@type":"g:Int32","@value":560}},{"id":{"@type":"g:Int32","@value":7856},"outV":{"@type":"g:Int32","@value":700}},{"id":{"@type":"g:Int32","@value":7348},"outV":{"@type":"g:Int32","@value":133}},{"id":{"@type":"g:Int32","@value":7094},"outV":{"@type":"g:Int32","@value":68}},{"id":{"@type":"g:Int32","@value":7352},"outV":{"@type":"g:Int32","@value":184}},{"id":{"@type":"g:Int32","@value":7870},"outV":{"@type":"g:Int32","@value":709}},{"id":{"@type":"g:Int32","@value":7366},"outV":{"@type":"g:Int32","@value":424}},{"id":{"@type":"g:Int32","@value":7368},"outV":{"@type":"g:Int32","@value":29}},{"id":{"@type":"g:Int32","@value":7884},"outV":{"@type":"g:Int32","@value":76}},{"id":{"@type":"g:Int32","@value":7886},"outV":{"@type":"g:Int32","@value":719}},{"id":{"@type":"g:Int32","@value":7632},"outV":{"@type":"g:Int32","@value":580}},{"id":{"@type":"g:Int32","@value":7888},"outV":{"@type":"g:Int32","@value":720}},{"id":{"@type":"g:Int32","@value":7634},"outV":{"@type":"g:Int32","@value":582}},{"id":{"@type":"g:Int32","@value":7894},"outV":{"@type":"g:Int32","@value":723}},{"id":{"@type":"g:Int32","@value":7388},"outV":{"@type":"g:Int32","@value":34}},{"id":{"@type":"g:Int32","@value":7390},"outV":{"@type":"g:Int32","@value":429}},{"id":{"@type":"g:Int32","@value":7140},"outV":{"@type":"g:Int32","@value":366}},{"id":{"@type":"g:Int32","@value":7908},"outV":{"@type":"g:Int32","@value":731}},{"id":{"@type":"g:Int32","@value":7400},"outV":{"@type":"g:Int32","@value":432}},{"id":{"@type":"g:Int32","@value":7402},"outV":{"@type":"g:Int32","@value":433}},{"id":{"@type":"g:Int32","@value":7154},"outV":{"@type":"g:Int32","@value":85}},{"id":{"@type":"g:Int32","@value":7922},"outV":{"@type":"g:Int32","@value":738}},{"id":{"@type":"g:Int32","@value":7670},"outV":{"@type":"g:Int32","@value":604}},{"id":{"@type":"g:Int32","@value":7672},"outV":{"@type":"g:Int32","@value":606}},{"id":{"@type":"g:Int32","@value":7928},"outV":{"@type":"g:Int32","@value":33}},{"id":{"@type":"g:Int32","@value":7162},"outV":{"@type":"g:Int32","@value":38}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7283},"outV":{"@type":"g:Int32","@value":148}},{"id":{"@type":"g:Int32","@value":7077},"outV":{"@type":"g:Int32","@value":353}},{"id":{"@type":"g:Int32","@value":7275},"outV":{"@type":"g:Int32","@value":114}},{"id":{"@type":"g:Int32","@value":7229},"outV":{"@type":"g:Int32","@value":392}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1036},"value":"Weir"}]}}
-{"id":{"@type":"g:Int32","@value":352},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7074},"outV":{"@type":"g:Int32","@value":167}},{"id":{"@type":"g:Int32","@value":7522},"outV":{"@type":"g:Int32","@value":509}},{"id":{"@type":"g:Int32","@value":7586},"outV":{"@type":"g:Int32","@value":44}},{"id":{"@type":"g:Int32","@value":7618},"outV":{"@type":"g:Int32","@value":151}},{"id":{"@type":"g:Int32","@value":7268},"outV":{"@type":"g:Int32","@value":399}},{"id":{"@type":"g:Int32","@value":7398},"outV":{"@type":"g:Int32","@value":431}},{"id":{"@type":"g:Int32","@value":7144},"outV":{"@type":"g:Int32","@value":189}},{"id":{"@type":"g:Int32","@value":7176},"outV":{"@type":"g:Int32","@value":221}},{"id":{"@type":"g:Int32","@value":7210},"outV":{"@type":"g:Int32","@value":118}},{"id":{"@type":"g:Int32","@value":7242},"outV":{"@type":"g:Int32","@value":395}},{"id":{"@type":"g:Int32","@value":7532},"outV":{"@type":"g:Int32","@value":513}},{"id":{"@type":"g:Int32","@value":7278},"outV":{"@type":"g:Int32","@value":182}},{"id":{"@type":"g:Int32","@value":7374},"outV":{"@type":"g:Int32","@value":223}},{"id":{"@type":"g:Int32","@value":7160},"outV":{"@type":"g:Int32","@value":106}},{"id":{"@type":"g:Int32","@value":7640},"outV":{"@type":"g:Int32","@value":586}},{"id":{"@type":"g:Int32","@value":7736},"outV":{"@type":"g:Int32","@value":638}},{"id":{"@type":"g:Int32","@value":7132},"outV":{"@type":"g:Int32","@value":183}},{"id":{"@type":"g:Int32","@value":7198},"outV":{"@type":"g:Int32","@value":231}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7267},"outV":{"@type":"g:Int32","@value":399}},{"id":{"@type":"g:Int32","@value":7159},"outV":{"@type":"g:Int32","@value":106}},{"id":{"@type":"g:Int32","@value":7241},"outV":{"@type":"g:Int32","@value":395}},{"id":{"@type":"g:Int32","@value":7131},"outV":{"@type":"g:Int32","@value":183}},{"id":{"@type":"g:Int32","@value":7277},"outV":{"@type":"g:Int32","@value":182}},{"id":{"@type":"g:Int32","@value":7373},"outV":{"@type":"g:Int32","@value":223}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1037},"value":"Mydland"}]}}
-{"id":{"@type":"g:Int32","@value":353},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7078},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7077},"inV":{"@type":"g:Int32","@value":351}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1038},"value":"BORN CROSS EYED"}],"songType":[{"id":{"@type":"g:Int64","@value":1040},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1039},"value":{"@type":"g:Int32","@value":13}}]}}
-{"id":{"@type":"g:Int32","@value":354},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7200},"outV":{"@type":"g:Int32","@value":174}},{"id":{"@type":"g:Int32","@value":7488},"outV":{"@type":"g:Int32","@value":254}},{"id":{"@type":"g:Int32","@value":7106},"outV":{"@type":"g:Int32","@value":357}},{"id":{"@type":"g:Int32","@value":7298},"outV":{"@type":"g:Int32","@value":410}},{"id":{"@type":"g:Int32","@value":7394},"outV":{"@type":"g:Int32","@value":172}},{"id":{"@type":"g:Int32","@value":7270},"outV":{"@type":"g:Int32","@value":400}},{"id":{"@type":"g:Int32","@value":7080},"outV":{"@type":"g:Int32","@value":46}},{"id":{"@type":"g:Int32","@value":7274},"outV":{"@type":"g:Int32","@value":402}},{"id":{"@type":"g:Int32","@value":7148},"outV":{"@type":"g:Int32","@value":281}},{"id":{"@type":"g:Int32","@value":7758},"outV":{"@type":"g:Int32","@value":306}},{"id":{"@type":"g:Int32","@value":7152},"outV":{"@type":"g:Int32","@value":371}},{"id":{"@type":"g:Int32","@value":7382},"outV":{"@type":"g:Int32","@value":176}},{"id":{"@type":"g:Int32","@value":7288},"outV":{"@type":"g:Int32","@value":109}},{"id":{"@type":"g:Int32","@value":7098},"outV":{"@type":"g:Int32","@value":119}},{"id":{"@type":"g:Int32","@value":7578},"outV":{"@type":"g:Int32","@value":547}},{"id":{"@type":"g:Int32","@value":7548},"outV":{"@type":"g:Int32","@value":522}},{"id":{"@type":"g:Int32","@value":7708},"outV":{"@type":"g:Int32","@value":625}},{"id":{"@type":"g:Int32","@value":8028},"outV":{"@type":"g:Int32","@value":242}},{"id":{"@type":"g:Int32","@value":7294},"outV":{"@type":"g:Int32","@value":409}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7097},"outV":{"@type":"g:Int32","@value":119}},{"id":{"@type":"g:Int32","@value":7273},"outV":{"@type":"g:Int32","@value":402}},{"id":{"@type":"g:Int32","@value":7151},"outV":{"@type":"g:Int32","@value":371}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1041},"value":"Lesh"}]}}
-{"id":{"@type":"g:Int32","@value":355},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7088},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7087},"inV":{"@type":"g:Int32","@value":340}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1042},"value":"CANT COME DOWN"}],"songType":[{"id":{"@type":"g:Int64","@value":1044},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1043},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":356},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7104},"outV":{"@type":"g:Int32","@value":234}},{"id":{"@type":"g:Int32","@value":7680},"outV":{"@type":"g:Int32","@value":610}},{"id":{"@type":"g:Int32","@value":7872},"outV":{"@type":"g:Int32","@value":710}},{"id":{"@type":"g:Int32","@value":7556},"outV":{"@type":"g:Int32","@value":529}},{"id":{"@type":"g:Int32","@value":7684},"outV":{"@type":"g:Int32","@value":613}},{"id":{"@type":"g:Int32","@value":7432},"outV":{"@type":"g:Int32","@value":450}},{"id":{"@type":"g:Int32","@value":7880},"outV":{"@type":"g:Int32","@value":717}},{"id":{"@type":"g:Int32","@value":7882},"outV":{"@type":"g:Int32","@value":40}},{"id":{"@type":"g:Int32","@value":7564},"outV":{"@type":"g:Int32","@value":538}},{"id":{"@type":"g:Int32","@value":7508},"outV":{"@type":"g:Int32","@value":502}},{"id":{"@type":"g:Int32","@value":7892},"outV":{"@type":"g:Int32","@value":722}},{"id":{"@type":"g:Int32","@value":7256},"outV":{"@type":"g:Int32","@value":205}},{"id":{"@type":"g:Int32","@value":7768},"outV":{"@type":"g:Int32","@value":653}},{"id":{"@type":"g:Int32","@value":7832},"outV":{"@type":"g:Int32","@value":687}},{"id":{"@type":"g:Int32","@value":7960},"outV":{"@type":"g:Int32","@value":762}},{"id":{"@type":"g:Int32","@value":8024},"outV":{"@type":"g:Int32","@value":146}},{"id":{"@type":"g:Int32","@value":7836},"outV":{"@type":"g:Int32","@value":690}},{"id":{"@type":"g:Int32","@value":7900},"outV":{"@type":"g:Int32","@value":727}},{"id":{"@type":"g:Int32","@value":7712},"outV":{"@type":"g:Int32","@value":626}},{"id":{"@type":"g:Int32","@value":7904},"outV":{"@type":"g:Int32","@value":728}},{"id":{"@type":"g:Int32","@value":7658},"outV":{"@type":"g:Int32","@value":595}},{"id":{"@type":"g:Int32","@value":7468},"outV":{"@type":"g:Int32","@value":477}},{"id":{"@type":"g:Int32","@value":7660},"outV":{"@type":"g:Int32","@value":597}},{"id":{"@type":"g:Int32","@value":8044},"outV":{"@type":"g:Int32","@value":805}},{"id":{"@type":"g:Int32","@value":7150},"outV":{"@type":"g:Int32","@value":370}},{"id":{"@type":"g:Int32","@value":7342},"outV":{"@type":"g:Int32","@value":418}},{"id":{"@type":"g:Int32","@value":7662},"outV":{"@type":"g:Int32","@value":599}},{"id":{"@type":"g:Int32","@value":7984},"outV":{"@type":"g:Int32","@value":776}},{"id":{"@type":"g:Int32","@value":7282},"outV":{"@type":"g:Int32","@value":404}},{"id":{"@type":"g:Int32","@value":7538},"outV":{"@type":"g:Int32","@value":517}},{"id":{"@type":"g:Int32","@value":7604},"outV":{"@type":"g:Int32","@value":161}},{"id":{"@type":"g:Int32","@value":7354},"outV":{"@type":"g:Int32","@value":419}},{"id":{"@type":"g:Int32","@value":7420},"outV":{"@type":"g:Int32","@value":440}},{"id":{"@type":"g:Int32","@value":7804},"outV":{"@type":"g:Int32","@value":207}},{"id":{"@type":"g:Int32","@value":7422},"outV":{"@type":"g:Int32","@value":441}},{"id":{"@type":"g:Int32","@value":7486},"outV":{"@type":"g:Int32","@value":489}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7281},"outV":{"@type":"g:Int32","@value":404}},{"id":{"@type":"g:Int32","@value":7353},"outV":{"@type":"g:Int32","@value":419}},{"id":{"@type":"g:Int32","@value":7419},"outV":{"@type":"g:Int32","@value":440}},{"id":{"@type":"g:Int32","@value":7149},"outV":{"@type":"g:Int32","@value":370}},{"id":{"@type":"g:Int32","@value":7341},"outV":{"@type":"g:Int32","@value":418}},{"id":{"@type":"g:Int32","@value":7103},"outV":{"@type":"g:Int32","@value":234}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1045},"value":"Pigpen"}]}}
-{"id":{"@type":"g:Int32","@value":357},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7106},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7105},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1046},"value":"CLEMENTINE"}],"songType":[{"id":{"@type":"g:Int64","@value":1048},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1047},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":358},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7110},"inV":{"@type":"g:Int32","@value":359}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7109},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1049},"value":"CORRINA"}],"songType":[{"id":{"@type":"g:Int64","@value":1051},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1050},"value":{"@type":"g:Int32","@value":77}}]}}
-{"id":{"@type":"g:Int32","@value":359},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7110},"outV":{"@type":"g:Int32","@value":358}},{"id":{"@type":"g:Int32","@value":7180},"outV":{"@type":"g:Int32","@value":379}},{"id":{"@type":"g:Int32","@value":7292},"outV":{"@type":"g:Int32","@value":13}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1052},"value":"Weir_Hart"}]}}
-{"id":{"@type":"g:Int32","@value":360},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7112},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7111},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1053},"value":"COSMIC CHARLEY"}],"songType":[{"id":{"@type":"g:Int64","@value":1055},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1054},"value":{"@type":"g:Int32","@value":41}}]}}
-{"id":{"@type":"g:Int32","@value":361},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7116},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7115},"inV":{"@type":"g:Int32","@value":340}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1056},"value":"CREAM PUFF WAR"}],"songType":[{"id":{"@type":"g:Int64","@value":1058},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1057},"value":{"@type":"g:Int32","@value":7}}]}}
-{"id":{"@type":"g:Int32","@value":362},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7120},"outV":{"@type":"g:Int32","@value":39}},{"id":{"@type":"g:Int32","@value":7248},"outV":{"@type":"g:Int32","@value":396}},{"id":{"@type":"g:Int32","@value":7314},"outV":{"@type":"g:Int32","@value":414}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7247},"outV":{"@type":"g:Int32","@value":396}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1059},"value":"Garcia_Lesh"}]}}
-{"id":{"@type":"g:Int32","@value":363},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7124},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7123},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1060},"value":"DAYS BETWEEN"}],"songType":[{"id":{"@type":"g:Int64","@value":1062},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1061},"value":{"@type":"g:Int32","@value":41}}]}}
-{"id":{"@type":"g:Int32","@value":364},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7130},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7129},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1063},"value":"DOING THAT RAG"}],"songType":[{"id":{"@type":"g:Int64","@value":1065},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1064},"value":{"@type":"g:Int32","@value":37}}]}}
-{"id":{"@type":"g:Int32","@value":365},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7544},"inV":{"@type":"g:Int32","@value":340}},{"id":{"@type":"g:Int32","@value":7134},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7543},"inV":{"@type":"g:Int32","@value":451}},{"id":{"@type":"g:Int32","@value":7133},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1066},"value":"DOWN SO LONG"}],"songType":[{"id":{"@type":"g:Int64","@value":1068},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1067},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":366},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7140},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7139},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1069},"value":"THE DWARF"}],"songType":[{"id":{"@type":"g:Int64","@value":1071},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1070},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":367},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7347},"outV":{"@type":"g:Int32","@value":133}},{"id":{"@type":"g:Int32","@value":7141},"outV":{"@type":"g:Int32","@value":158}},{"id":{"@type":"g:Int32","@value":7343},"outV":{"@type":"g:Int32","@value":153}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1072},"value":"Hunter_Weir"}]}}
-{"id":{"@type":"g:Int32","@value":368},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7142},"outV":{"@type":"g:Int32","@value":158}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1073},"value":"Weir_Hart_Welnick"}]}}
-{"id":{"@type":"g:Int32","@value":369},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7146},"inV":{"@type":"g:Int32","@value":339}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7145},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1074},"value":"EASY WIND"}],"songType":[{"id":{"@type":"g:Int64","@value":1076},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1075},"value":{"@type":"g:Int32","@value":44}}]}}
-{"id":{"@type":"g:Int32","@value":370},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7150},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7149},"inV":{"@type":"g:Int32","@value":356}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1077},"value":"EMPTY PAGES"}],"songType":[{"id":{"@type":"g:Int64","@value":1079},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1078},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":371},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7152},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7151},"inV":{"@type":"g:Int32","@value":354}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1080},"value":"EQUINOX"}],"songType":[{"id":{"@type":"g:Int64","@value":1082},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1081},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":372},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7155},"outV":{"@type":"g:Int32","@value":43}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1083},"value":"Dixon"}]}}
-{"id":{"@type":"g:Int32","@value":373},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7156},"outV":{"@type":"g:Int32","@value":43}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1084},"value":"Weir_Wasserman"}]}}
-{"id":{"@type":"g:Int32","@value":374},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7168},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7167},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1085},"value":"FRANCE"}],"songType":[{"id":{"@type":"g:Int64","@value":1087},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1086},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":375},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7170},"outV":{"@type":"g:Int32","@value":154}},{"id":{"@type":"g:Int32","@value":7412},"outV":{"@type":"g:Int32","@value":134}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1088},"value":"Garcia_Kreutzmann"}]}}
-{"id":{"@type":"g:Int32","@value":376},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7172},"outV":{"@type":"g:Int32","@value":104}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1089},"value":"Garcia_Dawson"}]}}
-{"id":{"@type":"g:Int32","@value":377},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7174},"outV":{"@type":"g:Int32","@value":208}},{"id":{"@type":"g:Int32","@value":7350},"outV":{"@type":"g:Int32","@value":196}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7173},"outV":{"@type":"g:Int32","@value":208}},{"id":{"@type":"g:Int32","@value":7349},"outV":{"@type":"g:Int32","@value":196}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1090},"value":"Donna_Godchaux"}]}}
-{"id":{"@type":"g:Int32","@value":378},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7178},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7177},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1091},"value":"THE GOLDEN ROAD (TO UNLIMITED DEVOTION)"}],"songType":[{"id":{"@type":"g:Int64","@value":1093},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1092},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":379},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7180},"inV":{"@type":"g:Int32","@value":359}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7179},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1094},"value":"GREATEST STORY EVER TOLD"}],"songType":[{"id":{"@type":"g:Int64","@value":1096},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1095},"value":{"@type":"g:Int32","@value":280}}]}}
-{"id":{"@type":"g:Int32","@value":380},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7183},"outV":{"@type":"g:Int32","@value":209}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1097},"value":"Barlow_instrumental"}]}}
-{"id":{"@type":"g:Int32","@value":381},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7186},"outV":{"@type":"g:Int32","@value":64}},{"id":{"@type":"g:Int32","@value":7748},"outV":{"@type":"g:Int32","@value":257}},{"id":{"@type":"g:Int32","@value":7766},"outV":{"@type":"g:Int32","@value":651}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1098},"value":"Weir_Mydland"}]}}
-{"id":{"@type":"g:Int32","@value":382},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7194},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7193},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1099},"value":"HOLLYWOOD CANTATA"}],"songType":[{"id":{"@type":"g:Int64","@value":1101},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1100},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":383},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7199},"outV":{"@type":"g:Int32","@value":174}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1102},"value":"Charles"}]}}
-{"id":{"@type":"g:Int32","@value":384},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7330},"outV":{"@type":"g:Int32","@value":149}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7361},"outV":{"@type":"g:Int32","@value":423}},{"id":{"@type":"g:Int32","@value":7205},"outV":{"@type":"g:Int32","@value":123}},{"id":{"@type":"g:Int32","@value":7399},"outV":{"@type":"g:Int32","@value":432}},{"id":{"@type":"g:Int32","@value":7309},"outV":{"@type":"g:Int32","@value":219}},{"id":{"@type":"g:Int32","@value":7325},"outV":{"@type":"g:Int32","@value":288}},{"id":{"@type":"g:Int32","@value":7357},"outV":{"@type":"g:Int32","@value":421}},{"id":{"@type":"g:Int32","@value":7215},"outV":{"@type":"g:Int32","@value":387}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1103},"value":"instrumental"}]}}
-{"id":{"@type":"g:Int32","@value":385},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7718},"inV":{"@type":"g:Int32","@value":453}},{"id":{"@type":"g:Int32","@value":7212},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7717},"inV":{"@type":"g:Int32","@value":446}},{"id":{"@type":"g:Int32","@value":7211},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1104},"value":"KEEP ROLLING BY"}],"songType":[{"id":{"@type":"g:Int64","@value":1106},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1105},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":386},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7214},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7213},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1107},"value":"KEEP YOUR DAY JOB"}],"songType":[{"id":{"@type":"g:Int64","@value":1109},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1108},"value":{"@type":"g:Int32","@value":57}}]}}
-{"id":{"@type":"g:Int32","@value":387},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7216},"inV":{"@type":"g:Int32","@value":388}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7215},"inV":{"@type":"g:Int32","@value":384}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1110},"value":"KING SOLOMONS MARBLES"}],"songType":[{"id":{"@type":"g:Int64","@value":1112},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1111},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":388},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7216},"outV":{"@type":"g:Int32","@value":387}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1113},"value":"Lesh_Hart_Kreutzmann"}]}}
-{"id":{"@type":"g:Int32","@value":389},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7218},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7217},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1114},"value":"LADY WITH A FAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1116},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1115},"value":{"@type":"g:Int32","@value":302}}]}}
-{"id":{"@type":"g:Int32","@value":390},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7222},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7221},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1117},"value":"LAZY RIVER ROAD"}],"songType":[{"id":{"@type":"g:Int64","@value":1119},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1118},"value":{"@type":"g:Int32","@value":65}}]}}
-{"id":{"@type":"g:Int32","@value":391},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7224},"outV":{"@type":"g:Int32","@value":195}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1120},"value":"Keith_Godchaux"}]}}
-{"id":{"@type":"g:Int32","@value":392},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7230},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7229},"inV":{"@type":"g:Int32","@value":351}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1121},"value":"LITTLE STAR"}],"songType":[{"id":{"@type":"g:Int64","@value":1123},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1122},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":393},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7240},"inV":{"@type":"g:Int32","@value":394}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7239},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1124},"value":"MASONS CHILDREN"}],"songType":[{"id":{"@type":"g:Int64","@value":1126},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1125},"value":{"@type":"g:Int32","@value":18}}]}}
-{"id":{"@type":"g:Int32","@value":394},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7240},"outV":{"@type":"g:Int32","@value":393}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1127},"value":"Garcia_Weir_Lesh"}]}}
-{"id":{"@type":"g:Int32","@value":395},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7242},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7241},"inV":{"@type":"g:Int32","@value":352}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1128},"value":"MAYBE YOU KNOW"}],"songType":[{"id":{"@type":"g:Int64","@value":1130},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1129},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":396},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7248},"inV":{"@type":"g:Int32","@value":362}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7247},"inV":{"@type":"g:Int32","@value":362}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1131},"value":"MINDBENDER"}],"songType":[{"id":{"@type":"g:Int64","@value":1133},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1132},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":397},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7260},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7259},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1134},"value":"THE MONSTER"}],"songType":[{"id":{"@type":"g:Int64","@value":1136},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1135},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":398},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7262},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7261},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1137},"value":"MOUNTAINS OF THE MOON"}],"songType":[{"id":{"@type":"g:Int64","@value":1139},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1138},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":399},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7268},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7267},"inV":{"@type":"g:Int32","@value":352}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1140},"value":"NEVER TRUST A WOMAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1142},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1141},"value":{"@type":"g:Int32","@value":42}}]}}
-{"id":{"@type":"g:Int32","@value":400},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7270},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7269},"inV":{"@type":"g:Int32","@value":401}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1143},"value":"NEW POTATO CABOOSE"}],"songType":[{"id":{"@type":"g:Int64","@value":1145},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1144},"value":{"@type":"g:Int32","@value":26}}]}}
-{"id":{"@type":"g:Int32","@value":401},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7269},"outV":{"@type":"g:Int32","@value":400}},{"id":{"@type":"g:Int32","@value":7301},"outV":{"@type":"g:Int32","@value":267}},{"id":{"@type":"g:Int32","@value":7381},"outV":{"@type":"g:Int32","@value":176}},{"id":{"@type":"g:Int32","@value":7293},"outV":{"@type":"g:Int32","@value":409}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1146},"value":"Petersen"}]}}
-{"id":{"@type":"g:Int32","@value":402},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7274},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7273},"inV":{"@type":"g:Int32","@value":354}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1147},"value":"NO LEFT TURN UNSTONED (CARDBOARD COWBOY)"}],"songType":[{"id":{"@type":"g:Int64","@value":1149},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1148},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":403},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7280},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7279},"inV":{"@type":"g:Int32","@value":340}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1150},"value":"THE ONLY TIME IS NOW"}],"songType":[{"id":{"@type":"g:Int64","@value":1152},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1151},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":404},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7282},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7281},"inV":{"@type":"g:Int32","@value":356}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1153},"value":"OPERATOR"}],"songType":[{"id":{"@type":"g:Int64","@value":1155},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1154},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":405},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7284},"outV":{"@type":"g:Int32","@value":148}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1156},"value":"Weir_Kreutzmann"}]}}
-{"id":{"@type":"g:Int32","@value":406},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7286},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7285},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1157},"value":"OTIS ON A SHAKEDOWN CRUISE"}],"songType":[{"id":{"@type":"g:Int64","@value":1159},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1158},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":407},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7287},"outV":{"@type":"g:Int32","@value":109}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1160},"value":"Monk"}]}}
-{"id":{"@type":"g:Int32","@value":408},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7290},"outV":{"@type":"g:Int32","@value":79}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1161},"value":"Weir_Bralove"}]}}
-{"id":{"@type":"g:Int32","@value":409},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7294},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7293},"inV":{"@type":"g:Int32","@value":401}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1162},"value":"PRIDE OF CUCAMONGA"}],"songType":[{"id":{"@type":"g:Int64","@value":1164},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1163},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":410},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7298},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7297},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1165},"value":"RED"}],"songType":[{"id":{"@type":"g:Int64","@value":1167},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1166},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":411},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7300},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7299},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1168},"value":"REUBEN AND CERISE"}],"songType":[{"id":{"@type":"g:Int64","@value":1170},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1169},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":412},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7302},"outV":{"@type":"g:Int32","@value":267}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1171},"value":"Mydland_Lesh"}]}}
-{"id":{"@type":"g:Int32","@value":413},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7306},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7305},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1172},"value":"ROSEMARY"}],"songType":[{"id":{"@type":"g:Int64","@value":1174},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1173},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":414},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7314},"inV":{"@type":"g:Int32","@value":362}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7313},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1175},"value":"SAINT STEPHEN"}],"songType":[{"id":{"@type":"g:Int64","@value":1177},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1176},"value":{"@type":"g:Int32","@value":165}}]}}
-{"id":{"@type":"g:Int32","@value":415},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7442},"outV":{"@type":"g:Int32","@value":185}},{"id":{"@type":"g:Int32","@value":7826},"outV":{"@type":"g:Int32","@value":682}},{"id":{"@type":"g:Int32","@value":7842},"outV":{"@type":"g:Int32","@value":695}},{"id":{"@type":"g:Int32","@value":8018},"outV":{"@type":"g:Int32","@value":792}},{"id":{"@type":"g:Int32","@value":7318},"outV":{"@type":"g:Int32","@value":37}},{"id":{"@type":"g:Int32","@value":7974},"outV":{"@type":"g:Int32","@value":275}},{"id":{"@type":"g:Int32","@value":7690},"outV":{"@type":"g:Int32","@value":177}},{"id":{"@type":"g:Int32","@value":7834},"outV":{"@type":"g:Int32","@value":689}},{"id":{"@type":"g:Int32","@value":8010},"outV":{"@type":"g:Int32","@value":788}},{"id":{"@type":"g:Int32","@value":7934},"outV":{"@type":"g:Int32","@value":746}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1178},"value":"Welnick"}]}}
-{"id":{"@type":"g:Int32","@value":416},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7988},"outV":{"@type":"g:Int32","@value":778}},{"id":{"@type":"g:Int32","@value":7334},"outV":{"@type":"g:Int32","@value":136}},{"id":{"@type":"g:Int32","@value":7386},"outV":{"@type":"g:Int32","@value":427}},{"id":{"@type":"g:Int32","@value":7930},"outV":{"@type":"g:Int32","@value":136}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7333},"outV":{"@type":"g:Int32","@value":136}},{"id":{"@type":"g:Int32","@value":7385},"outV":{"@type":"g:Int32","@value":427}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1179},"value":"Hornsby"}]}}
-{"id":{"@type":"g:Int32","@value":417},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7336},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7335},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1180},"value":"STANDING ON THE CORNER"}],"songType":[{"id":{"@type":"g:Int64","@value":1182},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1181},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":418},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7342},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7341},"inV":{"@type":"g:Int32","@value":356}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1183},"value":"THE STRANGER (TWO SOULS IN COMMUNION)"}],"songType":[{"id":{"@type":"g:Int64","@value":1185},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1184},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":419},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7354},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7353},"inV":{"@type":"g:Int32","@value":356}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1186},"value":"TASTEBUD"}],"songType":[{"id":{"@type":"g:Int64","@value":1188},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1187},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":420},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7356},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7355},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1189},"value":"TENNESSEE JED"}],"songType":[{"id":{"@type":"g:Int64","@value":1191},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1190},"value":{"@type":"g:Int32","@value":433}}]}}
-{"id":{"@type":"g:Int32","@value":421},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7358},"inV":{"@type":"g:Int32","@value":422}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7357},"inV":{"@type":"g:Int32","@value":384}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1192},"value":"TERRAPIN FLYER"}],"songType":[{"id":{"@type":"g:Int64","@value":1194},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1193},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":422},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7362},"outV":{"@type":"g:Int32","@value":423}},{"id":{"@type":"g:Int32","@value":7358},"outV":{"@type":"g:Int32","@value":421}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1195},"value":"Hart_Kreutzmann"}]}}
-{"id":{"@type":"g:Int32","@value":423},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7362},"inV":{"@type":"g:Int32","@value":422}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7361},"inV":{"@type":"g:Int32","@value":384}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1196},"value":"TERRAPIN TRANSIT"}],"songType":[{"id":{"@type":"g:Int64","@value":1198},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1197},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":424},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7366},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7365},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1199},"value":"THIS TIME FOREVER"}],"songType":[{"id":{"@type":"g:Int64","@value":1201},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1200},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":425},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7370},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7369},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1202},"value":"TILL THE MORNING COMES"}],"songType":[{"id":{"@type":"g:Int64","@value":1204},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1203},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":426},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7378},"outV":{"@type":"g:Int32","@value":21}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1205},"value":"Garcia_Lesh_Weir"}]}}
-{"id":{"@type":"g:Int32","@value":427},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7386},"inV":{"@type":"g:Int32","@value":416}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7385},"inV":{"@type":"g:Int32","@value":416}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1206},"value":"THE VALLEY ROAD"}],"songType":[{"id":{"@type":"g:Int64","@value":1208},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1207},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":428},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7387},"outV":{"@type":"g:Int32","@value":34}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1209},"value":"Graham"}]}}
-{"id":{"@type":"g:Int32","@value":429},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7390},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7389},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1210},"value":"WALK IN THE SUNSHINE"}],"songType":[{"id":{"@type":"g:Int64","@value":1212},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1211},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":430},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7396},"outV":{"@type":"g:Int32","@value":35}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1213},"value":"Welnick_Bralove"}]}}
-{"id":{"@type":"g:Int32","@value":431},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7398},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7397},"inV":{"@type":"g:Int32","@value":350}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1214},"value":"WE CAN RUN"}],"songType":[{"id":{"@type":"g:Int64","@value":1216},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1215},"value":{"@type":"g:Int32","@value":22}}]}}
-{"id":{"@type":"g:Int32","@value":432},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7400},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7399},"inV":{"@type":"g:Int32","@value":384}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1217},"value":"WEATHER REPORT SUITE PRELUDE"}],"songType":[{"id":{"@type":"g:Int64","@value":1219},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1218},"value":{"@type":"g:Int32","@value":52}}]}}
-{"id":{"@type":"g:Int32","@value":433},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7402},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7401},"inV":{"@type":"g:Int32","@value":434}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1220},"value":"WEATHER REPORT SUITE PART 1"}],"songType":[{"id":{"@type":"g:Int64","@value":1222},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1221},"value":{"@type":"g:Int32","@value":47}}]}}
-{"id":{"@type":"g:Int32","@value":434},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7401},"outV":{"@type":"g:Int32","@value":433}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1223},"value":"Weir_Andersen"}]}}
-{"id":{"@type":"g:Int32","@value":435},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7404},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7403},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1224},"value":"WEST L.A. FADEAWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":1226},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1225},"value":{"@type":"g:Int32","@value":140}}]}}
-{"id":{"@type":"g:Int32","@value":436},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7408},"inV":{"@type":"g:Int32","@value":339}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7407},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1227},"value":"WHATLL YOU RAISE"}],"songType":[{"id":{"@type":"g:Int64","@value":1229},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1228},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":437},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7410},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7409},"inV":{"@type":"g:Int32","@value":339}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1230},"value":"WHATS BECOME OF THE BABY"}],"songType":[{"id":{"@type":"g:Int64","@value":1232},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1231},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":438},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7416},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7415},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1233},"value":"YOU CANT CATCH ME"}],"songType":[{"id":{"@type":"g:Int64","@value":1235},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1234},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":439},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7418},"inV":{"@type":"g:Int32","@value":342}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7417},"inV":{"@type":"g:Int32","@value":342}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1236},"value":"YOU DONT HAVE TO ASK"}],"songType":[{"id":{"@type":"g:Int64","@value":1238},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1237},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":440},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7420},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7419},"inV":{"@type":"g:Int32","@value":356}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1239},"value":"YOU SEE A BROKEN HEART"}],"songType":[{"id":{"@type":"g:Int64","@value":1241},"value":"original"}],"performances":[{"id":{"@type":"g:Int64","@value":1240},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":441},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7422},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7421},"inV":{"@type":"g:Int32","@value":442}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1242},"value":"AINT IT CRAZY (THE RUB)"}],"songType":[{"id":{"@type":"g:Int64","@value":1244},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1243},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":442},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7507},"outV":{"@type":"g:Int32","@value":502}},{"id":{"@type":"g:Int32","@value":7899},"outV":{"@type":"g:Int32","@value":727}},{"id":{"@type":"g:Int32","@value":7421},"outV":{"@type":"g:Int32","@value":441}},{"id":{"@type":"g:Int32","@value":7485},"outV":{"@type":"g:Int32","@value":489}},{"id":{"@type":"g:Int32","@value":7711},"outV":{"@type":"g:Int32","@value":626}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1245},"value":"Lightning_Hopkins"}]}}
-{"id":{"@type":"g:Int32","@value":443},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7424},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7423},"inV":{"@type":"g:Int32","@value":444}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1246},"value":"AINT THAT PECULIAR"}],"songType":[{"id":{"@type":"g:Int64","@value":1248},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1247},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":444},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7423},"outV":{"@type":"g:Int32","@value":443}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1249},"value":"Robinson_et_al"}]}}
-{"id":{"@type":"g:Int32","@value":445},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7426},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7425},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1250},"value":"ALABAMA BOUND"}],"songType":[{"id":{"@type":"g:Int64","@value":1252},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1251},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":446},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7425},"outV":{"@type":"g:Int32","@value":445}},{"id":{"@type":"g:Int32","@value":7491},"outV":{"@type":"g:Int32","@value":492}},{"id":{"@type":"g:Int32","@value":7941},"outV":{"@type":"g:Int32","@value":752}},{"id":{"@type":"g:Int32","@value":7433},"outV":{"@type":"g:Int32","@value":452}},{"id":{"@type":"g:Int32","@value":7883},"outV":{"@type":"g:Int32","@value":76}},{"id":{"@type":"g:Int32","@value":7821},"outV":{"@type":"g:Int32","@value":111}},{"id":{"@type":"g:Int32","@value":7949},"outV":{"@type":"g:Int32","@value":756}},{"id":{"@type":"g:Int32","@value":7695},"outV":{"@type":"g:Int32","@value":620}},{"id":{"@type":"g:Int32","@value":7505},"outV":{"@type":"g:Int32","@value":78}},{"id":{"@type":"g:Int32","@value":7637},"outV":{"@type":"g:Int32","@value":584}},{"id":{"@type":"g:Int32","@value":8021},"outV":{"@type":"g:Int32","@value":794}},{"id":{"@type":"g:Int32","@value":7447},"outV":{"@type":"g:Int32","@value":463}},{"id":{"@type":"g:Int32","@value":7513},"outV":{"@type":"g:Int32","@value":506}},{"id":{"@type":"g:Int32","@value":7705},"outV":{"@type":"g:Int32","@value":624}},{"id":{"@type":"g:Int32","@value":7515},"outV":{"@type":"g:Int32","@value":198}},{"id":{"@type":"g:Int32","@value":7581},"outV":{"@type":"g:Int32","@value":5}},{"id":{"@type":"g:Int32","@value":7645},"outV":{"@type":"g:Int32","@value":187}},{"id":{"@type":"g:Int32","@value":7837},"outV":{"@type":"g:Int32","@value":692}},{"id":{"@type":"g:Int32","@value":7455},"outV":{"@type":"g:Int32","@value":468}},{"id":{"@type":"g:Int32","@value":7967},"outV":{"@type":"g:Int32","@value":768}},{"id":{"@type":"g:Int32","@value":8031},"outV":{"@type":"g:Int32","@value":797}},{"id":{"@type":"g:Int32","@value":7457},"outV":{"@type":"g:Int32","@value":470}},{"id":{"@type":"g:Int32","@value":7713},"outV":{"@type":"g:Int32","@value":298}},{"id":{"@type":"g:Int32","@value":8035},"outV":{"@type":"g:Int32","@value":800}},{"id":{"@type":"g:Int32","@value":7461},"outV":{"@type":"g:Int32","@value":472}},{"id":{"@type":"g:Int32","@value":7525},"outV":{"@type":"g:Int32","@value":512}},{"id":{"@type":"g:Int32","@value":7717},"outV":{"@type":"g:Int32","@value":385}},{"id":{"@type":"g:Int32","@value":7845},"outV":{"@type":"g:Int32","@value":697}},{"id":{"@type":"g:Int32","@value":7527},"outV":{"@type":"g:Int32","@value":180}},{"id":{"@type":"g:Int32","@value":7535},"outV":{"@type":"g:Int32","@value":72}},{"id":{"@type":"g:Int32","@value":7983},"outV":{"@type":"g:Int32","@value":776}},{"id":{"@type":"g:Int32","@value":7985},"outV":{"@type":"g:Int32","@value":777}},{"id":{"@type":"g:Int32","@value":7667},"outV":{"@type":"g:Int32","@value":603}},{"id":{"@type":"g:Int32","@value":7545},"outV":{"@type":"g:Int32","@value":521}},{"id":{"@type":"g:Int32","@value":7673},"outV":{"@type":"g:Int32","@value":62}},{"id":{"@type":"g:Int32","@value":7737},"outV":{"@type":"g:Int32","@value":220}},{"id":{"@type":"g:Int32","@value":7675},"outV":{"@type":"g:Int32","@value":607}},{"id":{"@type":"g:Int32","@value":7549},"outV":{"@type":"g:Int32","@value":524}},{"id":{"@type":"g:Int32","@value":7805},"outV":{"@type":"g:Int32","@value":319}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1253},"value":"Traditional"}]}}
-{"id":{"@type":"g:Int32","@value":447},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7520},"outV":{"@type":"g:Int32","@value":508}},{"id":{"@type":"g:Int32","@value":7970},"outV":{"@type":"g:Int32","@value":311}},{"id":{"@type":"g:Int32","@value":7652},"outV":{"@type":"g:Int32","@value":251}},{"id":{"@type":"g:Int32","@value":7910},"outV":{"@type":"g:Int32","@value":250}},{"id":{"@type":"g:Int32","@value":7624},"outV":{"@type":"g:Int32","@value":575}},{"id":{"@type":"g:Int32","@value":7656},"outV":{"@type":"g:Int32","@value":266}},{"id":{"@type":"g:Int32","@value":8008},"outV":{"@type":"g:Int32","@value":287}},{"id":{"@type":"g:Int32","@value":7946},"outV":{"@type":"g:Int32","@value":330}},{"id":{"@type":"g:Int32","@value":7788},"outV":{"@type":"g:Int32","@value":663}},{"id":{"@type":"g:Int32","@value":7502},"outV":{"@type":"g:Int32","@value":271}},{"id":{"@type":"g:Int32","@value":7598},"outV":{"@type":"g:Int32","@value":284}},{"id":{"@type":"g:Int32","@value":7918},"outV":{"@type":"g:Int32","@value":736}},{"id":{"@type":"g:Int32","@value":7698},"outV":{"@type":"g:Int32","@value":310}},{"id":{"@type":"g:Int32","@value":7540},"outV":{"@type":"g:Int32","@value":519}},{"id":{"@type":"g:Int32","@value":7700},"outV":{"@type":"g:Int32","@value":249}},{"id":{"@type":"g:Int32","@value":7764},"outV":{"@type":"g:Int32","@value":264}},{"id":{"@type":"g:Int32","@value":7860},"outV":{"@type":"g:Int32","@value":702}},{"id":{"@type":"g:Int32","@value":7608},"outV":{"@type":"g:Int32","@value":260}},{"id":{"@type":"g:Int32","@value":7450},"outV":{"@type":"g:Int32","@value":464}},{"id":{"@type":"g:Int32","@value":7902},"outV":{"@type":"g:Int32","@value":331}},{"id":{"@type":"g:Int32","@value":7966},"outV":{"@type":"g:Int32","@value":767}},{"id":{"@type":"g:Int32","@value":8030},"outV":{"@type":"g:Int32","@value":297}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7681},"outV":{"@type":"g:Int32","@value":612}},{"id":{"@type":"g:Int32","@value":7427},"outV":{"@type":"g:Int32","@value":165}},{"id":{"@type":"g:Int32","@value":7623},"outV":{"@type":"g:Int32","@value":575}},{"id":{"@type":"g:Int32","@value":7687},"outV":{"@type":"g:Int32","@value":616}},{"id":{"@type":"g:Int32","@value":8007},"outV":{"@type":"g:Int32","@value":287}},{"id":{"@type":"g:Int32","@value":7945},"outV":{"@type":"g:Int32","@value":330}},{"id":{"@type":"g:Int32","@value":7501},"outV":{"@type":"g:Int32","@value":271}},{"id":{"@type":"g:Int32","@value":7565},"outV":{"@type":"g:Int32","@value":335}},{"id":{"@type":"g:Int32","@value":7759},"outV":{"@type":"g:Int32","@value":131}},{"id":{"@type":"g:Int32","@value":7697},"outV":{"@type":"g:Int32","@value":310}},{"id":{"@type":"g:Int32","@value":7699},"outV":{"@type":"g:Int32","@value":249}},{"id":{"@type":"g:Int32","@value":7763},"outV":{"@type":"g:Int32","@value":264}},{"id":{"@type":"g:Int32","@value":8019},"outV":{"@type":"g:Int32","@value":117}},{"id":{"@type":"g:Int32","@value":7449},"outV":{"@type":"g:Int32","@value":464}},{"id":{"@type":"g:Int32","@value":7897},"outV":{"@type":"g:Int32","@value":128}},{"id":{"@type":"g:Int32","@value":7451},"outV":{"@type":"g:Int32","@value":269}},{"id":{"@type":"g:Int32","@value":7707},"outV":{"@type":"g:Int32","@value":625}},{"id":{"@type":"g:Int32","@value":7901},"outV":{"@type":"g:Int32","@value":331}},{"id":{"@type":"g:Int32","@value":7965},"outV":{"@type":"g:Int32","@value":767}},{"id":{"@type":"g:Int32","@value":8029},"outV":{"@type":"g:Int32","@value":297}},{"id":{"@type":"g:Int32","@value":7519},"outV":{"@type":"g:Int32","@value":508}},{"id":{"@type":"g:Int32","@value":7777},"outV":{"@type":"g:Int32","@value":660}},{"id":{"@type":"g:Int32","@value":7969},"outV":{"@type":"g:Int32","@value":311}},{"id":{"@type":"g:Int32","@value":7651},"outV":{"@type":"g:Int32","@value":251}},{"id":{"@type":"g:Int32","@value":7779},"outV":{"@type":"g:Int32","@value":661}},{"id":{"@type":"g:Int32","@value":7909},"outV":{"@type":"g:Int32","@value":250}},{"id":{"@type":"g:Int32","@value":7655},"outV":{"@type":"g:Int32","@value":266}},{"id":{"@type":"g:Int32","@value":7719},"outV":{"@type":"g:Int32","@value":204}},{"id":{"@type":"g:Int32","@value":7975},"outV":{"@type":"g:Int32","@value":770}},{"id":{"@type":"g:Int32","@value":7529},"outV":{"@type":"g:Int32","@value":71}},{"id":{"@type":"g:Int32","@value":7787},"outV":{"@type":"g:Int32","@value":663}},{"id":{"@type":"g:Int32","@value":7851},"outV":{"@type":"g:Int32","@value":698}},{"id":{"@type":"g:Int32","@value":7597},"outV":{"@type":"g:Int32","@value":284}},{"id":{"@type":"g:Int32","@value":7917},"outV":{"@type":"g:Int32","@value":736}},{"id":{"@type":"g:Int32","@value":7539},"outV":{"@type":"g:Int32","@value":519}},{"id":{"@type":"g:Int32","@value":7859},"outV":{"@type":"g:Int32","@value":702}},{"id":{"@type":"g:Int32","@value":7607},"outV":{"@type":"g:Int32","@value":260}},{"id":{"@type":"g:Int32","@value":7991},"outV":{"@type":"g:Int32","@value":66}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1254},"value":"Bob_Dylan"}]}}
-{"id":{"@type":"g:Int32","@value":448},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7430},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7429},"inV":{"@type":"g:Int32","@value":449}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1255},"value":"ALL I HAVE TO DO IS DREAM"}],"songType":[{"id":{"@type":"g:Int64","@value":1257},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1256},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":449},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7429},"outV":{"@type":"g:Int32","@value":448}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1258},"value":"Boudleaux_Bryant"}]}}
-{"id":{"@type":"g:Int32","@value":450},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7432},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7431},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1259},"value":"ALL OF MY LOVE"}],"songType":[{"id":{"@type":"g:Int64","@value":1261},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1260},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":451},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7584},"outV":{"@type":"g:Int32","@value":550}},{"id":{"@type":"g:Int32","@value":7728},"outV":{"@type":"g:Int32","@value":633}},{"id":{"@type":"g:Int32","@value":7510},"outV":{"@type":"g:Int32","@value":503}},{"id":{"@type":"g:Int32","@value":7436},"outV":{"@type":"g:Int32","@value":454}},{"id":{"@type":"g:Int32","@value":7692},"outV":{"@type":"g:Int32","@value":617}},{"id":{"@type":"g:Int32","@value":7998},"outV":{"@type":"g:Int32","@value":784}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7827},"outV":{"@type":"g:Int32","@value":684}},{"id":{"@type":"g:Int32","@value":7509},"outV":{"@type":"g:Int32","@value":503}},{"id":{"@type":"g:Int32","@value":7925},"outV":{"@type":"g:Int32","@value":742}},{"id":{"@type":"g:Int32","@value":7431},"outV":{"@type":"g:Int32","@value":450}},{"id":{"@type":"g:Int32","@value":7543},"outV":{"@type":"g:Int32","@value":365}},{"id":{"@type":"g:Int32","@value":7735},"outV":{"@type":"g:Int32","@value":638}},{"id":{"@type":"g:Int32","@value":7435},"outV":{"@type":"g:Int32","@value":454}},{"id":{"@type":"g:Int32","@value":7467},"outV":{"@type":"g:Int32","@value":477}},{"id":{"@type":"g:Int32","@value":7563},"outV":{"@type":"g:Int32","@value":538}},{"id":{"@type":"g:Int32","@value":7755},"outV":{"@type":"g:Int32","@value":648}},{"id":{"@type":"g:Int32","@value":7997},"outV":{"@type":"g:Int32","@value":784}},{"id":{"@type":"g:Int32","@value":7727},"outV":{"@type":"g:Int32","@value":633}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1262},"value":"Unknown"}]}}
-{"id":{"@type":"g:Int32","@value":452},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7434},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7433},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1263},"value":"AND WE BID YOU GOODNIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":1265},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1264},"value":{"@type":"g:Int32","@value":61}}]}}
-{"id":{"@type":"g:Int32","@value":453},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7760},"outV":{"@type":"g:Int32","@value":131}},{"id":{"@type":"g:Int32","@value":7858},"outV":{"@type":"g:Int32","@value":93}},{"id":{"@type":"g:Int32","@value":7718},"outV":{"@type":"g:Int32","@value":385}},{"id":{"@type":"g:Int32","@value":7990},"outV":{"@type":"g:Int32","@value":779}},{"id":{"@type":"g:Int32","@value":7592},"outV":{"@type":"g:Int32","@value":555}},{"id":{"@type":"g:Int32","@value":7434},"outV":{"@type":"g:Int32","@value":452}},{"id":{"@type":"g:Int32","@value":7706},"outV":{"@type":"g:Int32","@value":624}},{"id":{"@type":"g:Int32","@value":8012},"outV":{"@type":"g:Int32","@value":86}},{"id":{"@type":"g:Int32","@value":7646},"outV":{"@type":"g:Int32","@value":187}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1266},"value":"All"}]}}
-{"id":{"@type":"g:Int32","@value":454},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7436},"inV":{"@type":"g:Int32","@value":451}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7435},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1267},"value":"ANY WONDER"}],"songType":[{"id":{"@type":"g:Int64","@value":1269},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1268},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":455},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7438},"inV":{"@type":"g:Int32","@value":457}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7437},"inV":{"@type":"g:Int32","@value":456}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1270},"value":"ARE YOU LONELY FOR ME BABY"}],"songType":[{"id":{"@type":"g:Int64","@value":1272},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1271},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":456},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7437},"outV":{"@type":"g:Int32","@value":455}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1273},"value":"Freddie_Scott"}]}}
-{"id":{"@type":"g:Int32","@value":457},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7972},"outV":{"@type":"g:Int32","@value":47}},{"id":{"@type":"g:Int32","@value":8042},"outV":{"@type":"g:Int32","@value":55}},{"id":{"@type":"g:Int32","@value":7868},"outV":{"@type":"g:Int32","@value":707}},{"id":{"@type":"g:Int32","@value":7438},"outV":{"@type":"g:Int32","@value":455}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1274},"value":"Donna"}]}}
-{"id":{"@type":"g:Int32","@value":458},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7731},"outV":{"@type":"g:Int32","@value":324}},{"id":{"@type":"g:Int32","@value":7703},"outV":{"@type":"g:Int32","@value":166}},{"id":{"@type":"g:Int32","@value":7847},"outV":{"@type":"g:Int32","@value":26}},{"id":{"@type":"g:Int32","@value":7963},"outV":{"@type":"g:Int32","@value":766}},{"id":{"@type":"g:Int32","@value":7439},"outV":{"@type":"g:Int32","@value":25}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1275},"value":"Chuck_Berry"}]}}
-{"id":{"@type":"g:Int32","@value":459},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7441},"outV":{"@type":"g:Int32","@value":185}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1276},"value":"Pete_Townshend"}]}}
-{"id":{"@type":"g:Int32","@value":460},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7443},"outV":{"@type":"g:Int32","@value":163}},{"id":{"@type":"g:Int32","@value":7643},"outV":{"@type":"g:Int32","@value":589}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1277},"value":"Jimmy_Reed"}]}}
-{"id":{"@type":"g:Int32","@value":461},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7444},"outV":{"@type":"g:Int32","@value":163}},{"id":{"@type":"g:Int32","@value":7642},"outV":{"@type":"g:Int32","@value":588}},{"id":{"@type":"g:Int32","@value":7614},"outV":{"@type":"g:Int32","@value":132}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1278},"value":"Pigpen_Mydland"}]}}
-{"id":{"@type":"g:Int32","@value":462},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7744},"outV":{"@type":"g:Int32","@value":641}},{"id":{"@type":"g:Int32","@value":7602},"outV":{"@type":"g:Int32","@value":325}},{"id":{"@type":"g:Int32","@value":7446},"outV":{"@type":"g:Int32","@value":326}},{"id":{"@type":"g:Int32","@value":7482},"outV":{"@type":"g:Int32","@value":256}},{"id":{"@type":"g:Int32","@value":7850},"outV":{"@type":"g:Int32","@value":194}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7601},"outV":{"@type":"g:Int32","@value":325}},{"id":{"@type":"g:Int32","@value":7445},"outV":{"@type":"g:Int32","@value":326}},{"id":{"@type":"g:Int32","@value":7481},"outV":{"@type":"g:Int32","@value":256}},{"id":{"@type":"g:Int32","@value":7849},"outV":{"@type":"g:Int32","@value":194}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1279},"value":"John_Fogerty"}]}}
-{"id":{"@type":"g:Int32","@value":463},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7448},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7447},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1280},"value":"BALLAD OF CASEY JONES"}],"songType":[{"id":{"@type":"g:Int64","@value":1282},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1281},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":464},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7450},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7449},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1283},"value":"BALLAD OF FRANKIE LEE AND JUDAS PRIEST"}],"songType":[{"id":{"@type":"g:Int64","@value":1285},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1284},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":465},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7454},"inV":{"@type":"g:Int32","@value":467}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7453},"inV":{"@type":"g:Int32","@value":466}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1286},"value":"BANANA BOAT SONG (DAY-O)"}],"songType":[{"id":{"@type":"g:Int64","@value":1288},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1287},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":466},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7453},"outV":{"@type":"g:Int32","@value":465}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1289},"value":"Darling_Carey_Arkin"}]}}
-{"id":{"@type":"g:Int32","@value":467},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7454},"outV":{"@type":"g:Int32","@value":465}},{"id":{"@type":"g:Int32","@value":7534},"outV":{"@type":"g:Int32","@value":515}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1290},"value":"Neville_Brothers"}]}}
-{"id":{"@type":"g:Int32","@value":468},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7456},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7455},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1291},"value":"BANKS OF THE OHIO"}],"songType":[{"id":{"@type":"g:Int64","@value":1293},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1292},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":469},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7456},"outV":{"@type":"g:Int32","@value":468}},{"id":{"@type":"g:Int32","@value":7458},"outV":{"@type":"g:Int32","@value":470}},{"id":{"@type":"g:Int32","@value":7490},"outV":{"@type":"g:Int32","@value":301}},{"id":{"@type":"g:Int32","@value":8006},"outV":{"@type":"g:Int32","@value":300}},{"id":{"@type":"g:Int32","@value":7752},"outV":{"@type":"g:Int32","@value":143}},{"id":{"@type":"g:Int32","@value":7896},"outV":{"@type":"g:Int32","@value":725}},{"id":{"@type":"g:Int32","@value":7770},"outV":{"@type":"g:Int32","@value":655}},{"id":{"@type":"g:Int32","@value":7484},"outV":{"@type":"g:Int32","@value":487}},{"id":{"@type":"g:Int32","@value":7500},"outV":{"@type":"g:Int32","@value":499}},{"id":{"@type":"g:Int32","@value":7724},"outV":{"@type":"g:Int32","@value":630}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8005},"outV":{"@type":"g:Int32","@value":300}},{"id":{"@type":"g:Int32","@value":7751},"outV":{"@type":"g:Int32","@value":143}},{"id":{"@type":"g:Int32","@value":7895},"outV":{"@type":"g:Int32","@value":725}},{"id":{"@type":"g:Int32","@value":7769},"outV":{"@type":"g:Int32","@value":655}},{"id":{"@type":"g:Int32","@value":7499},"outV":{"@type":"g:Int32","@value":499}},{"id":{"@type":"g:Int32","@value":7723},"outV":{"@type":"g:Int32","@value":630}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1294},"value":"Joan_Baez"}]}}
-{"id":{"@type":"g:Int32","@value":470},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7458},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7457},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1295},"value":"BARBARA ALLEN"}],"songType":[{"id":{"@type":"g:Int64","@value":1297},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1296},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":471},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7459},"outV":{"@type":"g:Int32","@value":10}},{"id":{"@type":"g:Int32","@value":7783},"outV":{"@type":"g:Int32","@value":197}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1298},"value":"Jesse_Fuller"}]}}
-{"id":{"@type":"g:Int32","@value":472},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7462},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7461},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1299},"value":"BETTY AND DUPREE"}],"songType":[{"id":{"@type":"g:Int64","@value":1301},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1300},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":473},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7463},"outV":{"@type":"g:Int32","@value":152}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1302},"value":"Smith_Dixon"}]}}
-{"id":{"@type":"g:Int32","@value":474},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7464},"outV":{"@type":"g:Int32","@value":152}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1303},"value":"Pigpen_Garcia"}]}}
-{"id":{"@type":"g:Int32","@value":475},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7465},"outV":{"@type":"g:Int32","@value":303}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1304},"value":"Harris_Terry"}]}}
-{"id":{"@type":"g:Int32","@value":476},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7664},"outV":{"@type":"g:Int32","@value":601}},{"id":{"@type":"g:Int32","@value":7920},"outV":{"@type":"g:Int32","@value":113}},{"id":{"@type":"g:Int32","@value":8000},"outV":{"@type":"g:Int32","@value":30}},{"id":{"@type":"g:Int32","@value":7590},"outV":{"@type":"g:Int32","@value":292}},{"id":{"@type":"g:Int32","@value":7686},"outV":{"@type":"g:Int32","@value":42}},{"id":{"@type":"g:Int32","@value":7466},"outV":{"@type":"g:Int32","@value":303}},{"id":{"@type":"g:Int32","@value":7978},"outV":{"@type":"g:Int32","@value":164}},{"id":{"@type":"g:Int32","@value":7678},"outV":{"@type":"g:Int32","@value":608}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1305},"value":"Pigpen_Weir"}]}}
-{"id":{"@type":"g:Int32","@value":477},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7468},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7467},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1306},"value":"BIG BREASA"}],"songType":[{"id":{"@type":"g:Int64","@value":1308},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1307},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":478},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7989},"outV":{"@type":"g:Int32","@value":779}},{"id":{"@type":"g:Int32","@value":7799},"outV":{"@type":"g:Int32","@value":32}},{"id":{"@type":"g:Int32","@value":7469},"outV":{"@type":"g:Int32","@value":53}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1309},"value":"Noah_Lewis"}]}}
-{"id":{"@type":"g:Int32","@value":479},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7471},"outV":{"@type":"g:Int32","@value":15}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1310},"value":"Johnny_Cash"}]}}
-{"id":{"@type":"g:Int32","@value":480},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7473},"outV":{"@type":"g:Int32","@value":321}},{"id":{"@type":"g:Int32","@value":7857},"outV":{"@type":"g:Int32","@value":93}},{"id":{"@type":"g:Int32","@value":7861},"outV":{"@type":"g:Int32","@value":211}},{"id":{"@type":"g:Int32","@value":7973},"outV":{"@type":"g:Int32","@value":275}},{"id":{"@type":"g:Int32","@value":7575},"outV":{"@type":"g:Int32","@value":312}},{"id":{"@type":"g:Int32","@value":7671},"outV":{"@type":"g:Int32","@value":606}},{"id":{"@type":"g:Int32","@value":7753},"outV":{"@type":"g:Int32","@value":647}},{"id":{"@type":"g:Int32","@value":7833},"outV":{"@type":"g:Int32","@value":689}},{"id":{"@type":"g:Int32","@value":8027},"outV":{"@type":"g:Int32","@value":242}},{"id":{"@type":"g:Int32","@value":7517},"outV":{"@type":"g:Int32","@value":212}},{"id":{"@type":"g:Int32","@value":7613},"outV":{"@type":"g:Int32","@value":132}},{"id":{"@type":"g:Int32","@value":7583},"outV":{"@type":"g:Int32","@value":550}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1311},"value":"Lennon_McCartney"}]}}
-{"id":{"@type":"g:Int32","@value":481},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7476},"outV":{"@type":"g:Int32","@value":233}},{"id":{"@type":"g:Int32","@value":7750},"outV":{"@type":"g:Int32","@value":323}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7475},"outV":{"@type":"g:Int32","@value":233}},{"id":{"@type":"g:Int32","@value":7749},"outV":{"@type":"g:Int32","@value":323}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1312},"value":"Stephen_Stills"}]}}
-{"id":{"@type":"g:Int32","@value":482},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7478},"inV":{"@type":"g:Int32","@value":484}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7477},"inV":{"@type":"g:Int32","@value":483}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1313},"value":"BLUE MOON"}],"songType":[{"id":{"@type":"g:Int64","@value":1315},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1314},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":483},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7477},"outV":{"@type":"g:Int32","@value":482}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1316},"value":"Rodgers_Hart"}]}}
-{"id":{"@type":"g:Int32","@value":484},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7478},"outV":{"@type":"g:Int32","@value":482}},{"id":{"@type":"g:Int32","@value":7982},"outV":{"@type":"g:Int32","@value":774}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1317},"value":"Joey_Covington"}]}}
-{"id":{"@type":"g:Int32","@value":485},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7480},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7479},"inV":{"@type":"g:Int32","@value":486}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1318},"value":"BLUE SUEDE SHOES"}],"songType":[{"id":{"@type":"g:Int64","@value":1320},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1319},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":486},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7479},"outV":{"@type":"g:Int32","@value":485}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1321},"value":"Carl_Perkins"}]}}
-{"id":{"@type":"g:Int32","@value":487},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7484},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7483},"inV":{"@type":"g:Int32","@value":488}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1322},"value":"BOXER THE"}],"songType":[{"id":{"@type":"g:Int64","@value":1324},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1323},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":488},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7483},"outV":{"@type":"g:Int32","@value":487}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1325},"value":"Paul_Simon"}]}}
-{"id":{"@type":"g:Int32","@value":489},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7486},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7485},"inV":{"@type":"g:Int32","@value":442}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1326},"value":"BRING ME MY SHOTGUN"}],"songType":[{"id":{"@type":"g:Int64","@value":1328},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1327},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":490},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8011},"outV":{"@type":"g:Int32","@value":86}},{"id":{"@type":"g:Int32","@value":7487},"outV":{"@type":"g:Int32","@value":254}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1329},"value":"Robbie_Robertson"}]}}
-{"id":{"@type":"g:Int32","@value":491},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7489},"outV":{"@type":"g:Int32","@value":301}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1330},"value":"F_and_B_Bryant"}]}}
-{"id":{"@type":"g:Int32","@value":492},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7492},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7491},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1331},"value":"C.C.RIDER"}],"songType":[{"id":{"@type":"g:Int64","@value":1333},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1332},"value":{"@type":"g:Int32","@value":127}}]}}
-{"id":{"@type":"g:Int32","@value":493},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7493},"outV":{"@type":"g:Int32","@value":156}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1334},"value":"Rodney_Crowell"}]}}
-{"id":{"@type":"g:Int32","@value":494},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7496},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7495},"inV":{"@type":"g:Int32","@value":495}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1335},"value":"CATHYS CLOWN"}],"songType":[{"id":{"@type":"g:Int64","@value":1337},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1336},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":495},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7495},"outV":{"@type":"g:Int32","@value":494}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1338},"value":"Don_and_Phil_Everly"}]}}
-{"id":{"@type":"g:Int32","@value":496},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7498},"inV":{"@type":"g:Int32","@value":498}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7497},"inV":{"@type":"g:Int32","@value":497}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1339},"value":"CHECKING UP"}],"songType":[{"id":{"@type":"g:Int64","@value":1341},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1340},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":497},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7497},"outV":{"@type":"g:Int32","@value":496}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1342},"value":"Sonny_Boy_Williamson"}]}}
-{"id":{"@type":"g:Int32","@value":498},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7846},"outV":{"@type":"g:Int32","@value":697}},{"id":{"@type":"g:Int32","@value":7498},"outV":{"@type":"g:Int32","@value":496}},{"id":{"@type":"g:Int32","@value":7962},"outV":{"@type":"g:Int32","@value":764}},{"id":{"@type":"g:Int32","@value":8026},"outV":{"@type":"g:Int32","@value":795}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1343},"value":"Elvin_Bishop"}]}}
-{"id":{"@type":"g:Int32","@value":499},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7500},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7499},"inV":{"@type":"g:Int32","@value":469}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1344},"value":"CHILDREN OF THE 80S"}],"songType":[{"id":{"@type":"g:Int64","@value":1346},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1345},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":500},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7503},"outV":{"@type":"g:Int32","@value":337}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1347},"value":"Robyn_Hitchcock"}]}}
-{"id":{"@type":"g:Int32","@value":501},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7504},"outV":{"@type":"g:Int32","@value":337}},{"id":{"@type":"g:Int32","@value":7798},"outV":{"@type":"g:Int32","@value":334}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7797},"outV":{"@type":"g:Int32","@value":334}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1348},"value":"Suzanne_Vega"}]}}
-{"id":{"@type":"g:Int32","@value":502},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7508},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7507},"inV":{"@type":"g:Int32","@value":442}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1349},"value":"COME BACK BABY"}],"songType":[{"id":{"@type":"g:Int64","@value":1351},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1350},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":503},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7510},"inV":{"@type":"g:Int32","@value":451}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7509},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1352},"value":"COWBOY SONG"}],"songType":[{"id":{"@type":"g:Int64","@value":1354},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1353},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":504},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7512},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7511},"inV":{"@type":"g:Int32","@value":505}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1355},"value":"DANCING IN THE STREET"}],"songType":[{"id":{"@type":"g:Int64","@value":1357},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1356},"value":{"@type":"g:Int32","@value":123}}]}}
-{"id":{"@type":"g:Int32","@value":505},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7511},"outV":{"@type":"g:Int32","@value":504}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1358},"value":"Stevenson_et_al"}]}}
-{"id":{"@type":"g:Int32","@value":506},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7514},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7513},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1359},"value":"DARLING COREY"}],"songType":[{"id":{"@type":"g:Int64","@value":1361},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1360},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":507},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7518},"outV":{"@type":"g:Int32","@value":212}},{"id":{"@type":"g:Int32","@value":7726},"outV":{"@type":"g:Int32","@value":631}},{"id":{"@type":"g:Int32","@value":7822},"outV":{"@type":"g:Int32","@value":111}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1362},"value":"Garcia_Weir"}]}}
-{"id":{"@type":"g:Int32","@value":508},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7520},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7519},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1363},"value":"DEAD MAN DEAD MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1365},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1364},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":509},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7522},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7521},"inV":{"@type":"g:Int32","@value":510}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1366},"value":"DEAR MR FANTASY"}],"songType":[{"id":{"@type":"g:Int64","@value":1368},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1367},"value":{"@type":"g:Int32","@value":58}}]}}
-{"id":{"@type":"g:Int32","@value":510},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7521},"outV":{"@type":"g:Int32","@value":509}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1369},"value":"Winwood_et_al"}]}}
-{"id":{"@type":"g:Int32","@value":511},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7523},"outV":{"@type":"g:Int32","@value":135}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1370},"value":"Rev_Gary_Davis"}]}}
-{"id":{"@type":"g:Int32","@value":512},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7526},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7525},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1371},"value":"DEATH LETTER BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1373},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1372},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":513},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7532},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7531},"inV":{"@type":"g:Int32","@value":514}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1374},"value":"DEVIL WITH THE BLUE DRESS ON"}],"songType":[{"id":{"@type":"g:Int64","@value":1376},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1375},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":514},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7531},"outV":{"@type":"g:Int32","@value":513}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1377},"value":"Long_Stevenson"}]}}
-{"id":{"@type":"g:Int32","@value":515},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7534},"inV":{"@type":"g:Int32","@value":467}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7533},"inV":{"@type":"g:Int32","@value":516}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1378},"value":"DO YOU WANNA DANCE?"}],"songType":[{"id":{"@type":"g:Int64","@value":1380},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1379},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":516},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7533},"outV":{"@type":"g:Int32","@value":515}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1381},"value":"Bobby_Freeman"}]}}
-{"id":{"@type":"g:Int32","@value":517},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7538},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7537},"inV":{"@type":"g:Int32","@value":518}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1382},"value":"DONT MESS UP A GOOD THING"}],"songType":[{"id":{"@type":"g:Int64","@value":1384},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1383},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":518},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7537},"outV":{"@type":"g:Int32","@value":517}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1385},"value":"Oliver_Sain"}]}}
-{"id":{"@type":"g:Int32","@value":519},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7540},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7539},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1386},"value":"DONT THINK TWICE ITS ALL RIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":1388},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1387},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":520},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7633},"outV":{"@type":"g:Int32","@value":582}},{"id":{"@type":"g:Int32","@value":8003},"outV":{"@type":"g:Int32","@value":31}},{"id":{"@type":"g:Int32","@value":7541},"outV":{"@type":"g:Int32","@value":245}},{"id":{"@type":"g:Int32","@value":7927},"outV":{"@type":"g:Int32","@value":33}},{"id":{"@type":"g:Int32","@value":7625},"outV":{"@type":"g:Int32","@value":576}},{"id":{"@type":"g:Int32","@value":7641},"outV":{"@type":"g:Int32","@value":588}},{"id":{"@type":"g:Int32","@value":7881},"outV":{"@type":"g:Int32","@value":40}},{"id":{"@type":"g:Int32","@value":7739},"outV":{"@type":"g:Int32","@value":88}},{"id":{"@type":"g:Int32","@value":7789},"outV":{"@type":"g:Int32","@value":664}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1389},"value":"Willie_Dixon"}]}}
-{"id":{"@type":"g:Int32","@value":521},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7546},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7545},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1390},"value":"DRINK UP AND GO HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":1392},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1391},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":522},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7548},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7547},"inV":{"@type":"g:Int32","@value":523}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1393},"value":"EARLY MORNING RAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":1395},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1394},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":523},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7547},"outV":{"@type":"g:Int32","@value":522}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1396},"value":"Gordon_Lightfoot"}]}}
-{"id":{"@type":"g:Int32","@value":524},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7550},"inV":{"@type":"g:Int32","@value":525}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7549},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1397},"value":"EASY RIDER"}],"songType":[{"id":{"@type":"g:Int64","@value":1399},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1398},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":525},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7666},"outV":{"@type":"g:Int32","@value":2}},{"id":{"@type":"g:Int32","@value":7550},"outV":{"@type":"g:Int32","@value":524}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7665},"outV":{"@type":"g:Int32","@value":2}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1400},"value":"Spencer_Davis"}]}}
-{"id":{"@type":"g:Int32","@value":526},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7552},"inV":{"@type":"g:Int32","@value":527}},{"id":{"@type":"g:Int32","@value":7890},"inV":{"@type":"g:Int32","@value":527}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7889},"inV":{"@type":"g:Int32","@value":527}},{"id":{"@type":"g:Int32","@value":7551},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1401},"value":"SAY BOSS MAN (EIGHTEEN CHILDREN)"}],"songType":[{"id":{"@type":"g:Int64","@value":1403},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1402},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":527},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7552},"outV":{"@type":"g:Int32","@value":526}},{"id":{"@type":"g:Int32","@value":7890},"outV":{"@type":"g:Int32","@value":526}},{"id":{"@type":"g:Int32","@value":7844},"outV":{"@type":"g:Int32","@value":696}},{"id":{"@type":"g:Int32","@value":8038},"outV":{"@type":"g:Int32","@value":801}},{"id":{"@type":"g:Int32","@value":7916},"outV":{"@type":"g:Int32","@value":735}},{"id":{"@type":"g:Int32","@value":7948},"outV":{"@type":"g:Int32","@value":754}},{"id":{"@type":"g:Int32","@value":7694},"outV":{"@type":"g:Int32","@value":619}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7889},"outV":{"@type":"g:Int32","@value":526}},{"id":{"@type":"g:Int32","@value":7843},"outV":{"@type":"g:Int32","@value":696}},{"id":{"@type":"g:Int32","@value":7781},"outV":{"@type":"g:Int32","@value":6}},{"id":{"@type":"g:Int32","@value":8037},"outV":{"@type":"g:Int32","@value":801}},{"id":{"@type":"g:Int32","@value":8023},"outV":{"@type":"g:Int32","@value":146}},{"id":{"@type":"g:Int32","@value":7611},"outV":{"@type":"g:Int32","@value":1}},{"id":{"@type":"g:Int32","@value":7915},"outV":{"@type":"g:Int32","@value":735}},{"id":{"@type":"g:Int32","@value":7693},"outV":{"@type":"g:Int32","@value":619}},{"id":{"@type":"g:Int32","@value":7551},"outV":{"@type":"g:Int32","@value":526}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1404},"value":"Bo_Diddley"}]}}
-{"id":{"@type":"g:Int32","@value":528},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7553},"outV":{"@type":"g:Int32","@value":18}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1405},"value":"Marty_Robbins"}]}}
-{"id":{"@type":"g:Int32","@value":529},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7556},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7555},"inV":{"@type":"g:Int32","@value":530}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1406},"value":"EMPTY HEART"}],"songType":[{"id":{"@type":"g:Int64","@value":1408},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1407},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":530},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7555},"outV":{"@type":"g:Int32","@value":529}},{"id":{"@type":"g:Int32","@value":7933},"outV":{"@type":"g:Int32","@value":746}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1409},"value":"Jagger_Richard"}]}}
-{"id":{"@type":"g:Int32","@value":531},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7558},"inV":{"@type":"g:Int32","@value":533}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7557},"inV":{"@type":"g:Int32","@value":532}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1410},"value":"EVERY TIME YOU GO AWAY"}],"songType":[{"id":{"@type":"g:Int64","@value":1412},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1411},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":532},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7557},"outV":{"@type":"g:Int32","@value":531}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1413},"value":"Daryl_Hall"}]}}
-{"id":{"@type":"g:Int32","@value":533},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8016},"outV":{"@type":"g:Int32","@value":95}},{"id":{"@type":"g:Int32","@value":7558},"outV":{"@type":"g:Int32","@value":531}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1414},"value":"Hall_and_Oates"}]}}
-{"id":{"@type":"g:Int32","@value":534},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7559},"outV":{"@type":"g:Int32","@value":283}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1415},"value":"Davenport_Cooley"}]}}
-{"id":{"@type":"g:Int32","@value":535},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7562},"inV":{"@type":"g:Int32","@value":537}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7561},"inV":{"@type":"g:Int32","@value":536}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1416},"value":"FIRE IN THE CITY"}],"songType":[{"id":{"@type":"g:Int64","@value":1418},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1417},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":536},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7561},"outV":{"@type":"g:Int32","@value":535}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1419},"value":"Peter_Krug"}]}}
-{"id":{"@type":"g:Int32","@value":537},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7926},"outV":{"@type":"g:Int32","@value":742}},{"id":{"@type":"g:Int32","@value":7562},"outV":{"@type":"g:Int32","@value":535}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1420},"value":"Jon_Hendricks"}]}}
-{"id":{"@type":"g:Int32","@value":538},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7564},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7563},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1421},"value":"THE FLOOD"}],"songType":[{"id":{"@type":"g:Int64","@value":1423},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1422},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":539},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7566},"outV":{"@type":"g:Int32","@value":335}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1424},"value":"Neil_Young"}]}}
-{"id":{"@type":"g:Int32","@value":540},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7567},"outV":{"@type":"g:Int32","@value":315}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1425},"value":"Stevens"}]}}
-{"id":{"@type":"g:Int32","@value":541},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7570},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7569},"inV":{"@type":"g:Int32","@value":542}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1426},"value":"GAMES PEOPLE PLAY"}],"songType":[{"id":{"@type":"g:Int64","@value":1428},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1427},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":542},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7569},"outV":{"@type":"g:Int32","@value":541}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1429},"value":"Joe_South"}]}}
-{"id":{"@type":"g:Int32","@value":543},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7572},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7571},"inV":{"@type":"g:Int32","@value":544}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1430},"value":"GANSTER OF LOVE"}],"songType":[{"id":{"@type":"g:Int64","@value":1432},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1431},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":544},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7571},"outV":{"@type":"g:Int32","@value":543}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1433},"value":"Johnny_Guitar_Watson"}]}}
-{"id":{"@type":"g:Int32","@value":545},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7574},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7573},"inV":{"@type":"g:Int32","@value":546}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1434},"value":"GATHERING FLOWERS FOR THE MASTERS BOUQUET"}],"songType":[{"id":{"@type":"g:Int64","@value":1436},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1435},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":546},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7573},"outV":{"@type":"g:Int32","@value":545}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1437},"value":"Marvin_Baumgardner"}]}}
-{"id":{"@type":"g:Int32","@value":547},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7578},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7577},"inV":{"@type":"g:Int32","@value":548}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1438},"value":"GIMME SOME LOVING"}],"songType":[{"id":{"@type":"g:Int64","@value":1440},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1439},"value":{"@type":"g:Int32","@value":87}}]}}
-{"id":{"@type":"g:Int32","@value":548},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7577},"outV":{"@type":"g:Int32","@value":547}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1441},"value":"Winwood_Davis"}]}}
-{"id":{"@type":"g:Int32","@value":549},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7579},"outV":{"@type":"g:Int32","@value":227}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1442},"value":"Van_Morrison"}]}}
-{"id":{"@type":"g:Int32","@value":550},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7584},"inV":{"@type":"g:Int32","@value":451}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7583},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1443},"value":"GOOD DAY SUNSHINE"}],"songType":[{"id":{"@type":"g:Int64","@value":1445},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1444},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":551},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7585},"outV":{"@type":"g:Int32","@value":44}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1446},"value":"Blackwell_Marascalco"}]}}
-{"id":{"@type":"g:Int32","@value":552},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7587},"outV":{"@type":"g:Int32","@value":120}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1447},"value":"Resnick_Clark"}]}}
-{"id":{"@type":"g:Int32","@value":553},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7588},"outV":{"@type":"g:Int32","@value":120}},{"id":{"@type":"g:Int32","@value":7740},"outV":{"@type":"g:Int32","@value":88}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1448},"value":"Pigpen_Weir_Mydland"}]}}
-{"id":{"@type":"g:Int32","@value":554},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7589},"outV":{"@type":"g:Int32","@value":292}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1449},"value":"Williamson"}]}}
-{"id":{"@type":"g:Int32","@value":555},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7592},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7591},"inV":{"@type":"g:Int32","@value":556}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1450},"value":"GOOD TIMES"}],"songType":[{"id":{"@type":"g:Int64","@value":1452},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1451},"value":{"@type":"g:Int32","@value":47}}]}}
-{"id":{"@type":"g:Int32","@value":556},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7591},"outV":{"@type":"g:Int32","@value":555}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1453},"value":"Sam_Cooke"}]}}
-{"id":{"@type":"g:Int32","@value":557},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7593},"outV":{"@type":"g:Int32","@value":336}},{"id":{"@type":"g:Int32","@value":7871},"outV":{"@type":"g:Int32","@value":710}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1454},"value":"Leadbelly"}]}}
-{"id":{"@type":"g:Int32","@value":558},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7596},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7595},"inV":{"@type":"g:Int32","@value":559}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1455},"value":"GOT MY MOJO WORKING"}],"songType":[{"id":{"@type":"g:Int64","@value":1457},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1456},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":559},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7595},"outV":{"@type":"g:Int32","@value":558}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1458},"value":"Preston_Foster"}]}}
-{"id":{"@type":"g:Int32","@value":560},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7600},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7599},"inV":{"@type":"g:Int32","@value":561}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1459},"value":"GREEN GREEN GRASS OF HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":1461},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1460},"value":{"@type":"g:Int32","@value":9}}]}}
-{"id":{"@type":"g:Int32","@value":561},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7599},"outV":{"@type":"g:Int32","@value":560}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1462},"value":"Curly_Putnam"}]}}
-{"id":{"@type":"g:Int32","@value":562},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7603},"outV":{"@type":"g:Int32","@value":161}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1463},"value":"Redding"}]}}
-{"id":{"@type":"g:Int32","@value":563},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7606},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7605},"inV":{"@type":"g:Int32","@value":564}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1464},"value":"HE WAS A FRIEND OF MINE"}],"songType":[{"id":{"@type":"g:Int64","@value":1466},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1465},"value":{"@type":"g:Int32","@value":17}}]}}
-{"id":{"@type":"g:Int32","@value":564},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7605},"outV":{"@type":"g:Int32","@value":563}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1467},"value":"Mark_Spoelstra"}]}}
-{"id":{"@type":"g:Int32","@value":565},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7610},"inV":{"@type":"g:Int32","@value":567}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7609},"inV":{"@type":"g:Int32","@value":566}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1468},"value":"HELP ME RHONDA"}],"songType":[{"id":{"@type":"g:Int64","@value":1470},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1469},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":566},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7609},"outV":{"@type":"g:Int32","@value":565}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1471},"value":"Brian_Wilson"}]}}
-{"id":{"@type":"g:Int32","@value":567},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7816},"outV":{"@type":"g:Int32","@value":675}},{"id":{"@type":"g:Int32","@value":7864},"outV":{"@type":"g:Int32","@value":703}},{"id":{"@type":"g:Int32","@value":7610},"outV":{"@type":"g:Int32","@value":565}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1472},"value":"Beach_Boys"}]}}
-{"id":{"@type":"g:Int32","@value":568},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7616},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7615},"inV":{"@type":"g:Int32","@value":569}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1473},"value":"HEY LITTLE ONE"}],"songType":[{"id":{"@type":"g:Int64","@value":1475},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1474},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":569},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7615},"outV":{"@type":"g:Int32","@value":568}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1476},"value":"Bernette_Vorzon"}]}}
-{"id":{"@type":"g:Int32","@value":570},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7617},"outV":{"@type":"g:Int32","@value":151}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1477},"value":"Meters_(Traditional)"}]}}
-{"id":{"@type":"g:Int32","@value":571},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7620},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7619},"inV":{"@type":"g:Int32","@value":572}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1478},"value":"HI-HEEL SNEAKERS"}],"songType":[{"id":{"@type":"g:Int64","@value":1480},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1479},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":572},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7619},"outV":{"@type":"g:Int32","@value":571}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1481},"value":"Higgenbotham"}]}}
-{"id":{"@type":"g:Int32","@value":573},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7621},"outV":{"@type":"g:Int32","@value":332}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1482},"value":"Freddie_King"}]}}
-{"id":{"@type":"g:Int32","@value":574},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7906},"outV":{"@type":"g:Int32","@value":317}},{"id":{"@type":"g:Int32","@value":7924},"outV":{"@type":"g:Int32","@value":740}},{"id":{"@type":"g:Int32","@value":7622},"outV":{"@type":"g:Int32","@value":332}},{"id":{"@type":"g:Int32","@value":7756},"outV":{"@type":"g:Int32","@value":648}},{"id":{"@type":"g:Int32","@value":7932},"outV":{"@type":"g:Int32","@value":744}},{"id":{"@type":"g:Int32","@value":7980},"outV":{"@type":"g:Int32","@value":772}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1483},"value":"None"}]}}
-{"id":{"@type":"g:Int32","@value":575},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7624},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7623},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1484},"value":"HIGHWAY 61 REVISITED"}],"songType":[{"id":{"@type":"g:Int64","@value":1486},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1485},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":576},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7626},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7625},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1487},"value":"HOOCHIE COOCHIE MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1489},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1488},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":577},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7627},"outV":{"@type":"g:Int32","@value":247}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1490},"value":"Leroy_Carr_Frank_Stokes"}]}}
-{"id":{"@type":"g:Int32","@value":578},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7630},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7629},"inV":{"@type":"g:Int32","@value":579}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1491},"value":"HOW SWEET IT IS (TO BE LOVED BY YOU)"}],"songType":[{"id":{"@type":"g:Int64","@value":1493},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1492},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":579},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7629},"outV":{"@type":"g:Int32","@value":578}},{"id":{"@type":"g:Int32","@value":7869},"outV":{"@type":"g:Int32","@value":709}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1494},"value":"Holland_et_al"}]}}
-{"id":{"@type":"g:Int32","@value":580},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7632},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7631},"inV":{"@type":"g:Int32","@value":581}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1495},"value":"(BABY) HULLY GULLY"}],"songType":[{"id":{"@type":"g:Int64","@value":1497},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1496},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":581},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7631},"outV":{"@type":"g:Int32","@value":580}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1498},"value":"Smith_Goldsmith"}]}}
-{"id":{"@type":"g:Int32","@value":582},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7634},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7633},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1499},"value":"I AINT SUPERSTITIOUS"}],"songType":[{"id":{"@type":"g:Int64","@value":1501},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1500},"value":{"@type":"g:Int32","@value":8}}]}}
-{"id":{"@type":"g:Int32","@value":583},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7635},"outV":{"@type":"g:Int32","@value":216}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1502},"value":"Sonny_Curtis"}]}}
-{"id":{"@type":"g:Int32","@value":584},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7638},"inV":{"@type":"g:Int32","@value":585}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7637},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1503},"value":"I GOT A MIND TO GIVE UP LIVING"}],"songType":[{"id":{"@type":"g:Int64","@value":1505},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1504},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":585},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7638},"outV":{"@type":"g:Int32","@value":584}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1506},"value":"Boz_Scaggs"}]}}
-{"id":{"@type":"g:Int32","@value":586},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7640},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7639},"inV":{"@type":"g:Int32","@value":587}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1507},"value":"I HEARD IT THROUGH THE GRAPEVINE"}],"songType":[{"id":{"@type":"g:Int64","@value":1509},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1508},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":587},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7639},"outV":{"@type":"g:Int32","@value":586}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1510},"value":"Strong_Whitfield"}]}}
-{"id":{"@type":"g:Int32","@value":588},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7642},"inV":{"@type":"g:Int32","@value":461}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7641},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1511},"value":"I JUST WANT TO MAKE LOVE TO YOU"}],"songType":[{"id":{"@type":"g:Int64","@value":1513},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1512},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":589},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7644},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7643},"inV":{"@type":"g:Int32","@value":460}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1514},"value":"I KNOW ITS A SIN"}],"songType":[{"id":{"@type":"g:Int64","@value":1516},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1515},"value":{"@type":"g:Int32","@value":11}}]}}
-{"id":{"@type":"g:Int32","@value":590},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7648},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7647},"inV":{"@type":"g:Int32","@value":591}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1517},"value":"I SECOND THAT EMOTION"}],"songType":[{"id":{"@type":"g:Int64","@value":1519},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1518},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":591},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7647},"outV":{"@type":"g:Int32","@value":590}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1520},"value":"Robinson_Cleveland"}]}}
-{"id":{"@type":"g:Int32","@value":592},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7649},"outV":{"@type":"g:Int32","@value":258}},{"id":{"@type":"g:Int32","@value":7689},"outV":{"@type":"g:Int32","@value":177}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1521},"value":"George_Harrison"}]}}
-{"id":{"@type":"g:Int32","@value":593},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7654},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7653},"inV":{"@type":"g:Int32","@value":594}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1522},"value":"I WASHED MY HANDS IN MUDDY WATER"}],"songType":[{"id":{"@type":"g:Int64","@value":1524},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1523},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":594},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7653},"outV":{"@type":"g:Int32","@value":593}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1525},"value":"J_Babcock"}]}}
-{"id":{"@type":"g:Int32","@value":595},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7658},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7657},"inV":{"@type":"g:Int32","@value":596}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1526},"value":"ILL GO CRAZY"}],"songType":[{"id":{"@type":"g:Int64","@value":1528},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1527},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":596},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7841},"outV":{"@type":"g:Int32","@value":695}},{"id":{"@type":"g:Int32","@value":7657},"outV":{"@type":"g:Int32","@value":595}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1529},"value":"James_Brown"}]}}
-{"id":{"@type":"g:Int32","@value":597},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7660},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7659},"inV":{"@type":"g:Int32","@value":598}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1530},"value":"IM A HOG FOR YOU BABY"}],"songType":[{"id":{"@type":"g:Int64","@value":1532},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1531},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":598},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7659},"outV":{"@type":"g:Int32","@value":597}},{"id":{"@type":"g:Int32","@value":7709},"outV":{"@type":"g:Int32","@value":244}},{"id":{"@type":"g:Int32","@value":8047},"outV":{"@type":"g:Int32","@value":808}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1533},"value":"Leiber_Stoller"}]}}
-{"id":{"@type":"g:Int32","@value":599},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7662},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7661},"inV":{"@type":"g:Int32","@value":600}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1534},"value":"IM A KING BEE"}],"songType":[{"id":{"@type":"g:Int64","@value":1536},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1535},"value":{"@type":"g:Int32","@value":38}}]}}
-{"id":{"@type":"g:Int32","@value":600},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7661},"outV":{"@type":"g:Int32","@value":599}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1537},"value":"James_Moore"}]}}
-{"id":{"@type":"g:Int32","@value":601},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7664},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7663},"inV":{"@type":"g:Int32","@value":602}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1538},"value":"IM A LOVING MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1540},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1539},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":602},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7663},"outV":{"@type":"g:Int32","@value":601}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1541},"value":"Clancy_Carlile"}]}}
-{"id":{"@type":"g:Int32","@value":603},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7668},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7667},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1542},"value":"IVE BEEN ALL AROUND THIS WORLD"}],"songType":[{"id":{"@type":"g:Int64","@value":1544},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1543},"value":{"@type":"g:Int32","@value":18}}]}}
-{"id":{"@type":"g:Int32","@value":604},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7670},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7669},"inV":{"@type":"g:Int32","@value":605}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1545},"value":"IVE GOT A TIGER BY THE TAIL"}],"songType":[{"id":{"@type":"g:Int64","@value":1547},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1546},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":605},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7669},"outV":{"@type":"g:Int32","@value":604}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1548},"value":"Owens_Howard"}]}}
-{"id":{"@type":"g:Int32","@value":606},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7672},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7671},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1549},"value":"IVE JUST SEEN A FACE"}],"songType":[{"id":{"@type":"g:Int64","@value":1551},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1550},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":607},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7676},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7675},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1552},"value":"IN THE PINES"}],"songType":[{"id":{"@type":"g:Int64","@value":1554},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1553},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":608},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7678},"inV":{"@type":"g:Int32","@value":476}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7677},"inV":{"@type":"g:Int32","@value":609}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1555},"value":"IN THE MIDNIGHT HOUR"}],"songType":[{"id":{"@type":"g:Int64","@value":1557},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1556},"value":{"@type":"g:Int32","@value":46}}]}}
-{"id":{"@type":"g:Int32","@value":609},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7677},"outV":{"@type":"g:Int32","@value":608}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1558},"value":"Pickett_Cropper"}]}}
-{"id":{"@type":"g:Int32","@value":610},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7680},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7679},"inV":{"@type":"g:Int32","@value":611}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1559},"value":"IT HURTS ME TOO"}],"songType":[{"id":{"@type":"g:Int64","@value":1561},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1560},"value":{"@type":"g:Int32","@value":47}}]}}
-{"id":{"@type":"g:Int32","@value":611},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7679},"outV":{"@type":"g:Int32","@value":610}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1562},"value":"Tampa_Red"}]}}
-{"id":{"@type":"g:Int32","@value":612},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7682},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7681},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1563},"value":"IT TAKES ... A TRAIN TO CRY"}],"songType":[{"id":{"@type":"g:Int64","@value":1565},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1564},"value":{"@type":"g:Int32","@value":7}}]}}
-{"id":{"@type":"g:Int32","@value":613},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7684},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7683},"inV":{"@type":"g:Int32","@value":614}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1566},"value":"ITS A MANS MANS MANS WORLD"}],"songType":[{"id":{"@type":"g:Int64","@value":1568},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1567},"value":{"@type":"g:Int32","@value":11}}]}}
-{"id":{"@type":"g:Int32","@value":614},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7683},"outV":{"@type":"g:Int32","@value":613}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1569},"value":"Brown_et_al"}]}}
-{"id":{"@type":"g:Int32","@value":615},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7685},"outV":{"@type":"g:Int32","@value":42}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1570},"value":"B_and_S_Womack"}]}}
-{"id":{"@type":"g:Int32","@value":616},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7688},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7687},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1571},"value":"ITS ALL OVER NOW BABY BLUE"}],"songType":[{"id":{"@type":"g:Int64","@value":1573},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1572},"value":{"@type":"g:Int32","@value":145}}]}}
-{"id":{"@type":"g:Int32","@value":617},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7692},"inV":{"@type":"g:Int32","@value":451}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7691},"inV":{"@type":"g:Int32","@value":618}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1574},"value":"ITS MY OWN FAULT"}],"songType":[{"id":{"@type":"g:Int64","@value":1576},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1575},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":618},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7691},"outV":{"@type":"g:Int32","@value":617}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1577},"value":"John_Lee_Hooker"}]}}
-{"id":{"@type":"g:Int32","@value":619},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7694},"inV":{"@type":"g:Int32","@value":527}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7693},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1578},"value":"IVE SEEN THEM ALL"}],"songType":[{"id":{"@type":"g:Int64","@value":1580},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1579},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":620},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7696},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7695},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1581},"value":"JACK-A-ROE"}],"songType":[{"id":{"@type":"g:Int64","@value":1583},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1582},"value":{"@type":"g:Int32","@value":115}}]}}
-{"id":{"@type":"g:Int32","@value":621},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7702},"inV":{"@type":"g:Int32","@value":623}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7701},"inV":{"@type":"g:Int32","@value":622}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1584},"value":"JOHNS OTHER"}],"songType":[{"id":{"@type":"g:Int64","@value":1586},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1585},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":622},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7701},"outV":{"@type":"g:Int32","@value":621}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1587},"value":"Papa_John_Creach"}]}}
-{"id":{"@type":"g:Int32","@value":623},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7840},"outV":{"@type":"g:Int32","@value":693}},{"id":{"@type":"g:Int32","@value":7810},"outV":{"@type":"g:Int32","@value":672}},{"id":{"@type":"g:Int32","@value":7986},"outV":{"@type":"g:Int32","@value":777}},{"id":{"@type":"g:Int32","@value":7702},"outV":{"@type":"g:Int32","@value":621}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7809},"outV":{"@type":"g:Int32","@value":672}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1588},"value":"Jorma_Kaukonen"}]}}
-{"id":{"@type":"g:Int32","@value":624},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7706},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7705},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1589},"value":"JORDAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1591},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1590},"value":{"@type":"g:Int32","@value":12}}]}}
-{"id":{"@type":"g:Int32","@value":625},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7708},"inV":{"@type":"g:Int32","@value":354}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7707},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1592},"value":"JUST LIKE TOM THUMBS BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1594},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1593},"value":{"@type":"g:Int32","@value":58}}]}}
-{"id":{"@type":"g:Int32","@value":626},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7712},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7711},"inV":{"@type":"g:Int32","@value":442}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1595},"value":"KATIE MAE"}],"songType":[{"id":{"@type":"g:Int64","@value":1597},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1596},"value":{"@type":"g:Int32","@value":11}}]}}
-{"id":{"@type":"g:Int32","@value":627},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7715},"outV":{"@type":"g:Int32","@value":299}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1598},"value":"Clapton_Whitlock"}]}}
-{"id":{"@type":"g:Int32","@value":628},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7716},"outV":{"@type":"g:Int32","@value":299}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1599},"value":"Lesh_Mydland"}]}}
-{"id":{"@type":"g:Int32","@value":629},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7721},"outV":{"@type":"g:Int32","@value":144}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1600},"value":"Traditional_(arr_Valens)"}]}}
-{"id":{"@type":"g:Int32","@value":630},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7724},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7723},"inV":{"@type":"g:Int32","@value":469}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1601},"value":"LADY DI AND I"}],"songType":[{"id":{"@type":"g:Int64","@value":1603},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1602},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":631},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7726},"inV":{"@type":"g:Int32","@value":507}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7725},"inV":{"@type":"g:Int32","@value":632}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1604},"value":"THE LAST TIME"}],"songType":[{"id":{"@type":"g:Int64","@value":1606},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1605},"value":{"@type":"g:Int32","@value":70}}]}}
-{"id":{"@type":"g:Int32","@value":632},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7725},"outV":{"@type":"g:Int32","@value":631}},{"id":{"@type":"g:Int32","@value":7885},"outV":{"@type":"g:Int32","@value":719}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1607},"value":"Jagger_Richards"}]}}
-{"id":{"@type":"g:Int32","@value":633},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7728},"inV":{"@type":"g:Int32","@value":451}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7727},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1608},"value":"LEAVE YOUR LOVE AT HOME"}],"songType":[{"id":{"@type":"g:Int64","@value":1610},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1609},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":634},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7730},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7729},"inV":{"@type":"g:Int32","@value":635}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1611},"value":"LET IT BE ME"}],"songType":[{"id":{"@type":"g:Int64","@value":1613},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1612},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":635},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7729},"outV":{"@type":"g:Int32","@value":634}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1614},"value":"Curtis_et_al"}]}}
-{"id":{"@type":"g:Int32","@value":636},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7734},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7733},"inV":{"@type":"g:Int32","@value":637}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1615},"value":"LET ME IN"}],"songType":[{"id":{"@type":"g:Int64","@value":1617},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1616},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":637},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7733},"outV":{"@type":"g:Int32","@value":636}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1618},"value":"Gene_Crysler"}]}}
-{"id":{"@type":"g:Int32","@value":638},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7736},"inV":{"@type":"g:Int32","@value":352}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7735},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1619},"value":"LITTLE BUNNY FOO FOO"}],"songType":[{"id":{"@type":"g:Int64","@value":1621},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1620},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":639},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7742},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7741},"inV":{"@type":"g:Int32","@value":640}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1622},"value":"LONG BLACK LIMOUSINE"}],"songType":[{"id":{"@type":"g:Int64","@value":1624},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1623},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":640},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7741},"outV":{"@type":"g:Int32","@value":639}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1625},"value":"Stovall_George"}]}}
-{"id":{"@type":"g:Int32","@value":641},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7744},"inV":{"@type":"g:Int32","@value":462}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7743},"inV":{"@type":"g:Int32","@value":642}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1626},"value":"LONG TALL SALLY"}],"songType":[{"id":{"@type":"g:Int64","@value":1628},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1627},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":642},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7743},"outV":{"@type":"g:Int32","@value":641}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1629},"value":"Johnson_et_al"}]}}
-{"id":{"@type":"g:Int32","@value":643},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7746},"inV":{"@type":"g:Int32","@value":645}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7745},"inV":{"@type":"g:Int32","@value":644}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1630},"value":"LOOK ON YONDERS WALL"}],"songType":[{"id":{"@type":"g:Int64","@value":1632},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1631},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":644},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7745},"outV":{"@type":"g:Int32","@value":643}},{"id":{"@type":"g:Int32","@value":7957},"outV":{"@type":"g:Int32","@value":761}},{"id":{"@type":"g:Int32","@value":7791},"outV":{"@type":"g:Int32","@value":313}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1633},"value":"Arthur_Cruddup"}]}}
-{"id":{"@type":"g:Int32","@value":645},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7746},"outV":{"@type":"g:Int32","@value":643}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1634},"value":"Pigpen?"}]}}
-{"id":{"@type":"g:Int32","@value":646},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7747},"outV":{"@type":"g:Int32","@value":257}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1635},"value":"Richard_Berry"}]}}
-{"id":{"@type":"g:Int32","@value":647},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7754},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7753},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1636},"value":"LUCY IN THE SKY WITH DIAMONDS"}],"songType":[{"id":{"@type":"g:Int64","@value":1638},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1637},"value":{"@type":"g:Int32","@value":19}}]}}
-{"id":{"@type":"g:Int32","@value":648},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7756},"inV":{"@type":"g:Int32","@value":574}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7755},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1639},"value":"LUCKY MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1641},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1640},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":649},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7757},"outV":{"@type":"g:Int32","@value":306}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1642},"value":"Brecht_Wiell"}]}}
-{"id":{"@type":"g:Int32","@value":650},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7761},"outV":{"@type":"g:Int32","@value":112}},{"id":{"@type":"g:Int32","@value":7815},"outV":{"@type":"g:Int32","@value":675}},{"id":{"@type":"g:Int32","@value":7911},"outV":{"@type":"g:Int32","@value":206}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1643},"value":"Merle_Haggard"}]}}
-{"id":{"@type":"g:Int32","@value":651},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7766},"inV":{"@type":"g:Int32","@value":381}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7765},"inV":{"@type":"g:Int32","@value":652}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1644},"value":"MAN SMART (WOMAN SMARTER)"}],"songType":[{"id":{"@type":"g:Int64","@value":1646},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1645},"value":{"@type":"g:Int32","@value":199}}]}}
-{"id":{"@type":"g:Int32","@value":652},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7765},"outV":{"@type":"g:Int32","@value":651}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1647},"value":"Norman_Span"}]}}
-{"id":{"@type":"g:Int32","@value":653},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7768},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7767},"inV":{"@type":"g:Int32","@value":654}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1648},"value":"MANNISH BOY (IM A MAN)"}],"songType":[{"id":{"@type":"g:Int64","@value":1650},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1649},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":654},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7767},"outV":{"@type":"g:Int32","@value":653}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1651},"value":"Morganfield_McDaniel"}]}}
-{"id":{"@type":"g:Int32","@value":655},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7770},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7769},"inV":{"@type":"g:Int32","@value":469}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1652},"value":"MARRIOTT USA"}],"songType":[{"id":{"@type":"g:Int64","@value":1654},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1653},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":656},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7772},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7771},"inV":{"@type":"g:Int32","@value":657}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1655},"value":"MATILDA MATILDA"}],"songType":[{"id":{"@type":"g:Int64","@value":1657},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1656},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":657},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7771},"outV":{"@type":"g:Int32","@value":656}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1658},"value":"Harry_Belafonte"}]}}
-{"id":{"@type":"g:Int32","@value":658},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7773},"outV":{"@type":"g:Int32","@value":22}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1659},"value":"Kristofferson_Foster"}]}}
-{"id":{"@type":"g:Int32","@value":659},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7775},"outV":{"@type":"g:Int32","@value":12}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1660},"value":"John_Phillips"}]}}
-{"id":{"@type":"g:Int32","@value":660},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7778},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7777},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1661},"value":"MEMPHIS BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1663},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1662},"value":{"@type":"g:Int32","@value":76}}]}}
-{"id":{"@type":"g:Int32","@value":661},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7780},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7779},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1664},"value":"THE MIGHTY QUINN (QUINN THE ESKIMO)"}],"songType":[{"id":{"@type":"g:Int64","@value":1666},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1665},"value":{"@type":"g:Int32","@value":59}}]}}
-{"id":{"@type":"g:Int32","@value":662},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7785},"outV":{"@type":"g:Int32","@value":127}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1667},"value":"Bonnie_Dobson"}]}}
-{"id":{"@type":"g:Int32","@value":663},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7788},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7787},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1668},"value":"MR TAMBOURINE MAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1670},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1669},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":664},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7790},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7789},"inV":{"@type":"g:Int32","@value":520}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1671},"value":"MY BABE"}],"songType":[{"id":{"@type":"g:Int64","@value":1673},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1672},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":665},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7794},"inV":{"@type":"g:Int32","@value":666}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7793},"inV":{"@type":"g:Int32","@value":666}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1674},"value":"NEAL CASSADY RAP"}],"songType":[{"id":{"@type":"g:Int64","@value":1676},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1675},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":666},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7794},"outV":{"@type":"g:Int32","@value":665}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7793},"outV":{"@type":"g:Int32","@value":665}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1677},"value":"Neal_Cassady"}]}}
-{"id":{"@type":"g:Int32","@value":667},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7796},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7795},"inV":{"@type":"g:Int32","@value":668}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1678},"value":"NEIGHBOR NEIGHBOR"}],"songType":[{"id":{"@type":"g:Int64","@value":1680},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1679},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":668},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7795},"outV":{"@type":"g:Int32","@value":667}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1681},"value":"Valler_Meaux"}]}}
-{"id":{"@type":"g:Int32","@value":669},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7801},"outV":{"@type":"g:Int32","@value":320}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1682},"value":"Guida_Royster"}]}}
-{"id":{"@type":"g:Int32","@value":670},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7803},"outV":{"@type":"g:Int32","@value":207}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1683},"value":"Forest_Harvey"}]}}
-{"id":{"@type":"g:Int32","@value":671},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7807},"outV":{"@type":"g:Int32","@value":3}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1684},"value":"Hardin_Petty"}]}}
-{"id":{"@type":"g:Int32","@value":672},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7810},"inV":{"@type":"g:Int32","@value":623}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7809},"inV":{"@type":"g:Int32","@value":623}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1685},"value":"ODE FOR BILLIE DEAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1687},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1686},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":673},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7811},"outV":{"@type":"g:Int32","@value":199}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1688},"value":"Elizabeth_Cotten"}]}}
-{"id":{"@type":"g:Int32","@value":674},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7813},"outV":{"@type":"g:Int32","@value":8}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1689},"value":"West_Tilghman_Holly"}]}}
-{"id":{"@type":"g:Int32","@value":675},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7816},"inV":{"@type":"g:Int32","@value":567}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7815},"inV":{"@type":"g:Int32","@value":650}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1690},"value":"OKIE FROM MUSKOGEE"}],"songType":[{"id":{"@type":"g:Int64","@value":1692},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1691},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":676},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7818},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7817},"inV":{"@type":"g:Int32","@value":677}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1693},"value":"OL SLEWFOOT"}],"songType":[{"id":{"@type":"g:Int64","@value":1695},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1694},"value":{"@type":"g:Int32","@value":9}}]}}
-{"id":{"@type":"g:Int32","@value":677},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7817},"outV":{"@type":"g:Int32","@value":676}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1696},"value":"Hausey_Manney"}]}}
-{"id":{"@type":"g:Int32","@value":678},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7820},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7819},"inV":{"@type":"g:Int32","@value":679}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1697},"value":"OLD OLD HOUSE"}],"songType":[{"id":{"@type":"g:Int64","@value":1699},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1698},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":679},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7819},"outV":{"@type":"g:Int32","@value":678}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1700},"value":"Jones_Bynum"}]}}
-{"id":{"@type":"g:Int32","@value":680},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7824},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7823},"inV":{"@type":"g:Int32","@value":681}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1701},"value":"ONE KIND FAVOR"}],"songType":[{"id":{"@type":"g:Int64","@value":1703},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1702},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":681},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7823},"outV":{"@type":"g:Int32","@value":680}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1704},"value":"Blind_Lemon_Jefferson"}]}}
-{"id":{"@type":"g:Int32","@value":682},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7826},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7825},"inV":{"@type":"g:Int32","@value":683}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1705},"value":"ONE WAY OUT"}],"songType":[{"id":{"@type":"g:Int64","@value":1707},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1706},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":683},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7825},"outV":{"@type":"g:Int32","@value":682}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1708},"value":"James_Sehorn_Williamson"}]}}
-{"id":{"@type":"g:Int32","@value":684},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7828},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7827},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1709},"value":"ONE YOU LOVE THE"}],"songType":[{"id":{"@type":"g:Int64","@value":1711},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1710},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":685},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7830},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7829},"inV":{"@type":"g:Int32","@value":686}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1712},"value":"OVERSEAS STOMP (LINDBERGH HOP)"}],"songType":[{"id":{"@type":"g:Int64","@value":1714},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1713},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":686},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7829},"outV":{"@type":"g:Int32","@value":685}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1715},"value":"Jones_Shade"}]}}
-{"id":{"@type":"g:Int32","@value":687},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7832},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7831},"inV":{"@type":"g:Int32","@value":688}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1716},"value":"PAIN IN MY HEART"}],"songType":[{"id":{"@type":"g:Int64","@value":1718},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1717},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":688},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7831},"outV":{"@type":"g:Int32","@value":687}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1719},"value":"Naomi_Neville"}]}}
-{"id":{"@type":"g:Int32","@value":689},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7834},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7833},"inV":{"@type":"g:Int32","@value":480}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1720},"value":"PAPERBACK WRITER"}],"songType":[{"id":{"@type":"g:Int64","@value":1722},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1721},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":690},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7836},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7835},"inV":{"@type":"g:Int32","@value":691}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1723},"value":"PARCHMAN FARM"}],"songType":[{"id":{"@type":"g:Int64","@value":1725},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1724},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":691},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7835},"outV":{"@type":"g:Int32","@value":690}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1726},"value":"Mose_Allison"}]}}
-{"id":{"@type":"g:Int32","@value":692},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7838},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7837},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1727},"value":"PEGGYO"}],"songType":[{"id":{"@type":"g:Int64","@value":1729},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1728},"value":{"@type":"g:Int32","@value":265}}]}}
-{"id":{"@type":"g:Int32","@value":693},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7840},"inV":{"@type":"g:Int32","@value":623}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7839},"inV":{"@type":"g:Int32","@value":694}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1730},"value":"PEGGY SUE"}],"songType":[{"id":{"@type":"g:Int64","@value":1732},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1731},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":694},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7839},"outV":{"@type":"g:Int32","@value":693}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1733},"value":"Holly_Allison_Petty"}]}}
-{"id":{"@type":"g:Int32","@value":695},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7842},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7841},"inV":{"@type":"g:Int32","@value":596}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1734},"value":"PLEASE PLEASE PLEASE"}],"songType":[{"id":{"@type":"g:Int64","@value":1736},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1735},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":696},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7844},"inV":{"@type":"g:Int32","@value":527}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7843},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1737},"value":"POLLUTION"}],"songType":[{"id":{"@type":"g:Int64","@value":1739},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1738},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":697},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7846},"inV":{"@type":"g:Int32","@value":498}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7845},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1740},"value":"PRISONER BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1742},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1741},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":698},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7852},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7851},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1743},"value":"QUEEN JANE APPROXIMATELY"}],"songType":[{"id":{"@type":"g:Int64","@value":1745},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1744},"value":{"@type":"g:Int32","@value":129}}]}}
-{"id":{"@type":"g:Int32","@value":699},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7853},"outV":{"@type":"g:Int32","@value":20}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1746},"value":"Don_Rollins"}]}}
-{"id":{"@type":"g:Int32","@value":700},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7856},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7855},"inV":{"@type":"g:Int32","@value":701}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1747},"value":"RAILROADING ON THE GREAT DIVIDE"}],"songType":[{"id":{"@type":"g:Int64","@value":1749},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1748},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":701},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7855},"outV":{"@type":"g:Int32","@value":700}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1750},"value":"Sara_Carter"}]}}
-{"id":{"@type":"g:Int32","@value":702},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7860},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7859},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1751},"value":"RAINY DAY WOMEN"}],"songType":[{"id":{"@type":"g:Int64","@value":1753},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1752},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":703},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7864},"inV":{"@type":"g:Int32","@value":567}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7863},"inV":{"@type":"g:Int32","@value":704}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1754},"value":"RIOT IN CELL BLOCK"}],"songType":[{"id":{"@type":"g:Int64","@value":1756},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1755},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":704},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7891},"outV":{"@type":"g:Int32","@value":722}},{"id":{"@type":"g:Int32","@value":7863},"outV":{"@type":"g:Int32","@value":703}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1757},"value":"Lieber_Stoller"}]}}
-{"id":{"@type":"g:Int32","@value":705},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7866},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7865},"inV":{"@type":"g:Int32","@value":706}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1758},"value":"RIP IT UP"}],"songType":[{"id":{"@type":"g:Int64","@value":1760},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1759},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":706},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7865},"outV":{"@type":"g:Int32","@value":705}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1761},"value":"Blackwell_Marascaico"}]}}
-{"id":{"@type":"g:Int32","@value":707},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7868},"inV":{"@type":"g:Int32","@value":457}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7867},"inV":{"@type":"g:Int32","@value":708}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1762},"value":"RIVER DEEP MOUNTAIN HIGH"}],"songType":[{"id":{"@type":"g:Int64","@value":1764},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1763},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":708},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7867},"outV":{"@type":"g:Int32","@value":707}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1765},"value":"Greenwich_Barry_Spector"}]}}
-{"id":{"@type":"g:Int32","@value":709},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7870},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7869},"inV":{"@type":"g:Int32","@value":579}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1766},"value":"(IM A) ROAD RUNNER"}],"songType":[{"id":{"@type":"g:Int64","@value":1768},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1767},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":710},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7872},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7871},"inV":{"@type":"g:Int32","@value":557}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1769},"value":"ROBERTA"}],"songType":[{"id":{"@type":"g:Int64","@value":1771},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1770},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":711},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7874},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7873},"inV":{"@type":"g:Int32","@value":712}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1772},"value":"ROCKING PNEUMONIA"}],"songType":[{"id":{"@type":"g:Int64","@value":1774},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1773},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":712},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7873},"outV":{"@type":"g:Int32","@value":711}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1775},"value":"Vincent_Smith"}]}}
-{"id":{"@type":"g:Int32","@value":713},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7876},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7875},"inV":{"@type":"g:Int32","@value":714}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1776},"value":"ROLLING AND TUMBLING"}],"songType":[{"id":{"@type":"g:Int64","@value":1778},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1777},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":714},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7875},"outV":{"@type":"g:Int32","@value":713}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1779},"value":"Willie_Newbern"}]}}
-{"id":{"@type":"g:Int32","@value":715},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7878},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7877},"inV":{"@type":"g:Int32","@value":716}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1780},"value":"ROSA LEE MCFALL"}],"songType":[{"id":{"@type":"g:Int64","@value":1782},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1781},"value":{"@type":"g:Int32","@value":16}}]}}
-{"id":{"@type":"g:Int32","@value":716},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7877},"outV":{"@type":"g:Int32","@value":715}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1783},"value":"Charlie_Monroe"}]}}
-{"id":{"@type":"g:Int32","@value":717},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7880},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7879},"inV":{"@type":"g:Int32","@value":718}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1784},"value":"RUN RUDOLPH RUN"}],"songType":[{"id":{"@type":"g:Int64","@value":1786},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1785},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":718},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7879},"outV":{"@type":"g:Int32","@value":717}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1787},"value":"Brodie_Marks"}]}}
-{"id":{"@type":"g:Int32","@value":719},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7886},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7885},"inV":{"@type":"g:Int32","@value":632}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1788},"value":"(I CANT GET NO) SATISFACTION"}],"songType":[{"id":{"@type":"g:Int64","@value":1790},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1789},"value":{"@type":"g:Int32","@value":31}}]}}
-{"id":{"@type":"g:Int32","@value":720},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7888},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7887},"inV":{"@type":"g:Int32","@value":721}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1791},"value":"SAWMILL"}],"songType":[{"id":{"@type":"g:Int64","@value":1793},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1792},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":721},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7887},"outV":{"@type":"g:Int32","@value":720}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1794},"value":"Tillis_Whatley"}]}}
-{"id":{"@type":"g:Int32","@value":722},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7892},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7891},"inV":{"@type":"g:Int32","@value":704}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1795},"value":"SEARCHING"}],"songType":[{"id":{"@type":"g:Int64","@value":1797},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1796},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":723},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7894},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7893},"inV":{"@type":"g:Int32","@value":724}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1798},"value":"SEASONS OF MY HEART"}],"songType":[{"id":{"@type":"g:Int64","@value":1800},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1799},"value":{"@type":"g:Int32","@value":5}}]}}
-{"id":{"@type":"g:Int32","@value":724},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7893},"outV":{"@type":"g:Int32","@value":723}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1801},"value":"Jones_Edwards"}]}}
-{"id":{"@type":"g:Int32","@value":725},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7896},"inV":{"@type":"g:Int32","@value":469}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7895},"inV":{"@type":"g:Int32","@value":469}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1802},"value":"SGT PEPPERS BAND"}],"songType":[{"id":{"@type":"g:Int64","@value":1804},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1803},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":726},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7898},"outV":{"@type":"g:Int32","@value":128}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1805},"value":"Weir_Garcia"}]}}
-{"id":{"@type":"g:Int32","@value":727},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7900},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7899},"inV":{"@type":"g:Int32","@value":442}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1806},"value":"SHES MINE"}],"songType":[{"id":{"@type":"g:Int64","@value":1808},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1807},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":728},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7904},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7903},"inV":{"@type":"g:Int32","@value":729}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1809},"value":"SICK AND TIRED"}],"songType":[{"id":{"@type":"g:Int64","@value":1811},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1810},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":729},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7903},"outV":{"@type":"g:Int32","@value":728}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1812},"value":"Bartholomew_Kenner"}]}}
-{"id":{"@type":"g:Int32","@value":730},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7905},"outV":{"@type":"g:Int32","@value":317}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1813},"value":"Lawlor_Blake"}]}}
-{"id":{"@type":"g:Int32","@value":731},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7908},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7907},"inV":{"@type":"g:Int32","@value":732}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1814},"value":"SILVER THREADS AND GOLDEN NEEDLES"}],"songType":[{"id":{"@type":"g:Int64","@value":1816},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1815},"value":{"@type":"g:Int32","@value":17}}]}}
-{"id":{"@type":"g:Int32","@value":732},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7907},"outV":{"@type":"g:Int32","@value":731}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1817},"value":"Reynolds_Rhodes"}]}}
-{"id":{"@type":"g:Int32","@value":733},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7914},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7913},"inV":{"@type":"g:Int32","@value":734}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1818},"value":"SITTING ON TOP OF THE WORLD"}],"songType":[{"id":{"@type":"g:Int64","@value":1820},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1819},"value":{"@type":"g:Int32","@value":44}}]}}
-{"id":{"@type":"g:Int32","@value":734},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7913},"outV":{"@type":"g:Int32","@value":733}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1821},"value":"Jacobs_Carter"}]}}
-{"id":{"@type":"g:Int32","@value":735},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7916},"inV":{"@type":"g:Int32","@value":527}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7915},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1822},"value":"SLOW BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1824},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1823},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":736},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7918},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7917},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1825},"value":"SLOW TRAIN"}],"songType":[{"id":{"@type":"g:Int64","@value":1827},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1826},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":737},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7919},"outV":{"@type":"g:Int32","@value":113}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1828},"value":"Chester_Burnette"}]}}
-{"id":{"@type":"g:Int32","@value":738},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7922},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7921},"inV":{"@type":"g:Int32","@value":739}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1829},"value":"SO SAD (TO WATCH GOOD LOVE GO BAD)"}],"songType":[{"id":{"@type":"g:Int64","@value":1831},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1830},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":739},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7921},"outV":{"@type":"g:Int32","@value":738}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1832},"value":"Don_Everley"}]}}
-{"id":{"@type":"g:Int32","@value":740},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7924},"inV":{"@type":"g:Int32","@value":574}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7923},"inV":{"@type":"g:Int32","@value":741}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1833},"value":"SO WHAT"}],"songType":[{"id":{"@type":"g:Int64","@value":1835},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1834},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":741},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7923},"outV":{"@type":"g:Int32","@value":740}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1836},"value":"Miles_Davis"}]}}
-{"id":{"@type":"g:Int32","@value":742},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7926},"inV":{"@type":"g:Int32","@value":537}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7925},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1837},"value":"SONS AND DAUGHTERS"}],"songType":[{"id":{"@type":"g:Int64","@value":1839},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1838},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":743},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7987},"outV":{"@type":"g:Int32","@value":778}},{"id":{"@type":"g:Int32","@value":7929},"outV":{"@type":"g:Int32","@value":136}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1840},"value":"Bruce_Hornsby"}]}}
-{"id":{"@type":"g:Int32","@value":744},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7932},"inV":{"@type":"g:Int32","@value":574}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7931},"inV":{"@type":"g:Int32","@value":745}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1841},"value":"STARS AND STRIPES FOREVER"}],"songType":[{"id":{"@type":"g:Int64","@value":1843},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1842},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":745},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7931},"outV":{"@type":"g:Int32","@value":744}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1844},"value":"John_Philip_Sousa"}]}}
-{"id":{"@type":"g:Int32","@value":746},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7934},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7933},"inV":{"@type":"g:Int32","@value":530}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1845},"value":"START ME UP"}],"songType":[{"id":{"@type":"g:Int64","@value":1847},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1846},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":747},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7936},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7935},"inV":{"@type":"g:Int32","@value":748}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1848},"value":"STEALING"}],"songType":[{"id":{"@type":"g:Int64","@value":1850},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1849},"value":{"@type":"g:Int32","@value":4}}]}}
-{"id":{"@type":"g:Int32","@value":748},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7935},"outV":{"@type":"g:Int32","@value":747}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1851},"value":"Gus_Cannon"}]}}
-{"id":{"@type":"g:Int32","@value":749},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7937},"outV":{"@type":"g:Int32","@value":228}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1852},"value":"Bob_Marley"}]}}
-{"id":{"@type":"g:Int32","@value":750},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7940},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7939},"inV":{"@type":"g:Int32","@value":751}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1853},"value":"SWEET GEORGIA BROWN"}],"songType":[{"id":{"@type":"g:Int64","@value":1855},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1854},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":751},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7939},"outV":{"@type":"g:Int32","@value":750}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1856},"value":"Bernie_Casey_Pinkard"}]}}
-{"id":{"@type":"g:Int32","@value":752},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7942},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7941},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1857},"value":"SWING LOW SWEET CHARIOT"}],"songType":[{"id":{"@type":"g:Int64","@value":1859},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1858},"value":{"@type":"g:Int32","@value":8}}]}}
-{"id":{"@type":"g:Int32","@value":753},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7943},"outV":{"@type":"g:Int32","@value":272}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1860},"value":"Al_Green"}]}}
-{"id":{"@type":"g:Int32","@value":754},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7948},"inV":{"@type":"g:Int32","@value":527}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7947},"inV":{"@type":"g:Int32","@value":755}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1861},"value":"TAKE IT ALL OFF"}],"songType":[{"id":{"@type":"g:Int64","@value":1863},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1862},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":755},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7947},"outV":{"@type":"g:Int32","@value":754}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1864},"value":"Eva_Darby"}]}}
-{"id":{"@type":"g:Int32","@value":756},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7950},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7949},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1865},"value":"TELL IT TO ME"}],"songType":[{"id":{"@type":"g:Int64","@value":1867},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1866},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":757},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7952},"outV":{"@type":"g:Int32","@value":255}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7951},"outV":{"@type":"g:Int32","@value":255}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1868},"value":"Etta_James"}]}}
-{"id":{"@type":"g:Int32","@value":758},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7953},"outV":{"@type":"g:Int32","@value":139}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1869},"value":"Paul_McCartney"}]}}
-{"id":{"@type":"g:Int32","@value":759},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7956},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7955},"inV":{"@type":"g:Int32","@value":760}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1870},"value":"THATLL BE THE DAY"}],"songType":[{"id":{"@type":"g:Int64","@value":1872},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1871},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":760},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7955},"outV":{"@type":"g:Int32","@value":759}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1873},"value":"Buddy_Holly"}]}}
-{"id":{"@type":"g:Int32","@value":761},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7958},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7957},"inV":{"@type":"g:Int32","@value":644}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1874},"value":"THATS ALL RIGHT MAMA"}],"songType":[{"id":{"@type":"g:Int64","@value":1876},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1875},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":762},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7960},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7959},"inV":{"@type":"g:Int32","@value":763}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1877},"value":"THERES SOMETHING ON YOUR MIND"}],"songType":[{"id":{"@type":"g:Int64","@value":1879},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1878},"value":{"@type":"g:Int32","@value":2}}]}}
-{"id":{"@type":"g:Int32","@value":763},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7959},"outV":{"@type":"g:Int32","@value":762}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1880},"value":"Big_Jay_McNeely?"}]}}
-{"id":{"@type":"g:Int32","@value":764},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7962},"inV":{"@type":"g:Int32","@value":498}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7961},"inV":{"@type":"g:Int32","@value":765}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1881},"value":"THINGS I USED TO DO"}],"songType":[{"id":{"@type":"g:Int64","@value":1883},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1882},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":765},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7961},"outV":{"@type":"g:Int32","@value":764}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1884},"value":"Eddie_Jones"}]}}
-{"id":{"@type":"g:Int32","@value":766},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7964},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7963},"inV":{"@type":"g:Int32","@value":458}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1885},"value":"THIRTY DAYS"}],"songType":[{"id":{"@type":"g:Int64","@value":1887},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1886},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":767},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7966},"inV":{"@type":"g:Int32","@value":447}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7965},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1888},"value":"TIMES THEY ARE A CHANGING THE"}],"songType":[{"id":{"@type":"g:Int64","@value":1890},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1889},"value":{"@type":"g:Int32","@value":3}}]}}
-{"id":{"@type":"g:Int32","@value":768},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7968},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7967},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1891},"value":"TOM DOOLEY"}],"songType":[{"id":{"@type":"g:Int64","@value":1893},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1892},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":769},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7971},"outV":{"@type":"g:Int32","@value":47}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1894},"value":"Dolly_Parton"}]}}
-{"id":{"@type":"g:Int32","@value":770},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7976},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7975},"inV":{"@type":"g:Int32","@value":447}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1895},"value":"TOUGH MAMA"}],"songType":[{"id":{"@type":"g:Int64","@value":1897},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1896},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":771},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7977},"outV":{"@type":"g:Int32","@value":164}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1898},"value":"Scott_Malone"}]}}
-{"id":{"@type":"g:Int32","@value":772},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7980},"inV":{"@type":"g:Int32","@value":574}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7979},"inV":{"@type":"g:Int32","@value":773}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1899},"value":"TWENTY SIX MILES (SANTA CATALINA)"}],"songType":[{"id":{"@type":"g:Int64","@value":1901},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1900},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":773},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7979},"outV":{"@type":"g:Int32","@value":772}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1902},"value":"Belland_Larson"}]}}
-{"id":{"@type":"g:Int32","@value":774},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7982},"inV":{"@type":"g:Int32","@value":484}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7981},"inV":{"@type":"g:Int32","@value":775}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1903},"value":"TWIST AND SHOUT"}],"songType":[{"id":{"@type":"g:Int64","@value":1905},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1904},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":775},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7981},"outV":{"@type":"g:Int32","@value":774}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1906},"value":"Medley_Russell"}]}}
-{"id":{"@type":"g:Int32","@value":776},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7984},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7983},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1907},"value":"TWO TRAINS"}],"songType":[{"id":{"@type":"g:Int64","@value":1909},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1908},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":777},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7986},"inV":{"@type":"g:Int32","@value":623}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7985},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1910},"value":"UNCLE SAMS BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1912},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1911},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":778},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7988},"inV":{"@type":"g:Int32","@value":416}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7987},"inV":{"@type":"g:Int32","@value":743}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1913},"value":"VALLEY ROAD THE"}],"songType":[{"id":{"@type":"g:Int64","@value":1915},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1914},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":779},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7990},"inV":{"@type":"g:Int32","@value":453}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7989},"inV":{"@type":"g:Int32","@value":478}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1916},"value":"VIOLA LEE BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1918},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1917},"value":{"@type":"g:Int32","@value":32}}]}}
-{"id":{"@type":"g:Int32","@value":780},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7994},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7993},"inV":{"@type":"g:Int32","@value":781}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1919},"value":"WABASH CANNONBALL"}],"songType":[{"id":{"@type":"g:Int64","@value":1921},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1920},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":781},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7993},"outV":{"@type":"g:Int32","@value":780}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1922},"value":"A.P.Carter"}]}}
-{"id":{"@type":"g:Int32","@value":782},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7996},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7995},"inV":{"@type":"g:Int32","@value":783}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1923},"value":"WAKE UP LITTLE SUSIE"}],"songType":[{"id":{"@type":"g:Int64","@value":1925},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1924},"value":{"@type":"g:Int32","@value":14}}]}}
-{"id":{"@type":"g:Int32","@value":783},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7995},"outV":{"@type":"g:Int32","@value":782}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1926},"value":"F_&_B_Bryant"}]}}
-{"id":{"@type":"g:Int32","@value":784},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":7998},"inV":{"@type":"g:Int32","@value":451}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":7997},"inV":{"@type":"g:Int32","@value":451}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1927},"value":"WALK DOWN THE STREET"}],"songType":[{"id":{"@type":"g:Int64","@value":1929},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1928},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":785},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":7999},"outV":{"@type":"g:Int32","@value":30}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1930},"value":"Robert_Johnson"}]}}
-{"id":{"@type":"g:Int32","@value":786},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8002},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8001},"inV":{"@type":"g:Int32","@value":787}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1931},"value":"WALKING THE DOG"}],"songType":[{"id":{"@type":"g:Int64","@value":1933},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1932},"value":{"@type":"g:Int32","@value":6}}]}}
-{"id":{"@type":"g:Int32","@value":787},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8001},"outV":{"@type":"g:Int32","@value":786}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1934},"value":"Rufus_Thomas"}]}}
-{"id":{"@type":"g:Int32","@value":788},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8010},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8009},"inV":{"@type":"g:Int32","@value":789}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1935},"value":"WATCHING THE WHEELS"}],"songType":[{"id":{"@type":"g:Int64","@value":1937},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1936},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":789},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8009},"outV":{"@type":"g:Int32","@value":788}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1938},"value":"John_Lennon"}]}}
-{"id":{"@type":"g:Int32","@value":790},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8013},"outV":{"@type":"g:Int32","@value":214}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1939},"value":"Warren_Zevon"}]}}
-{"id":{"@type":"g:Int32","@value":791},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8015},"outV":{"@type":"g:Int32","@value":95}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1940},"value":"Cleveland_Gaye"}]}}
-{"id":{"@type":"g:Int32","@value":792},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8018},"inV":{"@type":"g:Int32","@value":415}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8017},"inV":{"@type":"g:Int32","@value":793}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1941},"value":"WHEN A MAN LOVES A WOMAN"}],"songType":[{"id":{"@type":"g:Int64","@value":1943},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1942},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":793},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8017},"outV":{"@type":"g:Int32","@value":792}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1944},"value":"Lewis_Wright"}]}}
-{"id":{"@type":"g:Int32","@value":794},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8022},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8021},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1945},"value":"WHISKEY IN THE JAR"}],"songType":[{"id":{"@type":"g:Int64","@value":1947},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1946},"value":{"@type":"g:Int32","@value":0}}]}}
-{"id":{"@type":"g:Int32","@value":795},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8026},"inV":{"@type":"g:Int32","@value":498}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8025},"inV":{"@type":"g:Int32","@value":796}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1948},"value":"WHOS LOVING YOU TONIGHT"}],"songType":[{"id":{"@type":"g:Int64","@value":1950},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1949},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":796},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8025},"outV":{"@type":"g:Int32","@value":795}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1951},"value":"Jimmy_Rodgers"}]}}
-{"id":{"@type":"g:Int32","@value":797},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8032},"inV":{"@type":"g:Int32","@value":798}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8031},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1952},"value":"WILL THE CIRCLE BE UNBROKEN"}],"songType":[{"id":{"@type":"g:Int64","@value":1954},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1953},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":798},"label":"artist","inE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8032},"outV":{"@type":"g:Int32","@value":797}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1955},"value":"Allman_Brothers"}]}}
-{"id":{"@type":"g:Int32","@value":799},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8033},"outV":{"@type":"g:Int32","@value":238}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1956},"value":"Johnny_Otis"}]}}
-{"id":{"@type":"g:Int32","@value":800},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8036},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8035},"inV":{"@type":"g:Int32","@value":446}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1957},"value":"WINING BOY BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1959},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1958},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":801},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8038},"inV":{"@type":"g:Int32","@value":527}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8037},"inV":{"@type":"g:Int32","@value":527}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1960},"value":"WO WOW HEY HEY"}],"songType":[{"id":{"@type":"g:Int64","@value":1962},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1961},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":802},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8040},"inV":{"@type":"g:Int32","@value":340}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8039},"inV":{"@type":"g:Int32","@value":803}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1963},"value":"WORKING MAN BLUES"}],"songType":[{"id":{"@type":"g:Int64","@value":1965},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1964},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":803},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8039},"outV":{"@type":"g:Int32","@value":802}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1966},"value":"Merl_Haggard"}]}}
-{"id":{"@type":"g:Int32","@value":804},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8041},"outV":{"@type":"g:Int32","@value":55}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1967},"value":"Loretta_Lynn"}]}}
-{"id":{"@type":"g:Int32","@value":805},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8044},"inV":{"@type":"g:Int32","@value":356}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8043},"inV":{"@type":"g:Int32","@value":806}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1968},"value":"YOU DONT LOVE ME"}],"songType":[{"id":{"@type":"g:Int64","@value":1970},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1969},"value":{"@type":"g:Int32","@value":1}}]}}
-{"id":{"@type":"g:Int32","@value":806},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8043},"outV":{"@type":"g:Int32","@value":805}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1971},"value":"Willie_Cobb"}]}}
-{"id":{"@type":"g:Int32","@value":807},"label":"artist","inE":{"writtenBy":[{"id":{"@type":"g:Int32","@value":8045},"outV":{"@type":"g:Int32","@value":235}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1972},"value":"Hank_Williams"}]}}
-{"id":{"@type":"g:Int32","@value":808},"label":"song","outE":{"sungBy":[{"id":{"@type":"g:Int32","@value":8048},"inV":{"@type":"g:Int32","@value":351}}],"writtenBy":[{"id":{"@type":"g:Int32","@value":8047},"inV":{"@type":"g:Int32","@value":598}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1973},"value":"YOUNG BLOOD"}],"songType":[{"id":{"@type":"g:Int64","@value":1975},"value":"cover"}],"performances":[{"id":{"@type":"g:Int64","@value":1974},"value":{"@type":"g:Int32","@value":1}}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v1d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v2d0.json
deleted file mode 100644
index 92c4d84..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v2d0.json
+++ /dev/null
@@ -1,808 +0,0 @@
-{"id":1,"label":"song","inE":{"followedBy":[{"id":3059,"outV":153,"properties":{"weight":1}},{"id":276,"outV":5,"properties":{"weight":2}},{"id":3704,"outV":3,"properties":{"weight":2}},{"id":4383,"outV":62,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":0,"inV":2,"properties":{"weight":1}},{"id":1,"inV":3,"properties":{"weight":2}},{"id":2,"inV":4,"properties":{"weight":1}},{"id":3,"inV":5,"properties":{"weight":1}},{"id":4,"inV":6,"properties":{"weight":1}}],"sungBy":[{"id":7612,"inV":340}],"writtenBy":[{"id":7611,"inV":527}]},"properties":{"name":[{"id":0,"value":"HEY BO DIDDLEY"}],"songType":[{"id":2,"value":"cover"}],"performances":[{"id":1,"value":5}]}}
-{"id":2,"label":"song","inE":{"followedBy":[{"id":0,"outV":1,"properties":{"weight":1}},{"id":323,"outV":34,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6190,"inV":123,"properties":{"weight":1}},{"id":6191,"inV":50,"properties":{"weight":1}}],"sungBy":[{"id":7666,"inV":525}],"writtenBy":[{"id":7665,"inV":525}]},"properties":{"name":[{"id":3,"value":"IM A MAN"}],"songType":[{"id":5,"value":"cover"}],"performances":[{"id":4,"value":1}]}}
-{"id":3,"label":"song","inE":{"followedBy":[{"id":1,"outV":1,"properties":{"weight":2}},{"id":2051,"outV":92,"properties":{"weight":4}},{"id":1412,"outV":83,"properties":{"weight":6}},{"id":6669,"outV":12,"properties":{"weight":1}},{"id":526,"outV":120,"properties":{"weight":2}},{"id":910,"outV":91,"properties":{"weight":3}},{"id":1166,"outV":26,"properties":{"weight":4}},{"id":6286,"outV":49,"properties":{"weight":1}},{"id":273,"outV":5,"properties":{"weight":40}},{"id":2194,"outV":235,"properties":{"weight":1}},{"id":1684,"outV":124,"properties":{"weight":1}},{"id":1941,"outV":148,"properties":{"weight":4}},{"id":3221,"outV":63,"properties":{"weight":1}},{"id":2712,"outV":13,"properties":{"weight":3}},{"id":6425,"outV":134,"properties":{"weight":2}},{"id":5787,"outV":76,"properties":{"weight":2}},{"id":5148,"outV":125,"properties":{"weight":4}},{"id":6692,"outV":141,"properties":{"weight":2}},{"id":6310,"outV":123,"properties":{"weight":1}},{"id":6448,"outV":187,"properties":{"weight":3}},{"id":2225,"outV":226,"properties":{"weight":1}},{"id":5042,"outV":209,"properties":{"weight":1}},{"id":4789,"outV":114,"properties":{"weight":2}},{"id":1464,"outV":81,"properties":{"weight":1}},{"id":2232,"outV":215,"properties":{"weight":1}},{"id":4665,"outV":154,"properties":{"weight":1}},{"id":2235,"outV":29,"properties":{"weight":163}},{"id":6208,"outV":319,"properties":{"weight":4}},{"id":706,"outV":206,"properties":{"weight":2}},{"id":835,"outV":171,"properties":{"weight":1}},{"id":5188,"outV":99,"properties":{"weight":1}},{"id":1862,"outV":94,"properties":{"weight":10}},{"id":1735,"outV":82,"properties":{"weight":1}},{"id":6343,"outV":21,"properties":{"weight":1}},{"id":4937,"outV":277,"properties":{"weight":1}},{"id":3276,"outV":160,"properties":{"weight":1}},{"id":3149,"outV":104,"properties":{"weight":1}},{"id":1358,"outV":130,"properties":{"weight":18}},{"id":4304,"outV":110,"properties":{"weight":1}},{"id":1105,"outV":59,"properties":{"weight":1}},{"id":722,"outV":80,"properties":{"weight":1}},{"id":4182,"outV":54,"properties":{"weight":1}},{"id":1499,"outV":164,"properties":{"weight":2}},{"id":2397,"outV":179,"properties":{"weight":1}},{"id":351,"outV":178,"properties":{"weight":1}},{"id":6623,"outV":127,"properties":{"weight":3}},{"id":2018,"outV":149,"properties":{"weight":1}},{"id":7011,"outV":89,"properties":{"weight":2}},{"id":5348,"outV":165,"properties":{"weight":1}},{"id":2278,"outV":25,"properties":{"weight":7}},{"id":1255,"outV":27,"properties":{"weight":2}},{"id":3048,"outV":153,"properties":{"weight":13}},{"id":5867,"outV":96,"properties":{"weight":116}},{"id":364,"outV":74,"properties":{"weight":2}},{"id":492,"outV":98,"properties":{"weight":1}},{"id":3948,"outV":138,"properties":{"weight":4}},{"id":4335,"outV":62,"properties":{"weight":1}},{"id":3312,"outV":252,"properties":{"weight":1}},{"id":5745,"outV":129,"properties":{"weight":1}},{"id":4596,"outV":85,"properties":{"weight":3}},{"id":5367,"outV":132,"properties":{"weight":1}},{"id":633,"outV":23,"properties":{"weight":1}},{"id":891,"outV":140,"properties":{"weight":2}},{"id":5375,"outV":69,"properties":{"weight":1}},{"id":6143,"outV":289,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":3712,"inV":27,"properties":{"weight":1}},{"id":3713,"inV":110,"properties":{"weight":4}},{"id":3714,"inV":215,"properties":{"weight":4}},{"id":3715,"inV":127,"properties":{"weight":10}},{"id":3716,"inV":83,"properties":{"weight":3}},{"id":3717,"inV":103,"properties":{"weight":2}},{"id":3718,"inV":68,"properties":{"weight":1}},{"id":3719,"inV":134,"properties":{"weight":2}},{"id":3720,"inV":25,"properties":{"weight":10}},{"id":3721,"inV":125,"properties":{"weight":54}},{"id":3722,"inV":130,"properties":{"weight":26}},{"id":3723,"inV":141,"properties":{"weight":2}},{"id":3724,"inV":145,"properties":{"weight":1}},{"id":3725,"inV":319,"properties":{"weight":3}},{"id":3726,"inV":12,"properties":{"weight":1}},{"id":3727,"inV":160,"properties":{"weight":37}},{"id":3728,"inV":70,"properties":{"weight":2}},{"id":3729,"inV":123,"properties":{"weight":1}},{"id":3730,"inV":129,"properties":{"weight":1}},{"id":3731,"inV":30,"properties":{"weight":2}},{"id":3732,"inV":148,"properties":{"weight":1}},{"id":3733,"inV":211,"properties":{"weight":3}},{"id":3734,"inV":87,"properties":{"weight":13}},{"id":3735,"inV":164,"properties":{"weight":4}},{"id":3736,"inV":64,"properties":{"weight":2}},{"id":3737,"inV":320,"properties":{"weight":1}},{"id":3738,"inV":61,"properties":{"weight":3}},{"id":3739,"inV":210,"properties":{"weight":3}},{"id":3740,"inV":50,"properties":{"weight":7}},{"id":3741,"inV":128,"properties":{"weight":3}},{"id":3742,"inV":315,"properties":{"weight":1}},{"id":3743,"inV":261,"properties":{"weight":1}},{"id":3744,"inV":213,"properties":{"weight":13}},{"id":3745,"inV":72,"properties":{"weight":1}},{"id":3746,"inV":38,"properties":{"weight":4}},{"id":3747,"inV":204,"properties":{"weight":14}},{"id":3748,"inV":62,"properties":{"weight":2}},{"id":3749,"inV":150,"properties":{"weight":8}},{"id":3750,"inV":309,"properties":{"weight":1}},{"id":3751,"inV":131,"properties":{"weight":1}},{"id":3752,"inV":151,"properties":{"weight":1}},{"id":3753,"inV":321,"properties":{"weight":1}},{"id":3754,"inV":90,"properties":{"weight":2}},{"id":3755,"inV":82,"properties":{"weight":1}},{"id":3756,"inV":120,"properties":{"weight":1}},{"id":3757,"inV":46,"properties":{"weight":5}},{"id":3758,"inV":157,"properties":{"weight":5}},{"id":3759,"inV":59,"properties":{"weight":1}},{"id":3760,"inV":81,"properties":{"weight":1}},{"id":3761,"inV":86,"properties":{"weight":5}},{"id":3762,"inV":140,"properties":{"weight":1}},{"id":3763,"inV":201,"properties":{"weight":1}},{"id":3764,"inV":214,"properties":{"weight":1}},{"id":3765,"inV":185,"properties":{"weight":2}},{"id":3766,"inV":216,"properties":{"weight":1}},{"id":3767,"inV":217,"properties":{"weight":2}},{"id":3768,"inV":236,"properties":{"weight":5}},{"id":3769,"inV":193,"properties":{"weight":1}},{"id":3770,"inV":79,"properties":{"weight":2}},{"id":3771,"inV":84,"properties":{"weight":1}},{"id":3772,"inV":23,"properties":{"weight":2}},{"id":3773,"inV":31,"properties":{"weight":2}},{"id":3774,"inV":240,"properties":{"weight":1}},{"id":3775,"inV":292,"properties":{"weight":1}},{"id":3776,"inV":9,"properties":{"weight":1}},{"id":3777,"inV":259,"properties":{"weight":1}},{"id":3694,"inV":5,"properties":{"weight":57}},{"id":3695,"inV":114,"properties":{"weight":30}},{"id":3696,"inV":74,"properties":{"weight":2}},{"id":3697,"inV":78,"properties":{"weight":3}},{"id":3698,"inV":10,"properties":{"weight":1}},{"id":3699,"inV":26,"properties":{"weight":4}},{"id":3700,"inV":153,"properties":{"weight":7}},{"id":3701,"inV":4,"properties":{"weight":4}},{"id":3702,"inV":317,"properties":{"weight":1}},{"id":3703,"inV":13,"properties":{"weight":5}},{"id":3704,"inV":1,"properties":{"weight":2}},{"id":3705,"inV":21,"properties":{"weight":2}},{"id":3706,"inV":57,"properties":{"weight":2}},{"id":3707,"inV":122,"properties":{"weight":2}},{"id":3708,"inV":318,"properties":{"weight":1}},{"id":3709,"inV":94,"properties":{"weight":26}},{"id":3710,"inV":96,"properties":{"weight":7}},{"id":3711,"inV":124,"properties":{"weight":15}}],"sungBy":[{"id":7808,"inV":351}],"writtenBy":[{"id":7807,"inV":671}]},"properties":{"name":[{"id":6,"value":"NOT FADE AWAY"}],"songType":[{"id":8,"value":"cover"}],"performances":[{"id":7,"value":531}]}}
-{"id":4,"label":"song","inE":{"followedBy":[{"id":128,"outV":97,"properties":{"weight":1}},{"id":1664,"outV":267,"properties":{"weight":1}},{"id":2,"outV":1,"properties":{"weight":1}},{"id":899,"outV":140,"properties":{"weight":1}},{"id":1667,"outV":124,"properties":{"weight":15}},{"id":4099,"outV":48,"properties":{"weight":1}},{"id":1156,"outV":26,"properties":{"weight":16}},{"id":773,"outV":122,"properties":{"weight":9}},{"id":6534,"outV":242,"properties":{"weight":1}},{"id":1032,"outV":73,"properties":{"weight":1}},{"id":6664,"outV":12,"properties":{"weight":3}},{"id":5129,"outV":222,"properties":{"weight":1}},{"id":5387,"outV":69,"properties":{"weight":1}},{"id":5517,"outV":43,"properties":{"weight":2}},{"id":5006,"outV":30,"properties":{"weight":2}},{"id":6030,"outV":204,"properties":{"weight":2}},{"id":2063,"outV":92,"properties":{"weight":1}},{"id":915,"outV":91,"properties":{"weight":2}},{"id":6940,"outV":84,"properties":{"weight":5}},{"id":2464,"outV":68,"properties":{"weight":1}},{"id":5795,"outV":76,"properties":{"weight":2}},{"id":3620,"outV":24,"properties":{"weight":2}},{"id":4772,"outV":114,"properties":{"weight":25}},{"id":2982,"outV":14,"properties":{"weight":3}},{"id":3367,"outV":184,"properties":{"weight":6}},{"id":2345,"outV":87,"properties":{"weight":2}},{"id":2861,"outV":101,"properties":{"weight":6}},{"id":1840,"outV":275,"properties":{"weight":1}},{"id":5425,"outV":102,"properties":{"weight":1}},{"id":180,"outV":70,"properties":{"weight":46}},{"id":2613,"outV":158,"properties":{"weight":1}},{"id":5434,"outV":217,"properties":{"weight":1}},{"id":5562,"outV":162,"properties":{"weight":2}},{"id":1469,"outV":81,"properties":{"weight":1}},{"id":446,"outV":38,"properties":{"weight":7}},{"id":2494,"outV":90,"properties":{"weight":3}},{"id":3266,"outV":160,"properties":{"weight":10}},{"id":326,"outV":34,"properties":{"weight":1}},{"id":583,"outV":120,"properties":{"weight":2}},{"id":6855,"outV":64,"properties":{"weight":12}},{"id":73,"outV":46,"properties":{"weight":4}},{"id":4425,"outV":212,"properties":{"weight":1}},{"id":1613,"outV":210,"properties":{"weight":2}},{"id":4941,"outV":86,"properties":{"weight":2}},{"id":6350,"outV":21,"properties":{"weight":1}},{"id":3535,"outV":201,"properties":{"weight":1}},{"id":980,"outV":11,"properties":{"weight":3}},{"id":1494,"outV":164,"properties":{"weight":3}},{"id":5206,"outV":99,"properties":{"weight":1}},{"id":5847,"outV":61,"properties":{"weight":2}},{"id":6490,"outV":187,"properties":{"weight":1}},{"id":2781,"outV":15,"properties":{"weight":4}},{"id":5600,"outV":42,"properties":{"weight":1}},{"id":353,"outV":74,"properties":{"weight":6}},{"id":5474,"outV":79,"properties":{"weight":1}},{"id":1891,"outV":103,"properties":{"weight":19}},{"id":3811,"outV":88,"properties":{"weight":2}},{"id":5989,"outV":50,"properties":{"weight":12}},{"id":4327,"outV":110,"properties":{"weight":2}},{"id":2538,"outV":57,"properties":{"weight":4}},{"id":3050,"outV":153,"properties":{"weight":13}},{"id":4970,"outV":236,"properties":{"weight":1}},{"id":2283,"outV":25,"properties":{"weight":9}},{"id":236,"outV":145,"properties":{"weight":1}},{"id":6126,"outV":72,"properties":{"weight":2}},{"id":5232,"outV":214,"properties":{"weight":2}},{"id":4594,"outV":85,"properties":{"weight":1}},{"id":1652,"outV":213,"properties":{"weight":3}},{"id":4084,"outV":109,"properties":{"weight":1}},{"id":629,"outV":23,"properties":{"weight":10}},{"id":3701,"outV":3,"properties":{"weight":4}},{"id":5621,"outV":22,"properties":{"weight":1}},{"id":7029,"outV":89,"properties":{"weight":1}},{"id":5238,"outV":32,"properties":{"weight":3}},{"id":2684,"outV":13,"properties":{"weight":9}},{"id":3325,"outV":268,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5120,"inV":40,"properties":{"weight":5}},{"id":5121,"inV":33,"properties":{"weight":3}},{"id":5122,"inV":79,"properties":{"weight":1}},{"id":5123,"inV":292,"properties":{"weight":1}},{"id":5071,"inV":50,"properties":{"weight":9}},{"id":5072,"inV":12,"properties":{"weight":26}},{"id":5073,"inV":18,"properties":{"weight":4}},{"id":5074,"inV":24,"properties":{"weight":9}},{"id":5075,"inV":23,"properties":{"weight":63}},{"id":5076,"inV":13,"properties":{"weight":12}},{"id":5077,"inV":10,"properties":{"weight":4}},{"id":5078,"inV":11,"properties":{"weight":3}},{"id":5079,"inV":26,"properties":{"weight":18}},{"id":5080,"inV":22,"properties":{"weight":1}},{"id":5081,"inV":16,"properties":{"weight":2}},{"id":5082,"inV":49,"properties":{"weight":1}},{"id":5083,"inV":25,"properties":{"weight":2}},{"id":5084,"inV":51,"properties":{"weight":1}},{"id":5085,"inV":15,"properties":{"weight":1}},{"id":5086,"inV":112,"properties":{"weight":4}},{"id":5087,"inV":121,"properties":{"weight":1}},{"id":5088,"inV":32,"properties":{"weight":7}},{"id":5089,"inV":68,"properties":{"weight":2}},{"id":5090,"inV":120,"properties":{"weight":77}},{"id":5091,"inV":103,"properties":{"weight":1}},{"id":5092,"inV":42,"properties":{"weight":3}},{"id":5093,"inV":85,"properties":{"weight":4}},{"id":5094,"inV":76,"properties":{"weight":5}},{"id":5095,"inV":181,"properties":{"weight":2}},{"id":5096,"inV":14,"properties":{"weight":2}},{"id":5097,"inV":122,"properties":{"weight":1}},{"id":5098,"inV":153,"properties":{"weight":3}},{"id":5099,"inV":96,"properties":{"weight":1}},{"id":5100,"inV":82,"properties":{"weight":3}},{"id":5101,"inV":110,"properties":{"weight":1}},{"id":5102,"inV":19,"properties":{"weight":6}},{"id":5103,"inV":129,"properties":{"weight":1}},{"id":5104,"inV":84,"properties":{"weight":1}},{"id":5105,"inV":88,"properties":{"weight":9}},{"id":5106,"inV":97,"properties":{"weight":1}},{"id":5107,"inV":114,"properties":{"weight":2}},{"id":5108,"inV":30,"properties":{"weight":8}},{"id":5109,"inV":31,"properties":{"weight":8}},{"id":5110,"inV":69,"properties":{"weight":4}},{"id":5111,"inV":127,"properties":{"weight":2}},{"id":5112,"inV":60,"properties":{"weight":1}},{"id":5113,"inV":39,"properties":{"weight":2}},{"id":5114,"inV":21,"properties":{"weight":1}},{"id":5115,"inV":117,"properties":{"weight":1}},{"id":5116,"inV":78,"properties":{"weight":1}},{"id":5117,"inV":38,"properties":{"weight":1}},{"id":5118,"inV":169,"properties":{"weight":2}},{"id":5119,"inV":118,"properties":{"weight":1}}],"sungBy":[{"id":7064,"inV":340}],"writtenBy":[{"id":7063,"inV":339}]},"properties":{"name":[{"id":9,"value":"BERTHA"}],"songType":[{"id":11,"value":"original"}],"performances":[{"id":10,"value":394}]}}
-{"id":5,"label":"song","inE":{"followedBy":[{"id":194,"outV":70,"properties":{"weight":8}},{"id":962,"outV":67,"properties":{"weight":5}},{"id":3,"outV":1,"properties":{"weight":1}},{"id":5446,"outV":231,"properties":{"weight":5}},{"id":6344,"outV":21,"properties":{"weight":6}},{"id":1738,"outV":82,"properties":{"weight":1}},{"id":6666,"outV":12,"properties":{"weight":1}},{"id":1867,"outV":94,"properties":{"weight":15}},{"id":4300,"outV":110,"properties":{"weight":1}},{"id":847,"outV":171,"properties":{"weight":1}},{"id":2832,"outV":101,"properties":{"weight":3}},{"id":6032,"outV":115,"properties":{"weight":1}},{"id":1170,"outV":26,"properties":{"weight":1}},{"id":5330,"outV":238,"properties":{"weight":1}},{"id":1491,"outV":164,"properties":{"weight":3}},{"id":1429,"outV":83,"properties":{"weight":3}},{"id":3033,"outV":14,"properties":{"weight":1}},{"id":6298,"outV":49,"properties":{"weight":1}},{"id":1373,"outV":130,"properties":{"weight":11}},{"id":4447,"outV":113,"properties":{"weight":1}},{"id":5151,"outV":125,"properties":{"weight":6}},{"id":5343,"outV":165,"properties":{"weight":2}},{"id":6431,"outV":134,"properties":{"weight":2}},{"id":1953,"outV":148,"properties":{"weight":10}},{"id":1634,"outV":210,"properties":{"weight":1}},{"id":2274,"outV":25,"properties":{"weight":8}},{"id":100,"outV":46,"properties":{"weight":1}},{"id":933,"outV":91,"properties":{"weight":1}},{"id":2021,"outV":149,"properties":{"weight":1}},{"id":6694,"outV":141,"properties":{"weight":2}},{"id":4009,"outV":225,"properties":{"weight":1}},{"id":682,"outV":219,"properties":{"weight":1}},{"id":3694,"outV":3,"properties":{"weight":57}},{"id":4718,"outV":186,"properties":{"weight":6}},{"id":3055,"outV":153,"properties":{"weight":9}},{"id":2480,"outV":68,"properties":{"weight":1}},{"id":2736,"outV":13,"properties":{"weight":3}},{"id":5426,"outV":102,"properties":{"weight":1}},{"id":6899,"outV":147,"properties":{"weight":1}},{"id":5879,"outV":96,"properties":{"weight":22}},{"id":6201,"outV":319,"properties":{"weight":2}},{"id":5370,"outV":132,"properties":{"weight":2}},{"id":700,"outV":206,"properties":{"weight":1}},{"id":2236,"outV":29,"properties":{"weight":5}},{"id":4604,"outV":85,"properties":{"weight":2}},{"id":5759,"outV":129,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":273,"inV":3,"properties":{"weight":40}},{"id":274,"inV":26,"properties":{"weight":3}},{"id":275,"inV":114,"properties":{"weight":40}},{"id":276,"inV":1,"properties":{"weight":2}},{"id":277,"inV":74,"properties":{"weight":3}},{"id":278,"inV":122,"properties":{"weight":3}},{"id":279,"inV":133,"properties":{"weight":2}},{"id":280,"inV":83,"properties":{"weight":1}},{"id":281,"inV":153,"properties":{"weight":5}},{"id":282,"inV":159,"properties":{"weight":1}},{"id":283,"inV":13,"properties":{"weight":3}},{"id":284,"inV":25,"properties":{"weight":19}},{"id":285,"inV":96,"properties":{"weight":10}},{"id":286,"inV":160,"properties":{"weight":2}},{"id":287,"inV":32,"properties":{"weight":1}},{"id":288,"inV":120,"properties":{"weight":16}},{"id":289,"inV":50,"properties":{"weight":1}},{"id":290,"inV":116,"properties":{"weight":1}},{"id":291,"inV":127,"properties":{"weight":6}},{"id":292,"inV":65,"properties":{"weight":1}},{"id":293,"inV":130,"properties":{"weight":3}},{"id":294,"inV":125,"properties":{"weight":5}},{"id":295,"inV":70,"properties":{"weight":13}},{"id":296,"inV":134,"properties":{"weight":1}},{"id":297,"inV":161,"properties":{"weight":1}},{"id":298,"inV":162,"properties":{"weight":1}},{"id":299,"inV":124,"properties":{"weight":3}},{"id":300,"inV":38,"properties":{"weight":1}},{"id":301,"inV":29,"properties":{"weight":11}},{"id":302,"inV":163,"properties":{"weight":1}},{"id":303,"inV":94,"properties":{"weight":5}},{"id":304,"inV":85,"properties":{"weight":1}},{"id":305,"inV":164,"properties":{"weight":6}},{"id":306,"inV":64,"properties":{"weight":1}},{"id":307,"inV":150,"properties":{"weight":1}},{"id":308,"inV":165,"properties":{"weight":7}},{"id":309,"inV":92,"properties":{"weight":1}},{"id":310,"inV":140,"properties":{"weight":1}},{"id":311,"inV":166,"properties":{"weight":1}}],"sungBy":[{"id":7582,"inV":340}],"writtenBy":[{"id":7581,"inV":446}]},"properties":{"name":[{"id":12,"value":"GOING DOWN THE ROAD FEELING BAD"}],"songType":[{"id":14,"value":"cover"}],"performances":[{"id":13,"value":293}]}}
-{"id":6,"label":"song","inE":{"followedBy":[{"id":4,"outV":1,"properties":{"weight":1}},{"id":2023,"outV":282,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2406,"inV":293,"properties":{"weight":1}},{"id":2407,"inV":96,"properties":{"weight":1}}],"sungBy":[{"id":7782,"inV":351}],"writtenBy":[{"id":7781,"inV":527}]},"properties":{"name":[{"id":15,"value":"MONA"}],"songType":[{"id":17,"value":"cover"}],"performances":[{"id":16,"value":1}]}}
-{"id":7,"label":"song","inE":{"followedBy":[{"id":2607,"outV":295,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5,"inV":8,"properties":{"weight":1}}]},"properties":{"name":[{"id":18,"value":"WHERE HAVE THE HEROES GONE"}],"songType":[{"id":20,"value":""}],"performances":[{"id":19,"value":0}]}}
-{"id":8,"label":"song","inE":{"followedBy":[{"id":4705,"outV":111,"properties":{"weight":1}},{"id":5,"outV":7,"properties":{"weight":1}},{"id":5901,"outV":96,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2976,"inV":302,"properties":{"weight":1}},{"id":2977,"inV":96,"properties":{"weight":1}},{"id":2978,"inV":72,"properties":{"weight":1}}],"sungBy":[{"id":7814,"inV":351}],"writtenBy":[{"id":7813,"inV":674}]},"properties":{"name":[{"id":21,"value":"OH BOY"}],"songType":[{"id":23,"value":"cover"}],"performances":[{"id":22,"value":2}]}}
-{"id":9,"label":"song","inE":{"followedBy":[{"id":3776,"outV":3,"properties":{"weight":1}},{"id":65,"outV":46,"properties":{"weight":2}},{"id":1923,"outV":103,"properties":{"weight":3}},{"id":5956,"outV":50,"properties":{"weight":2}},{"id":3077,"outV":153,"properties":{"weight":2}},{"id":5832,"outV":76,"properties":{"weight":1}},{"id":1161,"outV":26,"properties":{"weight":8}},{"id":2699,"outV":13,"properties":{"weight":3}},{"id":6539,"outV":55,"properties":{"weight":1}},{"id":6667,"outV":12,"properties":{"weight":2}},{"id":2578,"outV":57,"properties":{"weight":2}},{"id":787,"outV":122,"properties":{"weight":3}},{"id":3542,"outV":201,"properties":{"weight":1}},{"id":2775,"outV":15,"properties":{"weight":5}},{"id":2840,"outV":101,"properties":{"weight":2}},{"id":4953,"outV":86,"properties":{"weight":2}},{"id":1572,"outV":18,"properties":{"weight":3}},{"id":229,"outV":70,"properties":{"weight":1}},{"id":4264,"outV":10,"properties":{"weight":1}},{"id":4969,"outV":236,"properties":{"weight":3}},{"id":3498,"outV":58,"properties":{"weight":2}},{"id":5226,"outV":216,"properties":{"weight":1}},{"id":5548,"outV":166,"properties":{"weight":1}},{"id":2990,"outV":14,"properties":{"weight":4}},{"id":3950,"outV":138,"properties":{"weight":1}},{"id":2488,"outV":68,"properties":{"weight":1}},{"id":6776,"outV":39,"properties":{"weight":1}},{"id":3641,"outV":24,"properties":{"weight":2}},{"id":1532,"outV":164,"properties":{"weight":2}},{"id":1853,"outV":94,"properties":{"weight":1}},{"id":638,"outV":23,"properties":{"weight":2}},{"id":6335,"outV":21,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6,"inV":10,"properties":{"weight":3}},{"id":7,"inV":11,"properties":{"weight":2}},{"id":8,"inV":12,"properties":{"weight":3}},{"id":9,"inV":13,"properties":{"weight":6}},{"id":10,"inV":14,"properties":{"weight":3}},{"id":11,"inV":15,"properties":{"weight":3}},{"id":12,"inV":16,"properties":{"weight":1}},{"id":13,"inV":17,"properties":{"weight":1}},{"id":14,"inV":18,"properties":{"weight":5}},{"id":15,"inV":19,"properties":{"weight":1}},{"id":16,"inV":20,"properties":{"weight":1}},{"id":17,"inV":21,"properties":{"weight":1}},{"id":18,"inV":22,"properties":{"weight":2}},{"id":19,"inV":23,"properties":{"weight":2}},{"id":20,"inV":24,"properties":{"weight":1}},{"id":21,"inV":25,"properties":{"weight":1}},{"id":22,"inV":26,"properties":{"weight":1}},{"id":23,"inV":27,"properties":{"weight":1}},{"id":24,"inV":28,"properties":{"weight":2}},{"id":25,"inV":29,"properties":{"weight":1}},{"id":26,"inV":30,"properties":{"weight":5}},{"id":27,"inV":31,"properties":{"weight":2}},{"id":28,"inV":32,"properties":{"weight":1}},{"id":29,"inV":33,"properties":{"weight":2}},{"id":30,"inV":34,"properties":{"weight":2}},{"id":31,"inV":35,"properties":{"weight":3}},{"id":32,"inV":36,"properties":{"weight":2}},{"id":33,"inV":37,"properties":{"weight":3}},{"id":34,"inV":38,"properties":{"weight":1}},{"id":35,"inV":39,"properties":{"weight":1}},{"id":36,"inV":40,"properties":{"weight":1}},{"id":37,"inV":41,"properties":{"weight":1}},{"id":38,"inV":42,"properties":{"weight":1}},{"id":39,"inV":43,"properties":{"weight":1}}],"sungBy":[{"id":7190,"inV":340}],"writtenBy":[{"id":7189,"inV":339}]},"properties":{"name":[{"id":24,"value":"HERE COMES SUNSHINE"}],"songType":[{"id":26,"value":"original"}],"performances":[{"id":25,"value":65}]}}
-{"id":10,"label":"song","inE":{"followedBy":[{"id":3841,"outV":60,"properties":{"weight":1}},{"id":1027,"outV":73,"properties":{"weight":5}},{"id":6,"outV":9,"properties":{"weight":3}},{"id":3335,"outV":155,"properties":{"weight":1}},{"id":4103,"outV":48,"properties":{"weight":5}},{"id":6279,"outV":49,"properties":{"weight":1}},{"id":4233,"outV":52,"properties":{"weight":1}},{"id":4878,"outV":100,"properties":{"weight":19}},{"id":5264,"outV":32,"properties":{"weight":2}},{"id":2196,"outV":75,"properties":{"weight":4}},{"id":151,"outV":108,"properties":{"weight":3}},{"id":1571,"outV":18,"properties":{"weight":5}},{"id":3619,"outV":24,"properties":{"weight":2}},{"id":3237,"outV":63,"properties":{"weight":3}},{"id":4647,"outV":154,"properties":{"weight":1}},{"id":4521,"outV":105,"properties":{"weight":3}},{"id":1195,"outV":26,"properties":{"weight":1}},{"id":6444,"outV":187,"properties":{"weight":9}},{"id":6956,"outV":84,"properties":{"weight":1}},{"id":687,"outV":157,"properties":{"weight":1}},{"id":4784,"outV":114,"properties":{"weight":1}},{"id":6064,"outV":115,"properties":{"weight":1}},{"id":1714,"outV":82,"properties":{"weight":3}},{"id":3890,"outV":51,"properties":{"weight":9}},{"id":55,"outV":46,"properties":{"weight":1}},{"id":5175,"outV":71,"properties":{"weight":1}},{"id":1337,"outV":31,"properties":{"weight":1}},{"id":1083,"outV":59,"properties":{"weight":10}},{"id":4155,"outV":54,"properties":{"weight":6}},{"id":6077,"outV":72,"properties":{"weight":5}},{"id":5441,"outV":239,"properties":{"weight":1}},{"id":1987,"outV":152,"properties":{"weight":2}},{"id":1860,"outV":94,"properties":{"weight":1}},{"id":2116,"outV":17,"properties":{"weight":7}},{"id":3269,"outV":160,"properties":{"weight":2}},{"id":454,"outV":38,"properties":{"weight":1}},{"id":3142,"outV":104,"properties":{"weight":4}},{"id":2505,"outV":57,"properties":{"weight":12}},{"id":6603,"outV":127,"properties":{"weight":4}},{"id":6859,"outV":64,"properties":{"weight":1}},{"id":717,"outV":80,"properties":{"weight":9}},{"id":1360,"outV":130,"properties":{"weight":2}},{"id":3026,"outV":14,"properties":{"weight":1}},{"id":5972,"outV":50,"properties":{"weight":1}},{"id":5077,"outV":4,"properties":{"weight":4}},{"id":2392,"outV":87,"properties":{"weight":1}},{"id":1250,"outV":27,"properties":{"weight":10}},{"id":4706,"outV":111,"properties":{"weight":3}},{"id":6755,"outV":53,"properties":{"weight":1}},{"id":485,"outV":98,"properties":{"weight":4}},{"id":2917,"outV":78,"properties":{"weight":10}},{"id":3559,"outV":56,"properties":{"weight":16}},{"id":3436,"outV":58,"properties":{"weight":10}},{"id":3820,"outV":88,"properties":{"weight":1}},{"id":4463,"outV":202,"properties":{"weight":4}},{"id":880,"outV":189,"properties":{"weight":1}},{"id":6256,"outV":117,"properties":{"weight":1}},{"id":3698,"outV":3,"properties":{"weight":1}},{"id":2035,"outV":180,"properties":{"weight":1}},{"id":2291,"outV":25,"properties":{"weight":1}},{"id":3317,"outV":252,"properties":{"weight":1}},{"id":2806,"outV":15,"properties":{"weight":2}},{"id":2427,"outV":68,"properties":{"weight":2}},{"id":6782,"outV":39,"properties":{"weight":4}},{"id":4351,"outV":62,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":4235,"inV":56,"properties":{"weight":13}},{"id":4236,"inV":27,"properties":{"weight":7}},{"id":4237,"inV":58,"properties":{"weight":11}},{"id":4238,"inV":80,"properties":{"weight":6}},{"id":4239,"inV":59,"properties":{"weight":9}},{"id":4240,"inV":100,"properties":{"weight":21}},{"id":4241,"inV":104,"properties":{"weight":5}},{"id":4242,"inV":50,"properties":{"weight":2}},{"id":4243,"inV":48,"properties":{"weight":8}},{"id":4244,"inV":54,"properties":{"weight":13}},{"id":4245,"inV":19,"properties":{"weight":9}},{"id":4246,"inV":72,"properties":{"weight":4}},{"id":4247,"inV":14,"properties":{"weight":1}},{"id":4248,"inV":122,"properties":{"weight":2}},{"id":4249,"inV":235,"properties":{"weight":1}},{"id":4250,"inV":218,"properties":{"weight":1}},{"id":4251,"inV":252,"properties":{"weight":1}},{"id":4252,"inV":89,"properties":{"weight":3}},{"id":4253,"inV":57,"properties":{"weight":12}},{"id":4254,"inV":49,"properties":{"weight":3}},{"id":4255,"inV":94,"properties":{"weight":3}},{"id":4256,"inV":153,"properties":{"weight":1}},{"id":4257,"inV":13,"properties":{"weight":1}},{"id":4258,"inV":160,"properties":{"weight":1}},{"id":4259,"inV":51,"properties":{"weight":10}},{"id":4260,"inV":18,"properties":{"weight":3}},{"id":4261,"inV":202,"properties":{"weight":4}},{"id":4262,"inV":17,"properties":{"weight":5}},{"id":4263,"inV":46,"properties":{"weight":1}},{"id":4264,"inV":9,"properties":{"weight":1}},{"id":4265,"inV":55,"properties":{"weight":1}},{"id":4266,"inV":125,"properties":{"weight":1}},{"id":4267,"inV":69,"properties":{"weight":2}},{"id":4268,"inV":98,"properties":{"weight":8}},{"id":4269,"inV":82,"properties":{"weight":4}},{"id":4270,"inV":154,"properties":{"weight":1}},{"id":4271,"inV":105,"properties":{"weight":7}},{"id":4272,"inV":112,"properties":{"weight":2}},{"id":4273,"inV":109,"properties":{"weight":1}},{"id":4274,"inV":42,"properties":{"weight":2}},{"id":4275,"inV":121,"properties":{"weight":1}},{"id":4276,"inV":73,"properties":{"weight":5}},{"id":4277,"inV":106,"properties":{"weight":1}},{"id":4278,"inV":116,"properties":{"weight":1}},{"id":4279,"inV":68,"properties":{"weight":2}},{"id":4280,"inV":152,"properties":{"weight":1}},{"id":4281,"inV":23,"properties":{"weight":6}},{"id":4282,"inV":88,"properties":{"weight":1}},{"id":4283,"inV":39,"properties":{"weight":4}},{"id":4284,"inV":12,"properties":{"weight":1}},{"id":4285,"inV":111,"properties":{"weight":1}},{"id":4286,"inV":99,"properties":{"weight":1}},{"id":4287,"inV":87,"properties":{"weight":2}},{"id":4288,"inV":108,"properties":{"weight":2}},{"id":4289,"inV":53,"properties":{"weight":4}},{"id":4290,"inV":26,"properties":{"weight":5}},{"id":4291,"inV":117,"properties":{"weight":2}},{"id":4292,"inV":115,"properties":{"weight":2}},{"id":4293,"inV":63,"properties":{"weight":3}},{"id":4294,"inV":103,"properties":{"weight":1}}],"sungBy":[{"id":7460,"inV":351}],"writtenBy":[{"id":7459,"inV":471}]},"properties":{"name":[{"id":27,"value":"BEAT IT ON DOWN THE LINE"}],"songType":[{"id":29,"value":"cover"}],"performances":[{"id":28,"value":325}]}}
-{"id":11,"label":"song","inE":{"followedBy":[{"id":1088,"outV":59,"properties":{"weight":14}},{"id":6273,"outV":49,"properties":{"weight":2}},{"id":1989,"outV":152,"properties":{"weight":2}},{"id":7,"outV":9,"properties":{"weight":2}},{"id":4552,"outV":105,"properties":{"weight":3}},{"id":521,"outV":205,"properties":{"weight":1}},{"id":714,"outV":80,"properties":{"weight":5}},{"id":3146,"outV":104,"properties":{"weight":3}},{"id":4876,"outV":100,"properties":{"weight":2}},{"id":2190,"outV":235,"properties":{"weight":1}},{"id":4496,"outV":202,"properties":{"weight":1}},{"id":2513,"outV":57,"properties":{"weight":4}},{"id":4053,"outV":173,"properties":{"weight":1}},{"id":5078,"outV":4,"properties":{"weight":3}},{"id":1309,"outV":27,"properties":{"weight":5}},{"id":4769,"outV":114,"properties":{"weight":1}},{"id":5025,"outV":30,"properties":{"weight":1}},{"id":3554,"outV":56,"properties":{"weight":7}},{"id":1064,"outV":73,"properties":{"weight":1}},{"id":2920,"outV":78,"properties":{"weight":2}},{"id":6056,"outV":115,"properties":{"weight":2}},{"id":41,"outV":46,"properties":{"weight":2}},{"id":3434,"outV":58,"properties":{"weight":5}},{"id":6442,"outV":187,"properties":{"weight":7}},{"id":1775,"outV":234,"properties":{"weight":4}},{"id":3888,"outV":51,"properties":{"weight":1}},{"id":626,"outV":23,"properties":{"weight":1}},{"id":1396,"outV":190,"properties":{"weight":1}},{"id":4020,"outV":191,"properties":{"weight":1}},{"id":6772,"outV":39,"properties":{"weight":1}},{"id":3637,"outV":24,"properties":{"weight":2}},{"id":6072,"outV":72,"properties":{"weight":5}},{"id":4157,"outV":54,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":972,"inV":57,"properties":{"weight":4}},{"id":973,"inV":59,"properties":{"weight":3}},{"id":974,"inV":53,"properties":{"weight":4}},{"id":975,"inV":54,"properties":{"weight":15}},{"id":976,"inV":56,"properties":{"weight":3}},{"id":977,"inV":48,"properties":{"weight":3}},{"id":978,"inV":72,"properties":{"weight":4}},{"id":979,"inV":19,"properties":{"weight":9}},{"id":980,"inV":4,"properties":{"weight":3}},{"id":981,"inV":58,"properties":{"weight":6}},{"id":982,"inV":46,"properties":{"weight":1}},{"id":983,"inV":234,"properties":{"weight":7}},{"id":984,"inV":235,"properties":{"weight":2}},{"id":985,"inV":207,"properties":{"weight":4}},{"id":986,"inV":39,"properties":{"weight":3}},{"id":987,"inV":50,"properties":{"weight":1}},{"id":988,"inV":104,"properties":{"weight":2}},{"id":989,"inV":49,"properties":{"weight":1}},{"id":990,"inV":17,"properties":{"weight":3}},{"id":991,"inV":100,"properties":{"weight":1}},{"id":992,"inV":24,"properties":{"weight":1}},{"id":993,"inV":170,"properties":{"weight":2}},{"id":994,"inV":73,"properties":{"weight":1}},{"id":995,"inV":173,"properties":{"weight":1}},{"id":996,"inV":236,"properties":{"weight":1}},{"id":997,"inV":202,"properties":{"weight":3}},{"id":998,"inV":80,"properties":{"weight":2}},{"id":999,"inV":115,"properties":{"weight":4}},{"id":1000,"inV":105,"properties":{"weight":1}}],"sungBy":[{"id":7072,"inV":351}],"writtenBy":[{"id":7071,"inV":350}]},"properties":{"name":[{"id":30,"value":"BLACK THROATED WIND"}],"songType":[{"id":32,"value":"original"}],"performances":[{"id":31,"value":158}]}}
-{"id":12,"label":"song","inE":{"followedBy":[{"id":3072,"outV":153,"properties":{"weight":4}},{"id":2433,"outV":68,"properties":{"weight":1}},{"id":1410,"outV":83,"properties":{"weight":1}},{"id":3331,"outV":155,"properties":{"weight":2}},{"id":4227,"outV":52,"properties":{"weight":3}},{"id":1028,"outV":73,"properties":{"weight":12}},{"id":4102,"outV":48,"properties":{"weight":33}},{"id":8,"outV":9,"properties":{"weight":3}},{"id":6281,"outV":49,"properties":{"weight":2}},{"id":652,"outV":23,"properties":{"weight":2}},{"id":5388,"outV":69,"properties":{"weight":1}},{"id":525,"outV":120,"properties":{"weight":1}},{"id":3726,"outV":3,"properties":{"weight":1}},{"id":783,"outV":122,"properties":{"weight":1}},{"id":3855,"outV":60,"properties":{"weight":1}},{"id":1938,"outV":148,"properties":{"weight":1}},{"id":3986,"outV":106,"properties":{"weight":1}},{"id":916,"outV":91,"properties":{"weight":1}},{"id":1172,"outV":26,"properties":{"weight":4}},{"id":6935,"outV":84,"properties":{"weight":5}},{"id":3225,"outV":63,"properties":{"weight":4}},{"id":5017,"outV":30,"properties":{"weight":1}},{"id":155,"outV":108,"properties":{"weight":6}},{"id":2203,"outV":75,"properties":{"weight":3}},{"id":4893,"outV":100,"properties":{"weight":7}},{"id":4640,"outV":154,"properties":{"weight":10}},{"id":5665,"outV":169,"properties":{"weight":1}},{"id":1702,"outV":124,"properties":{"weight":1}},{"id":2598,"outV":112,"properties":{"weight":7}},{"id":5286,"outV":32,"properties":{"weight":4}},{"id":3879,"outV":51,"properties":{"weight":12}},{"id":4007,"outV":225,"properties":{"weight":1}},{"id":424,"outV":38,"properties":{"weight":5}},{"id":4522,"outV":105,"properties":{"weight":12}},{"id":5034,"outV":47,"properties":{"weight":1}},{"id":4779,"outV":114,"properties":{"weight":3}},{"id":6576,"outV":116,"properties":{"weight":1}},{"id":6835,"outV":64,"properties":{"weight":1}},{"id":6455,"outV":187,"properties":{"weight":12}},{"id":824,"outV":171,"properties":{"weight":1}},{"id":5304,"outV":170,"properties":{"weight":2}},{"id":1722,"outV":82,"properties":{"weight":1}},{"id":6074,"outV":72,"properties":{"weight":4}},{"id":4284,"outV":10,"properties":{"weight":1}},{"id":2109,"outV":17,"properties":{"weight":24}},{"id":703,"outV":206,"properties":{"weight":2}},{"id":5440,"outV":239,"properties":{"weight":2}},{"id":5952,"outV":50,"properties":{"weight":7}},{"id":1858,"outV":94,"properties":{"weight":2}},{"id":1347,"outV":31,"properties":{"weight":1}},{"id":1605,"outV":18,"properties":{"weight":1}},{"id":4165,"outV":54,"properties":{"weight":17}},{"id":3654,"outV":24,"properties":{"weight":3}},{"id":4038,"outV":173,"properties":{"weight":1}},{"id":6598,"outV":127,"properties":{"weight":1}},{"id":3271,"outV":160,"properties":{"weight":1}},{"id":3527,"outV":223,"properties":{"weight":1}},{"id":1096,"outV":59,"properties":{"weight":26}},{"id":3144,"outV":104,"properties":{"weight":24}},{"id":1993,"outV":152,"properties":{"weight":2}},{"id":6985,"outV":175,"properties":{"weight":1}},{"id":6730,"outV":53,"properties":{"weight":4}},{"id":3019,"outV":14,"properties":{"weight":1}},{"id":3788,"outV":168,"properties":{"weight":1}},{"id":5072,"outV":4,"properties":{"weight":26}},{"id":2515,"outV":57,"properties":{"weight":3}},{"id":1365,"outV":130,"properties":{"weight":2}},{"id":2647,"outV":137,"properties":{"weight":1}},{"id":730,"outV":80,"properties":{"weight":12}},{"id":2780,"outV":15,"properties":{"weight":3}},{"id":482,"outV":98,"properties":{"weight":8}},{"id":3810,"outV":88,"properties":{"weight":6}},{"id":7013,"outV":89,"properties":{"weight":1}},{"id":4072,"outV":109,"properties":{"weight":1}},{"id":2281,"outV":25,"properties":{"weight":2}},{"id":2668,"outV":13,"properties":{"weight":3}},{"id":3565,"outV":56,"properties":{"weight":9}},{"id":1262,"outV":27,"properties":{"weight":17}},{"id":2031,"outV":180,"properties":{"weight":1}},{"id":6769,"outV":39,"properties":{"weight":2}},{"id":1779,"outV":234,"properties":{"weight":1}},{"id":4468,"outV":202,"properties":{"weight":4}},{"id":1909,"outV":103,"properties":{"weight":1}},{"id":2934,"outV":78,"properties":{"weight":1}},{"id":3446,"outV":58,"properties":{"weight":4}},{"id":381,"outV":74,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6656,"inV":49,"properties":{"weight":9}},{"id":6657,"inV":19,"properties":{"weight":3}},{"id":6658,"inV":27,"properties":{"weight":9}},{"id":6659,"inV":252,"properties":{"weight":1}},{"id":6660,"inV":206,"properties":{"weight":1}},{"id":6661,"inV":89,"properties":{"weight":4}},{"id":6662,"inV":160,"properties":{"weight":1}},{"id":6663,"inV":15,"properties":{"weight":167}},{"id":6664,"inV":4,"properties":{"weight":3}},{"id":6665,"inV":202,"properties":{"weight":2}},{"id":6666,"inV":5,"properties":{"weight":1}},{"id":6667,"inV":9,"properties":{"weight":2}},{"id":6668,"inV":83,"properties":{"weight":3}},{"id":6669,"inV":3,"properties":{"weight":1}},{"id":6670,"inV":52,"properties":{"weight":1}},{"id":6671,"inV":25,"properties":{"weight":1}},{"id":6672,"inV":46,"properties":{"weight":1}},{"id":6673,"inV":123,"properties":{"weight":2}},{"id":6674,"inV":51,"properties":{"weight":4}},{"id":6675,"inV":17,"properties":{"weight":3}},{"id":6676,"inV":56,"properties":{"weight":5}},{"id":6677,"inV":98,"properties":{"weight":5}},{"id":6678,"inV":104,"properties":{"weight":4}},{"id":6679,"inV":69,"properties":{"weight":3}},{"id":6680,"inV":170,"properties":{"weight":2}},{"id":6681,"inV":82,"properties":{"weight":1}},{"id":6682,"inV":80,"properties":{"weight":2}},{"id":6683,"inV":215,"properties":{"weight":1}},{"id":6684,"inV":48,"properties":{"weight":1}},{"id":6685,"inV":14,"properties":{"weight":3}},{"id":6686,"inV":50,"properties":{"weight":2}},{"id":6687,"inV":24,"properties":{"weight":83}},{"id":6688,"inV":18,"properties":{"weight":1}},{"id":6689,"inV":39,"properties":{"weight":6}},{"id":6690,"inV":105,"properties":{"weight":1}},{"id":6691,"inV":131,"properties":{"weight":14}},{"id":6645,"inV":72,"properties":{"weight":7}},{"id":6646,"inV":58,"properties":{"weight":7}},{"id":6647,"inV":57,"properties":{"weight":6}},{"id":6648,"inV":54,"properties":{"weight":8}},{"id":6649,"inV":59,"properties":{"weight":14}},{"id":6650,"inV":100,"properties":{"weight":7}},{"id":6651,"inV":53,"properties":{"weight":4}},{"id":6652,"inV":148,"properties":{"weight":1}},{"id":6653,"inV":218,"properties":{"weight":2}},{"id":6654,"inV":235,"properties":{"weight":2}},{"id":6655,"inV":130,"properties":{"weight":1}}],"sungBy":[{"id":7776,"inV":351}],"writtenBy":[{"id":7775,"inV":659}]},"properties":{"name":[{"id":33,"value":"ME AND MY UNCLE"}],"songType":[{"id":35,"value":"cover"}],"performances":[{"id":34,"value":616}]}}
-{"id":13,"label":"song","inE":{"followedBy":[{"id":4865,"outV":35,"properties":{"weight":4}},{"id":1026,"outV":73,"properties":{"weight":1}},{"id":3330,"outV":155,"properties":{"weight":2}},{"id":5636,"outV":22,"properties":{"weight":1}},{"id":775,"outV":122,"properties":{"weight":1}},{"id":1799,"outV":196,"properties":{"weight":2}},{"id":6407,"outV":134,"properties":{"weight":24}},{"id":9,"outV":9,"properties":{"weight":6}},{"id":4874,"outV":100,"properties":{"weight":6}},{"id":4108,"outV":48,"properties":{"weight":3}},{"id":5132,"outV":222,"properties":{"weight":1}},{"id":2830,"outV":101,"properties":{"weight":8}},{"id":3857,"outV":60,"properties":{"weight":35}},{"id":6931,"outV":84,"properties":{"weight":7}},{"id":533,"outV":120,"properties":{"weight":1}},{"id":6165,"outV":36,"properties":{"weight":1}},{"id":4630,"outV":154,"properties":{"weight":8}},{"id":5142,"outV":125,"properties":{"weight":11}},{"id":283,"outV":5,"properties":{"weight":3}},{"id":1567,"outV":18,"properties":{"weight":3}},{"id":1823,"outV":41,"properties":{"weight":4}},{"id":3359,"outV":184,"properties":{"weight":3}},{"id":3617,"outV":24,"properties":{"weight":1}},{"id":3108,"outV":153,"properties":{"weight":1}},{"id":3878,"outV":51,"properties":{"weight":6}},{"id":2347,"outV":87,"properties":{"weight":8}},{"id":6443,"outV":187,"properties":{"weight":47}},{"id":6700,"outV":141,"properties":{"weight":4}},{"id":5682,"outV":167,"properties":{"weight":1}},{"id":53,"outV":46,"properties":{"weight":4}},{"id":823,"outV":171,"properties":{"weight":24}},{"id":4151,"outV":218,"properties":{"weight":2}},{"id":5943,"outV":50,"properties":{"weight":1}},{"id":2617,"outV":158,"properties":{"weight":1}},{"id":3386,"outV":177,"properties":{"weight":2}},{"id":4411,"outV":327,"properties":{"weight":1}},{"id":1852,"outV":94,"properties":{"weight":4}},{"id":6206,"outV":319,"properties":{"weight":1}},{"id":1087,"outV":59,"properties":{"weight":5}},{"id":2111,"outV":17,"properties":{"weight":4}},{"id":4159,"outV":54,"properties":{"weight":16}},{"id":6723,"outV":53,"properties":{"weight":6}},{"id":6984,"outV":175,"properties":{"weight":1}},{"id":3145,"outV":104,"properties":{"weight":4}},{"id":4947,"outV":86,"properties":{"weight":1}},{"id":5203,"outV":99,"properties":{"weight":2}},{"id":1366,"outV":130,"properties":{"weight":12}},{"id":1622,"outV":210,"properties":{"weight":1}},{"id":2908,"outV":118,"properties":{"weight":1}},{"id":1885,"outV":103,"properties":{"weight":3}},{"id":4959,"outV":207,"properties":{"weight":6}},{"id":3435,"outV":58,"properties":{"weight":8}},{"id":6763,"outV":39,"properties":{"weight":8}},{"id":5741,"outV":129,"properties":{"weight":12}},{"id":366,"outV":74,"properties":{"weight":38}},{"id":2926,"outV":78,"properties":{"weight":3}},{"id":623,"outV":23,"properties":{"weight":1}},{"id":4721,"outV":186,"properties":{"weight":4}},{"id":2165,"outV":151,"properties":{"weight":1}},{"id":886,"outV":140,"properties":{"weight":1}},{"id":3703,"outV":3,"properties":{"weight":5}},{"id":7031,"outV":89,"properties":{"weight":4}},{"id":1411,"outV":83,"properties":{"weight":7}},{"id":3974,"outV":106,"properties":{"weight":2}},{"id":6278,"outV":49,"properties":{"weight":1}},{"id":912,"outV":91,"properties":{"weight":59}},{"id":2192,"outV":235,"properties":{"weight":1}},{"id":4759,"outV":37,"properties":{"weight":2}},{"id":1179,"outV":26,"properties":{"weight":2}},{"id":5789,"outV":76,"properties":{"weight":3}},{"id":4257,"outV":10,"properties":{"weight":1}},{"id":6561,"outV":172,"properties":{"weight":1}},{"id":4771,"outV":114,"properties":{"weight":3}},{"id":1454,"outV":81,"properties":{"weight":10}},{"id":6073,"outV":72,"properties":{"weight":13}},{"id":5306,"outV":170,"properties":{"weight":4}},{"id":4027,"outV":173,"properties":{"weight":3}},{"id":1725,"outV":82,"properties":{"weight":3}},{"id":960,"outV":67,"properties":{"weight":2}},{"id":1985,"outV":152,"properties":{"weight":1}},{"id":6594,"outV":127,"properties":{"weight":6}},{"id":6342,"outV":21,"properties":{"weight":4}},{"id":455,"outV":139,"properties":{"weight":1}},{"id":3277,"outV":160,"properties":{"weight":3}},{"id":5837,"outV":258,"properties":{"weight":1}},{"id":208,"outV":70,"properties":{"weight":2}},{"id":2256,"outV":29,"properties":{"weight":1}},{"id":721,"outV":80,"properties":{"weight":1}},{"id":2771,"outV":15,"properties":{"weight":3}},{"id":5076,"outV":4,"properties":{"weight":12}},{"id":2519,"outV":57,"properties":{"weight":10}},{"id":4312,"outV":110,"properties":{"weight":1}},{"id":2268,"outV":25,"properties":{"weight":8}},{"id":2014,"outV":149,"properties":{"weight":1}},{"id":3552,"outV":56,"properties":{"weight":8}},{"id":481,"outV":98,"properties":{"weight":3}},{"id":1764,"outV":28,"properties":{"weight":3}},{"id":1258,"outV":27,"properties":{"weight":3}},{"id":1518,"outV":164,"properties":{"weight":1}},{"id":4846,"outV":119,"properties":{"weight":1}},{"id":4593,"outV":85,"properties":{"weight":2}},{"id":244,"outV":150,"properties":{"weight":3}},{"id":1780,"outV":234,"properties":{"weight":2}},{"id":4344,"outV":62,"properties":{"weight":12}},{"id":2044,"outV":92,"properties":{"weight":2}},{"id":5374,"outV":69,"properties":{"weight":34}},{"id":5886,"outV":96,"properties":{"weight":15}}]},"outE":{"followedBy":[{"id":2688,"inV":94,"properties":{"weight":4}},{"id":2689,"inV":130,"properties":{"weight":11}},{"id":2690,"inV":83,"properties":{"weight":13}},{"id":2691,"inV":170,"properties":{"weight":1}},{"id":2692,"inV":51,"properties":{"weight":3}},{"id":2693,"inV":22,"properties":{"weight":2}},{"id":2694,"inV":296,"properties":{"weight":1}},{"id":2695,"inV":52,"properties":{"weight":1}},{"id":2696,"inV":17,"properties":{"weight":2}},{"id":2697,"inV":202,"properties":{"weight":3}},{"id":2698,"inV":27,"properties":{"weight":2}},{"id":2699,"inV":9,"properties":{"weight":3}},{"id":2700,"inV":25,"properties":{"weight":12}},{"id":2701,"inV":195,"properties":{"weight":2}},{"id":2702,"inV":206,"properties":{"weight":1}},{"id":2703,"inV":39,"properties":{"weight":1}},{"id":2704,"inV":69,"properties":{"weight":6}},{"id":2705,"inV":24,"properties":{"weight":1}},{"id":2706,"inV":82,"properties":{"weight":3}},{"id":2707,"inV":57,"properties":{"weight":1}},{"id":2708,"inV":134,"properties":{"weight":9}},{"id":2709,"inV":110,"properties":{"weight":1}},{"id":2710,"inV":99,"properties":{"weight":3}},{"id":2711,"inV":76,"properties":{"weight":4}},{"id":2712,"inV":3,"properties":{"weight":3}},{"id":2713,"inV":178,"properties":{"weight":1}},{"id":2714,"inV":184,"properties":{"weight":1}},{"id":2715,"inV":60,"properties":{"weight":21}},{"id":2716,"inV":148,"properties":{"weight":1}},{"id":2717,"inV":32,"properties":{"weight":1}},{"id":2718,"inV":91,"properties":{"weight":42}},{"id":2719,"inV":103,"properties":{"weight":1}},{"id":2720,"inV":114,"properties":{"weight":4}},{"id":2721,"inV":141,"properties":{"weight":4}},{"id":2722,"inV":154,"properties":{"weight":3}},{"id":2723,"inV":109,"properties":{"weight":2}},{"id":2724,"inV":125,"properties":{"weight":9}},{"id":2725,"inV":85,"properties":{"weight":2}},{"id":2726,"inV":84,"properties":{"weight":5}},{"id":2727,"inV":50,"properties":{"weight":1}},{"id":2728,"inV":214,"properties":{"weight":1}},{"id":2729,"inV":72,"properties":{"weight":1}},{"id":2730,"inV":246,"properties":{"weight":1}},{"id":2731,"inV":129,"properties":{"weight":29}},{"id":2732,"inV":65,"properties":{"weight":2}},{"id":2733,"inV":133,"properties":{"weight":1}},{"id":2734,"inV":62,"properties":{"weight":1}},{"id":2735,"inV":29,"properties":{"weight":4}},{"id":2736,"inV":5,"properties":{"weight":3}},{"id":2737,"inV":183,"properties":{"weight":3}},{"id":2738,"inV":210,"properties":{"weight":1}},{"id":2739,"inV":128,"properties":{"weight":1}},{"id":2740,"inV":67,"properties":{"weight":1}},{"id":2741,"inV":212,"properties":{"weight":1}},{"id":2742,"inV":70,"properties":{"weight":2}},{"id":2743,"inV":75,"properties":{"weight":1}},{"id":2744,"inV":71,"properties":{"weight":1}},{"id":2745,"inV":168,"properties":{"weight":2}},{"id":2746,"inV":157,"properties":{"weight":1}},{"id":2747,"inV":92,"properties":{"weight":1}},{"id":2748,"inV":89,"properties":{"weight":5}},{"id":2749,"inV":81,"properties":{"weight":1}},{"id":2750,"inV":187,"properties":{"weight":1}},{"id":2751,"inV":164,"properties":{"weight":1}},{"id":2752,"inV":136,"properties":{"weight":1}},{"id":2753,"inV":46,"properties":{"weight":1}},{"id":2660,"inV":207,"properties":{"weight":3}},{"id":2661,"inV":122,"properties":{"weight":17}},{"id":2662,"inV":96,"properties":{"weight":157}},{"id":2663,"inV":104,"properties":{"weight":1}},{"id":2664,"inV":26,"properties":{"weight":14}},{"id":2665,"inV":123,"properties":{"weight":3}},{"id":2666,"inV":19,"properties":{"weight":12}},{"id":2667,"inV":100,"properties":{"weight":5}},{"id":2668,"inV":12,"properties":{"weight":3}},{"id":2669,"inV":49,"properties":{"weight":12}},{"id":2670,"inV":21,"properties":{"weight":4}},{"id":2671,"inV":120,"properties":{"weight":9}},{"id":2672,"inV":23,"properties":{"weight":5}},{"id":2673,"inV":59,"properties":{"weight":6}},{"id":2674,"inV":54,"properties":{"weight":5}},{"id":2675,"inV":80,"properties":{"weight":1}},{"id":2676,"inV":234,"properties":{"weight":1}},{"id":2677,"inV":53,"properties":{"weight":2}},{"id":2678,"inV":225,"properties":{"weight":1}},{"id":2679,"inV":235,"properties":{"weight":2}},{"id":2680,"inV":160,"properties":{"weight":3}},{"id":2681,"inV":56,"properties":{"weight":3}},{"id":2682,"inV":127,"properties":{"weight":6}},{"id":2683,"inV":18,"properties":{"weight":3}},{"id":2684,"inV":4,"properties":{"weight":9}},{"id":2685,"inV":15,"properties":{"weight":7}},{"id":2686,"inV":74,"properties":{"weight":86}},{"id":2687,"inV":153,"properties":{"weight":12}}],"sungBy":[{"id":7292,"inV":359}],"writtenBy":[{"id":7291,"inV":339}]},"properties":{"name":[{"id":36,"value":"PLAYING IN THE BAND"}],"songType":[{"id":38,"value":"original"}],"performances":[{"id":37,"value":582}]}}
-{"id":14,"label":"song","inE":{"followedBy":[{"id":6784,"outV":39,"properties":{"weight":10}},{"id":5251,"outV":32,"properties":{"weight":1}},{"id":4229,"outV":52,"properties":{"weight":3}},{"id":4745,"outV":294,"properties":{"weight":4}},{"id":10,"outV":9,"properties":{"weight":3}},{"id":6283,"outV":49,"properties":{"weight":2}},{"id":4364,"outV":62,"properties":{"weight":16}},{"id":4109,"outV":48,"properties":{"weight":10}},{"id":6544,"outV":55,"properties":{"weight":1}},{"id":4881,"outV":100,"properties":{"weight":20}},{"id":6034,"outV":115,"properties":{"weight":1}},{"id":531,"outV":120,"properties":{"weight":1}},{"id":3219,"outV":63,"properties":{"weight":2}},{"id":4758,"outV":37,"properties":{"weight":2}},{"id":4247,"outV":10,"properties":{"weight":1}},{"id":4631,"outV":154,"properties":{"weight":6}},{"id":3866,"outV":60,"properties":{"weight":2}},{"id":1947,"outV":148,"properties":{"weight":1}},{"id":1436,"outV":83,"properties":{"weight":7}},{"id":2844,"outV":101,"properties":{"weight":1}},{"id":6685,"outV":12,"properties":{"weight":3}},{"id":1183,"outV":26,"properties":{"weight":2}},{"id":160,"outV":108,"properties":{"weight":2}},{"id":4517,"outV":105,"properties":{"weight":6}},{"id":6954,"outV":84,"properties":{"weight":4}},{"id":1451,"outV":81,"properties":{"weight":12}},{"id":1582,"outV":18,"properties":{"weight":4}},{"id":3892,"outV":51,"properties":{"weight":10}},{"id":2107,"outV":17,"properties":{"weight":19}},{"id":5820,"outV":76,"properties":{"weight":1}},{"id":6463,"outV":187,"properties":{"weight":26}},{"id":1090,"outV":59,"properties":{"weight":7}},{"id":1731,"outV":82,"properties":{"weight":4}},{"id":6083,"outV":72,"properties":{"weight":9}},{"id":4037,"outV":173,"properties":{"weight":1}},{"id":2375,"outV":87,"properties":{"weight":8}},{"id":4169,"outV":54,"properties":{"weight":36}},{"id":5578,"outV":42,"properties":{"weight":1}},{"id":716,"outV":80,"properties":{"weight":10}},{"id":5964,"outV":50,"properties":{"weight":2}},{"id":845,"outV":171,"properties":{"weight":11}},{"id":5709,"outV":20,"properties":{"weight":1}},{"id":5838,"outV":258,"properties":{"weight":1}},{"id":1232,"outV":248,"properties":{"weight":1}},{"id":6993,"outV":175,"properties":{"weight":1}},{"id":3666,"outV":24,"properties":{"weight":2}},{"id":3156,"outV":104,"properties":{"weight":6}},{"id":3796,"outV":88,"properties":{"weight":1}},{"id":6742,"outV":53,"properties":{"weight":15}},{"id":2523,"outV":57,"properties":{"weight":9}},{"id":864,"outV":189,"properties":{"weight":2}},{"id":3556,"outV":56,"properties":{"weight":21}},{"id":102,"outV":46,"properties":{"weight":1}},{"id":5096,"outV":4,"properties":{"weight":2}},{"id":489,"outV":98,"properties":{"weight":3}},{"id":1257,"outV":27,"properties":{"weight":19}},{"id":2030,"outV":180,"properties":{"weight":2}},{"id":2159,"outV":151,"properties":{"weight":1}},{"id":2803,"outV":15,"properties":{"weight":4}},{"id":2935,"outV":78,"properties":{"weight":1}},{"id":2426,"outV":68,"properties":{"weight":4}},{"id":3962,"outV":106,"properties":{"weight":2}},{"id":4474,"outV":202,"properties":{"weight":1}},{"id":123,"outV":97,"properties":{"weight":1}},{"id":4092,"outV":109,"properties":{"weight":1}},{"id":5628,"outV":22,"properties":{"weight":1}},{"id":1021,"outV":73,"properties":{"weight":20}},{"id":3455,"outV":58,"properties":{"weight":12}}]},"outE":{"followedBy":[{"id":2981,"inV":50,"properties":{"weight":2}},{"id":2982,"inV":4,"properties":{"weight":3}},{"id":2983,"inV":53,"properties":{"weight":8}},{"id":2984,"inV":57,"properties":{"weight":55}},{"id":2985,"inV":89,"properties":{"weight":2}},{"id":2986,"inV":122,"properties":{"weight":1}},{"id":2987,"inV":153,"properties":{"weight":1}},{"id":2988,"inV":72,"properties":{"weight":26}},{"id":2989,"inV":19,"properties":{"weight":17}},{"id":2990,"inV":9,"properties":{"weight":4}},{"id":2991,"inV":17,"properties":{"weight":13}},{"id":2992,"inV":46,"properties":{"weight":5}},{"id":2993,"inV":51,"properties":{"weight":15}},{"id":2994,"inV":54,"properties":{"weight":28}},{"id":2995,"inV":202,"properties":{"weight":3}},{"id":2996,"inV":27,"properties":{"weight":6}},{"id":2997,"inV":52,"properties":{"weight":3}},{"id":2998,"inV":58,"properties":{"weight":1}},{"id":2999,"inV":56,"properties":{"weight":8}},{"id":3000,"inV":100,"properties":{"weight":12}},{"id":3001,"inV":99,"properties":{"weight":26}},{"id":3002,"inV":98,"properties":{"weight":3}},{"id":3003,"inV":104,"properties":{"weight":2}},{"id":3004,"inV":82,"properties":{"weight":6}},{"id":3005,"inV":215,"properties":{"weight":1}},{"id":3006,"inV":69,"properties":{"weight":2}},{"id":3007,"inV":103,"properties":{"weight":1}},{"id":3008,"inV":83,"properties":{"weight":8}},{"id":3009,"inV":101,"properties":{"weight":1}},{"id":3010,"inV":80,"properties":{"weight":8}},{"id":3011,"inV":121,"properties":{"weight":3}},{"id":3012,"inV":59,"properties":{"weight":1}},{"id":3013,"inV":26,"properties":{"weight":2}},{"id":3014,"inV":32,"properties":{"weight":2}},{"id":3015,"inV":155,"properties":{"weight":1}},{"id":3016,"inV":42,"properties":{"weight":2}},{"id":3017,"inV":18,"properties":{"weight":1}},{"id":3018,"inV":105,"properties":{"weight":11}},{"id":3019,"inV":12,"properties":{"weight":1}},{"id":3020,"inV":49,"properties":{"weight":27}},{"id":3021,"inV":65,"properties":{"weight":2}},{"id":3022,"inV":85,"properties":{"weight":2}},{"id":3023,"inV":73,"properties":{"weight":8}},{"id":3024,"inV":106,"properties":{"weight":3}},{"id":3025,"inV":189,"properties":{"weight":3}},{"id":3026,"inV":10,"properties":{"weight":1}},{"id":3027,"inV":210,"properties":{"weight":3}},{"id":3028,"inV":76,"properties":{"weight":1}},{"id":3029,"inV":87,"properties":{"weight":1}},{"id":3030,"inV":96,"properties":{"weight":1}},{"id":3031,"inV":150,"properties":{"weight":1}},{"id":3032,"inV":66,"properties":{"weight":1}},{"id":3033,"inV":5,"properties":{"weight":1}},{"id":3034,"inV":91,"properties":{"weight":29}},{"id":3035,"inV":60,"properties":{"weight":6}},{"id":3036,"inV":67,"properties":{"weight":1}},{"id":3037,"inV":74,"properties":{"weight":1}},{"id":3038,"inV":21,"properties":{"weight":1}},{"id":3039,"inV":169,"properties":{"weight":1}},{"id":3040,"inV":62,"properties":{"weight":1}},{"id":3041,"inV":39,"properties":{"weight":2}},{"id":3042,"inV":175,"properties":{"weight":1}},{"id":3043,"inV":172,"properties":{"weight":1}},{"id":3044,"inV":28,"properties":{"weight":5}},{"id":3045,"inV":173,"properties":{"weight":1}},{"id":3046,"inV":37,"properties":{"weight":5}},{"id":3047,"inV":35,"properties":{"weight":2}}],"sungBy":[{"id":7232,"inV":351}],"writtenBy":[{"id":7231,"inV":350}]},"properties":{"name":[{"id":39,"value":"LOOKS LIKE RAIN"}],"songType":[{"id":41,"value":"original"}],"performances":[{"id":40,"value":417}]}}
-{"id":15,"label":"song","inE":{"followedBy":[{"id":1152,"outV":26,"properties":{"weight":1}},{"id":769,"outV":122,"properties":{"weight":3}},{"id":5379,"outV":69,"properties":{"weight":4}},{"id":3844,"outV":60,"properties":{"weight":2}},{"id":1414,"outV":83,"properties":{"weight":2}},{"id":6663,"outV":12,"properties":{"weight":167}},{"id":4872,"outV":100,"properties":{"weight":9}},{"id":4105,"outV":48,"properties":{"weight":4}},{"id":11,"outV":9,"properties":{"weight":3}},{"id":4622,"outV":154,"properties":{"weight":1}},{"id":2833,"outV":101,"properties":{"weight":1}},{"id":2195,"outV":235,"properties":{"weight":1}},{"id":5141,"outV":125,"properties":{"weight":2}},{"id":3224,"outV":63,"properties":{"weight":2}},{"id":1945,"outV":148,"properties":{"weight":2}},{"id":5024,"outV":30,"properties":{"weight":2}},{"id":2597,"outV":112,"properties":{"weight":35}},{"id":1062,"outV":73,"properties":{"weight":1}},{"id":4776,"outV":114,"properties":{"weight":1}},{"id":5032,"outV":47,"properties":{"weight":1}},{"id":6698,"outV":141,"properties":{"weight":1}},{"id":3885,"outV":51,"properties":{"weight":14}},{"id":1712,"outV":82,"properties":{"weight":4}},{"id":5301,"outV":170,"properties":{"weight":1}},{"id":1847,"outV":94,"properties":{"weight":6}},{"id":4153,"outV":54,"properties":{"weight":7}},{"id":1339,"outV":31,"properties":{"weight":2}},{"id":6075,"outV":72,"properties":{"weight":4}},{"id":60,"outV":46,"properties":{"weight":1}},{"id":2108,"outV":17,"properties":{"weight":8}},{"id":6460,"outV":187,"properties":{"weight":10}},{"id":3653,"outV":24,"properties":{"weight":14}},{"id":3147,"outV":104,"properties":{"weight":2}},{"id":6731,"outV":53,"properties":{"weight":1}},{"id":1101,"outV":59,"properties":{"weight":2}},{"id":4052,"outV":173,"properties":{"weight":1}},{"id":2518,"outV":57,"properties":{"weight":5}},{"id":476,"outV":98,"properties":{"weight":3}},{"id":1372,"outV":130,"properties":{"weight":1}},{"id":1245,"outV":27,"properties":{"weight":5}},{"id":5085,"outV":4,"properties":{"weight":1}},{"id":2272,"outV":25,"properties":{"weight":4}},{"id":4577,"outV":254,"properties":{"weight":1}},{"id":5735,"outV":129,"properties":{"weight":2}},{"id":3432,"outV":58,"properties":{"weight":7}},{"id":746,"outV":80,"properties":{"weight":1}},{"id":3562,"outV":56,"properties":{"weight":6}},{"id":2411,"outV":68,"properties":{"weight":1}},{"id":2924,"outV":78,"properties":{"weight":3}},{"id":4467,"outV":202,"properties":{"weight":6}},{"id":376,"outV":74,"properties":{"weight":1}},{"id":5242,"outV":32,"properties":{"weight":2}},{"id":6267,"outV":49,"properties":{"weight":1}},{"id":2685,"outV":13,"properties":{"weight":7}}]},"outE":{"followedBy":[{"id":2816,"inV":103,"properties":{"weight":1}},{"id":2817,"inV":62,"properties":{"weight":1}},{"id":2818,"inV":64,"properties":{"weight":1}},{"id":2819,"inV":75,"properties":{"weight":3}},{"id":2820,"inV":152,"properties":{"weight":1}},{"id":2821,"inV":117,"properties":{"weight":1}},{"id":2822,"inV":168,"properties":{"weight":1}},{"id":2823,"inV":188,"properties":{"weight":1}},{"id":2824,"inV":131,"properties":{"weight":4}},{"id":2825,"inV":28,"properties":{"weight":1}},{"id":2826,"inV":124,"properties":{"weight":1}},{"id":2827,"inV":190,"properties":{"weight":1}},{"id":2828,"inV":137,"properties":{"weight":1}},{"id":2755,"inV":19,"properties":{"weight":8}},{"id":2756,"inV":56,"properties":{"weight":22}},{"id":2757,"inV":104,"properties":{"weight":17}},{"id":2758,"inV":49,"properties":{"weight":4}},{"id":2759,"inV":122,"properties":{"weight":3}},{"id":2760,"inV":23,"properties":{"weight":2}},{"id":2761,"inV":27,"properties":{"weight":23}},{"id":2762,"inV":89,"properties":{"weight":7}},{"id":2763,"inV":46,"properties":{"weight":1}},{"id":2764,"inV":57,"properties":{"weight":7}},{"id":2765,"inV":59,"properties":{"weight":6}},{"id":2766,"inV":58,"properties":{"weight":18}},{"id":2767,"inV":54,"properties":{"weight":25}},{"id":2768,"inV":100,"properties":{"weight":24}},{"id":2769,"inV":39,"properties":{"weight":3}},{"id":2770,"inV":160,"properties":{"weight":5}},{"id":2771,"inV":13,"properties":{"weight":3}},{"id":2772,"inV":51,"properties":{"weight":14}},{"id":2773,"inV":94,"properties":{"weight":4}},{"id":2774,"inV":148,"properties":{"weight":1}},{"id":2775,"inV":9,"properties":{"weight":5}},{"id":2776,"inV":48,"properties":{"weight":17}},{"id":2777,"inV":55,"properties":{"weight":1}},{"id":2778,"inV":72,"properties":{"weight":3}},{"id":2779,"inV":52,"properties":{"weight":1}},{"id":2780,"inV":12,"properties":{"weight":3}},{"id":2781,"inV":4,"properties":{"weight":4}},{"id":2782,"inV":83,"properties":{"weight":2}},{"id":2783,"inV":202,"properties":{"weight":6}},{"id":2784,"inV":82,"properties":{"weight":3}},{"id":2785,"inV":74,"properties":{"weight":1}},{"id":2786,"inV":69,"properties":{"weight":7}},{"id":2787,"inV":98,"properties":{"weight":10}},{"id":2788,"inV":21,"properties":{"weight":1}},{"id":2789,"inV":125,"properties":{"weight":1}},{"id":2790,"inV":170,"properties":{"weight":3}},{"id":2791,"inV":26,"properties":{"weight":1}},{"id":2792,"inV":60,"properties":{"weight":1}},{"id":2793,"inV":294,"properties":{"weight":2}},{"id":2794,"inV":99,"properties":{"weight":3}},{"id":2795,"inV":17,"properties":{"weight":10}},{"id":2796,"inV":63,"properties":{"weight":5}},{"id":2797,"inV":68,"properties":{"weight":3}},{"id":2798,"inV":108,"properties":{"weight":6}},{"id":2799,"inV":109,"properties":{"weight":1}},{"id":2800,"inV":196,"properties":{"weight":3}},{"id":2801,"inV":91,"properties":{"weight":1}},{"id":2802,"inV":18,"properties":{"weight":1}},{"id":2803,"inV":14,"properties":{"weight":4}},{"id":2804,"inV":105,"properties":{"weight":8}},{"id":2805,"inV":101,"properties":{"weight":2}},{"id":2806,"inV":10,"properties":{"weight":2}},{"id":2807,"inV":73,"properties":{"weight":26}},{"id":2808,"inV":78,"properties":{"weight":1}},{"id":2809,"inV":32,"properties":{"weight":3}},{"id":2810,"inV":106,"properties":{"weight":2}},{"id":2811,"inV":180,"properties":{"weight":2}},{"id":2812,"inV":88,"properties":{"weight":1}},{"id":2813,"inV":97,"properties":{"weight":1}},{"id":2814,"inV":53,"properties":{"weight":3}},{"id":2815,"inV":115,"properties":{"weight":4}}],"sungBy":[{"id":7472,"inV":351}],"writtenBy":[{"id":7471,"inV":479}]},"properties":{"name":[{"id":42,"value":"BIG RIVER"}],"songType":[{"id":44,"value":"cover"}],"performances":[{"id":43,"value":397}]}}
-{"id":16,"label":"song","inE":{"followedBy":[{"id":7008,"outV":89,"properties":{"weight":1}},{"id":6467,"outV":187,"properties":{"weight":1}},{"id":4101,"outV":48,"properties":{"weight":1}},{"id":5637,"outV":22,"properties":{"weight":3}},{"id":6341,"outV":21,"properties":{"weight":1}},{"id":5382,"outV":69,"properties":{"weight":4}},{"id":3273,"outV":160,"properties":{"weight":2}},{"id":6537,"outV":55,"properties":{"weight":1}},{"id":3882,"outV":51,"properties":{"weight":12}},{"id":12,"outV":9,"properties":{"weight":1}},{"id":1260,"outV":27,"properties":{"weight":1}},{"id":4172,"outV":54,"properties":{"weight":1}},{"id":6285,"outV":49,"properties":{"weight":1}},{"id":368,"outV":74,"properties":{"weight":1}},{"id":4464,"outV":202,"properties":{"weight":1}},{"id":468,"outV":195,"properties":{"weight":3}},{"id":5303,"outV":170,"properties":{"weight":2}},{"id":472,"outV":98,"properties":{"weight":2}},{"id":2521,"outV":57,"properties":{"weight":1}},{"id":5081,"outV":4,"properties":{"weight":2}},{"id":5146,"outV":125,"properties":{"weight":1}},{"id":1405,"outV":83,"properties":{"weight":5}},{"id":1854,"outV":94,"properties":{"weight":2}},{"id":1950,"outV":148,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2169,"inV":25,"properties":{"weight":1}},{"id":2170,"inV":101,"properties":{"weight":46}},{"id":2171,"inV":89,"properties":{"weight":2}},{"id":2172,"inV":130,"properties":{"weight":1}},{"id":2173,"inV":83,"properties":{"weight":1}}]},"properties":{"name":[{"id":45,"value":"WEATHER REPORT SUITE"}],"songType":[{"id":47,"value":""}],"performances":[{"id":46,"value":0}]}}
-{"id":17,"label":"song","inE":{"followedBy":[{"id":5955,"outV":50,"properties":{"weight":43}},{"id":5702,"outV":20,"properties":{"weight":2}},{"id":2696,"outV":13,"properties":{"weight":2}},{"id":6538,"outV":55,"properties":{"weight":1}},{"id":1163,"outV":26,"properties":{"weight":34}},{"id":13,"outV":9,"properties":{"weight":1}},{"id":402,"outV":38,"properties":{"weight":12}},{"id":5011,"outV":30,"properties":{"weight":3}},{"id":6675,"outV":12,"properties":{"weight":3}},{"id":1877,"outV":103,"properties":{"weight":2}},{"id":2522,"outV":57,"properties":{"weight":1}},{"id":475,"outV":98,"properties":{"weight":1}},{"id":3803,"outV":88,"properties":{"weight":4}},{"id":540,"outV":120,"properties":{"weight":1}},{"id":2588,"outV":112,"properties":{"weight":3}},{"id":3996,"outV":106,"properties":{"weight":1}},{"id":990,"outV":11,"properties":{"weight":3}},{"id":1570,"outV":18,"properties":{"weight":6}},{"id":2275,"outV":25,"properties":{"weight":1}},{"id":4262,"outV":10,"properties":{"weight":5}},{"id":2795,"outV":15,"properties":{"weight":10}},{"id":6955,"outV":84,"properties":{"weight":1}},{"id":2413,"outV":68,"properties":{"weight":9}},{"id":4077,"outV":109,"properties":{"weight":1}},{"id":2991,"outV":14,"properties":{"weight":13}},{"id":4912,"outV":100,"properties":{"weight":1}},{"id":3639,"outV":24,"properties":{"weight":13}},{"id":6583,"outV":116,"properties":{"weight":1}},{"id":58,"outV":46,"properties":{"weight":2}},{"id":635,"outV":23,"properties":{"weight":16}},{"id":5244,"outV":32,"properties":{"weight":19}},{"id":2942,"outV":78,"properties":{"weight":1}},{"id":6847,"outV":64,"properties":{"weight":7}}]},"outE":{"followedBy":[{"id":2112,"inV":24,"properties":{"weight":9}},{"id":2113,"inV":21,"properties":{"weight":1}},{"id":2114,"inV":46,"properties":{"weight":1}},{"id":2115,"inV":20,"properties":{"weight":2}},{"id":2116,"inV":10,"properties":{"weight":7}},{"id":2117,"inV":68,"properties":{"weight":25}},{"id":2118,"inV":32,"properties":{"weight":19}},{"id":2119,"inV":103,"properties":{"weight":3}},{"id":2120,"inV":121,"properties":{"weight":3}},{"id":2121,"inV":112,"properties":{"weight":31}},{"id":2122,"inV":85,"properties":{"weight":1}},{"id":2123,"inV":101,"properties":{"weight":1}},{"id":2124,"inV":109,"properties":{"weight":1}},{"id":2125,"inV":73,"properties":{"weight":1}},{"id":2126,"inV":88,"properties":{"weight":8}},{"id":2127,"inV":111,"properties":{"weight":3}},{"id":2128,"inV":54,"properties":{"weight":2}},{"id":2129,"inV":97,"properties":{"weight":2}},{"id":2130,"inV":100,"properties":{"weight":1}},{"id":2131,"inV":42,"properties":{"weight":1}},{"id":2132,"inV":58,"properties":{"weight":2}},{"id":2133,"inV":244,"properties":{"weight":1}},{"id":2134,"inV":56,"properties":{"weight":1}},{"id":2135,"inV":63,"properties":{"weight":1}},{"id":2136,"inV":188,"properties":{"weight":2}},{"id":2137,"inV":71,"properties":{"weight":1}},{"id":2138,"inV":30,"properties":{"weight":2}},{"id":2139,"inV":31,"properties":{"weight":1}},{"id":2140,"inV":77,"properties":{"weight":2}},{"id":2141,"inV":40,"properties":{"weight":1}},{"id":2142,"inV":33,"properties":{"weight":1}},{"id":2103,"inV":18,"properties":{"weight":17}},{"id":2104,"inV":39,"properties":{"weight":2}},{"id":2105,"inV":22,"properties":{"weight":4}},{"id":2106,"inV":50,"properties":{"weight":6}},{"id":2107,"inV":14,"properties":{"weight":19}},{"id":2108,"inV":15,"properties":{"weight":8}},{"id":2109,"inV":12,"properties":{"weight":24}},{"id":2110,"inV":23,"properties":{"weight":2}},{"id":2111,"inV":13,"properties":{"weight":4}}],"sungBy":[{"id":7364,"inV":340}],"writtenBy":[{"id":7363,"inV":339}]},"properties":{"name":[{"id":48,"value":"THEY LOVE EACH OTHER"}],"songType":[{"id":50,"value":"original"}],"performances":[{"id":49,"value":227}]}}
-{"id":18,"label":"song","inE":{"followedBy":[{"id":1024,"outV":73,"properties":{"weight":4}},{"id":4097,"outV":48,"properties":{"weight":13}},{"id":6276,"outV":49,"properties":{"weight":2}},{"id":2309,"outV":25,"properties":{"weight":1}},{"id":3333,"outV":155,"properties":{"weight":1}},{"id":4231,"outV":52,"properties":{"weight":1}},{"id":4360,"outV":62,"properties":{"weight":1}},{"id":3849,"outV":60,"properties":{"weight":1}},{"id":5257,"outV":32,"properties":{"weight":3}},{"id":5385,"outV":69,"properties":{"weight":2}},{"id":2189,"outV":235,"properties":{"weight":1}},{"id":14,"outV":9,"properties":{"weight":5}},{"id":654,"outV":23,"properties":{"weight":1}},{"id":5010,"outV":30,"properties":{"weight":2}},{"id":6546,"outV":55,"properties":{"weight":1}},{"id":4885,"outV":100,"properties":{"weight":11}},{"id":1814,"outV":273,"properties":{"weight":1}},{"id":1943,"outV":148,"properties":{"weight":1}},{"id":5145,"outV":125,"properties":{"weight":1}},{"id":6688,"outV":12,"properties":{"weight":1}},{"id":4642,"outV":154,"properties":{"weight":3}},{"id":2852,"outV":101,"properties":{"weight":1}},{"id":4260,"outV":10,"properties":{"weight":3}},{"id":3238,"outV":63,"properties":{"weight":1}},{"id":6695,"outV":141,"properties":{"weight":1}},{"id":3880,"outV":51,"properties":{"weight":12}},{"id":425,"outV":38,"properties":{"weight":2}},{"id":1193,"outV":26,"properties":{"weight":1}},{"id":2601,"outV":112,"properties":{"weight":1}},{"id":4524,"outV":105,"properties":{"weight":3}},{"id":45,"outV":46,"properties":{"weight":3}},{"id":4015,"outV":292,"properties":{"weight":1}},{"id":560,"outV":120,"properties":{"weight":1}},{"id":5299,"outV":170,"properties":{"weight":3}},{"id":6579,"outV":116,"properties":{"weight":1}},{"id":1716,"outV":82,"properties":{"weight":3}},{"id":4404,"outV":40,"properties":{"weight":1}},{"id":5429,"outV":315,"properties":{"weight":1}},{"id":4150,"outV":218,"properties":{"weight":1}},{"id":2103,"outV":17,"properties":{"weight":17}},{"id":4152,"outV":54,"properties":{"weight":18}},{"id":6456,"outV":187,"properties":{"weight":8}},{"id":1849,"outV":94,"properties":{"weight":6}},{"id":827,"outV":171,"properties":{"weight":1}},{"id":6715,"outV":53,"properties":{"weight":6}},{"id":6205,"outV":319,"properties":{"weight":1}},{"id":1086,"outV":59,"properties":{"weight":21}},{"id":5439,"outV":239,"properties":{"weight":1}},{"id":6080,"outV":72,"properties":{"weight":3}},{"id":1986,"outV":152,"properties":{"weight":1}},{"id":3270,"outV":160,"properties":{"weight":1}},{"id":5192,"outV":99,"properties":{"weight":1}},{"id":3017,"outV":14,"properties":{"weight":1}},{"id":1356,"outV":31,"properties":{"weight":1}},{"id":3148,"outV":104,"properties":{"weight":19}},{"id":4044,"outV":173,"properties":{"weight":4}},{"id":5073,"outV":4,"properties":{"weight":4}},{"id":4692,"outV":33,"properties":{"weight":1}},{"id":5716,"outV":20,"properties":{"weight":1}},{"id":2517,"outV":57,"properties":{"weight":11}},{"id":5973,"outV":50,"properties":{"weight":5}},{"id":3671,"outV":24,"properties":{"weight":3}},{"id":473,"outV":98,"properties":{"weight":6}},{"id":729,"outV":80,"properties":{"weight":5}},{"id":5850,"outV":61,"properties":{"weight":1}},{"id":1244,"outV":27,"properties":{"weight":16}},{"id":3807,"outV":88,"properties":{"weight":1}},{"id":3553,"outV":56,"properties":{"weight":16}},{"id":866,"outV":189,"properties":{"weight":1}},{"id":5602,"outV":42,"properties":{"weight":1}},{"id":355,"outV":74,"properties":{"weight":1}},{"id":3431,"outV":58,"properties":{"weight":8}},{"id":4967,"outV":207,"properties":{"weight":1}},{"id":7016,"outV":89,"properties":{"weight":3}},{"id":1642,"outV":213,"properties":{"weight":1}},{"id":2029,"outV":180,"properties":{"weight":1}},{"id":6765,"outV":39,"properties":{"weight":7}},{"id":6384,"outV":65,"properties":{"weight":1}},{"id":2802,"outV":15,"properties":{"weight":1}},{"id":3315,"outV":252,"properties":{"weight":1}},{"id":4851,"outV":119,"properties":{"weight":1}},{"id":3064,"outV":153,"properties":{"weight":2}},{"id":1401,"outV":190,"properties":{"weight":2}},{"id":2683,"outV":13,"properties":{"weight":3}},{"id":4476,"outV":202,"properties":{"weight":3}},{"id":2431,"outV":68,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":1536,"inV":59,"properties":{"weight":5}},{"id":1537,"inV":19,"properties":{"weight":17}},{"id":1538,"inV":100,"properties":{"weight":16}},{"id":1539,"inV":122,"properties":{"weight":6}},{"id":1540,"inV":46,"properties":{"weight":4}},{"id":1541,"inV":47,"properties":{"weight":1}},{"id":1542,"inV":74,"properties":{"weight":1}},{"id":1543,"inV":53,"properties":{"weight":7}},{"id":1544,"inV":94,"properties":{"weight":2}},{"id":1545,"inV":58,"properties":{"weight":13}},{"id":1546,"inV":57,"properties":{"weight":10}},{"id":1547,"inV":25,"properties":{"weight":1}},{"id":1548,"inV":39,"properties":{"weight":3}},{"id":1549,"inV":54,"properties":{"weight":29}},{"id":1550,"inV":120,"properties":{"weight":1}},{"id":1551,"inV":152,"properties":{"weight":1}},{"id":1552,"inV":89,"properties":{"weight":3}},{"id":1553,"inV":148,"properties":{"weight":1}},{"id":1554,"inV":252,"properties":{"weight":1}},{"id":1555,"inV":225,"properties":{"weight":1}},{"id":1556,"inV":80,"properties":{"weight":2}},{"id":1557,"inV":56,"properties":{"weight":11}},{"id":1558,"inV":27,"properties":{"weight":16}},{"id":1559,"inV":26,"properties":{"weight":1}},{"id":1560,"inV":206,"properties":{"weight":1}},{"id":1561,"inV":72,"properties":{"weight":5}},{"id":1562,"inV":23,"properties":{"weight":3}},{"id":1563,"inV":49,"properties":{"weight":3}},{"id":1564,"inV":51,"properties":{"weight":26}},{"id":1565,"inV":55,"properties":{"weight":2}},{"id":1566,"inV":202,"properties":{"weight":6}},{"id":1567,"inV":13,"properties":{"weight":3}},{"id":1568,"inV":83,"properties":{"weight":4}},{"id":1569,"inV":160,"properties":{"weight":2}},{"id":1570,"inV":17,"properties":{"weight":6}},{"id":1571,"inV":10,"properties":{"weight":5}},{"id":1572,"inV":9,"properties":{"weight":3}},{"id":1573,"inV":125,"properties":{"weight":2}},{"id":1574,"inV":98,"properties":{"weight":4}},{"id":1575,"inV":170,"properties":{"weight":5}},{"id":1576,"inV":69,"properties":{"weight":3}},{"id":1577,"inV":21,"properties":{"weight":1}},{"id":1578,"inV":82,"properties":{"weight":2}},{"id":1579,"inV":196,"properties":{"weight":1}},{"id":1580,"inV":104,"properties":{"weight":9}},{"id":1581,"inV":108,"properties":{"weight":4}},{"id":1582,"inV":14,"properties":{"weight":4}},{"id":1583,"inV":32,"properties":{"weight":4}},{"id":1584,"inV":50,"properties":{"weight":1}},{"id":1585,"inV":48,"properties":{"weight":7}},{"id":1586,"inV":101,"properties":{"weight":1}},{"id":1587,"inV":105,"properties":{"weight":5}},{"id":1588,"inV":208,"properties":{"weight":1}},{"id":1589,"inV":103,"properties":{"weight":2}},{"id":1590,"inV":42,"properties":{"weight":1}},{"id":1591,"inV":63,"properties":{"weight":2}},{"id":1592,"inV":24,"properties":{"weight":2}},{"id":1593,"inV":73,"properties":{"weight":7}},{"id":1594,"inV":222,"properties":{"weight":1}},{"id":1595,"inV":106,"properties":{"weight":1}},{"id":1596,"inV":189,"properties":{"weight":2}},{"id":1597,"inV":112,"properties":{"weight":1}},{"id":1598,"inV":68,"properties":{"weight":2}},{"id":1599,"inV":121,"properties":{"weight":1}},{"id":1600,"inV":180,"properties":{"weight":2}},{"id":1601,"inV":199,"properties":{"weight":1}},{"id":1602,"inV":88,"properties":{"weight":2}},{"id":1603,"inV":128,"properties":{"weight":1}},{"id":1604,"inV":60,"properties":{"weight":1}},{"id":1605,"inV":12,"properties":{"weight":1}},{"id":1606,"inV":75,"properties":{"weight":2}},{"id":1607,"inV":168,"properties":{"weight":1}},{"id":1608,"inV":175,"properties":{"weight":1}},{"id":1609,"inV":254,"properties":{"weight":1}},{"id":1610,"inV":174,"properties":{"weight":4}},{"id":1611,"inV":137,"properties":{"weight":1}},{"id":1612,"inV":173,"properties":{"weight":1}},{"id":1535,"inV":235,"properties":{"weight":1}}],"sungBy":[{"id":7554,"inV":351}],"writtenBy":[{"id":7553,"inV":528}]},"properties":{"name":[{"id":51,"value":"EL PASO"}],"songType":[{"id":53,"value":"cover"}],"performances":[{"id":52,"value":388}]}}
-{"id":19,"label":"song","inE":{"followedBy":[{"id":1537,"outV":18,"properties":{"weight":17}},{"id":3969,"outV":106,"properties":{"weight":1}},{"id":6657,"outV":12,"properties":{"weight":3}},{"id":4098,"outV":48,"properties":{"weight":1}},{"id":6532,"outV":242,"properties":{"weight":1}},{"id":1159,"outV":26,"properties":{"weight":21}},{"id":6152,"outV":36,"properties":{"weight":6}},{"id":394,"outV":74,"properties":{"weight":1}},{"id":522,"outV":120,"properties":{"weight":2}},{"id":5130,"outV":222,"properties":{"weight":1}},{"id":3467,"outV":58,"properties":{"weight":8}},{"id":15,"outV":9,"properties":{"weight":1}},{"id":272,"outV":150,"properties":{"weight":1}},{"id":4880,"outV":100,"properties":{"weight":1}},{"id":5267,"outV":32,"properties":{"weight":12}},{"id":4245,"outV":10,"properties":{"weight":9}},{"id":790,"outV":122,"properties":{"weight":1}},{"id":2841,"outV":101,"properties":{"weight":18}},{"id":3097,"outV":153,"properties":{"weight":3}},{"id":411,"outV":38,"properties":{"weight":6}},{"id":2335,"outV":290,"properties":{"weight":2}},{"id":5535,"outV":43,"properties":{"weight":1}},{"id":1825,"outV":41,"properties":{"weight":1}},{"id":3874,"outV":60,"properties":{"weight":1}},{"id":4770,"outV":114,"properties":{"weight":4}},{"id":6308,"outV":123,"properties":{"weight":1}},{"id":2086,"outV":188,"properties":{"weight":1}},{"id":2215,"outV":75,"properties":{"weight":1}},{"id":5801,"outV":76,"properties":{"weight":5}},{"id":42,"outV":46,"properties":{"weight":5}},{"id":3628,"outV":24,"properties":{"weight":9}},{"id":2989,"outV":14,"properties":{"weight":17}},{"id":5167,"outV":71,"properties":{"weight":1}},{"id":6831,"outV":64,"properties":{"weight":7}},{"id":2354,"outV":87,"properties":{"weight":2}},{"id":5938,"outV":50,"properties":{"weight":19}},{"id":951,"outV":67,"properties":{"weight":2}},{"id":3511,"outV":223,"properties":{"weight":1}},{"id":1848,"outV":94,"properties":{"weight":1}},{"id":314,"outV":34,"properties":{"weight":2}},{"id":2621,"outV":158,"properties":{"weight":2}},{"id":1472,"outV":81,"properties":{"weight":1}},{"id":6081,"outV":72,"properties":{"weight":24}},{"id":6978,"outV":175,"properties":{"weight":2}},{"id":2755,"outV":15,"properties":{"weight":8}},{"id":5701,"outV":20,"properties":{"weight":4}},{"id":3275,"outV":160,"properties":{"weight":2}},{"id":4171,"outV":54,"properties":{"weight":3}},{"id":206,"outV":70,"properties":{"weight":1}},{"id":4558,"outV":105,"properties":{"weight":1}},{"id":5200,"outV":99,"properties":{"weight":19}},{"id":5457,"outV":79,"properties":{"weight":4}},{"id":979,"outV":11,"properties":{"weight":9}},{"id":1620,"outV":210,"properties":{"weight":4}},{"id":5590,"outV":42,"properties":{"weight":4}},{"id":3799,"outV":88,"properties":{"weight":7}},{"id":4450,"outV":113,"properties":{"weight":1}},{"id":4962,"outV":207,"properties":{"weight":1}},{"id":6370,"outV":21,"properties":{"weight":1}},{"id":1763,"outV":28,"properties":{"weight":1}},{"id":2405,"outV":45,"properties":{"weight":1}},{"id":2279,"outV":25,"properties":{"weight":4}},{"id":2408,"outV":68,"properties":{"weight":5}},{"id":5864,"outV":96,"properties":{"weight":1}},{"id":2666,"outV":13,"properties":{"weight":12}},{"id":1900,"outV":103,"properties":{"weight":22}},{"id":3564,"outV":56,"properties":{"weight":2}},{"id":5102,"outV":4,"properties":{"weight":6}},{"id":1776,"outV":234,"properties":{"weight":7}},{"id":4976,"outV":236,"properties":{"weight":3}},{"id":2546,"outV":57,"properties":{"weight":28}},{"id":627,"outV":23,"properties":{"weight":3}},{"id":4083,"outV":109,"properties":{"weight":4}},{"id":4470,"outV":202,"properties":{"weight":2}},{"id":5622,"outV":22,"properties":{"weight":3}},{"id":6391,"outV":65,"properties":{"weight":2}},{"id":6394,"outV":136,"properties":{"weight":1}},{"id":4349,"outV":62,"properties":{"weight":1}},{"id":126,"outV":97,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3139,"inV":187,"properties":{"weight":402}},{"id":3140,"inV":39,"properties":{"weight":1}},{"id":3141,"inV":60,"properties":{"weight":1}}],"sungBy":[{"id":7100,"inV":340}],"writtenBy":[{"id":7099,"inV":339}]},"properties":{"name":[{"id":54,"value":"CHINA CAT SUNFLOWER"}],"songType":[{"id":56,"value":"original"}],"performances":[{"id":55,"value":554}]}}
-{"id":20,"label":"song","inE":{"followedBy":[{"id":5376,"outV":69,"properties":{"weight":1}},{"id":6592,"outV":116,"properties":{"weight":1}},{"id":2115,"outV":17,"properties":{"weight":2}},{"id":6084,"outV":72,"properties":{"weight":3}},{"id":4170,"outV":54,"properties":{"weight":4}},{"id":2955,"outV":78,"properties":{"weight":1}},{"id":1100,"outV":59,"properties":{"weight":5}},{"id":1164,"outV":26,"properties":{"weight":1}},{"id":2061,"outV":92,"properties":{"weight":1}},{"id":718,"outV":80,"properties":{"weight":2}},{"id":6543,"outV":55,"properties":{"weight":1}},{"id":6735,"outV":53,"properties":{"weight":1}},{"id":16,"outV":9,"properties":{"weight":1}},{"id":1809,"outV":199,"properties":{"weight":1}},{"id":3282,"outV":160,"properties":{"weight":1}},{"id":3609,"outV":56,"properties":{"weight":1}},{"id":1818,"outV":273,"properties":{"weight":1}},{"id":4894,"outV":100,"properties":{"weight":1}},{"id":479,"outV":98,"properties":{"weight":3}},{"id":2527,"outV":57,"properties":{"weight":3}},{"id":2027,"outV":180,"properties":{"weight":3}},{"id":3883,"outV":51,"properties":{"weight":4}},{"id":2287,"outV":25,"properties":{"weight":1}},{"id":4783,"outV":114,"properties":{"weight":1}},{"id":3442,"outV":58,"properties":{"weight":2}},{"id":4340,"outV":62,"properties":{"weight":1}},{"id":5300,"outV":170,"properties":{"weight":1}},{"id":5047,"outV":209,"properties":{"weight":1}},{"id":56,"outV":46,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5699,"inV":51,"properties":{"weight":6}},{"id":5700,"inV":100,"properties":{"weight":4}},{"id":5701,"inV":19,"properties":{"weight":4}},{"id":5702,"inV":17,"properties":{"weight":2}},{"id":5703,"inV":56,"properties":{"weight":2}},{"id":5704,"inV":39,"properties":{"weight":1}},{"id":5705,"inV":52,"properties":{"weight":1}},{"id":5706,"inV":94,"properties":{"weight":1}},{"id":5707,"inV":58,"properties":{"weight":3}},{"id":5708,"inV":59,"properties":{"weight":3}},{"id":5709,"inV":14,"properties":{"weight":1}},{"id":5710,"inV":55,"properties":{"weight":1}},{"id":5711,"inV":47,"properties":{"weight":1}},{"id":5712,"inV":27,"properties":{"weight":1}},{"id":5713,"inV":82,"properties":{"weight":1}},{"id":5714,"inV":83,"properties":{"weight":1}},{"id":5715,"inV":98,"properties":{"weight":2}},{"id":5716,"inV":18,"properties":{"weight":1}},{"id":5717,"inV":170,"properties":{"weight":2}},{"id":5718,"inV":180,"properties":{"weight":1}},{"id":5719,"inV":273,"properties":{"weight":2}},{"id":5720,"inV":199,"properties":{"weight":1}},{"id":5721,"inV":73,"properties":{"weight":1}},{"id":5722,"inV":197,"properties":{"weight":1}},{"id":5723,"inV":222,"properties":{"weight":1}},{"id":5724,"inV":104,"properties":{"weight":1}},{"id":5725,"inV":118,"properties":{"weight":1}},{"id":5726,"inV":215,"properties":{"weight":1}},{"id":5727,"inV":80,"properties":{"weight":1}},{"id":5728,"inV":173,"properties":{"weight":1}}],"sungBy":[{"id":7854,"inV":351}],"writtenBy":[{"id":7853,"inV":699}]},"properties":{"name":[{"id":57,"value":"THE RACE IS ON"}],"songType":[{"id":59,"value":"cover"}],"performances":[{"id":58,"value":59}]}}
-{"id":21,"label":"song","inE":{"followedBy":[{"id":5634,"outV":22,"properties":{"weight":3}},{"id":5384,"outV":69,"properties":{"weight":20}},{"id":777,"outV":122,"properties":{"weight":7}},{"id":907,"outV":174,"properties":{"weight":1}},{"id":3981,"outV":106,"properties":{"weight":1}},{"id":6413,"outV":134,"properties":{"weight":18}},{"id":3088,"outV":153,"properties":{"weight":1}},{"id":17,"outV":9,"properties":{"weight":1}},{"id":5137,"outV":125,"properties":{"weight":6}},{"id":4754,"outV":37,"properties":{"weight":6}},{"id":1427,"outV":83,"properties":{"weight":1}},{"id":3859,"outV":60,"properties":{"weight":12}},{"id":4888,"outV":100,"properties":{"weight":1}},{"id":6555,"outV":172,"properties":{"weight":2}},{"id":1949,"outV":148,"properties":{"weight":6}},{"id":3234,"outV":63,"properties":{"weight":1}},{"id":6179,"outV":36,"properties":{"weight":1}},{"id":932,"outV":91,"properties":{"weight":1}},{"id":2471,"outV":68,"properties":{"weight":1}},{"id":4519,"outV":105,"properties":{"weight":1}},{"id":4775,"outV":114,"properties":{"weight":5}},{"id":1577,"outV":18,"properties":{"weight":1}},{"id":4650,"outV":154,"properties":{"weight":2}},{"id":5035,"outV":47,"properties":{"weight":1}},{"id":44,"outV":46,"properties":{"weight":2}},{"id":1711,"outV":82,"properties":{"weight":2}},{"id":816,"outV":171,"properties":{"weight":11}},{"id":5680,"outV":167,"properties":{"weight":1}},{"id":945,"outV":67,"properties":{"weight":2}},{"id":3633,"outV":24,"properties":{"weight":1}},{"id":6705,"outV":141,"properties":{"weight":2}},{"id":6450,"outV":187,"properties":{"weight":8}},{"id":6195,"outV":232,"properties":{"weight":2}},{"id":1845,"outV":94,"properties":{"weight":8}},{"id":3896,"outV":51,"properties":{"weight":1}},{"id":5305,"outV":170,"properties":{"weight":1}},{"id":6202,"outV":319,"properties":{"weight":3}},{"id":1981,"outV":281,"properties":{"weight":1}},{"id":4030,"outV":173,"properties":{"weight":2}},{"id":3263,"outV":160,"properties":{"weight":4}},{"id":1089,"outV":59,"properties":{"weight":4}},{"id":2113,"outV":17,"properties":{"weight":1}},{"id":6722,"outV":53,"properties":{"weight":1}},{"id":2371,"outV":87,"properties":{"weight":2}},{"id":2500,"outV":90,"properties":{"weight":1}},{"id":5060,"outV":257,"properties":{"weight":1}},{"id":5957,"outV":50,"properties":{"weight":2}},{"id":6981,"outV":175,"properties":{"weight":5}},{"id":4166,"outV":54,"properties":{"weight":6}},{"id":713,"outV":80,"properties":{"weight":1}},{"id":3789,"outV":168,"properties":{"weight":1}},{"id":6605,"outV":127,"properties":{"weight":1}},{"id":5070,"outV":128,"properties":{"weight":1}},{"id":2512,"outV":57,"properties":{"weight":3}},{"id":2896,"outV":101,"properties":{"weight":1}},{"id":467,"outV":194,"properties":{"weight":1}},{"id":2645,"outV":137,"properties":{"weight":3}},{"id":470,"outV":195,"properties":{"weight":1}},{"id":1240,"outV":183,"properties":{"weight":1}},{"id":1368,"outV":130,"properties":{"weight":10}},{"id":1752,"outV":28,"properties":{"weight":8}},{"id":2904,"outV":118,"properties":{"weight":1}},{"id":6105,"outV":72,"properties":{"weight":1}},{"id":1242,"outV":27,"properties":{"weight":5}},{"id":5212,"outV":99,"properties":{"weight":1}},{"id":3038,"outV":14,"properties":{"weight":1}},{"id":2271,"outV":25,"properties":{"weight":4}},{"id":5855,"outV":61,"properties":{"weight":1}},{"id":2016,"outV":149,"properties":{"weight":8}},{"id":4451,"outV":113,"properties":{"weight":1}},{"id":484,"outV":98,"properties":{"weight":2}},{"id":2788,"outV":15,"properties":{"weight":1}},{"id":3433,"outV":58,"properties":{"weight":3}},{"id":5738,"outV":129,"properties":{"weight":2}},{"id":5866,"outV":96,"properties":{"weight":96}},{"id":4588,"outV":85,"properties":{"weight":5}},{"id":238,"outV":145,"properties":{"weight":1}},{"id":2670,"outV":13,"properties":{"weight":4}},{"id":4462,"outV":202,"properties":{"weight":2}},{"id":7022,"outV":89,"properties":{"weight":1}},{"id":5359,"outV":132,"properties":{"weight":2}},{"id":6768,"outV":39,"properties":{"weight":2}},{"id":2162,"outV":151,"properties":{"weight":1}},{"id":3190,"outV":104,"properties":{"weight":1}},{"id":2040,"outV":92,"properties":{"weight":2}},{"id":3705,"outV":3,"properties":{"weight":2}},{"id":3322,"outV":252,"properties":{"weight":1}},{"id":5114,"outV":4,"properties":{"weight":1}},{"id":4347,"outV":62,"properties":{"weight":3}},{"id":4859,"outV":35,"properties":{"weight":4}},{"id":1148,"outV":26,"properties":{"weight":3}},{"id":6268,"outV":49,"properties":{"weight":51}},{"id":637,"outV":23,"properties":{"weight":3}},{"id":382,"outV":74,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":6319,"inV":59,"properties":{"weight":3}},{"id":6320,"inV":96,"properties":{"weight":72}},{"id":6321,"inV":319,"properties":{"weight":24}},{"id":6322,"inV":148,"properties":{"weight":48}},{"id":6323,"inV":25,"properties":{"weight":7}},{"id":6324,"inV":27,"properties":{"weight":3}},{"id":6325,"inV":252,"properties":{"weight":2}},{"id":6326,"inV":145,"properties":{"weight":2}},{"id":6327,"inV":89,"properties":{"weight":3}},{"id":6328,"inV":54,"properties":{"weight":1}},{"id":6329,"inV":74,"properties":{"weight":1}},{"id":6330,"inV":49,"properties":{"weight":12}},{"id":6331,"inV":153,"properties":{"weight":5}},{"id":6332,"inV":56,"properties":{"weight":3}},{"id":6333,"inV":125,"properties":{"weight":32}},{"id":6334,"inV":130,"properties":{"weight":34}},{"id":6335,"inV":9,"properties":{"weight":1}},{"id":6336,"inV":94,"properties":{"weight":24}},{"id":6337,"inV":51,"properties":{"weight":1}},{"id":6338,"inV":83,"properties":{"weight":11}},{"id":6339,"inV":127,"properties":{"weight":9}},{"id":6340,"inV":149,"properties":{"weight":2}},{"id":6341,"inV":16,"properties":{"weight":1}},{"id":6342,"inV":13,"properties":{"weight":4}},{"id":6343,"inV":3,"properties":{"weight":1}},{"id":6344,"inV":5,"properties":{"weight":6}},{"id":6345,"inV":209,"properties":{"weight":3}},{"id":6346,"inV":101,"properties":{"weight":1}},{"id":6347,"inV":338,"properties":{"weight":1}},{"id":6348,"inV":281,"properties":{"weight":1}},{"id":6349,"inV":114,"properties":{"weight":1}},{"id":6350,"inV":4,"properties":{"weight":1}},{"id":6351,"inV":91,"properties":{"weight":8}},{"id":6352,"inV":120,"properties":{"weight":1}},{"id":6353,"inV":32,"properties":{"weight":2}},{"id":6354,"inV":70,"properties":{"weight":3}},{"id":6355,"inV":84,"properties":{"weight":1}},{"id":6356,"inV":154,"properties":{"weight":1}},{"id":6357,"inV":62,"properties":{"weight":1}},{"id":6358,"inV":50,"properties":{"weight":1}},{"id":6359,"inV":141,"properties":{"weight":5}},{"id":6360,"inV":82,"properties":{"weight":1}},{"id":6361,"inV":58,"properties":{"weight":1}},{"id":6362,"inV":65,"properties":{"weight":1}},{"id":6363,"inV":33,"properties":{"weight":20}},{"id":6364,"inV":113,"properties":{"weight":28}},{"id":6365,"inV":31,"properties":{"weight":4}},{"id":6366,"inV":29,"properties":{"weight":1}},{"id":6367,"inV":67,"properties":{"weight":2}},{"id":6368,"inV":60,"properties":{"weight":7}},{"id":6369,"inV":87,"properties":{"weight":1}},{"id":6370,"inV":19,"properties":{"weight":1}},{"id":6371,"inV":175,"properties":{"weight":7}},{"id":6372,"inV":57,"properties":{"weight":1}},{"id":6373,"inV":173,"properties":{"weight":1}},{"id":6374,"inV":292,"properties":{"weight":1}},{"id":6375,"inV":139,"properties":{"weight":4}},{"id":6376,"inV":286,"properties":{"weight":1}},{"id":6377,"inV":329,"properties":{"weight":1}},{"id":6378,"inV":37,"properties":{"weight":1}}],"sungBy":[{"id":7378,"inV":426}],"writtenBy":[{"id":7377,"inV":339}]},"properties":{"name":[{"id":60,"value":"TRUCKING"}],"songType":[{"id":62,"value":"original"}],"performances":[{"id":61,"value":519}]}}
-{"id":22,"label":"song","inE":{"followedBy":[{"id":6082,"outV":72,"properties":{"weight":1}},{"id":708,"outV":206,"properties":{"weight":1}},{"id":2693,"outV":13,"properties":{"weight":2}},{"id":3274,"outV":160,"properties":{"weight":1}},{"id":5196,"outV":99,"properties":{"weight":2}},{"id":720,"outV":80,"properties":{"weight":2}},{"id":5136,"outV":125,"properties":{"weight":1}},{"id":18,"outV":9,"properties":{"weight":2}},{"id":4886,"outV":100,"properties":{"weight":2}},{"id":1367,"outV":130,"properties":{"weight":2}},{"id":1944,"outV":148,"properties":{"weight":4}},{"id":5080,"outV":4,"properties":{"weight":1}},{"id":1243,"outV":27,"properties":{"weight":3}},{"id":477,"outV":98,"properties":{"weight":2}},{"id":2525,"outV":57,"properties":{"weight":2}},{"id":4961,"outV":207,"properties":{"weight":1}},{"id":7009,"outV":89,"properties":{"weight":1}},{"id":3555,"outV":56,"properties":{"weight":2}},{"id":807,"outV":122,"properties":{"weight":1}},{"id":2919,"outV":78,"properties":{"weight":1}},{"id":4465,"outV":202,"properties":{"weight":2}},{"id":6451,"outV":187,"properties":{"weight":2}},{"id":5942,"outV":50,"properties":{"weight":1}},{"id":2105,"outV":17,"properties":{"weight":4}},{"id":6265,"outV":49,"properties":{"weight":1}},{"id":3900,"outV":51,"properties":{"weight":2}},{"id":4156,"outV":54,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":5632,"inV":148,"properties":{"weight":4}},{"id":5633,"inV":27,"properties":{"weight":1}},{"id":5634,"inV":21,"properties":{"weight":3}},{"id":5635,"inV":57,"properties":{"weight":2}},{"id":5636,"inV":13,"properties":{"weight":1}},{"id":5637,"inV":16,"properties":{"weight":3}},{"id":5638,"inV":72,"properties":{"weight":1}},{"id":5639,"inV":94,"properties":{"weight":1}},{"id":5640,"inV":56,"properties":{"weight":1}},{"id":5641,"inV":83,"properties":{"weight":1}},{"id":5642,"inV":122,"properties":{"weight":1}},{"id":5643,"inV":98,"properties":{"weight":1}},{"id":5644,"inV":59,"properties":{"weight":2}},{"id":5645,"inV":82,"properties":{"weight":3}},{"id":5646,"inV":202,"properties":{"weight":1}},{"id":5647,"inV":142,"properties":{"weight":1}},{"id":5648,"inV":302,"properties":{"weight":1}},{"id":5649,"inV":301,"properties":{"weight":1}},{"id":5621,"inV":4,"properties":{"weight":1}},{"id":5622,"inV":19,"properties":{"weight":3}},{"id":5623,"inV":58,"properties":{"weight":1}},{"id":5624,"inV":89,"properties":{"weight":1}},{"id":5625,"inV":160,"properties":{"weight":1}},{"id":5626,"inV":100,"properties":{"weight":2}},{"id":5627,"inV":54,"properties":{"weight":6}},{"id":5628,"inV":14,"properties":{"weight":1}},{"id":5629,"inV":39,"properties":{"weight":1}},{"id":5630,"inV":234,"properties":{"weight":1}},{"id":5631,"inV":120,"properties":{"weight":2}}],"sungBy":[{"id":7774,"inV":351}],"writtenBy":[{"id":7773,"inV":658}]},"properties":{"name":[{"id":63,"value":"ME AND BOBBY MCGEE"}],"songType":[{"id":65,"value":"cover"}],"performances":[{"id":64,"value":118}]}}
-{"id":23,"label":"song","inE":{"followedBy":[{"id":4354,"outV":62,"properties":{"weight":4}},{"id":1928,"outV":148,"properties":{"weight":1}},{"id":4234,"outV":52,"properties":{"weight":1}},{"id":143,"outV":97,"properties":{"weight":1}},{"id":6031,"outV":204,"properties":{"weight":1}},{"id":19,"outV":9,"properties":{"weight":2}},{"id":5140,"outV":125,"properties":{"weight":1}},{"id":1046,"outV":73,"properties":{"weight":1}},{"id":3862,"outV":60,"properties":{"weight":1}},{"id":4889,"outV":100,"properties":{"weight":3}},{"id":1562,"outV":18,"properties":{"weight":3}},{"id":4773,"outV":114,"properties":{"weight":3}},{"id":5029,"outV":47,"properties":{"weight":1}},{"id":6949,"outV":84,"properties":{"weight":5}},{"id":3884,"outV":51,"properties":{"weight":3}},{"id":943,"outV":67,"properties":{"weight":2}},{"id":48,"outV":46,"properties":{"weight":1}},{"id":1457,"outV":81,"properties":{"weight":1}},{"id":568,"outV":120,"properties":{"weight":2}},{"id":696,"outV":157,"properties":{"weight":1}},{"id":4281,"outV":10,"properties":{"weight":6}},{"id":1210,"outV":26,"properties":{"weight":1}},{"id":2362,"outV":87,"properties":{"weight":28}},{"id":3772,"outV":3,"properties":{"weight":2}},{"id":6461,"outV":187,"properties":{"weight":2}},{"id":2110,"outV":17,"properties":{"weight":2}},{"id":4162,"outV":54,"properties":{"weight":3}},{"id":1859,"outV":94,"properties":{"weight":1}},{"id":1092,"outV":59,"properties":{"weight":3}},{"id":1990,"outV":152,"properties":{"weight":2}},{"id":2760,"outV":15,"properties":{"weight":2}},{"id":6602,"outV":127,"properties":{"weight":1}},{"id":6733,"outV":53,"properties":{"weight":2}},{"id":6861,"outV":64,"properties":{"weight":1}},{"id":1490,"outV":164,"properties":{"weight":2}},{"id":5075,"outV":4,"properties":{"weight":63}},{"id":2520,"outV":57,"properties":{"weight":5}},{"id":361,"outV":74,"properties":{"weight":1}},{"id":5739,"outV":129,"properties":{"weight":1}},{"id":6380,"outV":65,"properties":{"weight":59}},{"id":1647,"outV":213,"properties":{"weight":2}},{"id":1264,"outV":27,"properties":{"weight":1}},{"id":2672,"outV":13,"properties":{"weight":5}},{"id":3440,"outV":58,"properties":{"weight":1}},{"id":2929,"outV":78,"properties":{"weight":4}},{"id":3569,"outV":56,"properties":{"weight":1}},{"id":4469,"outV":202,"properties":{"weight":1}},{"id":6266,"outV":49,"properties":{"weight":1}},{"id":767,"outV":122,"properties":{"weight":11}}]},"outE":{"followedBy":[{"id":640,"inV":125,"properties":{"weight":1}},{"id":641,"inV":129,"properties":{"weight":1}},{"id":642,"inV":69,"properties":{"weight":8}},{"id":643,"inV":98,"properties":{"weight":2}},{"id":644,"inV":39,"properties":{"weight":1}},{"id":645,"inV":170,"properties":{"weight":2}},{"id":646,"inV":68,"properties":{"weight":2}},{"id":647,"inV":112,"properties":{"weight":6}},{"id":648,"inV":91,"properties":{"weight":1}},{"id":649,"inV":104,"properties":{"weight":22}},{"id":650,"inV":63,"properties":{"weight":1}},{"id":651,"inV":73,"properties":{"weight":15}},{"id":652,"inV":12,"properties":{"weight":2}},{"id":653,"inV":74,"properties":{"weight":1}},{"id":654,"inV":18,"properties":{"weight":1}},{"id":655,"inV":88,"properties":{"weight":7}},{"id":656,"inV":32,"properties":{"weight":3}},{"id":657,"inV":215,"properties":{"weight":1}},{"id":658,"inV":64,"properties":{"weight":2}},{"id":659,"inV":108,"properties":{"weight":3}},{"id":660,"inV":210,"properties":{"weight":1}},{"id":661,"inV":71,"properties":{"weight":1}},{"id":662,"inV":26,"properties":{"weight":1}},{"id":663,"inV":105,"properties":{"weight":4}},{"id":664,"inV":45,"properties":{"weight":2}},{"id":665,"inV":117,"properties":{"weight":1}},{"id":666,"inV":151,"properties":{"weight":1}},{"id":667,"inV":60,"properties":{"weight":2}},{"id":668,"inV":116,"properties":{"weight":1}},{"id":669,"inV":42,"properties":{"weight":1}},{"id":670,"inV":188,"properties":{"weight":2}},{"id":671,"inV":31,"properties":{"weight":3}},{"id":672,"inV":87,"properties":{"weight":1}},{"id":673,"inV":30,"properties":{"weight":1}},{"id":674,"inV":24,"properties":{"weight":1}},{"id":675,"inV":175,"properties":{"weight":1}},{"id":676,"inV":173,"properties":{"weight":3}},{"id":677,"inV":137,"properties":{"weight":1}},{"id":678,"inV":191,"properties":{"weight":1}},{"id":679,"inV":192,"properties":{"weight":1}},{"id":680,"inV":190,"properties":{"weight":3}},{"id":681,"inV":40,"properties":{"weight":1}},{"id":608,"inV":72,"properties":{"weight":3}},{"id":609,"inV":141,"properties":{"weight":1}},{"id":610,"inV":94,"properties":{"weight":1}},{"id":611,"inV":58,"properties":{"weight":4}},{"id":612,"inV":27,"properties":{"weight":10}},{"id":613,"inV":160,"properties":{"weight":3}},{"id":614,"inV":49,"properties":{"weight":6}},{"id":615,"inV":50,"properties":{"weight":1}},{"id":616,"inV":78,"properties":{"weight":2}},{"id":617,"inV":207,"properties":{"weight":1}},{"id":618,"inV":57,"properties":{"weight":4}},{"id":619,"inV":59,"properties":{"weight":6}},{"id":620,"inV":218,"properties":{"weight":1}},{"id":621,"inV":122,"properties":{"weight":1}},{"id":622,"inV":152,"properties":{"weight":1}},{"id":623,"inV":13,"properties":{"weight":1}},{"id":624,"inV":56,"properties":{"weight":14}},{"id":625,"inV":89,"properties":{"weight":2}},{"id":626,"inV":11,"properties":{"weight":1}},{"id":627,"inV":19,"properties":{"weight":3}},{"id":628,"inV":100,"properties":{"weight":5}},{"id":629,"inV":4,"properties":{"weight":10}},{"id":630,"inV":47,"properties":{"weight":1}},{"id":631,"inV":202,"properties":{"weight":1}},{"id":632,"inV":80,"properties":{"weight":11}},{"id":633,"inV":3,"properties":{"weight":1}},{"id":634,"inV":51,"properties":{"weight":8}},{"id":635,"inV":17,"properties":{"weight":16}},{"id":636,"inV":48,"properties":{"weight":11}},{"id":637,"inV":21,"properties":{"weight":3}},{"id":638,"inV":9,"properties":{"weight":2}},{"id":639,"inV":53,"properties":{"weight":1}}]},"properties":{"name":[{"id":66,"value":"GREATEST STORY"}],"songType":[{"id":68,"value":""}],"performances":[{"id":67,"value":0}]}}
-{"id":24,"label":"song","inE":{"followedBy":[{"id":4226,"outV":52,"properties":{"weight":1}},{"id":1155,"outV":26,"properties":{"weight":2}},{"id":3079,"outV":153,"properties":{"weight":2}},{"id":3338,"outV":155,"properties":{"weight":1}},{"id":6282,"outV":49,"properties":{"weight":2}},{"id":785,"outV":122,"properties":{"weight":1}},{"id":2705,"outV":13,"properties":{"weight":1}},{"id":5139,"outV":125,"properties":{"weight":1}},{"id":20,"outV":9,"properties":{"weight":1}},{"id":6806,"outV":39,"properties":{"weight":2}},{"id":4887,"outV":100,"properties":{"weight":15}},{"id":5272,"outV":32,"properties":{"weight":2}},{"id":4121,"outV":48,"properties":{"weight":2}},{"id":6687,"outV":12,"properties":{"weight":83}},{"id":674,"outV":23,"properties":{"weight":1}},{"id":5027,"outV":30,"properties":{"weight":1}},{"id":167,"outV":108,"properties":{"weight":1}},{"id":2602,"outV":112,"properties":{"weight":130}},{"id":4778,"outV":114,"properties":{"weight":1}},{"id":3243,"outV":63,"properties":{"weight":1}},{"id":5036,"outV":47,"properties":{"weight":1}},{"id":6446,"outV":187,"properties":{"weight":5}},{"id":2223,"outV":226,"properties":{"weight":2}},{"id":688,"outV":157,"properties":{"weight":1}},{"id":3889,"outV":51,"properties":{"weight":4}},{"id":4146,"outV":218,"properties":{"weight":1}},{"id":6071,"outV":72,"properties":{"weight":3}},{"id":1592,"outV":18,"properties":{"weight":2}},{"id":1720,"outV":82,"properties":{"weight":4}},{"id":4537,"outV":105,"properties":{"weight":2}},{"id":6714,"outV":53,"properties":{"weight":3}},{"id":1085,"outV":59,"properties":{"weight":26}},{"id":2112,"outV":17,"properties":{"weight":9}},{"id":4032,"outV":173,"properties":{"weight":2}},{"id":449,"outV":38,"properties":{"weight":1}},{"id":705,"outV":206,"properties":{"weight":1}},{"id":4167,"outV":54,"properties":{"weight":8}},{"id":2507,"outV":57,"properties":{"weight":14}},{"id":6606,"outV":127,"properties":{"weight":1}},{"id":5074,"outV":4,"properties":{"weight":9}},{"id":6227,"outV":117,"properties":{"weight":1}},{"id":4950,"outV":86,"properties":{"weight":1}},{"id":471,"outV":98,"properties":{"weight":3}},{"id":728,"outV":80,"properties":{"weight":3}},{"id":94,"outV":46,"properties":{"weight":1}},{"id":992,"outV":11,"properties":{"weight":1}},{"id":2916,"outV":78,"properties":{"weight":2}},{"id":4073,"outV":109,"properties":{"weight":2}},{"id":3437,"outV":58,"properties":{"weight":6}},{"id":1263,"outV":27,"properties":{"weight":2}},{"id":3568,"outV":56,"properties":{"weight":2}},{"id":4466,"outV":202,"properties":{"weight":5}},{"id":1781,"outV":234,"properties":{"weight":1}},{"id":3194,"outV":104,"properties":{"weight":4}},{"id":2429,"outV":68,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":3617,"inV":13,"properties":{"weight":1}},{"id":3618,"inV":125,"properties":{"weight":2}},{"id":3619,"inV":10,"properties":{"weight":2}},{"id":3620,"inV":4,"properties":{"weight":2}},{"id":3621,"inV":54,"properties":{"weight":28}},{"id":3622,"inV":56,"properties":{"weight":24}},{"id":3623,"inV":59,"properties":{"weight":7}},{"id":3624,"inV":46,"properties":{"weight":7}},{"id":3625,"inV":100,"properties":{"weight":17}},{"id":3626,"inV":152,"properties":{"weight":2}},{"id":3627,"inV":235,"properties":{"weight":1}},{"id":3628,"inV":19,"properties":{"weight":9}},{"id":3629,"inV":122,"properties":{"weight":2}},{"id":3630,"inV":120,"properties":{"weight":1}},{"id":3631,"inV":94,"properties":{"weight":2}},{"id":3632,"inV":57,"properties":{"weight":7}},{"id":3633,"inV":21,"properties":{"weight":1}},{"id":3634,"inV":27,"properties":{"weight":11}},{"id":3635,"inV":160,"properties":{"weight":1}},{"id":3636,"inV":89,"properties":{"weight":1}},{"id":3637,"inV":11,"properties":{"weight":2}},{"id":3638,"inV":58,"properties":{"weight":18}},{"id":3639,"inV":17,"properties":{"weight":13}},{"id":3640,"inV":72,"properties":{"weight":3}},{"id":3641,"inV":9,"properties":{"weight":2}},{"id":3642,"inV":80,"properties":{"weight":5}},{"id":3643,"inV":316,"properties":{"weight":1}},{"id":3644,"inV":52,"properties":{"weight":1}},{"id":3645,"inV":51,"properties":{"weight":21}},{"id":3646,"inV":55,"properties":{"weight":1}},{"id":3647,"inV":202,"properties":{"weight":4}},{"id":3648,"inV":49,"properties":{"weight":1}},{"id":3649,"inV":98,"properties":{"weight":10}},{"id":3650,"inV":53,"properties":{"weight":5}},{"id":3651,"inV":83,"properties":{"weight":1}},{"id":3652,"inV":82,"properties":{"weight":1}},{"id":3653,"inV":15,"properties":{"weight":14}},{"id":3654,"inV":12,"properties":{"weight":3}},{"id":3655,"inV":104,"properties":{"weight":11}},{"id":3656,"inV":68,"properties":{"weight":7}},{"id":3657,"inV":48,"properties":{"weight":14}},{"id":3658,"inV":109,"properties":{"weight":2}},{"id":3659,"inV":154,"properties":{"weight":1}},{"id":3660,"inV":155,"properties":{"weight":1}},{"id":3661,"inV":112,"properties":{"weight":6}},{"id":3662,"inV":32,"properties":{"weight":6}},{"id":3663,"inV":105,"properties":{"weight":3}},{"id":3664,"inV":208,"properties":{"weight":1}},{"id":3665,"inV":73,"properties":{"weight":34}},{"id":3666,"inV":14,"properties":{"weight":2}},{"id":3667,"inV":42,"properties":{"weight":4}},{"id":3668,"inV":121,"properties":{"weight":1}},{"id":3669,"inV":63,"properties":{"weight":3}},{"id":3670,"inV":88,"properties":{"weight":4}},{"id":3671,"inV":18,"properties":{"weight":3}},{"id":3672,"inV":116,"properties":{"weight":2}},{"id":3673,"inV":78,"properties":{"weight":3}},{"id":3674,"inV":84,"properties":{"weight":1}},{"id":3675,"inV":170,"properties":{"weight":3}},{"id":3676,"inV":108,"properties":{"weight":4}},{"id":3677,"inV":102,"properties":{"weight":1}},{"id":3678,"inV":64,"properties":{"weight":1}},{"id":3679,"inV":99,"properties":{"weight":1}},{"id":3680,"inV":39,"properties":{"weight":4}},{"id":3681,"inV":299,"properties":{"weight":1}},{"id":3682,"inV":223,"properties":{"weight":1}},{"id":3683,"inV":91,"properties":{"weight":1}},{"id":3684,"inV":75,"properties":{"weight":5}},{"id":3685,"inV":106,"properties":{"weight":3}},{"id":3686,"inV":188,"properties":{"weight":2}},{"id":3687,"inV":215,"properties":{"weight":1}},{"id":3688,"inV":168,"properties":{"weight":1}},{"id":3689,"inV":131,"properties":{"weight":9}},{"id":3690,"inV":115,"properties":{"weight":1}},{"id":3691,"inV":117,"properties":{"weight":1}},{"id":3692,"inV":173,"properties":{"weight":1}},{"id":3693,"inV":254,"properties":{"weight":2}}],"sungBy":[{"id":7244,"inV":351}],"writtenBy":[{"id":7243,"inV":350}]},"properties":{"name":[{"id":69,"value":"MEXICALI BLUES"}],"songType":[{"id":71,"value":"original"}],"performances":[{"id":70,"value":435}]}}
-{"id":25,"label":"song","inE":{"followedBy":[{"id":6400,"outV":136,"properties":{"weight":1}},{"id":2053,"outV":92,"properties":{"weight":1}},{"id":6533,"outV":242,"properties":{"weight":1}},{"id":3078,"outV":153,"properties":{"weight":2}},{"id":5383,"outV":69,"properties":{"weight":2}},{"id":3720,"outV":3,"properties":{"weight":10}},{"id":6409,"outV":134,"properties":{"weight":5}},{"id":1547,"outV":18,"properties":{"weight":1}},{"id":4875,"outV":100,"properties":{"weight":3}},{"id":2700,"outV":13,"properties":{"weight":12}},{"id":6671,"outV":12,"properties":{"weight":1}},{"id":913,"outV":91,"properties":{"weight":3}},{"id":786,"outV":122,"properties":{"weight":4}},{"id":4627,"outV":154,"properties":{"weight":5}},{"id":21,"outV":9,"properties":{"weight":1}},{"id":5144,"outV":125,"properties":{"weight":87}},{"id":284,"outV":5,"properties":{"weight":19}},{"id":2851,"outV":101,"properties":{"weight":1}},{"id":5031,"outV":47,"properties":{"weight":1}},{"id":6701,"outV":141,"properties":{"weight":7}},{"id":1966,"outV":148,"properties":{"weight":1}},{"id":6449,"outV":187,"properties":{"weight":16}},{"id":3891,"outV":51,"properties":{"weight":1}},{"id":6323,"outV":21,"properties":{"weight":7}},{"id":1721,"outV":82,"properties":{"weight":2}},{"id":4410,"outV":327,"properties":{"weight":1}},{"id":6076,"outV":72,"properties":{"weight":2}},{"id":6718,"outV":53,"properties":{"weight":2}},{"id":1856,"outV":94,"properties":{"weight":54}},{"id":3265,"outV":160,"properties":{"weight":2}},{"id":4677,"outV":33,"properties":{"weight":1}},{"id":6597,"outV":127,"properties":{"weight":17}},{"id":711,"outV":80,"properties":{"weight":1}},{"id":1097,"outV":59,"properties":{"weight":3}},{"id":4298,"outV":135,"properties":{"weight":1}},{"id":4303,"outV":110,"properties":{"weight":5}},{"id":4178,"outV":54,"properties":{"weight":1}},{"id":213,"outV":70,"properties":{"weight":1}},{"id":469,"outV":195,"properties":{"weight":1}},{"id":1369,"outV":130,"properties":{"weight":77}},{"id":5083,"outV":4,"properties":{"weight":2}},{"id":2012,"outV":149,"properties":{"weight":1}},{"id":2396,"outV":179,"properties":{"weight":1}},{"id":2524,"outV":57,"properties":{"weight":2}},{"id":350,"outV":178,"properties":{"weight":1}},{"id":5731,"outV":129,"properties":{"weight":11}},{"id":3944,"outV":138,"properties":{"weight":3}},{"id":491,"outV":98,"properties":{"weight":1}},{"id":369,"outV":74,"properties":{"weight":4}},{"id":4337,"outV":62,"properties":{"weight":2}},{"id":6902,"outV":133,"properties":{"weight":1}},{"id":2169,"outV":16,"properties":{"weight":1}},{"id":2937,"outV":78,"properties":{"weight":1}},{"id":5371,"outV":132,"properties":{"weight":1}},{"id":6270,"outV":49,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2304,"inV":112,"properties":{"weight":2}},{"id":2305,"inV":109,"properties":{"weight":2}},{"id":2306,"inV":84,"properties":{"weight":10}},{"id":2307,"inV":50,"properties":{"weight":16}},{"id":2308,"inV":214,"properties":{"weight":6}},{"id":2309,"inV":18,"properties":{"weight":1}},{"id":2310,"inV":289,"properties":{"weight":1}},{"id":2311,"inV":120,"properties":{"weight":71}},{"id":2312,"inV":65,"properties":{"weight":5}},{"id":2313,"inV":72,"properties":{"weight":5}},{"id":2314,"inV":166,"properties":{"weight":1}},{"id":2315,"inV":133,"properties":{"weight":6}},{"id":2316,"inV":38,"properties":{"weight":4}},{"id":2317,"inV":124,"properties":{"weight":7}},{"id":2318,"inV":211,"properties":{"weight":1}},{"id":2319,"inV":87,"properties":{"weight":5}},{"id":2320,"inV":210,"properties":{"weight":4}},{"id":2321,"inV":64,"properties":{"weight":2}},{"id":2322,"inV":164,"properties":{"weight":8}},{"id":2323,"inV":96,"properties":{"weight":1}},{"id":2324,"inV":213,"properties":{"weight":7}},{"id":2325,"inV":165,"properties":{"weight":1}},{"id":2326,"inV":150,"properties":{"weight":1}},{"id":2327,"inV":204,"properties":{"weight":9}},{"id":2328,"inV":42,"properties":{"weight":1}},{"id":2329,"inV":86,"properties":{"weight":1}},{"id":2330,"inV":46,"properties":{"weight":1}},{"id":2331,"inV":216,"properties":{"weight":2}},{"id":2332,"inV":236,"properties":{"weight":4}},{"id":2333,"inV":185,"properties":{"weight":1}},{"id":2334,"inV":93,"properties":{"weight":1}},{"id":2261,"inV":122,"properties":{"weight":16}},{"id":2262,"inV":26,"properties":{"weight":16}},{"id":2263,"inV":100,"properties":{"weight":2}},{"id":2264,"inV":53,"properties":{"weight":1}},{"id":2265,"inV":114,"properties":{"weight":31}},{"id":2266,"inV":54,"properties":{"weight":4}},{"id":2267,"inV":104,"properties":{"weight":1}},{"id":2268,"inV":13,"properties":{"weight":8}},{"id":2269,"inV":57,"properties":{"weight":1}},{"id":2270,"inV":278,"properties":{"weight":1}},{"id":2271,"inV":21,"properties":{"weight":4}},{"id":2272,"inV":15,"properties":{"weight":4}},{"id":2273,"inV":51,"properties":{"weight":1}},{"id":2274,"inV":5,"properties":{"weight":8}},{"id":2275,"inV":17,"properties":{"weight":1}},{"id":2276,"inV":83,"properties":{"weight":4}},{"id":2277,"inV":27,"properties":{"weight":2}},{"id":2278,"inV":3,"properties":{"weight":7}},{"id":2279,"inV":19,"properties":{"weight":4}},{"id":2280,"inV":202,"properties":{"weight":3}},{"id":2281,"inV":12,"properties":{"weight":2}},{"id":2282,"inV":89,"properties":{"weight":3}},{"id":2283,"inV":4,"properties":{"weight":9}},{"id":2284,"inV":59,"properties":{"weight":6}},{"id":2285,"inV":80,"properties":{"weight":1}},{"id":2286,"inV":130,"properties":{"weight":1}},{"id":2287,"inV":20,"properties":{"weight":1}},{"id":2288,"inV":82,"properties":{"weight":2}},{"id":2289,"inV":153,"properties":{"weight":21}},{"id":2290,"inV":98,"properties":{"weight":1}},{"id":2291,"inV":10,"properties":{"weight":1}},{"id":2292,"inV":127,"properties":{"weight":2}},{"id":2293,"inV":99,"properties":{"weight":1}},{"id":2294,"inV":215,"properties":{"weight":3}},{"id":2295,"inV":103,"properties":{"weight":3}},{"id":2296,"inV":154,"properties":{"weight":3}},{"id":2297,"inV":63,"properties":{"weight":1}},{"id":2298,"inV":78,"properties":{"weight":2}},{"id":2299,"inV":160,"properties":{"weight":10}},{"id":2300,"inV":74,"properties":{"weight":7}},{"id":2301,"inV":91,"properties":{"weight":2}},{"id":2302,"inV":76,"properties":{"weight":1}},{"id":2303,"inV":32,"properties":{"weight":7}}],"sungBy":[{"id":7440,"inV":351}],"writtenBy":[{"id":7439,"inV":458}]},"properties":{"name":[{"id":72,"value":"AROUND AND AROUND"}],"songType":[{"id":74,"value":"cover"}],"performances":[{"id":73,"value":418}]}}
-{"id":26,"label":"song","inE":{"followedBy":[{"id":768,"outV":122,"properties":{"weight":18}},{"id":1665,"outV":124,"properties":{"weight":1}},{"id":3073,"outV":153,"properties":{"weight":18}},{"id":2050,"outV":92,"properties":{"weight":1}},{"id":5378,"outV":69,"properties":{"weight":3}},{"id":1417,"outV":83,"properties":{"weight":2}},{"id":4746,"outV":294,"properties":{"weight":1}},{"id":6410,"outV":134,"properties":{"weight":1}},{"id":4107,"outV":48,"properties":{"weight":1}},{"id":268,"outV":150,"properties":{"weight":2}},{"id":3216,"outV":63,"properties":{"weight":2}},{"id":274,"outV":5,"properties":{"weight":3}},{"id":2835,"outV":101,"properties":{"weight":2}},{"id":4500,"outV":202,"properties":{"weight":2}},{"id":22,"outV":9,"properties":{"weight":1}},{"id":662,"outV":23,"properties":{"weight":1}},{"id":1559,"outV":18,"properties":{"weight":1}},{"id":920,"outV":91,"properties":{"weight":1}},{"id":4633,"outV":154,"properties":{"weight":1}},{"id":2458,"outV":68,"properties":{"weight":1}},{"id":4892,"outV":100,"properties":{"weight":5}},{"id":4765,"outV":114,"properties":{"weight":30}},{"id":6818,"outV":39,"properties":{"weight":3}},{"id":4004,"outV":66,"properties":{"weight":1}},{"id":6948,"outV":84,"properties":{"weight":4}},{"id":2213,"outV":75,"properties":{"weight":1}},{"id":5030,"outV":47,"properties":{"weight":1}},{"id":554,"outV":120,"properties":{"weight":6}},{"id":5676,"outV":167,"properties":{"weight":1}},{"id":686,"outV":157,"properties":{"weight":3}},{"id":175,"outV":108,"properties":{"weight":1}},{"id":3887,"outV":51,"properties":{"weight":7}},{"id":4529,"outV":105,"properties":{"weight":5}},{"id":6065,"outV":115,"properties":{"weight":1}},{"id":5043,"outV":209,"properties":{"weight":1}},{"id":2356,"outV":87,"properties":{"weight":2}},{"id":821,"outV":171,"properties":{"weight":1}},{"id":3383,"outV":184,"properties":{"weight":1}},{"id":3256,"outV":285,"properties":{"weight":1}},{"id":1726,"outV":82,"properties":{"weight":3}},{"id":6462,"outV":187,"properties":{"weight":4}},{"id":4290,"outV":10,"properties":{"weight":5}},{"id":1476,"outV":81,"properties":{"weight":1}},{"id":3268,"outV":160,"properties":{"weight":3}},{"id":3013,"outV":14,"properties":{"weight":2}},{"id":3143,"outV":104,"properties":{"weight":4}},{"id":4168,"outV":54,"properties":{"weight":17}},{"id":4041,"outV":173,"properties":{"weight":1}},{"id":6986,"outV":175,"properties":{"weight":2}},{"id":77,"outV":46,"properties":{"weight":1}},{"id":1997,"outV":152,"properties":{"weight":1}},{"id":5326,"outV":170,"properties":{"weight":1}},{"id":1103,"outV":59,"properties":{"weight":4}},{"id":6609,"outV":127,"properties":{"weight":3}},{"id":2516,"outV":57,"properties":{"weight":4}},{"id":6101,"outV":72,"properties":{"weight":2}},{"id":2262,"outV":25,"properties":{"weight":16}},{"id":4311,"outV":110,"properties":{"weight":1}},{"id":5079,"outV":4,"properties":{"weight":18}},{"id":474,"outV":98,"properties":{"weight":1}},{"id":2651,"outV":137,"properties":{"weight":7}},{"id":863,"outV":189,"properties":{"weight":1}},{"id":6751,"outV":53,"properties":{"weight":4}},{"id":7007,"outV":89,"properties":{"weight":2}},{"id":3425,"outV":77,"properties":{"weight":1}},{"id":5218,"outV":99,"properties":{"weight":2}},{"id":357,"outV":74,"properties":{"weight":9}},{"id":5733,"outV":129,"properties":{"weight":3}},{"id":2791,"outV":15,"properties":{"weight":1}},{"id":4583,"outV":254,"properties":{"weight":1}},{"id":2664,"outV":13,"properties":{"weight":14}},{"id":1385,"outV":130,"properties":{"weight":1}},{"id":6379,"outV":65,"properties":{"weight":58}},{"id":3438,"outV":58,"properties":{"weight":42}},{"id":1903,"outV":103,"properties":{"weight":1}},{"id":5231,"outV":214,"properties":{"weight":4}},{"id":3571,"outV":56,"properties":{"weight":4}},{"id":3699,"outV":3,"properties":{"weight":4}},{"id":885,"outV":140,"properties":{"weight":1}},{"id":1653,"outV":213,"properties":{"weight":1}},{"id":1014,"outV":73,"properties":{"weight":4}},{"id":1659,"outV":263,"properties":{"weight":1}},{"id":6140,"outV":289,"properties":{"weight":2}},{"id":1277,"outV":27,"properties":{"weight":3}},{"id":2941,"outV":78,"properties":{"weight":3}},{"id":4350,"outV":62,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1152,"inV":15,"properties":{"weight":1}},{"id":1153,"inV":78,"properties":{"weight":4}},{"id":1154,"inV":206,"properties":{"weight":1}},{"id":1155,"inV":24,"properties":{"weight":2}},{"id":1156,"inV":4,"properties":{"weight":16}},{"id":1157,"inV":104,"properties":{"weight":18}},{"id":1158,"inV":74,"properties":{"weight":2}},{"id":1159,"inV":19,"properties":{"weight":21}},{"id":1160,"inV":51,"properties":{"weight":3}},{"id":1161,"inV":9,"properties":{"weight":8}},{"id":1162,"inV":83,"properties":{"weight":14}},{"id":1163,"inV":17,"properties":{"weight":34}},{"id":1164,"inV":20,"properties":{"weight":1}},{"id":1165,"inV":202,"properties":{"weight":1}},{"id":1166,"inV":3,"properties":{"weight":4}},{"id":1167,"inV":89,"properties":{"weight":1}},{"id":1168,"inV":69,"properties":{"weight":5}},{"id":1169,"inV":98,"properties":{"weight":4}},{"id":1170,"inV":5,"properties":{"weight":1}},{"id":1171,"inV":56,"properties":{"weight":5}},{"id":1172,"inV":12,"properties":{"weight":4}},{"id":1173,"inV":99,"properties":{"weight":2}},{"id":1174,"inV":68,"properties":{"weight":3}},{"id":1175,"inV":110,"properties":{"weight":1}},{"id":1176,"inV":134,"properties":{"weight":2}},{"id":1177,"inV":215,"properties":{"weight":4}},{"id":1178,"inV":76,"properties":{"weight":4}},{"id":1179,"inV":13,"properties":{"weight":2}},{"id":1180,"inV":112,"properties":{"weight":5}},{"id":1181,"inV":42,"properties":{"weight":1}},{"id":1182,"inV":148,"properties":{"weight":1}},{"id":1183,"inV":14,"properties":{"weight":2}},{"id":1184,"inV":82,"properties":{"weight":27}},{"id":1185,"inV":80,"properties":{"weight":11}},{"id":1186,"inV":50,"properties":{"weight":1}},{"id":1187,"inV":70,"properties":{"weight":2}},{"id":1188,"inV":84,"properties":{"weight":6}},{"id":1189,"inV":105,"properties":{"weight":2}},{"id":1190,"inV":153,"properties":{"weight":2}},{"id":1191,"inV":48,"properties":{"weight":16}},{"id":1192,"inV":63,"properties":{"weight":1}},{"id":1193,"inV":18,"properties":{"weight":1}},{"id":1194,"inV":96,"properties":{"weight":1}},{"id":1195,"inV":10,"properties":{"weight":1}},{"id":1196,"inV":116,"properties":{"weight":1}},{"id":1197,"inV":97,"properties":{"weight":2}},{"id":1198,"inV":108,"properties":{"weight":1}},{"id":1199,"inV":88,"properties":{"weight":2}},{"id":1200,"inV":72,"properties":{"weight":1}},{"id":1201,"inV":73,"properties":{"weight":1}},{"id":1202,"inV":60,"properties":{"weight":3}},{"id":1203,"inV":223,"properties":{"weight":1}},{"id":1204,"inV":62,"properties":{"weight":6}},{"id":1205,"inV":75,"properties":{"weight":2}},{"id":1206,"inV":30,"properties":{"weight":1}},{"id":1207,"inV":39,"properties":{"weight":1}},{"id":1208,"inV":64,"properties":{"weight":2}},{"id":1209,"inV":46,"properties":{"weight":5}},{"id":1210,"inV":23,"properties":{"weight":1}},{"id":1211,"inV":81,"properties":{"weight":6}},{"id":1212,"inV":151,"properties":{"weight":2}},{"id":1213,"inV":156,"properties":{"weight":1}},{"id":1214,"inV":247,"properties":{"weight":1}},{"id":1215,"inV":87,"properties":{"weight":2}},{"id":1216,"inV":85,"properties":{"weight":1}},{"id":1217,"inV":34,"properties":{"weight":5}},{"id":1218,"inV":114,"properties":{"weight":1}},{"id":1219,"inV":36,"properties":{"weight":2}},{"id":1220,"inV":41,"properties":{"weight":1}},{"id":1221,"inV":229,"properties":{"weight":1}},{"id":1222,"inV":236,"properties":{"weight":1}},{"id":1223,"inV":79,"properties":{"weight":1}},{"id":1224,"inV":177,"properties":{"weight":1}},{"id":1225,"inV":176,"properties":{"weight":1}},{"id":1226,"inV":175,"properties":{"weight":1}},{"id":1227,"inV":35,"properties":{"weight":1}},{"id":1228,"inV":93,"properties":{"weight":1}},{"id":1142,"inV":58,"properties":{"weight":2}},{"id":1143,"inV":160,"properties":{"weight":3}},{"id":1144,"inV":54,"properties":{"weight":9}},{"id":1145,"inV":49,"properties":{"weight":6}},{"id":1146,"inV":100,"properties":{"weight":13}},{"id":1147,"inV":57,"properties":{"weight":15}},{"id":1148,"inV":21,"properties":{"weight":3}},{"id":1149,"inV":27,"properties":{"weight":6}},{"id":1150,"inV":59,"properties":{"weight":41}},{"id":1151,"inV":94,"properties":{"weight":1}}],"sungBy":[{"id":7848,"inV":351}],"writtenBy":[{"id":7847,"inV":458}]},"properties":{"name":[{"id":75,"value":"PROMISED LAND"}],"songType":[{"id":77,"value":"cover"}],"performances":[{"id":76,"value":427}]}}
-{"id":27,"label":"song","inE":{"followedBy":[{"id":3712,"outV":3,"properties":{"weight":1}},{"id":4992,"outV":30,"properties":{"weight":10}},{"id":5504,"outV":131,"properties":{"weight":1}},{"id":5633,"outV":22,"properties":{"weight":1}},{"id":2434,"outV":68,"properties":{"weight":8}},{"id":6658,"outV":12,"properties":{"weight":9}},{"id":1796,"outV":196,"properties":{"weight":1}},{"id":134,"outV":97,"properties":{"weight":7}},{"id":1030,"outV":73,"properties":{"weight":3}},{"id":2184,"outV":208,"properties":{"weight":1}},{"id":6792,"outV":39,"properties":{"weight":1}},{"id":906,"outV":174,"properties":{"weight":1}},{"id":2698,"outV":13,"properties":{"weight":2}},{"id":523,"outV":120,"properties":{"weight":5}},{"id":4236,"outV":10,"properties":{"weight":7}},{"id":781,"outV":122,"properties":{"weight":2}},{"id":5518,"outV":43,"properties":{"weight":1}},{"id":1558,"outV":18,"properties":{"weight":16}},{"id":23,"outV":9,"properties":{"weight":1}},{"id":3608,"outV":56,"properties":{"weight":2}},{"id":1946,"outV":148,"properties":{"weight":1}},{"id":2586,"outV":112,"properties":{"weight":2}},{"id":4123,"outV":48,"properties":{"weight":2}},{"id":5663,"outV":169,"properties":{"weight":1}},{"id":2080,"outV":188,"properties":{"weight":12}},{"id":5796,"outV":76,"properties":{"weight":4}},{"id":6437,"outV":318,"properties":{"weight":1}},{"id":3366,"outV":184,"properties":{"weight":2}},{"id":423,"outV":38,"properties":{"weight":2}},{"id":6059,"outV":115,"properties":{"weight":3}},{"id":5932,"outV":314,"properties":{"weight":1}},{"id":5165,"outV":71,"properties":{"weight":5}},{"id":4654,"outV":154,"properties":{"weight":1}},{"id":4911,"outV":100,"properties":{"weight":1}},{"id":4016,"outV":292,"properties":{"weight":2}},{"id":3634,"outV":24,"properties":{"weight":11}},{"id":2996,"outV":14,"properties":{"weight":6}},{"id":6324,"outV":21,"properties":{"weight":3}},{"id":6836,"outV":64,"properties":{"weight":3}},{"id":4149,"outV":218,"properties":{"weight":1}},{"id":6584,"outV":116,"properties":{"weight":1}},{"id":5954,"outV":50,"properties":{"weight":5}},{"id":707,"outV":206,"properties":{"weight":1}},{"id":5443,"outV":239,"properties":{"weight":1}},{"id":3524,"outV":223,"properties":{"weight":1}},{"id":837,"outV":171,"properties":{"weight":1}},{"id":1992,"outV":152,"properties":{"weight":1}},{"id":2761,"outV":15,"properties":{"weight":23}},{"id":1354,"outV":31,"properties":{"weight":3}},{"id":1359,"outV":130,"properties":{"weight":1}},{"id":5712,"outV":20,"properties":{"weight":1}},{"id":3793,"outV":88,"properties":{"weight":16}},{"id":6230,"outV":117,"properties":{"weight":6}},{"id":88,"outV":46,"properties":{"weight":1}},{"id":4569,"outV":254,"properties":{"weight":2}},{"id":2906,"outV":118,"properties":{"weight":1}},{"id":3418,"outV":77,"properties":{"weight":2}},{"id":5469,"outV":79,"properties":{"weight":1}},{"id":5854,"outV":61,"properties":{"weight":1}},{"id":480,"outV":98,"properties":{"weight":2}},{"id":4066,"outV":109,"properties":{"weight":6}},{"id":4707,"outV":111,"properties":{"weight":1}},{"id":612,"outV":23,"properties":{"weight":10}},{"id":2277,"outV":25,"properties":{"weight":2}},{"id":3301,"outV":160,"properties":{"weight":1}},{"id":1895,"outV":103,"properties":{"weight":1}},{"id":4968,"outV":207,"properties":{"weight":1}},{"id":3177,"outV":104,"properties":{"weight":3}},{"id":5609,"outV":42,"properties":{"weight":2}},{"id":874,"outV":189,"properties":{"weight":1}},{"id":2157,"outV":151,"properties":{"weight":1}},{"id":3057,"outV":153,"properties":{"weight":3}},{"id":3314,"outV":252,"properties":{"weight":1}},{"id":1783,"outV":234,"properties":{"weight":1}},{"id":5239,"outV":32,"properties":{"weight":28}},{"id":2936,"outV":78,"properties":{"weight":1}},{"id":1149,"outV":26,"properties":{"weight":6}},{"id":3967,"outV":106,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1280,"inV":88,"properties":{"weight":5}},{"id":1281,"inV":181,"properties":{"weight":4}},{"id":1282,"inV":38,"properties":{"weight":2}},{"id":1283,"inV":49,"properties":{"weight":1}},{"id":1284,"inV":184,"properties":{"weight":1}},{"id":1285,"inV":112,"properties":{"weight":2}},{"id":1286,"inV":73,"properties":{"weight":1}},{"id":1287,"inV":97,"properties":{"weight":6}},{"id":1288,"inV":106,"properties":{"weight":1}},{"id":1289,"inV":64,"properties":{"weight":6}},{"id":1290,"inV":115,"properties":{"weight":7}},{"id":1291,"inV":245,"properties":{"weight":2}},{"id":1292,"inV":51,"properties":{"weight":1}},{"id":1293,"inV":223,"properties":{"weight":2}},{"id":1294,"inV":117,"properties":{"weight":11}},{"id":1295,"inV":253,"properties":{"weight":1}},{"id":1296,"inV":77,"properties":{"weight":5}},{"id":1297,"inV":221,"properties":{"weight":1}},{"id":1298,"inV":30,"properties":{"weight":1}},{"id":1299,"inV":169,"properties":{"weight":1}},{"id":1300,"inV":188,"properties":{"weight":4}},{"id":1301,"inV":79,"properties":{"weight":3}},{"id":1302,"inV":71,"properties":{"weight":2}},{"id":1303,"inV":114,"properties":{"weight":1}},{"id":1304,"inV":31,"properties":{"weight":1}},{"id":1305,"inV":202,"properties":{"weight":1}},{"id":1306,"inV":40,"properties":{"weight":1}},{"id":1307,"inV":254,"properties":{"weight":3}},{"id":1308,"inV":43,"properties":{"weight":4}},{"id":1309,"inV":11,"properties":{"weight":5}},{"id":1310,"inV":158,"properties":{"weight":1}},{"id":1311,"inV":58,"properties":{"weight":2}},{"id":1312,"inV":57,"properties":{"weight":1}},{"id":1313,"inV":173,"properties":{"weight":1}},{"id":1241,"inV":153,"properties":{"weight":6}},{"id":1242,"inV":21,"properties":{"weight":5}},{"id":1243,"inV":22,"properties":{"weight":3}},{"id":1244,"inV":18,"properties":{"weight":16}},{"id":1245,"inV":15,"properties":{"weight":5}},{"id":1246,"inV":74,"properties":{"weight":2}},{"id":1247,"inV":218,"properties":{"weight":1}},{"id":1248,"inV":152,"properties":{"weight":1}},{"id":1249,"inV":206,"properties":{"weight":2}},{"id":1250,"inV":10,"properties":{"weight":10}},{"id":1251,"inV":89,"properties":{"weight":3}},{"id":1252,"inV":252,"properties":{"weight":1}},{"id":1253,"inV":50,"properties":{"weight":6}},{"id":1254,"inV":226,"properties":{"weight":2}},{"id":1255,"inV":3,"properties":{"weight":2}},{"id":1256,"inV":39,"properties":{"weight":1}},{"id":1257,"inV":14,"properties":{"weight":19}},{"id":1258,"inV":13,"properties":{"weight":3}},{"id":1259,"inV":72,"properties":{"weight":2}},{"id":1260,"inV":16,"properties":{"weight":1}},{"id":1261,"inV":46,"properties":{"weight":4}},{"id":1262,"inV":12,"properties":{"weight":17}},{"id":1263,"inV":24,"properties":{"weight":2}},{"id":1264,"inV":23,"properties":{"weight":1}},{"id":1265,"inV":68,"properties":{"weight":15}},{"id":1266,"inV":32,"properties":{"weight":9}},{"id":1267,"inV":109,"properties":{"weight":3}},{"id":1268,"inV":121,"properties":{"weight":2}},{"id":1269,"inV":101,"properties":{"weight":20}},{"id":1270,"inV":85,"properties":{"weight":6}},{"id":1271,"inV":42,"properties":{"weight":6}},{"id":1272,"inV":76,"properties":{"weight":1}},{"id":1273,"inV":110,"properties":{"weight":1}},{"id":1274,"inV":208,"properties":{"weight":1}},{"id":1275,"inV":70,"properties":{"weight":1}},{"id":1276,"inV":155,"properties":{"weight":1}},{"id":1277,"inV":26,"properties":{"weight":3}},{"id":1278,"inV":103,"properties":{"weight":8}},{"id":1279,"inV":91,"properties":{"weight":2}}],"sungBy":[{"id":7296,"inV":340}],"writtenBy":[{"id":7295,"inV":339}]},"properties":{"name":[{"id":78,"value":"RAMBLE ON ROSE"}],"songType":[{"id":80,"value":"original"}],"performances":[{"id":79,"value":316}]}}
-{"id":28,"label":"song","inE":{"followedBy":[{"id":1443,"outV":83,"properties":{"weight":3}},{"id":4387,"outV":62,"properties":{"weight":2}},{"id":3044,"outV":14,"properties":{"weight":5}},{"id":3204,"outV":229,"properties":{"weight":2}},{"id":5829,"outV":76,"properties":{"weight":4}},{"id":6182,"outV":36,"properties":{"weight":2}},{"id":4615,"outV":85,"properties":{"weight":1}},{"id":3496,"outV":58,"properties":{"weight":1}},{"id":457,"outV":139,"properties":{"weight":1}},{"id":2473,"outV":68,"properties":{"weight":1}},{"id":2825,"outV":15,"properties":{"weight":1}},{"id":5227,"outV":216,"properties":{"weight":1}},{"id":5419,"outV":69,"properties":{"weight":2}},{"id":2636,"outV":137,"properties":{"weight":3}},{"id":4012,"outV":292,"properties":{"weight":1}},{"id":2576,"outV":57,"properties":{"weight":1}},{"id":1971,"outV":148,"properties":{"weight":1}},{"id":4563,"outV":254,"properties":{"weight":1}},{"id":852,"outV":171,"properties":{"weight":4}},{"id":6518,"outV":187,"properties":{"weight":8}},{"id":24,"outV":9,"properties":{"weight":2}},{"id":4735,"outV":186,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":1760,"inV":36,"properties":{"weight":2}},{"id":1761,"inV":96,"properties":{"weight":1}},{"id":1762,"inV":83,"properties":{"weight":2}},{"id":1763,"inV":19,"properties":{"weight":1}},{"id":1764,"inV":13,"properties":{"weight":3}},{"id":1765,"inV":166,"properties":{"weight":1}},{"id":1766,"inV":173,"properties":{"weight":1}},{"id":1767,"inV":172,"properties":{"weight":2}},{"id":1768,"inV":254,"properties":{"weight":1}},{"id":1769,"inV":148,"properties":{"weight":1}},{"id":1770,"inV":140,"properties":{"weight":1}},{"id":1771,"inV":138,"properties":{"weight":2}},{"id":1772,"inV":49,"properties":{"weight":2}},{"id":1750,"inV":34,"properties":{"weight":1}},{"id":1751,"inV":41,"properties":{"weight":10}},{"id":1752,"inV":21,"properties":{"weight":8}},{"id":1753,"inV":40,"properties":{"weight":1}},{"id":1754,"inV":82,"properties":{"weight":1}},{"id":1755,"inV":60,"properties":{"weight":3}},{"id":1756,"inV":137,"properties":{"weight":1}},{"id":1757,"inV":85,"properties":{"weight":3}},{"id":1758,"inV":81,"properties":{"weight":1}},{"id":1759,"inV":91,"properties":{"weight":2}}]},"properties":{"name":[{"id":81,"value":"LONG WAY TO GO HOME"}],"songType":[{"id":83,"value":""}],"performances":[{"id":82,"value":0}]}}
-{"id":29,"label":"song","inE":{"followedBy":[{"id":386,"outV":74,"properties":{"weight":2}},{"id":4681,"outV":33,"properties":{"weight":1}},{"id":3914,"outV":51,"properties":{"weight":1}},{"id":1871,"outV":94,"properties":{"weight":43}},{"id":2639,"outV":137,"properties":{"weight":1}},{"id":3856,"outV":60,"properties":{"weight":1}},{"id":5904,"outV":96,"properties":{"weight":26}},{"id":6424,"outV":134,"properties":{"weight":23}},{"id":6616,"outV":127,"properties":{"weight":14}},{"id":25,"outV":9,"properties":{"weight":1}},{"id":217,"outV":70,"properties":{"weight":1}},{"id":6297,"outV":49,"properties":{"weight":1}},{"id":5595,"outV":42,"properties":{"weight":1}},{"id":1437,"outV":83,"properties":{"weight":1}},{"id":5406,"outV":69,"properties":{"weight":1}},{"id":6366,"outV":21,"properties":{"weight":1}},{"id":931,"outV":91,"properties":{"weight":1}},{"id":2019,"outV":149,"properties":{"weight":1}},{"id":4003,"outV":66,"properties":{"weight":1}},{"id":5156,"outV":125,"properties":{"weight":22}},{"id":3494,"outV":58,"properties":{"weight":2}},{"id":3942,"outV":138,"properties":{"weight":12}},{"id":2344,"outV":87,"properties":{"weight":1}},{"id":811,"outV":122,"properties":{"weight":1}},{"id":1963,"outV":148,"properties":{"weight":3}},{"id":1388,"outV":130,"properties":{"weight":54}},{"id":301,"outV":5,"properties":{"weight":11}},{"id":2735,"outV":13,"properties":{"weight":4}},{"id":6706,"outV":141,"properties":{"weight":2}},{"id":6196,"outV":232,"properties":{"weight":1}},{"id":5365,"outV":132,"properties":{"weight":3}},{"id":950,"outV":67,"properties":{"weight":2}},{"id":4728,"outV":186,"properties":{"weight":1}},{"id":5753,"outV":129,"properties":{"weight":8}},{"id":7033,"outV":89,"properties":{"weight":2}},{"id":2555,"outV":57,"properties":{"weight":1}},{"id":6395,"outV":136,"properties":{"weight":2}},{"id":5694,"outV":159,"properties":{"weight":1}},{"id":895,"outV":140,"properties":{"weight":4}},{"id":2047,"outV":92,"properties":{"weight":7}}]},"outE":{"followedBy":[{"id":2240,"inV":57,"properties":{"weight":1}},{"id":2241,"inV":134,"properties":{"weight":1}},{"id":2242,"inV":210,"properties":{"weight":1}},{"id":2243,"inV":96,"properties":{"weight":2}},{"id":2244,"inV":114,"properties":{"weight":11}},{"id":2245,"inV":125,"properties":{"weight":7}},{"id":2246,"inV":120,"properties":{"weight":5}},{"id":2247,"inV":127,"properties":{"weight":1}},{"id":2248,"inV":148,"properties":{"weight":1}},{"id":2249,"inV":94,"properties":{"weight":1}},{"id":2250,"inV":164,"properties":{"weight":46}},{"id":2251,"inV":160,"properties":{"weight":1}},{"id":2252,"inV":153,"properties":{"weight":1}},{"id":2253,"inV":264,"properties":{"weight":1}},{"id":2254,"inV":81,"properties":{"weight":1}},{"id":2255,"inV":133,"properties":{"weight":1}},{"id":2256,"inV":13,"properties":{"weight":1}},{"id":2257,"inV":62,"properties":{"weight":1}},{"id":2258,"inV":140,"properties":{"weight":1}},{"id":2259,"inV":236,"properties":{"weight":1}},{"id":2260,"inV":38,"properties":{"weight":2}},{"id":2235,"inV":3,"properties":{"weight":163}},{"id":2236,"inV":5,"properties":{"weight":5}},{"id":2237,"inV":87,"properties":{"weight":6}},{"id":2238,"inV":130,"properties":{"weight":3}},{"id":2239,"inV":154,"properties":{"weight":1}}],"sungBy":[{"id":7368,"inV":351}],"writtenBy":[{"id":7367,"inV":350}]},"properties":{"name":[{"id":84,"value":"THROWING STONES"}],"songType":[{"id":86,"value":"original"}],"performances":[{"id":85,"value":265}]}}
-{"id":30,"label":"song","inE":{"followedBy":[{"id":2503,"outV":90,"properties":{"weight":1}},{"id":2378,"outV":87,"properties":{"weight":11}},{"id":6027,"outV":204,"properties":{"weight":2}},{"id":846,"outV":171,"properties":{"weight":2}},{"id":3343,"outV":155,"properties":{"weight":1}},{"id":2000,"outV":152,"properties":{"weight":1}},{"id":4368,"outV":62,"properties":{"weight":8}},{"id":2961,"outV":78,"properties":{"weight":8}},{"id":1298,"outV":27,"properties":{"weight":1}},{"id":3602,"outV":56,"properties":{"weight":3}},{"id":3731,"outV":3,"properties":{"weight":2}},{"id":3927,"outV":51,"properties":{"weight":2}},{"id":6872,"outV":64,"properties":{"weight":1}},{"id":6233,"outV":117,"properties":{"weight":1}},{"id":26,"outV":9,"properties":{"weight":5}},{"id":2138,"outV":17,"properties":{"weight":2}},{"id":2202,"outV":75,"properties":{"weight":2}},{"id":1052,"outV":73,"properties":{"weight":3}},{"id":1440,"outV":83,"properties":{"weight":1}},{"id":673,"outV":23,"properties":{"weight":1}},{"id":5666,"outV":167,"properties":{"weight":1}},{"id":166,"outV":108,"properties":{"weight":1}},{"id":1126,"outV":59,"properties":{"weight":24}},{"id":3430,"outV":312,"properties":{"weight":1}},{"id":4134,"outV":48,"properties":{"weight":4}},{"id":3242,"outV":63,"properties":{"weight":1}},{"id":4843,"outV":114,"properties":{"weight":1}},{"id":5611,"outV":42,"properties":{"weight":1}},{"id":5996,"outV":50,"properties":{"weight":8}},{"id":879,"outV":189,"properties":{"weight":1}},{"id":1839,"outV":275,"properties":{"weight":1}},{"id":4656,"outV":154,"properties":{"weight":13}},{"id":6641,"outV":127,"properties":{"weight":1}},{"id":5108,"outV":4,"properties":{"weight":8}},{"id":1206,"outV":26,"properties":{"weight":1}},{"id":1463,"outV":81,"properties":{"weight":1}},{"id":3192,"outV":104,"properties":{"weight":1}},{"id":6392,"outV":65,"properties":{"weight":1}},{"id":6968,"outV":84,"properties":{"weight":8}},{"id":1786,"outV":259,"properties":{"weight":1}},{"id":4542,"outV":105,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":4992,"inV":27,"properties":{"weight":10}},{"id":4993,"inV":51,"properties":{"weight":3}},{"id":4994,"inV":106,"properties":{"weight":4}},{"id":4995,"inV":80,"properties":{"weight":6}},{"id":4996,"inV":62,"properties":{"weight":2}},{"id":4997,"inV":104,"properties":{"weight":11}},{"id":4998,"inV":75,"properties":{"weight":6}},{"id":4999,"inV":232,"properties":{"weight":1}},{"id":5000,"inV":42,"properties":{"weight":1}},{"id":5001,"inV":151,"properties":{"weight":1}},{"id":5002,"inV":56,"properties":{"weight":7}},{"id":5003,"inV":105,"properties":{"weight":4}},{"id":5004,"inV":170,"properties":{"weight":2}},{"id":5005,"inV":168,"properties":{"weight":2}},{"id":5006,"inV":4,"properties":{"weight":2}},{"id":5007,"inV":117,"properties":{"weight":2}},{"id":5008,"inV":118,"properties":{"weight":2}},{"id":5009,"inV":100,"properties":{"weight":4}},{"id":5010,"inV":18,"properties":{"weight":2}},{"id":5011,"inV":17,"properties":{"weight":3}},{"id":5012,"inV":188,"properties":{"weight":4}},{"id":5013,"inV":78,"properties":{"weight":1}},{"id":5014,"inV":202,"properties":{"weight":2}},{"id":5015,"inV":73,"properties":{"weight":6}},{"id":5016,"inV":189,"properties":{"weight":1}},{"id":5017,"inV":12,"properties":{"weight":1}},{"id":5018,"inV":112,"properties":{"weight":1}},{"id":5019,"inV":191,"properties":{"weight":1}},{"id":5020,"inV":254,"properties":{"weight":2}},{"id":5021,"inV":137,"properties":{"weight":4}},{"id":5022,"inV":173,"properties":{"weight":2}},{"id":5023,"inV":115,"properties":{"weight":1}},{"id":5024,"inV":15,"properties":{"weight":2}},{"id":5025,"inV":11,"properties":{"weight":1}},{"id":5026,"inV":65,"properties":{"weight":1}},{"id":5027,"inV":24,"properties":{"weight":1}},{"id":4985,"inV":333,"properties":{"weight":1}},{"id":4986,"inV":54,"properties":{"weight":2}},{"id":4987,"inV":48,"properties":{"weight":18}},{"id":4988,"inV":97,"properties":{"weight":1}},{"id":4989,"inV":108,"properties":{"weight":1}},{"id":4990,"inV":98,"properties":{"weight":7}},{"id":4991,"inV":63,"properties":{"weight":3}}],"sungBy":[{"id":8000,"inV":476}],"writtenBy":[{"id":7999,"inV":785}]},"properties":{"name":[{"id":87,"value":"WALKING BLUES"}],"songType":[{"id":89,"value":"cover"}],"performances":[{"id":88,"value":139}]}}
-{"id":31,"label":"song","inE":{"followedBy":[{"id":2496,"outV":90,"properties":{"weight":1}},{"id":3201,"outV":104,"properties":{"weight":4}},{"id":4547,"outV":105,"properties":{"weight":2}},{"id":265,"outV":150,"properties":{"weight":1}},{"id":1677,"outV":124,"properties":{"weight":1}},{"id":2386,"outV":87,"properties":{"weight":10}},{"id":4050,"outV":173,"properties":{"weight":1}},{"id":1619,"outV":210,"properties":{"weight":2}},{"id":2582,"outV":57,"properties":{"weight":1}},{"id":6294,"outV":49,"properties":{"weight":1}},{"id":2967,"outV":78,"properties":{"weight":10}},{"id":6871,"outV":64,"properties":{"weight":2}},{"id":1304,"outV":27,"properties":{"weight":1}},{"id":27,"outV":9,"properties":{"weight":2}},{"id":2139,"outV":17,"properties":{"weight":1}},{"id":6365,"outV":21,"properties":{"weight":4}},{"id":222,"outV":70,"properties":{"weight":1}},{"id":671,"outV":23,"properties":{"weight":3}},{"id":3871,"outV":60,"properties":{"weight":1}},{"id":3935,"outV":51,"properties":{"weight":1}},{"id":1059,"outV":73,"properties":{"weight":2}},{"id":3308,"outV":160,"properties":{"weight":1}},{"id":5612,"outV":42,"properties":{"weight":1}},{"id":4141,"outV":48,"properties":{"weight":1}},{"id":6957,"outV":84,"properties":{"weight":6}},{"id":1136,"outV":59,"properties":{"weight":7}},{"id":4657,"outV":154,"properties":{"weight":7}},{"id":3506,"outV":192,"properties":{"weight":1}},{"id":4914,"outV":100,"properties":{"weight":1}},{"id":755,"outV":80,"properties":{"weight":1}},{"id":4019,"outV":191,"properties":{"weight":1}},{"id":5109,"outV":4,"properties":{"weight":8}},{"id":6517,"outV":187,"properties":{"weight":1}},{"id":1081,"outV":243,"properties":{"weight":1}},{"id":6010,"outV":50,"properties":{"weight":2}},{"id":1789,"outV":259,"properties":{"weight":1}},{"id":3773,"outV":3,"properties":{"weight":2}},{"id":3135,"outV":153,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1344,"inV":80,"properties":{"weight":3}},{"id":1345,"inV":124,"properties":{"weight":1}},{"id":1346,"inV":63,"properties":{"weight":2}},{"id":1347,"inV":12,"properties":{"weight":1}},{"id":1348,"inV":192,"properties":{"weight":2}},{"id":1349,"inV":56,"properties":{"weight":5}},{"id":1350,"inV":173,"properties":{"weight":4}},{"id":1351,"inV":98,"properties":{"weight":1}},{"id":1352,"inV":78,"properties":{"weight":2}},{"id":1353,"inV":254,"properties":{"weight":1}},{"id":1354,"inV":27,"properties":{"weight":3}},{"id":1355,"inV":54,"properties":{"weight":1}},{"id":1356,"inV":18,"properties":{"weight":1}},{"id":1316,"inV":50,"properties":{"weight":2}},{"id":1317,"inV":53,"properties":{"weight":2}},{"id":1318,"inV":48,"properties":{"weight":4}},{"id":1319,"inV":97,"properties":{"weight":1}},{"id":1320,"inV":94,"properties":{"weight":2}},{"id":1321,"inV":127,"properties":{"weight":1}},{"id":1322,"inV":183,"properties":{"weight":1}},{"id":1323,"inV":34,"properties":{"weight":1}},{"id":1324,"inV":117,"properties":{"weight":1}},{"id":1325,"inV":188,"properties":{"weight":6}},{"id":1326,"inV":105,"properties":{"weight":2}},{"id":1327,"inV":167,"properties":{"weight":1}},{"id":1328,"inV":169,"properties":{"weight":2}},{"id":1329,"inV":60,"properties":{"weight":1}},{"id":1330,"inV":81,"properties":{"weight":1}},{"id":1331,"inV":104,"properties":{"weight":5}},{"id":1332,"inV":51,"properties":{"weight":8}},{"id":1333,"inV":116,"properties":{"weight":1}},{"id":1334,"inV":125,"properties":{"weight":1}},{"id":1335,"inV":202,"properties":{"weight":5}},{"id":1336,"inV":256,"properties":{"weight":1}},{"id":1337,"inV":10,"properties":{"weight":1}},{"id":1338,"inV":73,"properties":{"weight":8}},{"id":1339,"inV":15,"properties":{"weight":2}},{"id":1340,"inV":62,"properties":{"weight":1}},{"id":1341,"inV":100,"properties":{"weight":3}},{"id":1342,"inV":115,"properties":{"weight":2}},{"id":1343,"inV":137,"properties":{"weight":2}}],"sungBy":[{"id":8004,"inV":351}],"writtenBy":[{"id":8003,"inV":520}]},"properties":{"name":[{"id":90,"value":"WANG DANG DOODLE"}],"songType":[{"id":92,"value":"cover"}],"performances":[{"id":91,"value":95}]}}
-{"id":32,"label":"song","inE":{"followedBy":[{"id":3461,"outV":58,"properties":{"weight":4}},{"id":1798,"outV":196,"properties":{"weight":1}},{"id":1674,"outV":124,"properties":{"weight":5}},{"id":2186,"outV":208,"properties":{"weight":1}},{"id":5516,"outV":328,"properties":{"weight":1}},{"id":3086,"outV":153,"properties":{"weight":4}},{"id":656,"outV":23,"properties":{"weight":3}},{"id":4114,"outV":48,"properties":{"weight":16}},{"id":917,"outV":91,"properties":{"weight":1}},{"id":6933,"outV":84,"properties":{"weight":14}},{"id":3226,"outV":63,"properties":{"weight":2}},{"id":4634,"outV":154,"properties":{"weight":26}},{"id":28,"outV":9,"properties":{"weight":1}},{"id":157,"outV":108,"properties":{"weight":5}},{"id":2717,"outV":13,"properties":{"weight":1}},{"id":287,"outV":5,"properties":{"weight":1}},{"id":4511,"outV":105,"properties":{"weight":7}},{"id":4900,"outV":100,"properties":{"weight":11}},{"id":805,"outV":122,"properties":{"weight":1}},{"id":2221,"outV":75,"properties":{"weight":1}},{"id":1583,"outV":18,"properties":{"weight":4}},{"id":179,"outV":70,"properties":{"weight":1}},{"id":949,"outV":67,"properties":{"weight":1}},{"id":1461,"outV":81,"properties":{"weight":1}},{"id":2357,"outV":87,"properties":{"weight":15}},{"id":5557,"outV":162,"properties":{"weight":2}},{"id":5430,"outV":315,"properties":{"weight":1}},{"id":439,"outV":38,"properties":{"weight":2}},{"id":567,"outV":120,"properties":{"weight":6}},{"id":4792,"outV":114,"properties":{"weight":5}},{"id":1728,"outV":82,"properties":{"weight":1}},{"id":5313,"outV":170,"properties":{"weight":3}},{"id":3907,"outV":51,"properties":{"weight":18}},{"id":2118,"outV":17,"properties":{"weight":19}},{"id":3014,"outV":14,"properties":{"weight":2}},{"id":6089,"outV":72,"properties":{"weight":9}},{"id":1994,"outV":152,"properties":{"weight":1}},{"id":6477,"outV":187,"properties":{"weight":3}},{"id":3662,"outV":24,"properties":{"weight":6}},{"id":1104,"outV":59,"properties":{"weight":32}},{"id":5585,"outV":42,"properties":{"weight":1}},{"id":6353,"outV":21,"properties":{"weight":2}},{"id":3285,"outV":160,"properties":{"weight":7}},{"id":4183,"outV":54,"properties":{"weight":21}},{"id":5975,"outV":50,"properties":{"weight":6}},{"id":2648,"outV":137,"properties":{"weight":1}},{"id":3160,"outV":104,"properties":{"weight":14}},{"id":1628,"outV":210,"properties":{"weight":3}},{"id":862,"outV":189,"properties":{"weight":6}},{"id":4702,"outV":111,"properties":{"weight":1}},{"id":5088,"outV":4,"properties":{"weight":7}},{"id":5856,"outV":61,"properties":{"weight":1}},{"id":2529,"outV":57,"properties":{"weight":3}},{"id":6881,"outV":64,"properties":{"weight":1}},{"id":738,"outV":80,"properties":{"weight":8}},{"id":2146,"outV":228,"properties":{"weight":1}},{"id":2148,"outV":151,"properties":{"weight":3}},{"id":105,"outV":46,"properties":{"weight":1}},{"id":2928,"outV":78,"properties":{"weight":17}},{"id":4080,"outV":109,"properties":{"weight":1}},{"id":1266,"outV":27,"properties":{"weight":9}},{"id":500,"outV":98,"properties":{"weight":7}},{"id":3572,"outV":56,"properties":{"weight":24}},{"id":373,"outV":74,"properties":{"weight":3}},{"id":1013,"outV":73,"properties":{"weight":3}},{"id":2809,"outV":15,"properties":{"weight":3}},{"id":3961,"outV":106,"properties":{"weight":2}},{"id":4346,"outV":62,"properties":{"weight":8}},{"id":1788,"outV":259,"properties":{"weight":1}},{"id":2303,"outV":25,"properties":{"weight":7}}]},"outE":{"followedBy":[{"id":5248,"inV":104,"properties":{"weight":32}},{"id":5249,"inV":98,"properties":{"weight":12}},{"id":5250,"inV":108,"properties":{"weight":7}},{"id":5251,"inV":14,"properties":{"weight":1}},{"id":5252,"inV":59,"properties":{"weight":17}},{"id":5253,"inV":68,"properties":{"weight":3}},{"id":5254,"inV":57,"properties":{"weight":11}},{"id":5255,"inV":54,"properties":{"weight":23}},{"id":5256,"inV":110,"properties":{"weight":1}},{"id":5257,"inV":18,"properties":{"weight":3}},{"id":5258,"inV":100,"properties":{"weight":11}},{"id":5259,"inV":80,"properties":{"weight":16}},{"id":5260,"inV":50,"properties":{"weight":2}},{"id":5261,"inV":105,"properties":{"weight":16}},{"id":5262,"inV":208,"properties":{"weight":2}},{"id":5263,"inV":121,"properties":{"weight":1}},{"id":5264,"inV":10,"properties":{"weight":2}},{"id":5265,"inV":189,"properties":{"weight":4}},{"id":5266,"inV":73,"properties":{"weight":16}},{"id":5267,"inV":19,"properties":{"weight":12}},{"id":5268,"inV":74,"properties":{"weight":1}},{"id":5269,"inV":72,"properties":{"weight":4}},{"id":5270,"inV":109,"properties":{"weight":2}},{"id":5271,"inV":53,"properties":{"weight":6}},{"id":5272,"inV":24,"properties":{"weight":2}},{"id":5273,"inV":106,"properties":{"weight":2}},{"id":5274,"inV":63,"properties":{"weight":4}},{"id":5275,"inV":78,"properties":{"weight":1}},{"id":5276,"inV":58,"properties":{"weight":10}},{"id":5277,"inV":306,"properties":{"weight":1}},{"id":5278,"inV":88,"properties":{"weight":2}},{"id":5279,"inV":112,"properties":{"weight":2}},{"id":5280,"inV":65,"properties":{"weight":1}},{"id":5281,"inV":39,"properties":{"weight":3}},{"id":5282,"inV":99,"properties":{"weight":1}},{"id":5283,"inV":75,"properties":{"weight":4}},{"id":5284,"inV":267,"properties":{"weight":1}},{"id":5285,"inV":71,"properties":{"weight":1}},{"id":5286,"inV":12,"properties":{"weight":4}},{"id":5287,"inV":115,"properties":{"weight":3}},{"id":5288,"inV":223,"properties":{"weight":2}},{"id":5289,"inV":253,"properties":{"weight":1}},{"id":5290,"inV":77,"properties":{"weight":1}},{"id":5291,"inV":169,"properties":{"weight":1}},{"id":5292,"inV":188,"properties":{"weight":2}},{"id":5293,"inV":118,"properties":{"weight":1}},{"id":5294,"inV":137,"properties":{"weight":3}},{"id":5295,"inV":173,"properties":{"weight":6}},{"id":5296,"inV":254,"properties":{"weight":1}},{"id":5297,"inV":174,"properties":{"weight":1}},{"id":5237,"inV":76,"properties":{"weight":3}},{"id":5238,"inV":4,"properties":{"weight":3}},{"id":5239,"inV":27,"properties":{"weight":28}},{"id":5240,"inV":82,"properties":{"weight":4}},{"id":5241,"inV":48,"properties":{"weight":33}},{"id":5242,"inV":15,"properties":{"weight":2}},{"id":5243,"inV":56,"properties":{"weight":22}},{"id":5244,"inV":17,"properties":{"weight":19}},{"id":5245,"inV":51,"properties":{"weight":27}},{"id":5246,"inV":215,"properties":{"weight":1}},{"id":5247,"inV":103,"properties":{"weight":2}}],"sungBy":[{"id":7800,"inV":351}],"writtenBy":[{"id":7799,"inV":478}]},"properties":{"name":[{"id":93,"value":"NEW MINGLEWOOD BLUES"}],"songType":[{"id":95,"value":"cover"}],"performances":[{"id":94,"value":435}]}}
-{"id":33,"label":"song","inE":{"followedBy":[{"id":4385,"outV":62,"properties":{"weight":1}},{"id":5121,"outV":4,"properties":{"weight":3}},{"id":3939,"outV":51,"properties":{"weight":1}},{"id":6213,"outV":319,"properties":{"weight":1}},{"id":4936,"outV":100,"properties":{"weight":1}},{"id":6292,"outV":49,"properties":{"weight":12}},{"id":4437,"outV":113,"properties":{"weight":2}},{"id":4731,"outV":186,"properties":{"weight":1}},{"id":6363,"outV":21,"properties":{"weight":20}},{"id":892,"outV":140,"properties":{"weight":1}},{"id":4668,"outV":154,"properties":{"weight":1}},{"id":29,"outV":9,"properties":{"weight":2}},{"id":4605,"outV":85,"properties":{"weight":2}},{"id":2142,"outV":17,"properties":{"weight":1}},{"id":5918,"outV":96,"properties":{"weight":1}},{"id":3199,"outV":104,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4672,"inV":96,"properties":{"weight":17}},{"id":4673,"inV":125,"properties":{"weight":4}},{"id":4674,"inV":130,"properties":{"weight":1}},{"id":4675,"inV":94,"properties":{"weight":2}},{"id":4676,"inV":113,"properties":{"weight":2}},{"id":4677,"inV":25,"properties":{"weight":1}},{"id":4678,"inV":141,"properties":{"weight":1}},{"id":4679,"inV":116,"properties":{"weight":1}},{"id":4680,"inV":83,"properties":{"weight":1}},{"id":4681,"inV":29,"properties":{"weight":1}},{"id":4682,"inV":49,"properties":{"weight":5}},{"id":4683,"inV":89,"properties":{"weight":1}},{"id":4684,"inV":175,"properties":{"weight":1}},{"id":4685,"inV":148,"properties":{"weight":2}},{"id":4686,"inV":137,"properties":{"weight":1}},{"id":4687,"inV":104,"properties":{"weight":1}},{"id":4688,"inV":191,"properties":{"weight":1}},{"id":4689,"inV":173,"properties":{"weight":2}},{"id":4690,"inV":48,"properties":{"weight":1}},{"id":4691,"inV":105,"properties":{"weight":2}},{"id":4692,"inV":18,"properties":{"weight":1}},{"id":4693,"inV":42,"properties":{"weight":1}},{"id":4694,"inV":117,"properties":{"weight":1}}],"sungBy":[{"id":7928,"inV":351}],"writtenBy":[{"id":7927,"inV":520}]},"properties":{"name":[{"id":96,"value":"SPOONFUL"}],"songType":[{"id":98,"value":"cover"}],"performances":[{"id":97,"value":52}]}}
-{"id":34,"label":"song","inE":{"followedBy":[{"id":1217,"outV":26,"properties":{"weight":5}},{"id":4481,"outV":202,"properties":{"weight":1}},{"id":2887,"outV":101,"properties":{"weight":4}},{"id":3785,"outV":168,"properties":{"weight":4}},{"id":2570,"outV":57,"properties":{"weight":5}},{"id":1229,"outV":248,"properties":{"weight":1}},{"id":6990,"outV":175,"properties":{"weight":1}},{"id":83,"outV":46,"properties":{"weight":8}},{"id":3603,"outV":56,"properties":{"weight":2}},{"id":1749,"outV":82,"properties":{"weight":1}},{"id":6869,"outV":64,"properties":{"weight":1}},{"id":854,"outV":171,"properties":{"weight":2}},{"id":1750,"outV":28,"properties":{"weight":1}},{"id":2903,"outV":118,"properties":{"weight":1}},{"id":1048,"outV":73,"properties":{"weight":3}},{"id":3928,"outV":51,"properties":{"weight":2}},{"id":4377,"outV":62,"properties":{"weight":3}},{"id":5531,"outV":43,"properties":{"weight":1}},{"id":30,"outV":9,"properties":{"weight":2}},{"id":4448,"outV":113,"properties":{"weight":1}},{"id":3493,"outV":58,"properties":{"weight":3}},{"id":5669,"outV":167,"properties":{"weight":1}},{"id":5478,"outV":79,"properties":{"weight":2}},{"id":5416,"outV":69,"properties":{"weight":1}},{"id":1323,"outV":31,"properties":{"weight":1}},{"id":4139,"outV":48,"properties":{"weight":1}},{"id":6892,"outV":93,"properties":{"weight":1}},{"id":6127,"outV":72,"properties":{"weight":12}},{"id":1137,"outV":59,"properties":{"weight":1}},{"id":2481,"outV":68,"properties":{"weight":1}},{"id":1459,"outV":81,"properties":{"weight":5}},{"id":6004,"outV":50,"properties":{"weight":2}},{"id":3189,"outV":104,"properties":{"weight":1}},{"id":4662,"outV":154,"properties":{"weight":1}},{"id":6520,"outV":187,"properties":{"weight":2}},{"id":6393,"outV":136,"properties":{"weight":2}},{"id":4925,"outV":100,"properties":{"weight":2}},{"id":1919,"outV":103,"properties":{"weight":8}}]},"outE":{"followedBy":[{"id":320,"inV":92,"properties":{"weight":4}},{"id":321,"inV":168,"properties":{"weight":2}},{"id":322,"inV":83,"properties":{"weight":5}},{"id":323,"inV":2,"properties":{"weight":1}},{"id":324,"inV":89,"properties":{"weight":2}},{"id":325,"inV":169,"properties":{"weight":1}},{"id":326,"inV":4,"properties":{"weight":1}},{"id":327,"inV":115,"properties":{"weight":1}},{"id":328,"inV":71,"properties":{"weight":1}},{"id":329,"inV":100,"properties":{"weight":1}},{"id":330,"inV":58,"properties":{"weight":1}},{"id":331,"inV":117,"properties":{"weight":1}},{"id":332,"inV":170,"properties":{"weight":1}},{"id":333,"inV":171,"properties":{"weight":1}},{"id":334,"inV":91,"properties":{"weight":1}},{"id":335,"inV":172,"properties":{"weight":1}},{"id":336,"inV":62,"properties":{"weight":3}},{"id":337,"inV":69,"properties":{"weight":3}},{"id":338,"inV":74,"properties":{"weight":1}},{"id":339,"inV":35,"properties":{"weight":2}},{"id":340,"inV":37,"properties":{"weight":4}},{"id":341,"inV":49,"properties":{"weight":1}},{"id":342,"inV":46,"properties":{"weight":1}},{"id":343,"inV":173,"properties":{"weight":1}},{"id":344,"inV":174,"properties":{"weight":1}},{"id":345,"inV":175,"properties":{"weight":1}},{"id":346,"inV":176,"properties":{"weight":1}},{"id":347,"inV":177,"properties":{"weight":1}},{"id":312,"inV":82,"properties":{"weight":7}},{"id":313,"inV":81,"properties":{"weight":22}},{"id":314,"inV":19,"properties":{"weight":2}},{"id":315,"inV":39,"properties":{"weight":1}},{"id":316,"inV":167,"properties":{"weight":1}},{"id":317,"inV":60,"properties":{"weight":12}},{"id":318,"inV":87,"properties":{"weight":3}},{"id":319,"inV":72,"properties":{"weight":3}}],"sungBy":[{"id":7388,"inV":351}],"writtenBy":[{"id":7387,"inV":428}]},"properties":{"name":[{"id":99,"value":"VICTIM OR THE CRIME"}],"songType":[{"id":101,"value":"original"}],"performances":[{"id":100,"value":96}]}}
-{"id":35,"label":"song","inE":{"followedBy":[{"id":4738,"outV":186,"properties":{"weight":3}},{"id":5858,"outV":61,"properties":{"weight":1}},{"id":4389,"outV":62,"properties":{"weight":1}},{"id":6821,"outV":39,"properties":{"weight":1}},{"id":3047,"outV":14,"properties":{"weight":2}},{"id":905,"outV":174,"properties":{"weight":2}},{"id":1001,"outV":176,"properties":{"weight":1}},{"id":6186,"outV":36,"properties":{"weight":3}},{"id":1227,"outV":26,"properties":{"weight":1}},{"id":5835,"outV":76,"properties":{"weight":1}},{"id":108,"outV":46,"properties":{"weight":1}},{"id":1485,"outV":81,"properties":{"weight":2}},{"id":462,"outV":139,"properties":{"weight":1}},{"id":3214,"outV":229,"properties":{"weight":1}},{"id":6991,"outV":175,"properties":{"weight":1}},{"id":339,"outV":34,"properties":{"weight":2}},{"id":6136,"outV":72,"properties":{"weight":3}},{"id":6521,"outV":187,"properties":{"weight":5}},{"id":858,"outV":171,"properties":{"weight":5}},{"id":31,"outV":9,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":4864,"inV":92,"properties":{"weight":2}},{"id":4865,"inV":13,"properties":{"weight":4}},{"id":4866,"inV":158,"properties":{"weight":1}},{"id":4867,"inV":215,"properties":{"weight":1}},{"id":4868,"inV":258,"properties":{"weight":1}},{"id":4869,"inV":85,"properties":{"weight":1}},{"id":4853,"inV":36,"properties":{"weight":6}},{"id":4854,"inV":175,"properties":{"weight":3}},{"id":4855,"inV":94,"properties":{"weight":1}},{"id":4856,"inV":69,"properties":{"weight":1}},{"id":4857,"inV":83,"properties":{"weight":3}},{"id":4858,"inV":41,"properties":{"weight":4}},{"id":4859,"inV":21,"properties":{"weight":4}},{"id":4860,"inV":96,"properties":{"weight":2}},{"id":4861,"inV":60,"properties":{"weight":4}},{"id":4862,"inV":91,"properties":{"weight":1}},{"id":4863,"inV":229,"properties":{"weight":1}}],"sungBy":[{"id":7396,"inV":430}],"writtenBy":[{"id":7395,"inV":339}]},"properties":{"name":[{"id":102,"value":"WAY TO GO HOME"}],"songType":[{"id":104,"value":"original"}],"performances":[{"id":103,"value":92}]}}
-{"id":36,"label":"song","inE":{"followedBy":[{"id":2881,"outV":101,"properties":{"weight":1}},{"id":3522,"outV":223,"properties":{"weight":1}},{"id":1219,"outV":26,"properties":{"weight":2}},{"id":1479,"outV":81,"properties":{"weight":6}},{"id":5896,"outV":96,"properties":{"weight":5}},{"id":396,"outV":74,"properties":{"weight":2}},{"id":2640,"outV":137,"properties":{"weight":2}},{"id":849,"outV":171,"properties":{"weight":2}},{"id":6418,"outV":134,"properties":{"weight":1}},{"id":4371,"outV":62,"properties":{"weight":8}},{"id":4755,"outV":37,"properties":{"weight":1}},{"id":2580,"outV":57,"properties":{"weight":1}},{"id":4564,"outV":254,"properties":{"weight":1}},{"id":2391,"outV":87,"properties":{"weight":1}},{"id":3864,"outV":60,"properties":{"weight":5}},{"id":1435,"outV":83,"properties":{"weight":4}},{"id":6813,"outV":39,"properties":{"weight":1}},{"id":6559,"outV":172,"properties":{"weight":1}},{"id":32,"outV":9,"properties":{"weight":2}},{"id":1760,"outV":28,"properties":{"weight":2}},{"id":6562,"outV":181,"properties":{"weight":140}},{"id":3492,"outV":58,"properties":{"weight":2}},{"id":5221,"outV":99,"properties":{"weight":1}},{"id":5415,"outV":69,"properties":{"weight":4}},{"id":6504,"outV":187,"properties":{"weight":8}},{"id":106,"outV":46,"properties":{"weight":2}},{"id":6382,"outV":65,"properties":{"weight":1}},{"id":4853,"outV":35,"properties":{"weight":6}},{"id":6133,"outV":72,"properties":{"weight":3}},{"id":4663,"outV":154,"properties":{"weight":2}},{"id":6967,"outV":84,"properties":{"weight":1}},{"id":1914,"outV":103,"properties":{"weight":2}},{"id":3390,"outV":177,"properties":{"weight":1}},{"id":7038,"outV":89,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6146,"inV":82,"properties":{"weight":7}},{"id":6147,"inV":57,"properties":{"weight":25}},{"id":6148,"inV":84,"properties":{"weight":3}},{"id":6149,"inV":96,"properties":{"weight":41}},{"id":6150,"inV":130,"properties":{"weight":8}},{"id":6151,"inV":153,"properties":{"weight":1}},{"id":6152,"inV":19,"properties":{"weight":6}},{"id":6153,"inV":91,"properties":{"weight":28}},{"id":6154,"inV":74,"properties":{"weight":4}},{"id":6155,"inV":125,"properties":{"weight":5}},{"id":6156,"inV":154,"properties":{"weight":2}},{"id":6157,"inV":72,"properties":{"weight":5}},{"id":6158,"inV":65,"properties":{"weight":1}},{"id":6159,"inV":141,"properties":{"weight":4}},{"id":6160,"inV":83,"properties":{"weight":8}},{"id":6161,"inV":94,"properties":{"weight":1}},{"id":6162,"inV":49,"properties":{"weight":20}},{"id":6163,"inV":122,"properties":{"weight":1}},{"id":6164,"inV":73,"properties":{"weight":1}},{"id":6165,"inV":13,"properties":{"weight":1}},{"id":6166,"inV":53,"properties":{"weight":1}},{"id":6167,"inV":149,"properties":{"weight":1}},{"id":6168,"inV":69,"properties":{"weight":13}},{"id":6169,"inV":99,"properties":{"weight":1}},{"id":6170,"inV":134,"properties":{"weight":1}},{"id":6171,"inV":87,"properties":{"weight":1}},{"id":6172,"inV":106,"properties":{"weight":1}},{"id":6173,"inV":183,"properties":{"weight":1}},{"id":6174,"inV":60,"properties":{"weight":7}},{"id":6175,"inV":67,"properties":{"weight":2}},{"id":6176,"inV":39,"properties":{"weight":1}},{"id":6177,"inV":62,"properties":{"weight":1}},{"id":6178,"inV":129,"properties":{"weight":1}},{"id":6179,"inV":21,"properties":{"weight":1}},{"id":6180,"inV":175,"properties":{"weight":3}},{"id":6181,"inV":81,"properties":{"weight":2}},{"id":6182,"inV":28,"properties":{"weight":2}},{"id":6183,"inV":137,"properties":{"weight":1}},{"id":6184,"inV":61,"properties":{"weight":1}},{"id":6185,"inV":173,"properties":{"weight":2}},{"id":6186,"inV":35,"properties":{"weight":3}},{"id":6187,"inV":258,"properties":{"weight":1}},{"id":6188,"inV":37,"properties":{"weight":2}},{"id":6189,"inV":41,"properties":{"weight":1}}],"sungBy":[{"id":7312,"inV":351}],"writtenBy":[{"id":7311,"inV":350}]},"properties":{"name":[{"id":105,"value":"SAINT OF CIRCUMSTANCE"}],"songType":[{"id":107,"value":"original"}],"performances":[{"id":106,"value":222}]}}
-{"id":37,"label":"song","inE":{"followedBy":[{"id":2624,"outV":158,"properties":{"weight":1}},{"id":33,"outV":9,"properties":{"weight":3}},{"id":2659,"outV":137,"properties":{"weight":1}},{"id":1445,"outV":83,"properties":{"weight":1}},{"id":3046,"outV":14,"properties":{"weight":5}},{"id":3209,"outV":229,"properties":{"weight":1}},{"id":6378,"outV":21,"properties":{"weight":1}},{"id":107,"outV":46,"properties":{"weight":2}},{"id":6188,"outV":36,"properties":{"weight":2}},{"id":1006,"outV":176,"properties":{"weight":2}},{"id":1486,"outV":81,"properties":{"weight":2}},{"id":5487,"outV":79,"properties":{"weight":1}},{"id":4049,"outV":173,"properties":{"weight":1}},{"id":340,"outV":34,"properties":{"weight":4}},{"id":6135,"outV":72,"properties":{"weight":2}},{"id":6522,"outV":187,"properties":{"weight":4}},{"id":860,"outV":171,"properties":{"weight":1}},{"id":5438,"outV":217,"properties":{"weight":1}},{"id":4671,"outV":154,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4748,"inV":49,"properties":{"weight":4}},{"id":4749,"inV":41,"properties":{"weight":3}},{"id":4750,"inV":174,"properties":{"weight":1}},{"id":4751,"inV":81,"properties":{"weight":1}},{"id":4752,"inV":60,"properties":{"weight":2}},{"id":4753,"inV":83,"properties":{"weight":1}},{"id":4754,"inV":21,"properties":{"weight":6}},{"id":4755,"inV":36,"properties":{"weight":1}},{"id":4756,"inV":85,"properties":{"weight":5}},{"id":4757,"inV":229,"properties":{"weight":2}},{"id":4758,"inV":14,"properties":{"weight":2}},{"id":4759,"inV":13,"properties":{"weight":2}},{"id":4760,"inV":74,"properties":{"weight":1}},{"id":4761,"inV":137,"properties":{"weight":1}},{"id":4762,"inV":96,"properties":{"weight":2}},{"id":4763,"inV":176,"properties":{"weight":1}},{"id":4764,"inV":91,"properties":{"weight":1}}],"sungBy":[{"id":7318,"inV":415}],"writtenBy":[{"id":7317,"inV":339}]},"properties":{"name":[{"id":108,"value":"SAMBA IN THE RAIN"}],"songType":[{"id":110,"value":"original"}],"performances":[{"id":109,"value":38}]}}
-{"id":38,"label":"song","inE":{"followedBy":[{"id":3584,"outV":56,"properties":{"weight":2}},{"id":6016,"outV":204,"properties":{"weight":6}},{"id":1282,"outV":27,"properties":{"weight":2}},{"id":6916,"outV":133,"properties":{"weight":1}},{"id":5125,"outV":222,"properties":{"weight":5}},{"id":262,"outV":150,"properties":{"weight":1}},{"id":1673,"outV":124,"properties":{"weight":8}},{"id":3339,"outV":155,"properties":{"weight":1}},{"id":2316,"outV":25,"properties":{"weight":4}},{"id":4372,"outV":62,"properties":{"weight":4}},{"id":2965,"outV":78,"properties":{"weight":2}},{"id":5402,"outV":69,"properties":{"weight":1}},{"id":34,"outV":9,"properties":{"weight":1}},{"id":3746,"outV":3,"properties":{"weight":4}},{"id":3107,"outV":153,"properties":{"weight":9}},{"id":804,"outV":122,"properties":{"weight":4}},{"id":4644,"outV":154,"properties":{"weight":4}},{"id":938,"outV":91,"properties":{"weight":1}},{"id":300,"outV":5,"properties":{"weight":1}},{"id":1837,"outV":275,"properties":{"weight":2}},{"id":6318,"outV":123,"properties":{"weight":1}},{"id":692,"outV":157,"properties":{"weight":1}},{"id":4917,"outV":100,"properties":{"weight":1}},{"id":5558,"outV":162,"properties":{"weight":1}},{"id":6582,"outV":116,"properties":{"weight":1}},{"id":2489,"outV":90,"properties":{"weight":19}},{"id":2365,"outV":87,"properties":{"weight":7}},{"id":3517,"outV":223,"properties":{"weight":1}},{"id":5437,"outV":217,"properties":{"weight":1}},{"id":577,"outV":120,"properties":{"weight":9}},{"id":5698,"outV":156,"properties":{"weight":1}},{"id":836,"outV":171,"properties":{"weight":1}},{"id":5828,"outV":76,"properties":{"weight":1}},{"id":4809,"outV":114,"properties":{"weight":3}},{"id":4938,"outV":86,"properties":{"weight":6}},{"id":1996,"outV":152,"properties":{"weight":1}},{"id":5453,"outV":79,"properties":{"weight":1}},{"id":3918,"outV":51,"properties":{"weight":1}},{"id":4432,"outV":308,"properties":{"weight":1}},{"id":5201,"outV":99,"properties":{"weight":2}},{"id":6481,"outV":187,"properties":{"weight":9}},{"id":6098,"outV":72,"properties":{"weight":8}},{"id":2260,"outV":29,"properties":{"weight":2}},{"id":3287,"outV":160,"properties":{"weight":14}},{"id":1624,"outV":210,"properties":{"weight":5}},{"id":5849,"outV":61,"properties":{"weight":2}},{"id":6745,"outV":53,"properties":{"weight":3}},{"id":1501,"outV":164,"properties":{"weight":4}},{"id":97,"outV":46,"properties":{"weight":1}},{"id":4198,"outV":54,"properties":{"weight":1}},{"id":5222,"outV":216,"properties":{"weight":3}},{"id":877,"outV":189,"properties":{"weight":1}},{"id":1646,"outV":213,"properties":{"weight":2}},{"id":4974,"outV":236,"properties":{"weight":1}},{"id":6894,"outV":93,"properties":{"weight":1}},{"id":6640,"outV":127,"properties":{"weight":1}},{"id":1905,"outV":103,"properties":{"weight":1}},{"id":6385,"outV":65,"properties":{"weight":2}},{"id":2550,"outV":57,"properties":{"weight":15}},{"id":3958,"outV":106,"properties":{"weight":2}},{"id":1020,"outV":73,"properties":{"weight":4}},{"id":5117,"outV":4,"properties":{"weight":1}},{"id":6526,"outV":211,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":402,"inV":17,"properties":{"weight":12}},{"id":403,"inV":69,"properties":{"weight":9}},{"id":404,"inV":54,"properties":{"weight":3}},{"id":405,"inV":154,"properties":{"weight":34}},{"id":406,"inV":104,"properties":{"weight":19}},{"id":407,"inV":170,"properties":{"weight":1}},{"id":408,"inV":56,"properties":{"weight":6}},{"id":409,"inV":59,"properties":{"weight":10}},{"id":410,"inV":106,"properties":{"weight":1}},{"id":411,"inV":19,"properties":{"weight":6}},{"id":412,"inV":57,"properties":{"weight":4}},{"id":413,"inV":72,"properties":{"weight":4}},{"id":414,"inV":141,"properties":{"weight":1}},{"id":415,"inV":91,"properties":{"weight":1}},{"id":416,"inV":73,"properties":{"weight":11}},{"id":417,"inV":83,"properties":{"weight":2}},{"id":418,"inV":49,"properties":{"weight":1}},{"id":419,"inV":53,"properties":{"weight":1}},{"id":420,"inV":88,"properties":{"weight":4}},{"id":421,"inV":68,"properties":{"weight":2}},{"id":422,"inV":63,"properties":{"weight":1}},{"id":423,"inV":27,"properties":{"weight":2}},{"id":424,"inV":12,"properties":{"weight":5}},{"id":425,"inV":18,"properties":{"weight":2}},{"id":426,"inV":58,"properties":{"weight":4}},{"id":427,"inV":82,"properties":{"weight":1}},{"id":428,"inV":108,"properties":{"weight":2}},{"id":429,"inV":112,"properties":{"weight":1}},{"id":430,"inV":80,"properties":{"weight":4}},{"id":431,"inV":76,"properties":{"weight":1}},{"id":432,"inV":48,"properties":{"weight":4}},{"id":433,"inV":98,"properties":{"weight":2}},{"id":434,"inV":99,"properties":{"weight":2}},{"id":435,"inV":39,"properties":{"weight":2}},{"id":436,"inV":78,"properties":{"weight":5}},{"id":437,"inV":187,"properties":{"weight":1}},{"id":438,"inV":105,"properties":{"weight":7}},{"id":439,"inV":32,"properties":{"weight":2}},{"id":440,"inV":51,"properties":{"weight":1}},{"id":441,"inV":116,"properties":{"weight":3}},{"id":442,"inV":168,"properties":{"weight":2}},{"id":443,"inV":188,"properties":{"weight":1}},{"id":444,"inV":189,"properties":{"weight":2}},{"id":445,"inV":86,"properties":{"weight":1}},{"id":446,"inV":4,"properties":{"weight":7}},{"id":447,"inV":96,"properties":{"weight":1}},{"id":448,"inV":100,"properties":{"weight":2}},{"id":449,"inV":24,"properties":{"weight":1}},{"id":450,"inV":190,"properties":{"weight":1}},{"id":451,"inV":191,"properties":{"weight":1}},{"id":452,"inV":192,"properties":{"weight":1}},{"id":453,"inV":40,"properties":{"weight":2}},{"id":454,"inV":10,"properties":{"weight":1}}],"sungBy":[{"id":7162,"inV":351}],"writtenBy":[{"id":7161,"inV":350}]},"properties":{"name":[{"id":111,"value":"FEEL LIKE A STRANGER"}],"songType":[{"id":113,"value":"original"}],"performances":[{"id":112,"value":207}]}}
-{"id":39,"label":"song","inE":{"followedBy":[{"id":4096,"outV":109,"properties":{"weight":1}},{"id":6275,"outV":49,"properties":{"weight":1}},{"id":644,"outV":23,"properties":{"weight":1}},{"id":772,"outV":122,"properties":{"weight":1}},{"id":3589,"outV":56,"properties":{"weight":1}},{"id":7045,"outV":269,"properties":{"weight":1}},{"id":4871,"outV":100,"properties":{"weight":2}},{"id":1548,"outV":18,"properties":{"weight":3}},{"id":141,"outV":97,"properties":{"weight":1}},{"id":5389,"outV":69,"properties":{"weight":1}},{"id":2703,"outV":13,"properties":{"weight":1}},{"id":528,"outV":120,"properties":{"weight":1}},{"id":1042,"outV":73,"properties":{"weight":1}},{"id":2451,"outV":68,"properties":{"weight":2}},{"id":3989,"outV":106,"properties":{"weight":2}},{"id":3872,"outV":60,"properties":{"weight":2}},{"id":6176,"outV":36,"properties":{"weight":1}},{"id":5281,"outV":32,"properties":{"weight":3}},{"id":6689,"outV":12,"properties":{"weight":6}},{"id":35,"outV":9,"properties":{"weight":1}},{"id":6569,"outV":116,"properties":{"weight":3}},{"id":2605,"outV":112,"properties":{"weight":1}},{"id":4782,"outV":114,"properties":{"weight":1}},{"id":435,"outV":38,"properties":{"weight":2}},{"id":5814,"outV":76,"properties":{"weight":4}},{"id":1207,"outV":26,"properties":{"weight":1}},{"id":2104,"outV":17,"properties":{"weight":2}},{"id":1850,"outV":94,"properties":{"weight":1}},{"id":59,"outV":46,"properties":{"weight":1}},{"id":315,"outV":34,"properties":{"weight":1}},{"id":4283,"outV":10,"properties":{"weight":4}},{"id":5948,"outV":50,"properties":{"weight":1}},{"id":5183,"outV":71,"properties":{"weight":1}},{"id":5057,"outV":257,"properties":{"weight":1}},{"id":3140,"outV":19,"properties":{"weight":1}},{"id":2504,"outV":57,"properties":{"weight":1}},{"id":5704,"outV":20,"properties":{"weight":1}},{"id":6729,"outV":53,"properties":{"weight":2}},{"id":4173,"outV":54,"properties":{"weight":2}},{"id":2894,"outV":101,"properties":{"weight":1}},{"id":2769,"outV":15,"properties":{"weight":3}},{"id":211,"outV":70,"properties":{"weight":1}},{"id":986,"outV":11,"properties":{"weight":3}},{"id":3802,"outV":88,"properties":{"weight":6}},{"id":5598,"outV":42,"properties":{"weight":1}},{"id":1119,"outV":59,"properties":{"weight":1}},{"id":3680,"outV":24,"properties":{"weight":4}},{"id":6240,"outV":117,"properties":{"weight":3}},{"id":3041,"outV":14,"properties":{"weight":2}},{"id":5217,"outV":99,"properties":{"weight":1}},{"id":5857,"outV":61,"properties":{"weight":1}},{"id":483,"outV":98,"properties":{"weight":1}},{"id":4964,"outV":207,"properties":{"weight":1}},{"id":3173,"outV":104,"properties":{"weight":2}},{"id":4582,"outV":254,"properties":{"weight":1}},{"id":6502,"outV":187,"properties":{"weight":2}},{"id":1256,"outV":27,"properties":{"weight":1}},{"id":7019,"outV":89,"properties":{"weight":1}},{"id":3311,"outV":252,"properties":{"weight":1}},{"id":2160,"outV":151,"properties":{"weight":1}},{"id":3443,"outV":58,"properties":{"weight":1}},{"id":4852,"outV":119,"properties":{"weight":1}},{"id":5493,"outV":131,"properties":{"weight":4}},{"id":5113,"outV":4,"properties":{"weight":2}},{"id":2940,"outV":78,"properties":{"weight":1}},{"id":5629,"outV":22,"properties":{"weight":1}},{"id":4223,"outV":324,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6784,"inV":14,"properties":{"weight":10}},{"id":6785,"inV":112,"properties":{"weight":1}},{"id":6786,"inV":42,"properties":{"weight":3}},{"id":6787,"inV":109,"properties":{"weight":1}},{"id":6788,"inV":106,"properties":{"weight":2}},{"id":6789,"inV":99,"properties":{"weight":1}},{"id":6790,"inV":121,"properties":{"weight":1}},{"id":6791,"inV":73,"properties":{"weight":2}},{"id":6792,"inV":27,"properties":{"weight":1}},{"id":6793,"inV":103,"properties":{"weight":1}},{"id":6794,"inV":227,"properties":{"weight":1}},{"id":6795,"inV":88,"properties":{"weight":1}},{"id":6796,"inV":97,"properties":{"weight":3}},{"id":6797,"inV":70,"properties":{"weight":2}},{"id":6798,"inV":49,"properties":{"weight":1}},{"id":6799,"inV":245,"properties":{"weight":1}},{"id":6800,"inV":76,"properties":{"weight":2}},{"id":6801,"inV":223,"properties":{"weight":2}},{"id":6802,"inV":71,"properties":{"weight":1}},{"id":6803,"inV":101,"properties":{"weight":2}},{"id":6804,"inV":96,"properties":{"weight":2}},{"id":6805,"inV":85,"properties":{"weight":2}},{"id":6806,"inV":24,"properties":{"weight":2}},{"id":6807,"inV":77,"properties":{"weight":2}},{"id":6808,"inV":167,"properties":{"weight":1}},{"id":6809,"inV":221,"properties":{"weight":1}},{"id":6810,"inV":105,"properties":{"weight":1}},{"id":6811,"inV":58,"properties":{"weight":1}},{"id":6812,"inV":91,"properties":{"weight":1}},{"id":6813,"inV":36,"properties":{"weight":1}},{"id":6814,"inV":83,"properties":{"weight":1}},{"id":6815,"inV":86,"properties":{"weight":1}},{"id":6816,"inV":117,"properties":{"weight":1}},{"id":6817,"inV":79,"properties":{"weight":1}},{"id":6818,"inV":26,"properties":{"weight":3}},{"id":6819,"inV":43,"properties":{"weight":2}},{"id":6820,"inV":41,"properties":{"weight":1}},{"id":6821,"inV":35,"properties":{"weight":1}},{"id":6822,"inV":158,"properties":{"weight":1}},{"id":6763,"inV":13,"properties":{"weight":8}},{"id":6764,"inV":50,"properties":{"weight":3}},{"id":6765,"inV":18,"properties":{"weight":7}},{"id":6766,"inV":72,"properties":{"weight":1}},{"id":6767,"inV":100,"properties":{"weight":2}},{"id":6768,"inV":21,"properties":{"weight":2}},{"id":6769,"inV":12,"properties":{"weight":2}},{"id":6770,"inV":94,"properties":{"weight":1}},{"id":6771,"inV":59,"properties":{"weight":1}},{"id":6772,"inV":11,"properties":{"weight":1}},{"id":6773,"inV":140,"properties":{"weight":1}},{"id":6774,"inV":51,"properties":{"weight":2}},{"id":6775,"inV":46,"properties":{"weight":1}},{"id":6776,"inV":9,"properties":{"weight":1}},{"id":6777,"inV":48,"properties":{"weight":1}},{"id":6778,"inV":57,"properties":{"weight":2}},{"id":6779,"inV":98,"properties":{"weight":1}},{"id":6780,"inV":80,"properties":{"weight":1}},{"id":6781,"inV":82,"properties":{"weight":1}},{"id":6782,"inV":10,"properties":{"weight":4}},{"id":6783,"inV":68,"properties":{"weight":5}}],"sungBy":[{"id":7120,"inV":362}],"writtenBy":[{"id":7119,"inV":339}]},"properties":{"name":[{"id":114,"value":"CUMBERLAND BLUES"}],"songType":[{"id":116,"value":"original"}],"performances":[{"id":115,"value":223}]}}
-{"id":40,"label":"song","inE":{"followedBy":[{"id":5120,"outV":4,"properties":{"weight":5}},{"id":4930,"outV":100,"properties":{"weight":1}},{"id":36,"outV":9,"properties":{"weight":1}},{"id":1060,"outV":73,"properties":{"weight":2}},{"id":453,"outV":38,"properties":{"weight":2}},{"id":4550,"outV":105,"properties":{"weight":2}},{"id":1704,"outV":124,"properties":{"weight":1}},{"id":4616,"outV":85,"properties":{"weight":1}},{"id":681,"outV":23,"properties":{"weight":1}},{"id":1482,"outV":81,"properties":{"weight":1}},{"id":3502,"outV":192,"properties":{"weight":2}},{"id":1139,"outV":59,"properties":{"weight":3}},{"id":5492,"outV":79,"properties":{"weight":1}},{"id":4021,"outV":191,"properties":{"weight":1}},{"id":1753,"outV":28,"properties":{"weight":1}},{"id":2969,"outV":78,"properties":{"weight":1}},{"id":1306,"outV":27,"properties":{"weight":1}},{"id":4667,"outV":154,"properties":{"weight":5}},{"id":6011,"outV":50,"properties":{"weight":1}},{"id":2141,"outV":17,"properties":{"weight":1}},{"id":6877,"outV":64,"properties":{"weight":1}},{"id":6975,"outV":84,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":4390,"inV":202,"properties":{"weight":6}},{"id":4391,"inV":124,"properties":{"weight":1}},{"id":4392,"inV":96,"properties":{"weight":1}},{"id":4393,"inV":100,"properties":{"weight":3}},{"id":4394,"inV":115,"properties":{"weight":1}},{"id":4395,"inV":80,"properties":{"weight":2}},{"id":4396,"inV":54,"properties":{"weight":2}},{"id":4397,"inV":49,"properties":{"weight":1}},{"id":4398,"inV":73,"properties":{"weight":4}},{"id":4399,"inV":192,"properties":{"weight":4}},{"id":4400,"inV":188,"properties":{"weight":2}},{"id":4401,"inV":173,"properties":{"weight":4}},{"id":4402,"inV":104,"properties":{"weight":1}},{"id":4403,"inV":105,"properties":{"weight":4}},{"id":4404,"inV":18,"properties":{"weight":1}},{"id":4405,"inV":254,"properties":{"weight":1}},{"id":4406,"inV":190,"properties":{"weight":1}}],"sungBy":[{"id":7882,"inV":356}],"writtenBy":[{"id":7881,"inV":520}]},"properties":{"name":[{"id":117,"value":"THE SAME THING"}],"songType":[{"id":119,"value":"cover"}],"performances":[{"id":118,"value":45}]}}
-{"id":41,"label":"song","inE":{"followedBy":[{"id":1220,"outV":26,"properties":{"weight":1}},{"id":1484,"outV":81,"properties":{"weight":1}},{"id":2637,"outV":137,"properties":{"weight":1}},{"id":2893,"outV":101,"properties":{"weight":1}},{"id":4749,"outV":37,"properties":{"weight":3}},{"id":399,"outV":74,"properties":{"weight":7}},{"id":855,"outV":171,"properties":{"weight":3}},{"id":1751,"outV":28,"properties":{"weight":10}},{"id":4384,"outV":62,"properties":{"weight":5}},{"id":1442,"outV":83,"properties":{"weight":4}},{"id":6820,"outV":39,"properties":{"weight":1}},{"id":37,"outV":9,"properties":{"weight":1}},{"id":3877,"outV":60,"properties":{"weight":11}},{"id":5480,"outV":79,"properties":{"weight":1}},{"id":5418,"outV":69,"properties":{"weight":6}},{"id":939,"outV":91,"properties":{"weight":1}},{"id":4971,"outV":236,"properties":{"weight":1}},{"id":1004,"outV":176,"properties":{"weight":1}},{"id":6189,"outV":36,"properties":{"weight":1}},{"id":4215,"outV":54,"properties":{"weight":1}},{"id":6713,"outV":141,"properties":{"weight":1}},{"id":4858,"outV":35,"properties":{"weight":4}},{"id":3388,"outV":177,"properties":{"weight":1}},{"id":4028,"outV":173,"properties":{"weight":4}},{"id":4670,"outV":154,"properties":{"weight":1}},{"id":4734,"outV":186,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":1824,"inV":82,"properties":{"weight":1}},{"id":1825,"inV":19,"properties":{"weight":1}},{"id":1826,"inV":62,"properties":{"weight":1}},{"id":1827,"inV":89,"properties":{"weight":1}},{"id":1828,"inV":60,"properties":{"weight":3}},{"id":1829,"inV":173,"properties":{"weight":1}},{"id":1830,"inV":130,"properties":{"weight":1}},{"id":1831,"inV":49,"properties":{"weight":1}},{"id":1832,"inV":140,"properties":{"weight":1}},{"id":1833,"inV":186,"properties":{"weight":2}},{"id":1834,"inV":138,"properties":{"weight":1}},{"id":1835,"inV":274,"properties":{"weight":4}},{"id":1836,"inV":123,"properties":{"weight":1}},{"id":1819,"inV":96,"properties":{"weight":38}},{"id":1820,"inV":74,"properties":{"weight":7}},{"id":1821,"inV":91,"properties":{"weight":7}},{"id":1822,"inV":148,"properties":{"weight":1}},{"id":1823,"inV":13,"properties":{"weight":4}}]},"properties":{"name":[{"id":120,"value":"CORINA"}],"songType":[{"id":122,"value":""}],"performances":[{"id":121,"value":0}]}}
-{"id":42,"label":"song","inE":{"followedBy":[{"id":3457,"outV":58,"properties":{"weight":5}},{"id":6786,"outV":39,"properties":{"weight":3}},{"id":6019,"outV":204,"properties":{"weight":1}},{"id":4484,"outV":202,"properties":{"weight":2}},{"id":5000,"outV":30,"properties":{"weight":1}},{"id":1033,"outV":73,"properties":{"weight":3}},{"id":3082,"outV":153,"properties":{"weight":2}},{"id":1804,"outV":196,"properties":{"weight":1}},{"id":4111,"outV":48,"properties":{"weight":8}},{"id":152,"outV":108,"properties":{"weight":3}},{"id":2328,"outV":25,"properties":{"weight":1}},{"id":669,"outV":23,"properties":{"weight":1}},{"id":1181,"outV":26,"properties":{"weight":1}},{"id":2205,"outV":75,"properties":{"weight":1}},{"id":4895,"outV":100,"properties":{"weight":14}},{"id":4514,"outV":105,"properties":{"weight":4}},{"id":2596,"outV":112,"properties":{"weight":1}},{"id":38,"outV":9,"properties":{"weight":1}},{"id":6057,"outV":115,"properties":{"weight":1}},{"id":3247,"outV":63,"properties":{"weight":3}},{"id":4274,"outV":10,"properties":{"weight":2}},{"id":1590,"outV":18,"properties":{"weight":1}},{"id":6966,"outV":84,"properties":{"weight":1}},{"id":187,"outV":70,"properties":{"weight":1}},{"id":3902,"outV":51,"properties":{"weight":9}},{"id":3016,"outV":14,"properties":{"weight":2}},{"id":6473,"outV":187,"properties":{"weight":2}},{"id":5325,"outV":170,"properties":{"weight":1}},{"id":2131,"outV":17,"properties":{"weight":1}},{"id":3667,"outV":24,"properties":{"weight":4}},{"id":4693,"outV":33,"properties":{"weight":1}},{"id":601,"outV":120,"properties":{"weight":1}},{"id":731,"outV":80,"properties":{"weight":8}},{"id":3163,"outV":104,"properties":{"weight":11}},{"id":4190,"outV":54,"properties":{"weight":8}},{"id":6880,"outV":64,"properties":{"weight":1}},{"id":6753,"outV":53,"properties":{"weight":1}},{"id":1123,"outV":59,"properties":{"weight":7}},{"id":4835,"outV":114,"properties":{"weight":3}},{"id":5092,"outV":4,"properties":{"weight":3}},{"id":871,"outV":189,"properties":{"weight":1}},{"id":4711,"outV":111,"properties":{"weight":1}},{"id":5486,"outV":79,"properties":{"weight":1}},{"id":1395,"outV":130,"properties":{"weight":1}},{"id":1523,"outV":164,"properties":{"weight":3}},{"id":502,"outV":98,"properties":{"weight":5}},{"id":6006,"outV":50,"properties":{"weight":2}},{"id":1271,"outV":27,"properties":{"weight":6}},{"id":1785,"outV":259,"properties":{"weight":1}},{"id":3582,"outV":56,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":5570,"inV":82,"properties":{"weight":2}},{"id":5571,"inV":56,"properties":{"weight":16}},{"id":5572,"inV":100,"properties":{"weight":13}},{"id":5573,"inV":104,"properties":{"weight":3}},{"id":5574,"inV":59,"properties":{"weight":1}},{"id":5575,"inV":57,"properties":{"weight":6}},{"id":5576,"inV":121,"properties":{"weight":4}},{"id":5577,"inV":51,"properties":{"weight":11}},{"id":5578,"inV":14,"properties":{"weight":1}},{"id":5579,"inV":208,"properties":{"weight":1}},{"id":5580,"inV":105,"properties":{"weight":5}},{"id":5581,"inV":68,"properties":{"weight":1}},{"id":5582,"inV":108,"properties":{"weight":3}},{"id":5583,"inV":48,"properties":{"weight":7}},{"id":5584,"inV":196,"properties":{"weight":1}},{"id":5585,"inV":32,"properties":{"weight":1}},{"id":5586,"inV":54,"properties":{"weight":6}},{"id":5587,"inV":72,"properties":{"weight":6}},{"id":5588,"inV":63,"properties":{"weight":4}},{"id":5589,"inV":73,"properties":{"weight":6}},{"id":5590,"inV":19,"properties":{"weight":4}},{"id":5591,"inV":189,"properties":{"weight":2}},{"id":5592,"inV":53,"properties":{"weight":2}},{"id":5593,"inV":58,"properties":{"weight":8}},{"id":5594,"inV":99,"properties":{"weight":3}},{"id":5595,"inV":29,"properties":{"weight":1}},{"id":5596,"inV":116,"properties":{"weight":1}},{"id":5597,"inV":80,"properties":{"weight":1}},{"id":5598,"inV":39,"properties":{"weight":1}},{"id":5599,"inV":98,"properties":{"weight":2}},{"id":5600,"inV":4,"properties":{"weight":1}},{"id":5601,"inV":60,"properties":{"weight":1}},{"id":5602,"inV":18,"properties":{"weight":1}},{"id":5603,"inV":75,"properties":{"weight":2}},{"id":5604,"inV":46,"properties":{"weight":1}},{"id":5605,"inV":106,"properties":{"weight":1}},{"id":5606,"inV":170,"properties":{"weight":1}},{"id":5607,"inV":169,"properties":{"weight":1}},{"id":5608,"inV":115,"properties":{"weight":3}},{"id":5609,"inV":27,"properties":{"weight":2}},{"id":5610,"inV":114,"properties":{"weight":1}},{"id":5611,"inV":30,"properties":{"weight":1}},{"id":5612,"inV":31,"properties":{"weight":1}},{"id":5613,"inV":79,"properties":{"weight":1}},{"id":5614,"inV":87,"properties":{"weight":1}},{"id":5615,"inV":64,"properties":{"weight":2}},{"id":5616,"inV":84,"properties":{"weight":1}},{"id":5617,"inV":150,"properties":{"weight":1}},{"id":5618,"inV":137,"properties":{"weight":4}},{"id":5619,"inV":173,"properties":{"weight":1}},{"id":5620,"inV":254,"properties":{"weight":1}}],"sungBy":[{"id":7686,"inV":476}],"writtenBy":[{"id":7685,"inV":615}]},"properties":{"name":[{"id":123,"value":"ITS ALL OVER NOW"}],"songType":[{"id":125,"value":"cover"}],"performances":[{"id":124,"value":160}]}}
-{"id":43,"label":"song","inE":{"followedBy":[{"id":3936,"outV":51,"properties":{"weight":1}},{"id":6819,"outV":39,"properties":{"weight":2}},{"id":4580,"outV":254,"properties":{"weight":1}},{"id":1061,"outV":73,"properties":{"weight":3}},{"id":4934,"outV":100,"properties":{"weight":1}},{"id":6054,"outV":115,"properties":{"weight":1}},{"id":39,"outV":9,"properties":{"weight":1}},{"id":4551,"outV":105,"properties":{"weight":1}},{"id":1448,"outV":83,"properties":{"weight":1}},{"id":4493,"outV":202,"properties":{"weight":2}},{"id":3504,"outV":192,"properties":{"weight":1}},{"id":3250,"outV":63,"properties":{"weight":1}},{"id":1397,"outV":190,"properties":{"weight":2}},{"id":759,"outV":80,"properties":{"weight":1}},{"id":2650,"outV":137,"properties":{"weight":2}},{"id":4026,"outV":173,"properties":{"weight":7}},{"id":4219,"outV":54,"properties":{"weight":3}},{"id":1308,"outV":27,"properties":{"weight":4}},{"id":3198,"outV":104,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5517,"inV":4,"properties":{"weight":2}},{"id":5518,"inV":27,"properties":{"weight":1}},{"id":5519,"inV":72,"properties":{"weight":7}},{"id":5520,"inV":236,"properties":{"weight":6}},{"id":5521,"inV":57,"properties":{"weight":3}},{"id":5522,"inV":150,"properties":{"weight":1}},{"id":5523,"inV":100,"properties":{"weight":1}},{"id":5524,"inV":137,"properties":{"weight":1}},{"id":5525,"inV":48,"properties":{"weight":1}},{"id":5526,"inV":202,"properties":{"weight":2}},{"id":5527,"inV":54,"properties":{"weight":2}},{"id":5528,"inV":215,"properties":{"weight":2}},{"id":5529,"inV":104,"properties":{"weight":1}},{"id":5530,"inV":46,"properties":{"weight":1}},{"id":5531,"inV":34,"properties":{"weight":1}},{"id":5532,"inV":49,"properties":{"weight":1}},{"id":5533,"inV":119,"properties":{"weight":1}},{"id":5534,"inV":60,"properties":{"weight":1}},{"id":5535,"inV":19,"properties":{"weight":1}}],"sungBy":[{"id":7156,"inV":373}],"writtenBy":[{"id":7155,"inV":372}]},"properties":{"name":[{"id":126,"value":"ETERNITY"}],"songType":[{"id":128,"value":"original"}],"performances":[{"id":127,"value":44}]}}
-{"id":44,"label":"song","inE":{"followedBy":[{"id":2402,"outV":45,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":40,"inV":45,"properties":{"weight":3}}],"sungBy":[{"id":7586,"inV":352}],"writtenBy":[{"id":7585,"inV":551}]},"properties":{"name":[{"id":129,"value":"GOOD GOLLY MISS MOLLY"}],"songType":[{"id":131,"value":"cover"}],"performances":[{"id":130,"value":3}]}}
-{"id":45,"label":"song","inE":{"followedBy":[{"id":40,"outV":44,"properties":{"weight":3}},{"id":664,"outV":23,"properties":{"weight":2}},{"id":6856,"outV":64,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2402,"inV":44,"properties":{"weight":3}},{"id":2403,"inV":85,"properties":{"weight":1}},{"id":2404,"inV":49,"properties":{"weight":1}},{"id":2405,"inV":19,"properties":{"weight":1}}]},"properties":{"name":[{"id":132,"value":"DEVIL WITH A BLUE DRESS"}],"songType":[{"id":134,"value":""}],"performances":[{"id":133,"value":0}]}}
-{"id":46,"label":"song","inE":{"followedBy":[{"id":1540,"outV":18,"properties":{"weight":4}},{"id":2052,"outV":92,"properties":{"weight":1}},{"id":6917,"outV":133,"properties":{"weight":3}},{"id":4230,"outV":52,"properties":{"weight":2}},{"id":6024,"outV":204,"properties":{"weight":1}},{"id":4873,"outV":100,"properties":{"weight":2}},{"id":2572,"outV":57,"properties":{"weight":5}},{"id":6540,"outV":55,"properties":{"weight":2}},{"id":6672,"outV":12,"properties":{"weight":1}},{"id":1043,"outV":73,"properties":{"weight":2}},{"id":3991,"outV":106,"properties":{"weight":1}},{"id":2200,"outV":75,"properties":{"weight":2}},{"id":2968,"outV":78,"properties":{"weight":1}},{"id":2330,"outV":25,"properties":{"weight":1}},{"id":5530,"outV":43,"properties":{"weight":1}},{"id":3484,"outV":58,"properties":{"weight":4}},{"id":1446,"outV":83,"properties":{"weight":1}},{"id":4263,"outV":10,"properties":{"weight":1}},{"id":3624,"outV":24,"properties":{"weight":7}},{"id":4138,"outV":48,"properties":{"weight":1}},{"id":172,"outV":108,"properties":{"weight":1}},{"id":3757,"outV":3,"properties":{"weight":5}},{"id":3118,"outV":153,"properties":{"weight":5}},{"id":6447,"outV":187,"properties":{"weight":5}},{"id":2992,"outV":14,"properties":{"weight":5}},{"id":5169,"outV":71,"properties":{"weight":1}},{"id":5681,"outV":167,"properties":{"weight":1}},{"id":6578,"outV":116,"properties":{"weight":2}},{"id":4659,"outV":154,"properties":{"weight":2}},{"id":2485,"outV":68,"properties":{"weight":1}},{"id":4533,"outV":105,"properties":{"weight":1}},{"id":1209,"outV":26,"properties":{"weight":5}},{"id":6716,"outV":53,"properties":{"weight":1}},{"id":4158,"outV":54,"properties":{"weight":3}},{"id":2753,"outV":13,"properties":{"weight":1}},{"id":3521,"outV":223,"properties":{"weight":1}},{"id":2114,"outV":17,"properties":{"weight":1}},{"id":6085,"outV":72,"properties":{"weight":6}},{"id":2886,"outV":101,"properties":{"weight":4}},{"id":5321,"outV":170,"properties":{"weight":1}},{"id":5961,"outV":50,"properties":{"weight":5}},{"id":1099,"outV":59,"properties":{"weight":1}},{"id":1483,"outV":81,"properties":{"weight":1}},{"id":2763,"outV":15,"properties":{"weight":1}},{"id":589,"outV":120,"properties":{"weight":2}},{"id":3406,"outV":77,"properties":{"weight":2}},{"id":3922,"outV":51,"properties":{"weight":1}},{"id":6866,"outV":64,"properties":{"weight":1}},{"id":342,"outV":34,"properties":{"weight":1}},{"id":982,"outV":11,"properties":{"weight":1}},{"id":859,"outV":171,"properties":{"weight":1}},{"id":4830,"outV":114,"properties":{"weight":5}},{"id":1505,"outV":164,"properties":{"weight":8}},{"id":5604,"outV":42,"properties":{"weight":1}},{"id":5477,"outV":79,"properties":{"weight":3}},{"id":6631,"outV":127,"properties":{"weight":2}},{"id":1261,"outV":27,"properties":{"weight":4}},{"id":3823,"outV":88,"properties":{"weight":2}},{"id":4720,"outV":186,"properties":{"weight":4}},{"id":6896,"outV":93,"properties":{"weight":1}},{"id":1655,"outV":213,"properties":{"weight":1}},{"id":6775,"outV":39,"properties":{"weight":1}},{"id":1918,"outV":103,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":41,"inV":11,"properties":{"weight":2}},{"id":42,"inV":19,"properties":{"weight":5}},{"id":43,"inV":47,"properties":{"weight":1}},{"id":44,"inV":21,"properties":{"weight":2}},{"id":45,"inV":18,"properties":{"weight":3}},{"id":46,"inV":48,"properties":{"weight":1}},{"id":47,"inV":49,"properties":{"weight":4}},{"id":48,"inV":23,"properties":{"weight":1}},{"id":49,"inV":50,"properties":{"weight":10}},{"id":50,"inV":51,"properties":{"weight":4}},{"id":51,"inV":52,"properties":{"weight":2}},{"id":52,"inV":53,"properties":{"weight":2}},{"id":53,"inV":13,"properties":{"weight":4}},{"id":54,"inV":54,"properties":{"weight":2}},{"id":55,"inV":10,"properties":{"weight":1}},{"id":56,"inV":20,"properties":{"weight":1}},{"id":57,"inV":55,"properties":{"weight":1}},{"id":58,"inV":17,"properties":{"weight":2}},{"id":59,"inV":39,"properties":{"weight":1}},{"id":60,"inV":15,"properties":{"weight":1}},{"id":61,"inV":56,"properties":{"weight":2}},{"id":62,"inV":57,"properties":{"weight":3}},{"id":63,"inV":58,"properties":{"weight":1}},{"id":64,"inV":59,"properties":{"weight":2}},{"id":65,"inV":9,"properties":{"weight":2}},{"id":66,"inV":60,"properties":{"weight":3}},{"id":67,"inV":61,"properties":{"weight":2}},{"id":68,"inV":62,"properties":{"weight":7}},{"id":69,"inV":63,"properties":{"weight":1}},{"id":70,"inV":64,"properties":{"weight":3}},{"id":71,"inV":65,"properties":{"weight":1}},{"id":72,"inV":66,"properties":{"weight":1}},{"id":73,"inV":4,"properties":{"weight":4}},{"id":74,"inV":67,"properties":{"weight":1}},{"id":75,"inV":68,"properties":{"weight":2}},{"id":76,"inV":69,"properties":{"weight":2}},{"id":77,"inV":26,"properties":{"weight":1}},{"id":78,"inV":70,"properties":{"weight":1}},{"id":79,"inV":71,"properties":{"weight":1}},{"id":80,"inV":72,"properties":{"weight":4}},{"id":81,"inV":73,"properties":{"weight":1}},{"id":82,"inV":74,"properties":{"weight":1}},{"id":83,"inV":34,"properties":{"weight":8}},{"id":84,"inV":75,"properties":{"weight":1}},{"id":85,"inV":76,"properties":{"weight":1}},{"id":86,"inV":77,"properties":{"weight":1}},{"id":87,"inV":78,"properties":{"weight":4}},{"id":88,"inV":27,"properties":{"weight":1}},{"id":89,"inV":79,"properties":{"weight":2}},{"id":90,"inV":80,"properties":{"weight":1}},{"id":91,"inV":81,"properties":{"weight":2}},{"id":92,"inV":82,"properties":{"weight":2}},{"id":93,"inV":83,"properties":{"weight":4}},{"id":94,"inV":24,"properties":{"weight":1}},{"id":95,"inV":84,"properties":{"weight":2}},{"id":96,"inV":85,"properties":{"weight":2}},{"id":97,"inV":38,"properties":{"weight":1}},{"id":98,"inV":86,"properties":{"weight":1}},{"id":99,"inV":87,"properties":{"weight":2}},{"id":100,"inV":5,"properties":{"weight":1}},{"id":101,"inV":88,"properties":{"weight":1}},{"id":102,"inV":14,"properties":{"weight":1}},{"id":103,"inV":89,"properties":{"weight":1}},{"id":104,"inV":90,"properties":{"weight":1}},{"id":105,"inV":32,"properties":{"weight":1}},{"id":106,"inV":36,"properties":{"weight":2}},{"id":107,"inV":37,"properties":{"weight":2}},{"id":108,"inV":35,"properties":{"weight":1}},{"id":109,"inV":91,"properties":{"weight":1}},{"id":110,"inV":92,"properties":{"weight":1}},{"id":111,"inV":93,"properties":{"weight":1}},{"id":112,"inV":94,"properties":{"weight":1}}],"sungBy":[{"id":7080,"inV":354}],"writtenBy":[{"id":7079,"inV":339}]},"properties":{"name":[{"id":135,"value":"BOX OF RAIN"}],"songType":[{"id":137,"value":"original"}],"performances":[{"id":136,"value":161}]}}
-{"id":47,"label":"song","inE":{"followedBy":[{"id":5953,"outV":50,"properties":{"weight":1}},{"id":6596,"outV":127,"properties":{"weight":1}},{"id":1541,"outV":18,"properties":{"weight":1}},{"id":630,"outV":23,"properties":{"weight":1}},{"id":43,"outV":46,"properties":{"weight":1}},{"id":2509,"outV":57,"properties":{"weight":1}},{"id":6445,"outV":187,"properties":{"weight":1}},{"id":5711,"outV":20,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5029,"inV":23,"properties":{"weight":1}},{"id":5030,"inV":26,"properties":{"weight":1}},{"id":5031,"inV":25,"properties":{"weight":1}},{"id":5032,"inV":15,"properties":{"weight":1}},{"id":5033,"inV":153,"properties":{"weight":1}},{"id":5034,"inV":12,"properties":{"weight":1}},{"id":5035,"inV":21,"properties":{"weight":1}},{"id":5036,"inV":24,"properties":{"weight":1}}],"sungBy":[{"id":7972,"inV":457}],"writtenBy":[{"id":7971,"inV":769}]},"properties":{"name":[{"id":138,"value":"TOMORROW IS FOREVER"}],"songType":[{"id":140,"value":"cover"}],"performances":[{"id":139,"value":10}]}}
-{"id":48,"label":"song","inE":{"followedBy":[{"id":2953,"outV":78,"properties":{"weight":1}},{"id":3657,"outV":24,"properties":{"weight":14}},{"id":3979,"outV":106,"properties":{"weight":3}},{"id":5515,"outV":131,"properties":{"weight":2}},{"id":5583,"outV":42,"properties":{"weight":7}},{"id":977,"outV":11,"properties":{"weight":3}},{"id":5329,"outV":238,"properties":{"weight":1}},{"id":4690,"outV":33,"properties":{"weight":1}},{"id":4243,"outV":10,"properties":{"weight":8}},{"id":5525,"outV":43,"properties":{"weight":1}},{"id":5782,"outV":76,"properties":{"weight":5}},{"id":1879,"outV":103,"properties":{"weight":2}},{"id":1688,"outV":124,"properties":{"weight":1}},{"id":2776,"outV":15,"properties":{"weight":17}},{"id":3352,"outV":184,"properties":{"weight":3}},{"id":3801,"outV":88,"properties":{"weight":9}},{"id":5466,"outV":79,"properties":{"weight":1}},{"id":539,"outV":120,"properties":{"weight":6}},{"id":5979,"outV":50,"properties":{"weight":9}},{"id":6684,"outV":12,"properties":{"weight":1}},{"id":4062,"outV":109,"properties":{"weight":7}},{"id":2912,"outV":118,"properties":{"weight":1}},{"id":2084,"outV":188,"properties":{"weight":3}},{"id":3172,"outV":104,"properties":{"weight":1}},{"id":6052,"outV":115,"properties":{"weight":2}},{"id":1318,"outV":31,"properties":{"weight":4}},{"id":1191,"outV":26,"properties":{"weight":16}},{"id":6247,"outV":117,"properties":{"weight":2}},{"id":4459,"outV":272,"properties":{"weight":1}},{"id":3053,"outV":153,"properties":{"weight":1}},{"id":46,"outV":46,"properties":{"weight":1}},{"id":750,"outV":80,"properties":{"weight":1}},{"id":2414,"outV":68,"properties":{"weight":10}},{"id":432,"outV":38,"properties":{"weight":4}},{"id":1585,"outV":18,"properties":{"weight":7}},{"id":2553,"outV":57,"properties":{"weight":1}},{"id":5241,"outV":32,"properties":{"weight":33}},{"id":6777,"outV":39,"properties":{"weight":1}},{"id":4987,"outV":30,"properties":{"weight":18}},{"id":636,"outV":23,"properties":{"weight":11}},{"id":4924,"outV":100,"properties":{"weight":1}},{"id":6846,"outV":64,"properties":{"weight":4}},{"id":127,"outV":97,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":4097,"inV":18,"properties":{"weight":13}},{"id":4098,"inV":19,"properties":{"weight":1}},{"id":4099,"inV":4,"properties":{"weight":1}},{"id":4100,"inV":50,"properties":{"weight":3}},{"id":4101,"inV":16,"properties":{"weight":1}},{"id":4102,"inV":12,"properties":{"weight":33}},{"id":4103,"inV":10,"properties":{"weight":5}},{"id":4104,"inV":76,"properties":{"weight":1}},{"id":4105,"inV":15,"properties":{"weight":4}},{"id":4106,"inV":103,"properties":{"weight":8}},{"id":4107,"inV":26,"properties":{"weight":1}},{"id":4108,"inV":13,"properties":{"weight":3}},{"id":4109,"inV":14,"properties":{"weight":10}},{"id":4110,"inV":121,"properties":{"weight":6}},{"id":4111,"inV":42,"properties":{"weight":8}},{"id":4112,"inV":109,"properties":{"weight":8}},{"id":4113,"inV":196,"properties":{"weight":2}},{"id":4114,"inV":32,"properties":{"weight":16}},{"id":4115,"inV":85,"properties":{"weight":4}},{"id":4116,"inV":68,"properties":{"weight":9}},{"id":4117,"inV":208,"properties":{"weight":1}},{"id":4118,"inV":112,"properties":{"weight":6}},{"id":4119,"inV":189,"properties":{"weight":2}},{"id":4120,"inV":88,"properties":{"weight":16}},{"id":4121,"inV":24,"properties":{"weight":2}},{"id":4122,"inV":73,"properties":{"weight":2}},{"id":4123,"inV":27,"properties":{"weight":2}},{"id":4124,"inV":100,"properties":{"weight":1}},{"id":4125,"inV":181,"properties":{"weight":1}},{"id":4126,"inV":97,"properties":{"weight":6}},{"id":4127,"inV":58,"properties":{"weight":1}},{"id":4128,"inV":101,"properties":{"weight":6}},{"id":4129,"inV":56,"properties":{"weight":1}},{"id":4130,"inV":71,"properties":{"weight":4}},{"id":4131,"inV":117,"properties":{"weight":5}},{"id":4132,"inV":188,"properties":{"weight":9}},{"id":4133,"inV":257,"properties":{"weight":1}},{"id":4134,"inV":30,"properties":{"weight":4}},{"id":4135,"inV":79,"properties":{"weight":1}},{"id":4136,"inV":77,"properties":{"weight":7}},{"id":4137,"inV":169,"properties":{"weight":1}},{"id":4138,"inV":46,"properties":{"weight":1}},{"id":4139,"inV":34,"properties":{"weight":1}},{"id":4140,"inV":115,"properties":{"weight":2}},{"id":4141,"inV":31,"properties":{"weight":1}},{"id":4142,"inV":158,"properties":{"weight":4}},{"id":4143,"inV":173,"properties":{"weight":1}},{"id":4144,"inV":272,"properties":{"weight":1}},{"id":4145,"inV":292,"properties":{"weight":1}}],"sungBy":[{"id":7090,"inV":340}],"writtenBy":[{"id":7089,"inV":339}]},"properties":{"name":[{"id":141,"value":"CANDYMAN"}],"songType":[{"id":143,"value":"original"}],"performances":[{"id":142,"value":277}]}}
-{"id":49,"label":"song","inE":{"followedBy":[{"id":6656,"outV":12,"properties":{"weight":9}},{"id":1283,"outV":27,"properties":{"weight":1}},{"id":2179,"outV":208,"properties":{"weight":2}},{"id":2054,"outV":92,"properties":{"weight":1}},{"id":5894,"outV":96,"properties":{"weight":4}},{"id":1927,"outV":148,"properties":{"weight":2}},{"id":5768,"outV":76,"properties":{"weight":30}},{"id":778,"outV":122,"properties":{"weight":3}},{"id":3980,"outV":106,"properties":{"weight":2}},{"id":4748,"outV":37,"properties":{"weight":4}},{"id":6798,"outV":39,"properties":{"weight":1}},{"id":6162,"outV":36,"properties":{"weight":20}},{"id":2839,"outV":101,"properties":{"weight":8}},{"id":3863,"outV":60,"properties":{"weight":2}},{"id":5399,"outV":69,"properties":{"weight":5}},{"id":6554,"outV":172,"properties":{"weight":1}},{"id":1563,"outV":18,"properties":{"weight":3}},{"id":4891,"outV":100,"properties":{"weight":1}},{"id":5532,"outV":43,"properties":{"weight":1}},{"id":4254,"outV":10,"properties":{"weight":3}},{"id":4641,"outV":154,"properties":{"weight":4}},{"id":5537,"outV":126,"properties":{"weight":1}},{"id":6305,"outV":123,"properties":{"weight":1}},{"id":418,"outV":38,"properties":{"weight":1}},{"id":3236,"outV":63,"properties":{"weight":1}},{"id":1447,"outV":83,"properties":{"weight":1}},{"id":1831,"outV":41,"properties":{"weight":1}},{"id":4397,"outV":40,"properties":{"weight":1}},{"id":6573,"outV":116,"properties":{"weight":1}},{"id":47,"outV":46,"properties":{"weight":4}},{"id":5423,"outV":102,"properties":{"weight":1}},{"id":6194,"outV":232,"properties":{"weight":1}},{"id":6964,"outV":84,"properties":{"weight":1}},{"id":5686,"outV":167,"properties":{"weight":1}},{"id":6070,"outV":296,"properties":{"weight":1}},{"id":183,"outV":70,"properties":{"weight":1}},{"id":952,"outV":67,"properties":{"weight":2}},{"id":5945,"outV":50,"properties":{"weight":5}},{"id":6330,"outV":21,"properties":{"weight":12}},{"id":571,"outV":120,"properties":{"weight":1}},{"id":1724,"outV":82,"properties":{"weight":2}},{"id":1471,"outV":81,"properties":{"weight":1}},{"id":3648,"outV":24,"properties":{"weight":1}},{"id":6465,"outV":187,"properties":{"weight":9}},{"id":2758,"outV":15,"properties":{"weight":4}},{"id":6600,"outV":127,"properties":{"weight":1}},{"id":6857,"outV":64,"properties":{"weight":1}},{"id":842,"outV":171,"properties":{"weight":2}},{"id":4682,"outV":33,"properties":{"weight":5}},{"id":5450,"outV":231,"properties":{"weight":1}},{"id":460,"outV":139,"properties":{"weight":2}},{"id":3020,"outV":14,"properties":{"weight":27}},{"id":6734,"outV":53,"properties":{"weight":1}},{"id":341,"outV":34,"properties":{"weight":1}},{"id":5082,"outV":4,"properties":{"weight":1}},{"id":989,"outV":11,"properties":{"weight":1}},{"id":4061,"outV":109,"properties":{"weight":1}},{"id":4446,"outV":113,"properties":{"weight":6}},{"id":356,"outV":74,"properties":{"weight":1}},{"id":2404,"outV":45,"properties":{"weight":1}},{"id":614,"outV":23,"properties":{"weight":6}},{"id":2921,"outV":78,"properties":{"weight":1}},{"id":4585,"outV":85,"properties":{"weight":66}},{"id":3563,"outV":56,"properties":{"weight":1}},{"id":1772,"outV":28,"properties":{"weight":2}},{"id":3052,"outV":153,"properties":{"weight":3}},{"id":2669,"outV":13,"properties":{"weight":12}},{"id":5744,"outV":129,"properties":{"weight":1}},{"id":7024,"outV":89,"properties":{"weight":1}},{"id":246,"outV":150,"properties":{"weight":2}},{"id":1145,"outV":26,"properties":{"weight":6}},{"id":3323,"outV":252,"properties":{"weight":1}},{"id":509,"outV":98,"properties":{"weight":1}},{"id":6398,"outV":136,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6272,"inV":252,"properties":{"weight":2}},{"id":6273,"inV":11,"properties":{"weight":2}},{"id":6274,"inV":234,"properties":{"weight":2}},{"id":6275,"inV":39,"properties":{"weight":1}},{"id":6276,"inV":18,"properties":{"weight":2}},{"id":6277,"inV":96,"properties":{"weight":168}},{"id":6278,"inV":13,"properties":{"weight":1}},{"id":6279,"inV":10,"properties":{"weight":1}},{"id":6280,"inV":50,"properties":{"weight":3}},{"id":6281,"inV":12,"properties":{"weight":2}},{"id":6282,"inV":24,"properties":{"weight":2}},{"id":6283,"inV":14,"properties":{"weight":2}},{"id":6284,"inV":130,"properties":{"weight":1}},{"id":6285,"inV":16,"properties":{"weight":1}},{"id":6286,"inV":3,"properties":{"weight":1}},{"id":6287,"inV":145,"properties":{"weight":2}},{"id":6288,"inV":227,"properties":{"weight":1}},{"id":6289,"inV":83,"properties":{"weight":2}},{"id":6290,"inV":74,"properties":{"weight":1}},{"id":6291,"inV":85,"properties":{"weight":1}},{"id":6292,"inV":33,"properties":{"weight":12}},{"id":6293,"inV":113,"properties":{"weight":8}},{"id":6294,"inV":31,"properties":{"weight":1}},{"id":6295,"inV":183,"properties":{"weight":2}},{"id":6296,"inV":70,"properties":{"weight":3}},{"id":6297,"inV":29,"properties":{"weight":1}},{"id":6298,"inV":5,"properties":{"weight":1}},{"id":6299,"inV":278,"properties":{"weight":1}},{"id":6300,"inV":201,"properties":{"weight":1}},{"id":6301,"inV":123,"properties":{"weight":1}},{"id":6302,"inV":319,"properties":{"weight":1}},{"id":6303,"inV":186,"properties":{"weight":2}},{"id":6304,"inV":139,"properties":{"weight":3}},{"id":6264,"inV":148,"properties":{"weight":22}},{"id":6265,"inV":22,"properties":{"weight":1}},{"id":6266,"inV":23,"properties":{"weight":1}},{"id":6267,"inV":15,"properties":{"weight":1}},{"id":6268,"inV":21,"properties":{"weight":51}},{"id":6269,"inV":153,"properties":{"weight":3}},{"id":6270,"inV":25,"properties":{"weight":1}},{"id":6271,"inV":207,"properties":{"weight":3}}],"sungBy":[{"id":7182,"inV":340}],"writtenBy":[{"id":7181,"inV":339}]},"properties":{"name":[{"id":144,"value":"HES GONE"}],"songType":[{"id":146,"value":"original"}],"performances":[{"id":145,"value":328}]}}
-{"id":50,"label":"song","inE":{"followedBy":[{"id":5377,"outV":69,"properties":{"weight":1}},{"id":258,"outV":150,"properties":{"weight":4}},{"id":2307,"outV":25,"properties":{"weight":16}},{"id":4100,"outV":48,"properties":{"weight":3}},{"id":4359,"outV":62,"properties":{"weight":5}},{"id":5128,"outV":222,"properties":{"weight":5}},{"id":4877,"outV":100,"properties":{"weight":8}},{"id":3342,"outV":155,"properties":{"weight":2}},{"id":3087,"outV":153,"properties":{"weight":18}},{"id":1808,"outV":199,"properties":{"weight":1}},{"id":4632,"outV":154,"properties":{"weight":2}},{"id":796,"outV":122,"properties":{"weight":4}},{"id":6686,"outV":12,"properties":{"weight":2}},{"id":289,"outV":5,"properties":{"weight":1}},{"id":6946,"outV":84,"properties":{"weight":2}},{"id":1316,"outV":31,"properties":{"weight":2}},{"id":5159,"outV":125,"properties":{"weight":1}},{"id":3881,"outV":51,"properties":{"weight":16}},{"id":1838,"outV":275,"properties":{"weight":3}},{"id":559,"outV":120,"properties":{"weight":12}},{"id":6191,"outV":2,"properties":{"weight":1}},{"id":1584,"outV":18,"properties":{"weight":1}},{"id":49,"outV":46,"properties":{"weight":10}},{"id":6452,"outV":187,"properties":{"weight":10}},{"id":1078,"outV":227,"properties":{"weight":1}},{"id":1846,"outV":94,"properties":{"weight":5}},{"id":2106,"outV":17,"properties":{"weight":6}},{"id":4154,"outV":54,"properties":{"weight":17}},{"id":1093,"outV":59,"properties":{"weight":13}},{"id":5191,"outV":99,"properties":{"weight":2}},{"id":6728,"outV":53,"properties":{"weight":4}},{"id":2377,"outV":87,"properties":{"weight":3}},{"id":4427,"outV":212,"properties":{"weight":1}},{"id":2892,"outV":101,"properties":{"weight":1}},{"id":4940,"outV":86,"properties":{"weight":5}},{"id":3150,"outV":104,"properties":{"weight":4}},{"id":1362,"outV":130,"properties":{"weight":3}},{"id":1623,"outV":210,"properties":{"weight":6}},{"id":7004,"outV":197,"properties":{"weight":1}},{"id":869,"outV":189,"properties":{"weight":1}},{"id":4453,"outV":163,"properties":{"weight":1}},{"id":2150,"outV":151,"properties":{"weight":3}},{"id":4966,"outV":207,"properties":{"weight":1}},{"id":615,"outV":23,"properties":{"weight":1}},{"id":5223,"outV":216,"properties":{"weight":7}},{"id":1896,"outV":103,"properties":{"weight":5}},{"id":6764,"outV":39,"properties":{"weight":3}},{"id":1645,"outV":213,"properties":{"weight":8}},{"id":3439,"outV":58,"properties":{"weight":8}},{"id":5233,"outV":214,"properties":{"weight":1}},{"id":372,"outV":74,"properties":{"weight":3}},{"id":7030,"outV":89,"properties":{"weight":1}},{"id":4983,"outV":236,"properties":{"weight":1}},{"id":4473,"outV":202,"properties":{"weight":1}},{"id":2939,"outV":78,"properties":{"weight":1}},{"id":2428,"outV":68,"properties":{"weight":3}},{"id":6525,"outV":211,"properties":{"weight":3}},{"id":897,"outV":140,"properties":{"weight":2}},{"id":1668,"outV":124,"properties":{"weight":10}},{"id":6022,"outV":204,"properties":{"weight":8}},{"id":2183,"outV":208,"properties":{"weight":1}},{"id":4232,"outV":52,"properties":{"weight":1}},{"id":6280,"outV":49,"properties":{"weight":3}},{"id":2188,"outV":235,"properties":{"weight":3}},{"id":5260,"outV":32,"properties":{"weight":2}},{"id":6545,"outV":55,"properties":{"weight":1}},{"id":4242,"outV":10,"properties":{"weight":2}},{"id":3988,"outV":106,"properties":{"weight":1}},{"id":149,"outV":108,"properties":{"weight":2}},{"id":3740,"outV":3,"properties":{"weight":7}},{"id":4510,"outV":105,"properties":{"weight":5}},{"id":5791,"outV":76,"properties":{"weight":1}},{"id":2209,"outV":75,"properties":{"weight":1}},{"id":1186,"outV":26,"properties":{"weight":1}},{"id":2981,"outV":14,"properties":{"weight":2}},{"id":2727,"outV":13,"properties":{"weight":1}},{"id":6313,"outV":123,"properties":{"weight":2}},{"id":689,"outV":157,"properties":{"weight":1}},{"id":5555,"outV":162,"properties":{"weight":2}},{"id":1718,"outV":82,"properties":{"weight":2}},{"id":4793,"outV":114,"properties":{"weight":17}},{"id":1467,"outV":81,"properties":{"weight":1}},{"id":6079,"outV":72,"properties":{"weight":15}},{"id":2498,"outV":90,"properties":{"weight":4}},{"id":1988,"outV":152,"properties":{"weight":2}},{"id":3272,"outV":160,"properties":{"weight":18}},{"id":2508,"outV":57,"properties":{"weight":9}},{"id":5071,"outV":4,"properties":{"weight":9}},{"id":6358,"outV":21,"properties":{"weight":1}},{"id":987,"outV":11,"properties":{"weight":1}},{"id":478,"outV":98,"properties":{"weight":7}},{"id":1502,"outV":164,"properties":{"weight":6}},{"id":3551,"outV":56,"properties":{"weight":14}},{"id":1253,"outV":27,"properties":{"weight":6}},{"id":5863,"outV":96,"properties":{"weight":2}},{"id":6889,"outV":93,"properties":{"weight":1}},{"id":6387,"outV":65,"properties":{"weight":2}},{"id":6643,"outV":127,"properties":{"weight":2}},{"id":1015,"outV":73,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":5933,"inV":234,"properties":{"weight":3}},{"id":5934,"inV":104,"properties":{"weight":29}},{"id":5935,"inV":53,"properties":{"weight":12}},{"id":5936,"inV":72,"properties":{"weight":8}},{"id":5937,"inV":56,"properties":{"weight":19}},{"id":5938,"inV":19,"properties":{"weight":19}},{"id":5939,"inV":89,"properties":{"weight":4}},{"id":5940,"inV":59,"properties":{"weight":32}},{"id":5941,"inV":153,"properties":{"weight":2}},{"id":5942,"inV":22,"properties":{"weight":1}},{"id":5943,"inV":13,"properties":{"weight":1}},{"id":5944,"inV":207,"properties":{"weight":1}},{"id":5945,"inV":49,"properties":{"weight":5}},{"id":5946,"inV":54,"properties":{"weight":19}},{"id":5947,"inV":122,"properties":{"weight":2}},{"id":5948,"inV":39,"properties":{"weight":1}},{"id":5949,"inV":57,"properties":{"weight":17}},{"id":5950,"inV":58,"properties":{"weight":6}},{"id":5951,"inV":206,"properties":{"weight":1}},{"id":5952,"inV":12,"properties":{"weight":7}},{"id":5953,"inV":47,"properties":{"weight":1}},{"id":5954,"inV":27,"properties":{"weight":5}},{"id":5955,"inV":17,"properties":{"weight":43}},{"id":5956,"inV":9,"properties":{"weight":2}},{"id":5957,"inV":21,"properties":{"weight":2}},{"id":5958,"inV":94,"properties":{"weight":2}},{"id":5959,"inV":52,"properties":{"weight":3}},{"id":5960,"inV":55,"properties":{"weight":1}},{"id":5961,"inV":46,"properties":{"weight":5}},{"id":5962,"inV":202,"properties":{"weight":3}},{"id":5963,"inV":125,"properties":{"weight":1}},{"id":5964,"inV":14,"properties":{"weight":2}},{"id":5965,"inV":83,"properties":{"weight":3}},{"id":5966,"inV":51,"properties":{"weight":13}},{"id":5967,"inV":80,"properties":{"weight":15}},{"id":5968,"inV":98,"properties":{"weight":7}},{"id":5969,"inV":82,"properties":{"weight":9}},{"id":5970,"inV":69,"properties":{"weight":7}},{"id":5971,"inV":324,"properties":{"weight":1}},{"id":5972,"inV":10,"properties":{"weight":1}},{"id":5973,"inV":18,"properties":{"weight":5}},{"id":5974,"inV":196,"properties":{"weight":1}},{"id":5975,"inV":32,"properties":{"weight":6}},{"id":5976,"inV":110,"properties":{"weight":2}},{"id":5977,"inV":112,"properties":{"weight":5}},{"id":5978,"inV":154,"properties":{"weight":9}},{"id":5979,"inV":48,"properties":{"weight":9}},{"id":5980,"inV":120,"properties":{"weight":1}},{"id":5981,"inV":76,"properties":{"weight":1}},{"id":5982,"inV":84,"properties":{"weight":2}},{"id":5983,"inV":68,"properties":{"weight":2}},{"id":5984,"inV":70,"properties":{"weight":1}},{"id":5985,"inV":105,"properties":{"weight":3}},{"id":5986,"inV":78,"properties":{"weight":5}},{"id":5987,"inV":88,"properties":{"weight":6}},{"id":5988,"inV":65,"properties":{"weight":4}},{"id":5989,"inV":4,"properties":{"weight":12}},{"id":5990,"inV":180,"properties":{"weight":1}},{"id":5991,"inV":210,"properties":{"weight":2}},{"id":5992,"inV":99,"properties":{"weight":2}},{"id":5993,"inV":108,"properties":{"weight":2}},{"id":5994,"inV":73,"properties":{"weight":9}},{"id":5995,"inV":75,"properties":{"weight":3}},{"id":5996,"inV":30,"properties":{"weight":8}},{"id":5997,"inV":97,"properties":{"weight":2}},{"id":5998,"inV":117,"properties":{"weight":1}},{"id":5999,"inV":243,"properties":{"weight":1}},{"id":6000,"inV":170,"properties":{"weight":1}},{"id":6001,"inV":77,"properties":{"weight":1}},{"id":6002,"inV":71,"properties":{"weight":1}},{"id":6003,"inV":151,"properties":{"weight":1}},{"id":6004,"inV":34,"properties":{"weight":2}},{"id":6005,"inV":169,"properties":{"weight":1}},{"id":6006,"inV":42,"properties":{"weight":2}},{"id":6007,"inV":60,"properties":{"weight":1}},{"id":6008,"inV":81,"properties":{"weight":1}},{"id":6009,"inV":190,"properties":{"weight":2}},{"id":6010,"inV":31,"properties":{"weight":2}},{"id":6011,"inV":40,"properties":{"weight":1}}],"sungBy":[{"id":7208,"inV":351}],"writtenBy":[{"id":7207,"inV":339}]},"properties":{"name":[{"id":147,"value":"JACK STRAW"}],"songType":[{"id":149,"value":"original"}],"performances":[{"id":148,"value":473}]}}
-{"id":51,"label":"song","inE":{"followedBy":[{"id":4993,"outV":30,"properties":{"weight":3}},{"id":5505,"outV":131,"properties":{"weight":4}},{"id":2692,"outV":13,"properties":{"weight":3}},{"id":1160,"outV":26,"properties":{"weight":3}},{"id":3336,"outV":155,"properties":{"weight":1}},{"id":1292,"outV":27,"properties":{"weight":1}},{"id":2957,"outV":78,"properties":{"weight":1}},{"id":3469,"outV":58,"properties":{"weight":1}},{"id":5773,"outV":76,"properties":{"weight":2}},{"id":3982,"outV":106,"properties":{"weight":3}},{"id":6542,"outV":55,"properties":{"weight":2}},{"id":6674,"outV":12,"properties":{"weight":4}},{"id":3347,"outV":184,"properties":{"weight":2}},{"id":2069,"outV":188,"properties":{"weight":5}},{"id":2842,"outV":101,"properties":{"weight":2}},{"id":3610,"outV":56,"properties":{"weight":1}},{"id":2587,"outV":112,"properties":{"weight":5}},{"id":1564,"outV":18,"properties":{"weight":26}},{"id":4259,"outV":10,"properties":{"weight":10}},{"id":550,"outV":120,"properties":{"weight":1}},{"id":5542,"outV":126,"properties":{"weight":1}},{"id":1705,"outV":124,"properties":{"weight":1}},{"id":6825,"outV":64,"properties":{"weight":5}},{"id":6574,"outV":116,"properties":{"weight":1}},{"id":2993,"outV":14,"properties":{"weight":15}},{"id":5041,"outV":209,"properties":{"weight":1}},{"id":50,"outV":46,"properties":{"weight":4}},{"id":1332,"outV":31,"properties":{"weight":8}},{"id":5174,"outV":71,"properties":{"weight":2}},{"id":1719,"outV":82,"properties":{"weight":1}},{"id":440,"outV":38,"properties":{"weight":1}},{"id":3645,"outV":24,"properties":{"weight":21}},{"id":6337,"outV":21,"properties":{"weight":1}},{"id":5699,"outV":20,"properties":{"weight":6}},{"id":5577,"outV":42,"properties":{"weight":11}},{"id":3403,"outV":77,"properties":{"weight":7}},{"id":4557,"outV":105,"properties":{"weight":1}},{"id":5966,"outV":50,"properties":{"weight":13}},{"id":5331,"outV":238,"properties":{"weight":1}},{"id":2772,"outV":15,"properties":{"weight":14}},{"id":4565,"outV":254,"properties":{"weight":1}},{"id":5463,"outV":79,"properties":{"weight":3}},{"id":1370,"outV":130,"properties":{"weight":1}},{"id":5084,"outV":4,"properties":{"weight":1}},{"id":6237,"outV":117,"properties":{"weight":6}},{"id":2273,"outV":25,"properties":{"weight":1}},{"id":4070,"outV":109,"properties":{"weight":4}},{"id":4458,"outV":272,"properties":{"weight":1}},{"id":2417,"outV":68,"properties":{"weight":12}},{"id":3825,"outV":88,"properties":{"weight":2}},{"id":6774,"outV":39,"properties":{"weight":2}},{"id":4471,"outV":202,"properties":{"weight":1}},{"id":1400,"outV":190,"properties":{"weight":1}},{"id":634,"outV":23,"properties":{"weight":8}},{"id":5245,"outV":32,"properties":{"weight":27}}]},"outE":{"followedBy":[{"id":3878,"inV":13,"properties":{"weight":6}},{"id":3879,"inV":12,"properties":{"weight":12}},{"id":3880,"inV":18,"properties":{"weight":12}},{"id":3881,"inV":50,"properties":{"weight":16}},{"id":3882,"inV":16,"properties":{"weight":12}},{"id":3883,"inV":20,"properties":{"weight":4}},{"id":3884,"inV":23,"properties":{"weight":3}},{"id":3885,"inV":15,"properties":{"weight":14}},{"id":3886,"inV":55,"properties":{"weight":1}},{"id":3887,"inV":26,"properties":{"weight":7}},{"id":3888,"inV":11,"properties":{"weight":1}},{"id":3889,"inV":24,"properties":{"weight":4}},{"id":3890,"inV":10,"properties":{"weight":9}},{"id":3891,"inV":25,"properties":{"weight":1}},{"id":3892,"inV":14,"properties":{"weight":10}},{"id":3893,"inV":202,"properties":{"weight":1}},{"id":3894,"inV":89,"properties":{"weight":1}},{"id":3895,"inV":195,"properties":{"weight":1}},{"id":3896,"inV":21,"properties":{"weight":1}},{"id":3897,"inV":122,"properties":{"weight":1}},{"id":3898,"inV":69,"properties":{"weight":1}},{"id":3899,"inV":290,"properties":{"weight":1}},{"id":3900,"inV":22,"properties":{"weight":2}},{"id":3901,"inV":153,"properties":{"weight":1}},{"id":3902,"inV":42,"properties":{"weight":9}},{"id":3903,"inV":103,"properties":{"weight":8}},{"id":3904,"inV":68,"properties":{"weight":8}},{"id":3905,"inV":112,"properties":{"weight":8}},{"id":3906,"inV":121,"properties":{"weight":4}},{"id":3907,"inV":32,"properties":{"weight":18}},{"id":3908,"inV":109,"properties":{"weight":5}},{"id":3909,"inV":82,"properties":{"weight":1}},{"id":3910,"inV":110,"properties":{"weight":1}},{"id":3911,"inV":181,"properties":{"weight":1}},{"id":3912,"inV":88,"properties":{"weight":3}},{"id":3913,"inV":101,"properties":{"weight":15}},{"id":3914,"inV":29,"properties":{"weight":1}},{"id":3915,"inV":70,"properties":{"weight":1}},{"id":3916,"inV":97,"properties":{"weight":7}},{"id":3917,"inV":64,"properties":{"weight":1}},{"id":3918,"inV":38,"properties":{"weight":1}},{"id":3919,"inV":58,"properties":{"weight":1}},{"id":3920,"inV":117,"properties":{"weight":7}},{"id":3921,"inV":106,"properties":{"weight":4}},{"id":3922,"inV":46,"properties":{"weight":1}},{"id":3923,"inV":116,"properties":{"weight":1}},{"id":3924,"inV":223,"properties":{"weight":1}},{"id":3925,"inV":188,"properties":{"weight":3}},{"id":3926,"inV":77,"properties":{"weight":7}},{"id":3927,"inV":30,"properties":{"weight":2}},{"id":3928,"inV":34,"properties":{"weight":2}},{"id":3929,"inV":167,"properties":{"weight":3}},{"id":3930,"inV":71,"properties":{"weight":2}},{"id":3931,"inV":79,"properties":{"weight":7}},{"id":3932,"inV":285,"properties":{"weight":1}},{"id":3933,"inV":54,"properties":{"weight":1}},{"id":3934,"inV":53,"properties":{"weight":1}},{"id":3935,"inV":31,"properties":{"weight":1}},{"id":3936,"inV":43,"properties":{"weight":1}},{"id":3937,"inV":254,"properties":{"weight":2}},{"id":3938,"inV":99,"properties":{"weight":1}},{"id":3939,"inV":33,"properties":{"weight":1}},{"id":3940,"inV":115,"properties":{"weight":1}},{"id":3941,"inV":100,"properties":{"weight":1}}],"sungBy":[{"id":7308,"inV":340}],"writtenBy":[{"id":7307,"inV":339}]},"properties":{"name":[{"id":150,"value":"ROW JIMMY"}],"songType":[{"id":152,"value":"original"}],"performances":[{"id":151,"value":274}]}}
-{"id":52,"label":"song","inE":{"followedBy":[{"id":51,"outV":46,"properties":{"weight":2}},{"id":2997,"outV":14,"properties":{"weight":3}},{"id":5734,"outV":129,"properties":{"weight":1}},{"id":2695,"outV":13,"properties":{"weight":1}},{"id":5959,"outV":50,"properties":{"weight":3}},{"id":5705,"outV":20,"properties":{"weight":1}},{"id":2779,"outV":15,"properties":{"weight":1}},{"id":3644,"outV":24,"properties":{"weight":1}},{"id":6670,"outV":12,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4226,"inV":24,"properties":{"weight":1}},{"id":4227,"inV":12,"properties":{"weight":3}},{"id":4228,"inV":153,"properties":{"weight":1}},{"id":4229,"inV":14,"properties":{"weight":3}},{"id":4230,"inV":46,"properties":{"weight":2}},{"id":4231,"inV":18,"properties":{"weight":1}},{"id":4232,"inV":50,"properties":{"weight":1}},{"id":4233,"inV":10,"properties":{"weight":1}},{"id":4234,"inV":23,"properties":{"weight":1}}],"sungBy":[{"id":7392,"inV":340}],"writtenBy":[{"id":7391,"inV":339}]},"properties":{"name":[{"id":153,"value":"WAVE THAT FLAG"}],"songType":[{"id":155,"value":"original"}],"performances":[{"id":154,"value":15}]}}
-{"id":53,"label":"song","inE":{"followedBy":[{"id":4289,"outV":10,"properties":{"weight":4}},{"id":3650,"outV":24,"properties":{"weight":5}},{"id":3076,"outV":153,"properties":{"weight":1}},{"id":709,"outV":221,"properties":{"weight":1}},{"id":4549,"outV":105,"properties":{"weight":1}},{"id":1543,"outV":18,"properties":{"weight":7}},{"id":2185,"outV":208,"properties":{"weight":1}},{"id":2187,"outV":235,"properties":{"weight":1}},{"id":974,"outV":11,"properties":{"weight":4}},{"id":4430,"outV":299,"properties":{"weight":1}},{"id":3407,"outV":77,"properties":{"weight":1}},{"id":3791,"outV":88,"properties":{"weight":7}},{"id":784,"outV":122,"properties":{"weight":1}},{"id":1040,"outV":73,"properties":{"weight":1}},{"id":2450,"outV":68,"properties":{"weight":9}},{"id":6228,"outV":117,"properties":{"weight":2}},{"id":6166,"outV":36,"properties":{"weight":1}},{"id":5271,"outV":32,"properties":{"weight":6}},{"id":2264,"outV":25,"properties":{"weight":1}},{"id":5592,"outV":42,"properties":{"weight":2}},{"id":2075,"outV":188,"properties":{"weight":1}},{"id":3934,"outV":51,"properties":{"weight":1}},{"id":2911,"outV":118,"properties":{"weight":1}},{"id":419,"outV":38,"properties":{"weight":1}},{"id":4323,"outV":110,"properties":{"weight":1}},{"id":1317,"outV":31,"properties":{"weight":2}},{"id":2983,"outV":14,"properties":{"weight":8}},{"id":4777,"outV":114,"properties":{"weight":1}},{"id":875,"outV":189,"properties":{"weight":2}},{"id":5803,"outV":76,"properties":{"weight":2}},{"id":684,"outV":157,"properties":{"weight":1}},{"id":5935,"outV":50,"properties":{"weight":12}},{"id":370,"outV":74,"properties":{"weight":1}},{"id":6066,"outV":115,"properties":{"weight":1}},{"id":5491,"outV":79,"properties":{"weight":1}},{"id":52,"outV":46,"properties":{"weight":2}},{"id":116,"outV":97,"properties":{"weight":13}},{"id":5172,"outV":71,"properties":{"weight":3}},{"id":2677,"outV":13,"properties":{"weight":2}},{"id":1782,"outV":234,"properties":{"weight":1}},{"id":3510,"outV":223,"properties":{"weight":1}},{"id":6587,"outV":116,"properties":{"weight":1}},{"id":6651,"outV":12,"properties":{"weight":4}},{"id":6844,"outV":64,"properties":{"weight":2}},{"id":2814,"outV":15,"properties":{"weight":3}},{"id":3966,"outV":106,"properties":{"weight":1}},{"id":639,"outV":23,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6720,"inV":152,"properties":{"weight":2}},{"id":6721,"inV":122,"properties":{"weight":2}},{"id":6722,"inV":21,"properties":{"weight":1}},{"id":6723,"inV":13,"properties":{"weight":6}},{"id":6724,"inV":120,"properties":{"weight":1}},{"id":6725,"inV":207,"properties":{"weight":1}},{"id":6726,"inV":218,"properties":{"weight":2}},{"id":6727,"inV":234,"properties":{"weight":1}},{"id":6728,"inV":50,"properties":{"weight":4}},{"id":6729,"inV":39,"properties":{"weight":2}},{"id":6730,"inV":12,"properties":{"weight":4}},{"id":6731,"inV":15,"properties":{"weight":1}},{"id":6732,"inV":59,"properties":{"weight":1}},{"id":6733,"inV":23,"properties":{"weight":2}},{"id":6734,"inV":49,"properties":{"weight":1}},{"id":6735,"inV":20,"properties":{"weight":1}},{"id":6736,"inV":82,"properties":{"weight":1}},{"id":6737,"inV":189,"properties":{"weight":1}},{"id":6738,"inV":91,"properties":{"weight":1}},{"id":6739,"inV":85,"properties":{"weight":1}},{"id":6740,"inV":121,"properties":{"weight":4}},{"id":6741,"inV":103,"properties":{"weight":12}},{"id":6742,"inV":14,"properties":{"weight":15}},{"id":6743,"inV":76,"properties":{"weight":2}},{"id":6744,"inV":181,"properties":{"weight":1}},{"id":6745,"inV":38,"properties":{"weight":3}},{"id":6746,"inV":101,"properties":{"weight":10}},{"id":6747,"inV":73,"properties":{"weight":1}},{"id":6748,"inV":88,"properties":{"weight":4}},{"id":6749,"inV":112,"properties":{"weight":2}},{"id":6750,"inV":99,"properties":{"weight":1}},{"id":6751,"inV":26,"properties":{"weight":4}},{"id":6752,"inV":97,"properties":{"weight":3}},{"id":6753,"inV":42,"properties":{"weight":1}},{"id":6754,"inV":68,"properties":{"weight":6}},{"id":6755,"inV":10,"properties":{"weight":1}},{"id":6756,"inV":184,"properties":{"weight":1}},{"id":6757,"inV":114,"properties":{"weight":1}},{"id":6758,"inV":77,"properties":{"weight":2}},{"id":6759,"inV":79,"properties":{"weight":1}},{"id":6760,"inV":115,"properties":{"weight":1}},{"id":6761,"inV":71,"properties":{"weight":1}},{"id":6714,"inV":24,"properties":{"weight":3}},{"id":6715,"inV":18,"properties":{"weight":6}},{"id":6716,"inV":46,"properties":{"weight":1}},{"id":6717,"inV":153,"properties":{"weight":1}},{"id":6718,"inV":25,"properties":{"weight":2}},{"id":6719,"inV":89,"properties":{"weight":1}}],"sungBy":[{"id":7470,"inV":340}],"writtenBy":[{"id":7469,"inV":478}]},"properties":{"name":[{"id":156,"value":"BIG RAILROAD BLUES"}],"songType":[{"id":158,"value":"cover"}],"performances":[{"id":157,"value":175}]}}
-{"id":54,"label":"song","inE":{"followedBy":[{"id":3586,"outV":56,"properties":{"weight":1}},{"id":5510,"outV":131,"properties":{"weight":2}},{"id":3463,"outV":58,"properties":{"weight":3}},{"id":5255,"outV":32,"properties":{"weight":23}},{"id":904,"outV":174,"properties":{"weight":1}},{"id":1035,"outV":73,"properties":{"weight":3}},{"id":1549,"outV":18,"properties":{"weight":29}},{"id":5391,"outV":69,"properties":{"weight":1}},{"id":5777,"outV":76,"properties":{"weight":5}},{"id":404,"outV":38,"properties":{"weight":3}},{"id":2068,"outV":188,"properties":{"weight":14}},{"id":4244,"outV":10,"properties":{"weight":13}},{"id":4884,"outV":100,"properties":{"weight":2}},{"id":789,"outV":122,"properties":{"weight":1}},{"id":3350,"outV":184,"properties":{"weight":2}},{"id":5527,"outV":43,"properties":{"weight":2}},{"id":4508,"outV":244,"properties":{"weight":1}},{"id":2589,"outV":112,"properties":{"weight":4}},{"id":5661,"outV":169,"properties":{"weight":2}},{"id":6047,"outV":115,"properties":{"weight":4}},{"id":1698,"outV":124,"properties":{"weight":2}},{"id":2853,"outV":101,"properties":{"weight":2}},{"id":3621,"outV":24,"properties":{"weight":28}},{"id":5671,"outV":167,"properties":{"weight":1}},{"id":171,"outV":108,"properties":{"weight":1}},{"id":4396,"outV":40,"properties":{"weight":2}},{"id":5166,"outV":71,"properties":{"weight":7}},{"id":6830,"outV":64,"properties":{"weight":1}},{"id":561,"outV":120,"properties":{"weight":1}},{"id":4785,"outV":114,"properties":{"weight":1}},{"id":2994,"outV":14,"properties":{"weight":28}},{"id":54,"outV":46,"properties":{"weight":2}},{"id":6328,"outV":21,"properties":{"weight":1}},{"id":3514,"outV":223,"properties":{"weight":1}},{"id":5946,"outV":50,"properties":{"weight":19}},{"id":1084,"outV":59,"properties":{"weight":1}},{"id":3401,"outV":77,"properties":{"weight":7}},{"id":1355,"outV":31,"properties":{"weight":1}},{"id":3790,"outV":88,"properties":{"weight":21}},{"id":975,"outV":11,"properties":{"weight":15}},{"id":2767,"outV":15,"properties":{"weight":25}},{"id":2128,"outV":17,"properties":{"weight":2}},{"id":5586,"outV":42,"properties":{"weight":6}},{"id":2900,"outV":118,"properties":{"weight":1}},{"id":5464,"outV":79,"properties":{"weight":3}},{"id":2266,"outV":25,"properties":{"weight":4}},{"id":4058,"outV":109,"properties":{"weight":3}},{"id":4570,"outV":254,"properties":{"weight":4}},{"id":2652,"outV":137,"properties":{"weight":1}},{"id":3933,"outV":51,"properties":{"weight":1}},{"id":4960,"outV":207,"properties":{"weight":1}},{"id":6241,"outV":117,"properties":{"weight":8}},{"id":1893,"outV":103,"properties":{"weight":1}},{"id":2412,"outV":68,"properties":{"weight":28}},{"id":1008,"outV":237,"properties":{"weight":1}},{"id":2674,"outV":13,"properties":{"weight":5}},{"id":3956,"outV":106,"properties":{"weight":2}},{"id":4597,"outV":85,"properties":{"weight":1}},{"id":118,"outV":97,"properties":{"weight":8}},{"id":3319,"outV":252,"properties":{"weight":1}},{"id":1144,"outV":26,"properties":{"weight":9}},{"id":6648,"outV":12,"properties":{"weight":8}},{"id":4986,"outV":30,"properties":{"weight":2}},{"id":3195,"outV":104,"properties":{"weight":1}},{"id":5627,"outV":22,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":4152,"inV":18,"properties":{"weight":18}},{"id":4153,"inV":15,"properties":{"weight":7}},{"id":4154,"inV":50,"properties":{"weight":17}},{"id":4155,"inV":10,"properties":{"weight":6}},{"id":4156,"inV":22,"properties":{"weight":3}},{"id":4157,"inV":11,"properties":{"weight":2}},{"id":4158,"inV":46,"properties":{"weight":3}},{"id":4159,"inV":13,"properties":{"weight":16}},{"id":4160,"inV":152,"properties":{"weight":1}},{"id":4161,"inV":234,"properties":{"weight":2}},{"id":4162,"inV":23,"properties":{"weight":3}},{"id":4163,"inV":207,"properties":{"weight":2}},{"id":4164,"inV":120,"properties":{"weight":1}},{"id":4165,"inV":12,"properties":{"weight":17}},{"id":4166,"inV":21,"properties":{"weight":6}},{"id":4167,"inV":24,"properties":{"weight":8}},{"id":4168,"inV":26,"properties":{"weight":17}},{"id":4169,"inV":14,"properties":{"weight":36}},{"id":4170,"inV":20,"properties":{"weight":4}},{"id":4171,"inV":19,"properties":{"weight":3}},{"id":4172,"inV":16,"properties":{"weight":1}},{"id":4173,"inV":39,"properties":{"weight":2}},{"id":4174,"inV":82,"properties":{"weight":1}},{"id":4175,"inV":57,"properties":{"weight":1}},{"id":4176,"inV":153,"properties":{"weight":1}},{"id":4177,"inV":98,"properties":{"weight":1}},{"id":4178,"inV":25,"properties":{"weight":1}},{"id":4179,"inV":103,"properties":{"weight":27}},{"id":4180,"inV":68,"properties":{"weight":18}},{"id":4181,"inV":101,"properties":{"weight":22}},{"id":4182,"inV":3,"properties":{"weight":1}},{"id":4183,"inV":32,"properties":{"weight":21}},{"id":4184,"inV":85,"properties":{"weight":4}},{"id":4185,"inV":109,"properties":{"weight":11}},{"id":4186,"inV":155,"properties":{"weight":1}},{"id":4187,"inV":196,"properties":{"weight":1}},{"id":4188,"inV":121,"properties":{"weight":11}},{"id":4189,"inV":70,"properties":{"weight":1}},{"id":4190,"inV":42,"properties":{"weight":8}},{"id":4191,"inV":112,"properties":{"weight":8}},{"id":4192,"inV":110,"properties":{"weight":3}},{"id":4193,"inV":91,"properties":{"weight":1}},{"id":4194,"inV":189,"properties":{"weight":2}},{"id":4195,"inV":181,"properties":{"weight":2}},{"id":4196,"inV":106,"properties":{"weight":2}},{"id":4197,"inV":76,"properties":{"weight":1}},{"id":4198,"inV":38,"properties":{"weight":1}},{"id":4199,"inV":88,"properties":{"weight":4}},{"id":4200,"inV":104,"properties":{"weight":1}},{"id":4201,"inV":64,"properties":{"weight":7}},{"id":4202,"inV":97,"properties":{"weight":9}},{"id":4203,"inV":126,"properties":{"weight":1}},{"id":4204,"inV":71,"properties":{"weight":2}},{"id":4205,"inV":223,"properties":{"weight":1}},{"id":4206,"inV":117,"properties":{"weight":5}},{"id":4207,"inV":188,"properties":{"weight":4}},{"id":4208,"inV":77,"properties":{"weight":2}},{"id":4209,"inV":169,"properties":{"weight":1}},{"id":4210,"inV":79,"properties":{"weight":6}},{"id":4211,"inV":136,"properties":{"weight":1}},{"id":4212,"inV":248,"properties":{"weight":1}},{"id":4213,"inV":114,"properties":{"weight":1}},{"id":4214,"inV":115,"properties":{"weight":2}},{"id":4215,"inV":41,"properties":{"weight":1}},{"id":4216,"inV":158,"properties":{"weight":6}},{"id":4217,"inV":254,"properties":{"weight":2}},{"id":4218,"inV":83,"properties":{"weight":1}},{"id":4219,"inV":43,"properties":{"weight":3}},{"id":4220,"inV":131,"properties":{"weight":1}},{"id":4221,"inV":119,"properties":{"weight":1}},{"id":4222,"inV":72,"properties":{"weight":1}}]},"properties":{"name":[{"id":159,"value":"TENNESSE JED"}],"songType":[{"id":161,"value":""}],"performances":[{"id":160,"value":0}]}}
-{"id":55,"label":"song","inE":{"followedBy":[{"id":6464,"outV":187,"properties":{"weight":1}},{"id":5736,"outV":129,"properties":{"weight":1}},{"id":5960,"outV":50,"properties":{"weight":1}},{"id":4265,"outV":10,"properties":{"weight":1}},{"id":3886,"outV":51,"properties":{"weight":1}},{"id":5710,"outV":20,"properties":{"weight":1}},{"id":4472,"outV":202,"properties":{"weight":1}},{"id":57,"outV":46,"properties":{"weight":1}},{"id":793,"outV":122,"properties":{"weight":1}},{"id":2777,"outV":15,"properties":{"weight":1}},{"id":4890,"outV":100,"properties":{"weight":1}},{"id":1565,"outV":18,"properties":{"weight":2}},{"id":3646,"outV":24,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6544,"inV":14,"properties":{"weight":1}},{"id":6545,"inV":50,"properties":{"weight":1}},{"id":6546,"inV":18,"properties":{"weight":1}},{"id":6547,"inV":58,"properties":{"weight":1}},{"id":6548,"inV":122,"properties":{"weight":1}},{"id":6537,"inV":16,"properties":{"weight":1}},{"id":6538,"inV":17,"properties":{"weight":1}},{"id":6539,"inV":9,"properties":{"weight":1}},{"id":6540,"inV":46,"properties":{"weight":2}},{"id":6541,"inV":153,"properties":{"weight":1}},{"id":6542,"inV":51,"properties":{"weight":2}},{"id":6543,"inV":20,"properties":{"weight":1}}],"sungBy":[{"id":8042,"inV":457}],"writtenBy":[{"id":8041,"inV":804}]},"properties":{"name":[{"id":162,"value":"YOU AINT WOMAN ENOUGH"}],"songType":[{"id":164,"value":"cover"}],"performances":[{"id":163,"value":15}]}}
-{"id":56,"label":"song","inE":{"followedBy":[{"id":2177,"outV":208,"properties":{"weight":1}},{"id":4353,"outV":62,"properties":{"weight":2}},{"id":133,"outV":97,"properties":{"weight":6}},{"id":5509,"outV":131,"properties":{"weight":1}},{"id":5640,"outV":22,"properties":{"weight":1}},{"id":5002,"outV":30,"properties":{"weight":7}},{"id":4235,"outV":10,"properties":{"weight":13}},{"id":1171,"outV":26,"properties":{"weight":5}},{"id":6676,"outV":12,"properties":{"weight":5}},{"id":1557,"outV":18,"properties":{"weight":11}},{"id":150,"outV":108,"properties":{"weight":1}},{"id":408,"outV":38,"properties":{"weight":6}},{"id":2074,"outV":188,"properties":{"weight":9}},{"id":5786,"outV":76,"properties":{"weight":1}},{"id":2971,"outV":78,"properties":{"weight":1}},{"id":4129,"outV":48,"properties":{"weight":1}},{"id":3622,"outV":24,"properties":{"weight":24}},{"id":2599,"outV":112,"properties":{"weight":2}},{"id":553,"outV":120,"properties":{"weight":2}},{"id":1706,"outV":124,"properties":{"weight":1}},{"id":6828,"outV":64,"properties":{"weight":4}},{"id":3376,"outV":184,"properties":{"weight":2}},{"id":4017,"outV":292,"properties":{"weight":1}},{"id":5937,"outV":50,"properties":{"weight":19}},{"id":6962,"outV":84,"properties":{"weight":1}},{"id":2999,"outV":14,"properties":{"weight":8}},{"id":6332,"outV":21,"properties":{"weight":3}},{"id":61,"outV":46,"properties":{"weight":2}},{"id":5571,"outV":42,"properties":{"weight":16}},{"id":2756,"outV":15,"properties":{"weight":22}},{"id":6468,"outV":187,"properties":{"weight":1}},{"id":1349,"outV":31,"properties":{"weight":5}},{"id":5703,"outV":20,"properties":{"weight":2}},{"id":976,"outV":11,"properties":{"weight":3}},{"id":3409,"outV":77,"properties":{"weight":3}},{"id":5460,"outV":79,"properties":{"weight":1}},{"id":3797,"outV":88,"properties":{"weight":13}},{"id":2134,"outV":17,"properties":{"weight":1}},{"id":6242,"outV":117,"properties":{"weight":3}},{"id":4069,"outV":109,"properties":{"weight":3}},{"id":4965,"outV":207,"properties":{"weight":1}},{"id":749,"outV":80,"properties":{"weight":2}},{"id":624,"outV":23,"properties":{"weight":14}},{"id":3184,"outV":104,"properties":{"weight":1}},{"id":1777,"outV":234,"properties":{"weight":3}},{"id":1140,"outV":59,"properties":{"weight":1}},{"id":3060,"outV":153,"properties":{"weight":1}},{"id":1910,"outV":103,"properties":{"weight":1}},{"id":2424,"outV":68,"properties":{"weight":20}},{"id":2681,"outV":13,"properties":{"weight":3}},{"id":5243,"outV":32,"properties":{"weight":22}},{"id":4478,"outV":202,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3584,"inV":38,"properties":{"weight":2}},{"id":3585,"inV":88,"properties":{"weight":13}},{"id":3586,"inV":54,"properties":{"weight":1}},{"id":3587,"inV":73,"properties":{"weight":3}},{"id":3588,"inV":98,"properties":{"weight":1}},{"id":3589,"inV":39,"properties":{"weight":1}},{"id":3590,"inV":97,"properties":{"weight":4}},{"id":3591,"inV":113,"properties":{"weight":1}},{"id":3592,"inV":58,"properties":{"weight":2}},{"id":3593,"inV":64,"properties":{"weight":1}},{"id":3594,"inV":108,"properties":{"weight":1}},{"id":3595,"inV":57,"properties":{"weight":1}},{"id":3596,"inV":116,"properties":{"weight":1}},{"id":3597,"inV":71,"properties":{"weight":3}},{"id":3598,"inV":223,"properties":{"weight":2}},{"id":3599,"inV":62,"properties":{"weight":1}},{"id":3600,"inV":77,"properties":{"weight":6}},{"id":3601,"inV":117,"properties":{"weight":3}},{"id":3602,"inV":30,"properties":{"weight":3}},{"id":3603,"inV":34,"properties":{"weight":2}},{"id":3604,"inV":188,"properties":{"weight":3}},{"id":3605,"inV":169,"properties":{"weight":1}},{"id":3606,"inV":79,"properties":{"weight":1}},{"id":3607,"inV":115,"properties":{"weight":2}},{"id":3608,"inV":27,"properties":{"weight":2}},{"id":3609,"inV":20,"properties":{"weight":1}},{"id":3610,"inV":51,"properties":{"weight":1}},{"id":3611,"inV":124,"properties":{"weight":2}},{"id":3612,"inV":254,"properties":{"weight":1}},{"id":3613,"inV":174,"properties":{"weight":1}},{"id":3614,"inV":202,"properties":{"weight":1}},{"id":3615,"inV":158,"properties":{"weight":2}},{"id":3616,"inV":272,"properties":{"weight":1}},{"id":3551,"inV":50,"properties":{"weight":14}},{"id":3552,"inV":13,"properties":{"weight":8}},{"id":3553,"inV":18,"properties":{"weight":16}},{"id":3554,"inV":11,"properties":{"weight":7}},{"id":3555,"inV":22,"properties":{"weight":2}},{"id":3556,"inV":14,"properties":{"weight":21}},{"id":3557,"inV":122,"properties":{"weight":1}},{"id":3558,"inV":207,"properties":{"weight":2}},{"id":3559,"inV":10,"properties":{"weight":16}},{"id":3560,"inV":234,"properties":{"weight":1}},{"id":3561,"inV":315,"properties":{"weight":1}},{"id":3562,"inV":15,"properties":{"weight":6}},{"id":3563,"inV":49,"properties":{"weight":1}},{"id":3564,"inV":19,"properties":{"weight":2}},{"id":3565,"inV":12,"properties":{"weight":9}},{"id":3566,"inV":101,"properties":{"weight":9}},{"id":3567,"inV":82,"properties":{"weight":2}},{"id":3568,"inV":24,"properties":{"weight":2}},{"id":3569,"inV":23,"properties":{"weight":1}},{"id":3570,"inV":125,"properties":{"weight":1}},{"id":3571,"inV":26,"properties":{"weight":4}},{"id":3572,"inV":32,"properties":{"weight":24}},{"id":3573,"inV":103,"properties":{"weight":10}},{"id":3574,"inV":121,"properties":{"weight":7}},{"id":3575,"inV":109,"properties":{"weight":5}},{"id":3576,"inV":110,"properties":{"weight":1}},{"id":3577,"inV":85,"properties":{"weight":2}},{"id":3578,"inV":70,"properties":{"weight":1}},{"id":3579,"inV":112,"properties":{"weight":7}},{"id":3580,"inV":189,"properties":{"weight":1}},{"id":3581,"inV":68,"properties":{"weight":20}},{"id":3582,"inV":42,"properties":{"weight":6}},{"id":3583,"inV":106,"properties":{"weight":2}}],"sungBy":[{"id":7236,"inV":340}],"writtenBy":[{"id":7235,"inV":339}]},"properties":{"name":[{"id":165,"value":"LOSER"}],"songType":[{"id":167,"value":"original"}],"performances":[{"id":166,"value":345}]}}
-{"id":57,"label":"song","inE":{"followedBy":[{"id":5635,"outV":22,"properties":{"weight":2}},{"id":6147,"outV":36,"properties":{"weight":25}},{"id":5254,"outV":32,"properties":{"weight":11}},{"id":1546,"outV":18,"properties":{"weight":10}},{"id":3595,"outV":56,"properties":{"weight":1}},{"id":1934,"outV":148,"properties":{"weight":1}},{"id":5521,"outV":43,"properties":{"weight":3}},{"id":2707,"outV":13,"properties":{"weight":1}},{"id":3987,"outV":106,"properties":{"weight":1}},{"id":6038,"outV":115,"properties":{"weight":2}},{"id":2585,"outV":112,"properties":{"weight":6}},{"id":3355,"outV":184,"properties":{"weight":21}},{"id":412,"outV":38,"properties":{"weight":4}},{"id":4253,"outV":10,"properties":{"weight":12}},{"id":1312,"outV":27,"properties":{"weight":1}},{"id":162,"outV":108,"properties":{"weight":1}},{"id":6564,"outV":181,"properties":{"weight":2}},{"id":2984,"outV":14,"properties":{"weight":55}},{"id":6824,"outV":64,"properties":{"weight":6}},{"id":2090,"outV":188,"properties":{"weight":4}},{"id":1708,"outV":124,"properties":{"weight":1}},{"id":2860,"outV":101,"properties":{"weight":24}},{"id":3248,"outV":63,"properties":{"weight":1}},{"id":3632,"outV":24,"properties":{"weight":7}},{"id":2609,"outV":158,"properties":{"weight":7}},{"id":6708,"outV":141,"properties":{"weight":1}},{"id":5173,"outV":71,"properties":{"weight":6}},{"id":1723,"outV":82,"properties":{"weight":1}},{"id":957,"outV":67,"properties":{"weight":1}},{"id":5949,"outV":50,"properties":{"weight":17}},{"id":62,"outV":46,"properties":{"weight":3}},{"id":2240,"outV":29,"properties":{"weight":1}},{"id":4546,"outV":105,"properties":{"weight":2}},{"id":1095,"outV":59,"properties":{"weight":1}},{"id":5575,"outV":42,"properties":{"weight":6}},{"id":972,"outV":11,"properties":{"weight":4}},{"id":2764,"outV":15,"properties":{"weight":7}},{"id":3405,"outV":77,"properties":{"weight":4}},{"id":4175,"outV":54,"properties":{"weight":1}},{"id":5455,"outV":79,"properties":{"weight":4}},{"id":4571,"outV":254,"properties":{"weight":1}},{"id":6235,"outV":117,"properties":{"weight":3}},{"id":2269,"outV":25,"properties":{"weight":1}},{"id":4445,"outV":113,"properties":{"weight":1}},{"id":3294,"outV":160,"properties":{"weight":1}},{"id":3806,"outV":88,"properties":{"weight":3}},{"id":4320,"outV":110,"properties":{"weight":3}},{"id":6372,"outV":21,"properties":{"weight":1}},{"id":2149,"outV":151,"properties":{"weight":1}},{"id":7017,"outV":89,"properties":{"weight":1}},{"id":618,"outV":23,"properties":{"weight":4}},{"id":2410,"outV":68,"properties":{"weight":34}},{"id":4078,"outV":109,"properties":{"weight":7}},{"id":4849,"outV":119,"properties":{"weight":2}},{"id":4595,"outV":85,"properties":{"weight":1}},{"id":1908,"outV":103,"properties":{"weight":4}},{"id":119,"outV":97,"properties":{"weight":7}},{"id":6647,"outV":12,"properties":{"weight":6}},{"id":3706,"outV":3,"properties":{"weight":2}},{"id":6778,"outV":39,"properties":{"weight":2}},{"id":1147,"outV":26,"properties":{"weight":15}},{"id":6141,"outV":289,"properties":{"weight":1}},{"id":3070,"outV":153,"properties":{"weight":2}},{"id":3326,"outV":268,"properties":{"weight":1}},{"id":1791,"outV":196,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":2560,"inV":64,"properties":{"weight":5}},{"id":2561,"inV":88,"properties":{"weight":1}},{"id":2562,"inV":154,"properties":{"weight":1}},{"id":2563,"inV":127,"properties":{"weight":1}},{"id":2564,"inV":213,"properties":{"weight":1}},{"id":2565,"inV":238,"properties":{"weight":1}},{"id":2566,"inV":131,"properties":{"weight":1}},{"id":2567,"inV":243,"properties":{"weight":1}},{"id":2568,"inV":67,"properties":{"weight":1}},{"id":2569,"inV":60,"properties":{"weight":1}},{"id":2570,"inV":34,"properties":{"weight":5}},{"id":2571,"inV":89,"properties":{"weight":1}},{"id":2572,"inV":46,"properties":{"weight":5}},{"id":2573,"inV":81,"properties":{"weight":5}},{"id":2574,"inV":79,"properties":{"weight":2}},{"id":2575,"inV":74,"properties":{"weight":1}},{"id":2576,"inV":28,"properties":{"weight":1}},{"id":2577,"inV":216,"properties":{"weight":1}},{"id":2578,"inV":9,"properties":{"weight":2}},{"id":2579,"inV":61,"properties":{"weight":1}},{"id":2580,"inV":36,"properties":{"weight":1}},{"id":2581,"inV":117,"properties":{"weight":1}},{"id":2582,"inV":31,"properties":{"weight":1}},{"id":2583,"inV":93,"properties":{"weight":1}},{"id":2504,"inV":39,"properties":{"weight":1}},{"id":2505,"inV":10,"properties":{"weight":12}},{"id":2506,"inV":153,"properties":{"weight":4}},{"id":2507,"inV":24,"properties":{"weight":14}},{"id":2508,"inV":50,"properties":{"weight":9}},{"id":2509,"inV":47,"properties":{"weight":1}},{"id":2510,"inV":252,"properties":{"weight":1}},{"id":2511,"inV":205,"properties":{"weight":1}},{"id":2512,"inV":21,"properties":{"weight":3}},{"id":2513,"inV":11,"properties":{"weight":4}},{"id":2514,"inV":234,"properties":{"weight":1}},{"id":2515,"inV":12,"properties":{"weight":3}},{"id":2516,"inV":26,"properties":{"weight":4}},{"id":2517,"inV":18,"properties":{"weight":11}},{"id":2518,"inV":15,"properties":{"weight":5}},{"id":2519,"inV":13,"properties":{"weight":10}},{"id":2520,"inV":23,"properties":{"weight":5}},{"id":2521,"inV":16,"properties":{"weight":1}},{"id":2522,"inV":17,"properties":{"weight":1}},{"id":2523,"inV":14,"properties":{"weight":9}},{"id":2524,"inV":25,"properties":{"weight":2}},{"id":2525,"inV":22,"properties":{"weight":2}},{"id":2526,"inV":68,"properties":{"weight":6}},{"id":2527,"inV":20,"properties":{"weight":3}},{"id":2528,"inV":112,"properties":{"weight":3}},{"id":2529,"inV":32,"properties":{"weight":3}},{"id":2530,"inV":109,"properties":{"weight":3}},{"id":2531,"inV":101,"properties":{"weight":2}},{"id":2532,"inV":76,"properties":{"weight":30}},{"id":2533,"inV":83,"properties":{"weight":4}},{"id":2534,"inV":120,"properties":{"weight":2}},{"id":2535,"inV":121,"properties":{"weight":6}},{"id":2536,"inV":103,"properties":{"weight":5}},{"id":2537,"inV":82,"properties":{"weight":31}},{"id":2538,"inV":4,"properties":{"weight":4}},{"id":2539,"inV":70,"properties":{"weight":15}},{"id":2540,"inV":91,"properties":{"weight":5}},{"id":2541,"inV":59,"properties":{"weight":3}},{"id":2542,"inV":289,"properties":{"weight":1}},{"id":2543,"inV":84,"properties":{"weight":12}},{"id":2544,"inV":110,"properties":{"weight":1}},{"id":2545,"inV":65,"properties":{"weight":3}},{"id":2546,"inV":19,"properties":{"weight":28}},{"id":2547,"inV":73,"properties":{"weight":3}},{"id":2548,"inV":72,"properties":{"weight":4}},{"id":2549,"inV":78,"properties":{"weight":6}},{"id":2550,"inV":38,"properties":{"weight":15}},{"id":2551,"inV":96,"properties":{"weight":3}},{"id":2552,"inV":62,"properties":{"weight":3}},{"id":2553,"inV":48,"properties":{"weight":1}},{"id":2554,"inV":181,"properties":{"weight":1}},{"id":2555,"inV":29,"properties":{"weight":1}},{"id":2556,"inV":133,"properties":{"weight":1}},{"id":2557,"inV":87,"properties":{"weight":10}},{"id":2558,"inV":215,"properties":{"weight":11}},{"id":2559,"inV":210,"properties":{"weight":1}}],"sungBy":[{"id":7126,"inV":340}],"writtenBy":[{"id":7125,"inV":339}]},"properties":{"name":[{"id":168,"value":"DEAL"}],"songType":[{"id":170,"value":"original"}],"performances":[{"id":169,"value":423}]}}
-{"id":58,"label":"song","inE":{"followedBy":[{"id":901,"outV":174,"properties":{"weight":5}},{"id":2439,"outV":68,"properties":{"weight":3}},{"id":6535,"outV":242,"properties":{"weight":1}},{"id":3592,"outV":56,"properties":{"weight":2}},{"id":1545,"outV":18,"properties":{"weight":13}},{"id":4237,"outV":10,"properties":{"weight":11}},{"id":1039,"outV":73,"properties":{"weight":2}},{"id":3983,"outV":106,"properties":{"weight":2}},{"id":6547,"outV":55,"properties":{"weight":1}},{"id":5654,"outV":169,"properties":{"weight":2}},{"id":2071,"outV":188,"properties":{"weight":15}},{"id":6043,"outV":115,"properties":{"weight":2}},{"id":6811,"outV":39,"properties":{"weight":1}},{"id":5276,"outV":32,"properties":{"weight":10}},{"id":1311,"outV":27,"properties":{"weight":2}},{"id":4127,"outV":48,"properties":{"weight":1}},{"id":1701,"outV":124,"properties":{"weight":1}},{"id":4649,"outV":154,"properties":{"weight":1}},{"id":5545,"outV":126,"properties":{"weight":1}},{"id":426,"outV":38,"properties":{"weight":4}},{"id":6834,"outV":64,"properties":{"weight":1}},{"id":5171,"outV":71,"properties":{"weight":3}},{"id":3380,"outV":184,"properties":{"weight":2}},{"id":5045,"outV":209,"properties":{"weight":3}},{"id":2998,"outV":14,"properties":{"weight":1}},{"id":3638,"outV":24,"properties":{"weight":18}},{"id":3257,"outV":306,"properties":{"weight":1}},{"id":2618,"outV":158,"properties":{"weight":1}},{"id":5950,"outV":50,"properties":{"weight":6}},{"id":63,"outV":46,"properties":{"weight":1}},{"id":4420,"outV":198,"properties":{"weight":1}},{"id":330,"outV":34,"properties":{"weight":1}},{"id":3402,"outV":77,"properties":{"weight":8}},{"id":5707,"outV":20,"properties":{"weight":3}},{"id":2766,"outV":15,"properties":{"weight":18}},{"id":6222,"outV":117,"properties":{"weight":33}},{"id":3919,"outV":51,"properties":{"weight":1}},{"id":5456,"outV":79,"properties":{"weight":5}},{"id":3795,"outV":88,"properties":{"weight":16}},{"id":2132,"outV":17,"properties":{"weight":2}},{"id":981,"outV":11,"properties":{"weight":6}},{"id":4567,"outV":254,"properties":{"weight":1}},{"id":6999,"outV":197,"properties":{"weight":4}},{"id":4056,"outV":173,"properties":{"weight":1}},{"id":4696,"outV":111,"properties":{"weight":10}},{"id":5593,"outV":42,"properties":{"weight":8}},{"id":6361,"outV":21,"properties":{"weight":1}},{"id":2655,"outV":137,"properties":{"weight":1}},{"id":611,"outV":23,"properties":{"weight":4}},{"id":4326,"outV":110,"properties":{"weight":1}},{"id":744,"outV":80,"properties":{"weight":2}},{"id":3181,"outV":104,"properties":{"weight":1}},{"id":115,"outV":97,"properties":{"weight":10}},{"id":6388,"outV":65,"properties":{"weight":1}},{"id":1142,"outV":26,"properties":{"weight":2}},{"id":6646,"outV":12,"properties":{"weight":7}},{"id":5623,"outV":22,"properties":{"weight":1}},{"id":764,"outV":224,"properties":{"weight":1}},{"id":4094,"outV":109,"properties":{"weight":2}},{"id":5502,"outV":131,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":3456,"inV":116,"properties":{"weight":1}},{"id":3457,"inV":42,"properties":{"weight":5}},{"id":3458,"inV":112,"properties":{"weight":1}},{"id":3459,"inV":73,"properties":{"weight":2}},{"id":3460,"inV":76,"properties":{"weight":1}},{"id":3461,"inV":32,"properties":{"weight":4}},{"id":3462,"inV":181,"properties":{"weight":1}},{"id":3463,"inV":54,"properties":{"weight":3}},{"id":3464,"inV":84,"properties":{"weight":2}},{"id":3465,"inV":121,"properties":{"weight":3}},{"id":3466,"inV":64,"properties":{"weight":14}},{"id":3467,"inV":19,"properties":{"weight":8}},{"id":3468,"inV":102,"properties":{"weight":1}},{"id":3469,"inV":51,"properties":{"weight":1}},{"id":3470,"inV":97,"properties":{"weight":3}},{"id":3471,"inV":115,"properties":{"weight":1}},{"id":3472,"inV":223,"properties":{"weight":2}},{"id":3473,"inV":110,"properties":{"weight":1}},{"id":3474,"inV":141,"properties":{"weight":1}},{"id":3475,"inV":103,"properties":{"weight":11}},{"id":3476,"inV":213,"properties":{"weight":1}},{"id":3477,"inV":184,"properties":{"weight":1}},{"id":3478,"inV":71,"properties":{"weight":1}},{"id":3479,"inV":62,"properties":{"weight":4}},{"id":3480,"inV":292,"properties":{"weight":1}},{"id":3481,"inV":82,"properties":{"weight":8}},{"id":3482,"inV":117,"properties":{"weight":1}},{"id":3483,"inV":87,"properties":{"weight":1}},{"id":3484,"inV":46,"properties":{"weight":4}},{"id":3485,"inV":167,"properties":{"weight":2}},{"id":3486,"inV":114,"properties":{"weight":1}},{"id":3487,"inV":60,"properties":{"weight":1}},{"id":3488,"inV":81,"properties":{"weight":3}},{"id":3489,"inV":248,"properties":{"weight":3}},{"id":3490,"inV":74,"properties":{"weight":1}},{"id":3491,"inV":79,"properties":{"weight":3}},{"id":3492,"inV":36,"properties":{"weight":2}},{"id":3493,"inV":34,"properties":{"weight":3}},{"id":3494,"inV":29,"properties":{"weight":2}},{"id":3495,"inV":215,"properties":{"weight":1}},{"id":3496,"inV":28,"properties":{"weight":1}},{"id":3497,"inV":175,"properties":{"weight":1}},{"id":3498,"inV":9,"properties":{"weight":2}},{"id":3499,"inV":137,"properties":{"weight":1}},{"id":3500,"inV":119,"properties":{"weight":1}},{"id":3431,"inV":18,"properties":{"weight":8}},{"id":3432,"inV":15,"properties":{"weight":7}},{"id":3433,"inV":21,"properties":{"weight":3}},{"id":3434,"inV":11,"properties":{"weight":5}},{"id":3435,"inV":13,"properties":{"weight":8}},{"id":3436,"inV":10,"properties":{"weight":10}},{"id":3437,"inV":24,"properties":{"weight":6}},{"id":3438,"inV":26,"properties":{"weight":42}},{"id":3439,"inV":50,"properties":{"weight":8}},{"id":3440,"inV":23,"properties":{"weight":1}},{"id":3441,"inV":59,"properties":{"weight":1}},{"id":3442,"inV":20,"properties":{"weight":2}},{"id":3443,"inV":39,"properties":{"weight":1}},{"id":3444,"inV":222,"properties":{"weight":10}},{"id":3445,"inV":209,"properties":{"weight":3}},{"id":3446,"inV":12,"properties":{"weight":4}},{"id":3447,"inV":109,"properties":{"weight":2}},{"id":3448,"inV":88,"properties":{"weight":8}},{"id":3449,"inV":68,"properties":{"weight":6}},{"id":3450,"inV":273,"properties":{"weight":1}},{"id":3451,"inV":170,"properties":{"weight":1}},{"id":3452,"inV":198,"properties":{"weight":1}},{"id":3453,"inV":101,"properties":{"weight":6}},{"id":3454,"inV":199,"properties":{"weight":1}},{"id":3455,"inV":14,"properties":{"weight":12}}]},"properties":{"name":[{"id":171,"value":"BIRD SONG"}],"songType":[{"id":173,"value":""}],"performances":[{"id":172,"value":0}]}}
-{"id":59,"label":"song","inE":{"followedBy":[{"id":1536,"outV":18,"properties":{"weight":5}},{"id":5252,"outV":32,"properties":{"weight":17}},{"id":5126,"outV":222,"properties":{"weight":1}},{"id":3083,"outV":153,"properties":{"weight":6}},{"id":5644,"outV":22,"properties":{"weight":2}},{"id":5772,"outV":76,"properties":{"weight":3}},{"id":1805,"outV":196,"properties":{"weight":1}},{"id":4239,"outV":10,"properties":{"weight":9}},{"id":3346,"outV":184,"properties":{"weight":4}},{"id":2197,"outV":75,"properties":{"weight":1}},{"id":409,"outV":38,"properties":{"weight":10}},{"id":921,"outV":91,"properties":{"weight":1}},{"id":2593,"outV":112,"properties":{"weight":1}},{"id":6947,"outV":84,"properties":{"weight":1}},{"id":4006,"outV":225,"properties":{"weight":1}},{"id":551,"outV":120,"properties":{"weight":3}},{"id":3623,"outV":24,"properties":{"weight":7}},{"id":2858,"outV":101,"properties":{"weight":1}},{"id":3759,"outV":3,"properties":{"weight":1}},{"id":6319,"outV":21,"properties":{"weight":3}},{"id":6832,"outV":64,"properties":{"weight":67}},{"id":5940,"outV":50,"properties":{"weight":32}},{"id":1717,"outV":82,"properties":{"weight":1}},{"id":64,"outV":46,"properties":{"weight":2}},{"id":4800,"outV":114,"properties":{"weight":5}},{"id":961,"outV":67,"properties":{"weight":1}},{"id":3012,"outV":14,"properties":{"weight":1}},{"id":5574,"outV":42,"properties":{"weight":1}},{"id":5708,"outV":20,"properties":{"weight":3}},{"id":6732,"outV":53,"properties":{"weight":1}},{"id":973,"outV":11,"properties":{"weight":3}},{"id":2765,"outV":15,"properties":{"weight":6}},{"id":6221,"outV":117,"properties":{"weight":1}},{"id":3278,"outV":160,"properties":{"weight":2}},{"id":6607,"outV":127,"properties":{"weight":1}},{"id":5844,"outV":61,"properties":{"weight":3}},{"id":6102,"outV":72,"properties":{"weight":2}},{"id":5208,"outV":99,"properties":{"weight":1}},{"id":1884,"outV":103,"properties":{"weight":11}},{"id":6497,"outV":187,"properties":{"weight":1}},{"id":5476,"outV":79,"properties":{"weight":5}},{"id":619,"outV":23,"properties":{"weight":6}},{"id":2284,"outV":25,"properties":{"weight":6}},{"id":2541,"outV":57,"properties":{"weight":3}},{"id":4589,"outV":85,"properties":{"weight":2}},{"id":2673,"outV":13,"properties":{"weight":6}},{"id":3441,"outV":58,"properties":{"weight":1}},{"id":1778,"outV":234,"properties":{"weight":1}},{"id":5234,"outV":214,"properties":{"weight":2}},{"id":6771,"outV":39,"properties":{"weight":1}},{"id":2423,"outV":68,"properties":{"weight":1}},{"id":6649,"outV":12,"properties":{"weight":14}},{"id":1150,"outV":26,"properties":{"weight":41}}]},"outE":{"followedBy":[{"id":1083,"inV":10,"properties":{"weight":10}},{"id":1084,"inV":54,"properties":{"weight":1}},{"id":1085,"inV":24,"properties":{"weight":26}},{"id":1086,"inV":18,"properties":{"weight":21}},{"id":1087,"inV":13,"properties":{"weight":5}},{"id":1088,"inV":11,"properties":{"weight":14}},{"id":1089,"inV":21,"properties":{"weight":4}},{"id":1090,"inV":14,"properties":{"weight":7}},{"id":1091,"inV":218,"properties":{"weight":1}},{"id":1092,"inV":23,"properties":{"weight":3}},{"id":1093,"inV":50,"properties":{"weight":13}},{"id":1094,"inV":234,"properties":{"weight":2}},{"id":1095,"inV":57,"properties":{"weight":1}},{"id":1096,"inV":12,"properties":{"weight":26}},{"id":1097,"inV":25,"properties":{"weight":3}},{"id":1098,"inV":153,"properties":{"weight":2}},{"id":1099,"inV":46,"properties":{"weight":1}},{"id":1100,"inV":20,"properties":{"weight":5}},{"id":1101,"inV":15,"properties":{"weight":2}},{"id":1102,"inV":98,"properties":{"weight":2}},{"id":1103,"inV":26,"properties":{"weight":4}},{"id":1104,"inV":32,"properties":{"weight":32}},{"id":1105,"inV":3,"properties":{"weight":1}},{"id":1106,"inV":68,"properties":{"weight":11}},{"id":1107,"inV":112,"properties":{"weight":16}},{"id":1108,"inV":76,"properties":{"weight":6}},{"id":1109,"inV":121,"properties":{"weight":2}},{"id":1110,"inV":103,"properties":{"weight":4}},{"id":1111,"inV":101,"properties":{"weight":1}},{"id":1112,"inV":109,"properties":{"weight":1}},{"id":1113,"inV":155,"properties":{"weight":1}},{"id":1114,"inV":85,"properties":{"weight":4}},{"id":1115,"inV":91,"properties":{"weight":1}},{"id":1116,"inV":88,"properties":{"weight":7}},{"id":1117,"inV":170,"properties":{"weight":1}},{"id":1118,"inV":181,"properties":{"weight":3}},{"id":1119,"inV":39,"properties":{"weight":1}},{"id":1120,"inV":111,"properties":{"weight":3}},{"id":1121,"inV":69,"properties":{"weight":3}},{"id":1122,"inV":82,"properties":{"weight":1}},{"id":1123,"inV":42,"properties":{"weight":7}},{"id":1124,"inV":244,"properties":{"weight":1}},{"id":1125,"inV":245,"properties":{"weight":1}},{"id":1126,"inV":30,"properties":{"weight":24}},{"id":1127,"inV":223,"properties":{"weight":2}},{"id":1128,"inV":64,"properties":{"weight":1}},{"id":1129,"inV":116,"properties":{"weight":2}},{"id":1130,"inV":167,"properties":{"weight":2}},{"id":1131,"inV":228,"properties":{"weight":1}},{"id":1132,"inV":77,"properties":{"weight":1}},{"id":1133,"inV":71,"properties":{"weight":1}},{"id":1134,"inV":118,"properties":{"weight":1}},{"id":1135,"inV":169,"properties":{"weight":2}},{"id":1136,"inV":31,"properties":{"weight":7}},{"id":1137,"inV":34,"properties":{"weight":1}},{"id":1138,"inV":189,"properties":{"weight":2}},{"id":1139,"inV":40,"properties":{"weight":3}},{"id":1140,"inV":56,"properties":{"weight":1}}],"sungBy":[{"id":7346,"inV":340}],"writtenBy":[{"id":7345,"inV":339}]},"properties":{"name":[{"id":174,"value":"SUGAREE"}],"songType":[{"id":176,"value":"original"}],"performances":[{"id":175,"value":357}]}}
-{"id":60,"label":"song","inE":{"followedBy":[{"id":902,"outV":174,"properties":{"weight":2}},{"id":2569,"outV":57,"properties":{"weight":1}},{"id":3210,"outV":229,"properties":{"weight":2}},{"id":5135,"outV":334,"properties":{"weight":1}},{"id":4752,"outV":37,"properties":{"weight":2}},{"id":5651,"outV":169,"properties":{"weight":1}},{"id":5781,"outV":76,"properties":{"weight":11}},{"id":6553,"outV":172,"properties":{"weight":2}},{"id":667,"outV":23,"properties":{"weight":2}},{"id":2715,"outV":13,"properties":{"weight":21}},{"id":5405,"outV":69,"properties":{"weight":1}},{"id":2590,"outV":112,"properties":{"weight":1}},{"id":3358,"outV":184,"properties":{"weight":1}},{"id":5534,"outV":43,"properties":{"weight":1}},{"id":6174,"outV":36,"properties":{"weight":7}},{"id":3487,"outV":58,"properties":{"weight":1}},{"id":5921,"outV":96,"properties":{"weight":2}},{"id":1828,"outV":41,"properties":{"weight":3}},{"id":1329,"outV":31,"properties":{"weight":1}},{"id":1202,"outV":26,"properties":{"weight":3}},{"id":1458,"outV":81,"properties":{"weight":2}},{"id":6963,"outV":84,"properties":{"weight":2}},{"id":5689,"outV":159,"properties":{"weight":1}},{"id":3387,"outV":177,"properties":{"weight":1}},{"id":317,"outV":34,"properties":{"weight":12}},{"id":66,"outV":46,"properties":{"weight":3}},{"id":2883,"outV":101,"properties":{"weight":2}},{"id":6851,"outV":64,"properties":{"weight":2}},{"id":1604,"outV":18,"properties":{"weight":1}},{"id":3141,"outV":19,"properties":{"weight":1}},{"id":202,"outV":70,"properties":{"weight":4}},{"id":1747,"outV":82,"properties":{"weight":1}},{"id":2899,"outV":118,"properties":{"weight":1}},{"id":4823,"outV":114,"properties":{"weight":2}},{"id":1755,"outV":28,"properties":{"weight":3}},{"id":1883,"outV":103,"properties":{"weight":3}},{"id":3035,"outV":14,"properties":{"weight":6}},{"id":6368,"outV":21,"properties":{"weight":7}},{"id":5601,"outV":42,"properties":{"weight":1}},{"id":5475,"outV":79,"properties":{"weight":3}},{"id":2792,"outV":15,"properties":{"weight":1}},{"id":6508,"outV":187,"properties":{"weight":3}},{"id":6125,"outV":72,"properties":{"weight":3}},{"id":2166,"outV":151,"properties":{"weight":1}},{"id":2422,"outV":68,"properties":{"weight":1}},{"id":6007,"outV":50,"properties":{"weight":1}},{"id":5112,"outV":4,"properties":{"weight":1}},{"id":4861,"outV":35,"properties":{"weight":4}},{"id":4606,"outV":85,"properties":{"weight":5}}]},"outE":{"followedBy":[{"id":3841,"inV":10,"properties":{"weight":1}},{"id":3842,"inV":96,"properties":{"weight":10}},{"id":3843,"inV":110,"properties":{"weight":1}},{"id":3844,"inV":15,"properties":{"weight":2}},{"id":3845,"inV":141,"properties":{"weight":1}},{"id":3846,"inV":94,"properties":{"weight":1}},{"id":3847,"inV":130,"properties":{"weight":1}},{"id":3848,"inV":101,"properties":{"weight":1}},{"id":3849,"inV":18,"properties":{"weight":1}},{"id":3850,"inV":121,"properties":{"weight":1}},{"id":3851,"inV":181,"properties":{"weight":2}},{"id":3852,"inV":85,"properties":{"weight":16}},{"id":3853,"inV":70,"properties":{"weight":2}},{"id":3854,"inV":88,"properties":{"weight":1}},{"id":3855,"inV":12,"properties":{"weight":1}},{"id":3856,"inV":29,"properties":{"weight":1}},{"id":3857,"inV":13,"properties":{"weight":35}},{"id":3858,"inV":123,"properties":{"weight":1}},{"id":3859,"inV":21,"properties":{"weight":12}},{"id":3860,"inV":76,"properties":{"weight":8}},{"id":3861,"inV":184,"properties":{"weight":1}},{"id":3862,"inV":23,"properties":{"weight":1}},{"id":3863,"inV":49,"properties":{"weight":2}},{"id":3864,"inV":36,"properties":{"weight":5}},{"id":3865,"inV":74,"properties":{"weight":11}},{"id":3866,"inV":14,"properties":{"weight":2}},{"id":3867,"inV":154,"properties":{"weight":1}},{"id":3868,"inV":187,"properties":{"weight":1}},{"id":3869,"inV":280,"properties":{"weight":1}},{"id":3870,"inV":91,"properties":{"weight":1}},{"id":3871,"inV":31,"properties":{"weight":1}},{"id":3872,"inV":39,"properties":{"weight":2}},{"id":3873,"inV":114,"properties":{"weight":1}},{"id":3874,"inV":19,"properties":{"weight":1}},{"id":3875,"inV":89,"properties":{"weight":1}},{"id":3876,"inV":172,"properties":{"weight":2}},{"id":3877,"inV":41,"properties":{"weight":11}}],"sungBy":[{"id":7114,"inV":340}],"writtenBy":[{"id":7113,"inV":339}]},"properties":{"name":[{"id":177,"value":"CRAZY FINGERS"}],"songType":[{"id":179,"value":"original"}],"performances":[{"id":178,"value":144}]}}
-{"id":61,"label":"song","inE":{"followedBy":[{"id":1633,"outV":210,"properties":{"weight":1}},{"id":67,"outV":46,"properties":{"weight":2}},{"id":1315,"outV":161,"properties":{"weight":1}},{"id":2372,"outV":87,"properties":{"weight":1}},{"id":3302,"outV":160,"properties":{"weight":2}},{"id":6918,"outV":133,"properties":{"weight":1}},{"id":6184,"outV":36,"properties":{"weight":1}},{"id":4011,"outV":292,"properties":{"weight":1}},{"id":5068,"outV":128,"properties":{"weight":1}},{"id":3117,"outV":153,"properties":{"weight":1}},{"id":946,"outV":67,"properties":{"weight":1}},{"id":4818,"outV":114,"properties":{"weight":2}},{"id":2579,"outV":57,"properties":{"weight":1}},{"id":4502,"outV":202,"properties":{"weight":1}},{"id":3738,"outV":3,"properties":{"weight":3}},{"id":6619,"outV":127,"properties":{"weight":2}},{"id":2876,"outV":101,"properties":{"weight":1}},{"id":4348,"outV":62,"properties":{"weight":1}},{"id":6429,"outV":134,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5856,"inV":32,"properties":{"weight":1}},{"id":5857,"inV":39,"properties":{"weight":1}},{"id":5858,"inV":35,"properties":{"weight":1}},{"id":5842,"inV":160,"properties":{"weight":3}},{"id":5843,"inV":336,"properties":{"weight":1}},{"id":5844,"inV":59,"properties":{"weight":3}},{"id":5845,"inV":268,"properties":{"weight":2}},{"id":5846,"inV":62,"properties":{"weight":1}},{"id":5847,"inV":4,"properties":{"weight":2}},{"id":5848,"inV":65,"properties":{"weight":1}},{"id":5849,"inV":38,"properties":{"weight":2}},{"id":5850,"inV":18,"properties":{"weight":1}},{"id":5851,"inV":78,"properties":{"weight":1}},{"id":5852,"inV":64,"properties":{"weight":2}},{"id":5853,"inV":84,"properties":{"weight":1}},{"id":5854,"inV":27,"properties":{"weight":1}},{"id":5855,"inV":21,"properties":{"weight":1}}]},"properties":{"name":[{"id":180,"value":"MIDNIGHT HOUR"}],"songType":[{"id":182,"value":""}],"performances":[{"id":181,"value":0}]}}
-{"id":62,"label":"song","inE":{"followedBy":[{"id":256,"outV":150,"properties":{"weight":5}},{"id":1920,"outV":103,"properties":{"weight":5}},{"id":2817,"outV":15,"properties":{"weight":1}},{"id":6913,"outV":133,"properties":{"weight":1}},{"id":4996,"outV":30,"properties":{"weight":2}},{"id":1678,"outV":124,"properties":{"weight":3}},{"id":5134,"outV":222,"properties":{"weight":1}},{"id":3599,"outV":56,"properties":{"weight":1}},{"id":4495,"outV":202,"properties":{"weight":1}},{"id":5397,"outV":69,"properties":{"weight":2}},{"id":3479,"outV":58,"properties":{"weight":4}},{"id":2459,"outV":68,"properties":{"weight":2}},{"id":6557,"outV":172,"properties":{"weight":1}},{"id":3102,"outV":153,"properties":{"weight":5}},{"id":6177,"outV":36,"properties":{"weight":1}},{"id":1826,"outV":41,"properties":{"weight":1}},{"id":3748,"outV":3,"properties":{"weight":2}},{"id":2089,"outV":188,"properties":{"weight":2}},{"id":2734,"outV":13,"properties":{"weight":1}},{"id":5552,"outV":166,"properties":{"weight":1}},{"id":6577,"outV":116,"properties":{"weight":2}},{"id":5170,"outV":71,"properties":{"weight":1}},{"id":1204,"outV":26,"properties":{"weight":6}},{"id":4532,"outV":105,"properties":{"weight":1}},{"id":6969,"outV":84,"properties":{"weight":1}},{"id":2875,"outV":101,"properties":{"weight":8}},{"id":828,"outV":171,"properties":{"weight":1}},{"id":1340,"outV":31,"properties":{"weight":1}},{"id":4412,"outV":327,"properties":{"weight":1}},{"id":5821,"outV":76,"properties":{"weight":4}},{"id":2366,"outV":87,"properties":{"weight":2}},{"id":2495,"outV":90,"properties":{"weight":1}},{"id":6207,"outV":319,"properties":{"weight":1}},{"id":4416,"outV":198,"properties":{"weight":1}},{"id":1473,"outV":81,"properties":{"weight":1}},{"id":68,"outV":46,"properties":{"weight":7}},{"id":6980,"outV":175,"properties":{"weight":1}},{"id":4805,"outV":114,"properties":{"weight":4}},{"id":968,"outV":67,"properties":{"weight":1}},{"id":586,"outV":120,"properties":{"weight":2}},{"id":971,"outV":233,"properties":{"weight":1}},{"id":1995,"outV":152,"properties":{"weight":2}},{"id":5327,"outV":238,"properties":{"weight":1}},{"id":336,"outV":34,"properties":{"weight":3}},{"id":6864,"outV":64,"properties":{"weight":3}},{"id":2257,"outV":29,"properties":{"weight":1}},{"id":6357,"outV":21,"properties":{"weight":1}},{"id":4438,"outV":113,"properties":{"weight":1}},{"id":5846,"outV":61,"properties":{"weight":1}},{"id":1626,"outV":210,"properties":{"weight":7}},{"id":5210,"outV":99,"properties":{"weight":2}},{"id":6108,"outV":72,"properties":{"weight":10}},{"id":5341,"outV":165,"properties":{"weight":1}},{"id":3040,"outV":14,"properties":{"weight":1}},{"id":3298,"outV":160,"properties":{"weight":4}},{"id":3815,"outV":88,"properties":{"weight":3}},{"id":1641,"outV":213,"properties":{"weight":5}},{"id":5481,"outV":79,"properties":{"weight":2}},{"id":6506,"outV":187,"properties":{"weight":1}},{"id":6252,"outV":117,"properties":{"weight":1}},{"id":4977,"outV":236,"properties":{"weight":1}},{"id":2164,"outV":151,"properties":{"weight":1}},{"id":2552,"outV":57,"properties":{"weight":3}},{"id":5881,"outV":96,"properties":{"weight":15}},{"id":1658,"outV":262,"properties":{"weight":1}},{"id":6015,"outV":204,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":4352,"inV":215,"properties":{"weight":2}},{"id":4353,"inV":56,"properties":{"weight":2}},{"id":4354,"inV":23,"properties":{"weight":4}},{"id":4355,"inV":68,"properties":{"weight":2}},{"id":4356,"inV":65,"properties":{"weight":1}},{"id":4357,"inV":64,"properties":{"weight":3}},{"id":4358,"inV":88,"properties":{"weight":11}},{"id":4359,"inV":50,"properties":{"weight":5}},{"id":4360,"inV":18,"properties":{"weight":1}},{"id":4361,"inV":85,"properties":{"weight":6}},{"id":4362,"inV":80,"properties":{"weight":1}},{"id":4363,"inV":76,"properties":{"weight":5}},{"id":4364,"inV":14,"properties":{"weight":16}},{"id":4365,"inV":83,"properties":{"weight":1}},{"id":4366,"inV":97,"properties":{"weight":2}},{"id":4367,"inV":69,"properties":{"weight":1}},{"id":4368,"inV":30,"properties":{"weight":8}},{"id":4369,"inV":203,"properties":{"weight":2}},{"id":4370,"inV":223,"properties":{"weight":1}},{"id":4371,"inV":36,"properties":{"weight":8}},{"id":4372,"inV":38,"properties":{"weight":4}},{"id":4373,"inV":106,"properties":{"weight":1}},{"id":4374,"inV":165,"properties":{"weight":3}},{"id":4375,"inV":204,"properties":{"weight":1}},{"id":4376,"inV":257,"properties":{"weight":1}},{"id":4377,"inV":34,"properties":{"weight":3}},{"id":4378,"inV":197,"properties":{"weight":1}},{"id":4379,"inV":77,"properties":{"weight":1}},{"id":4380,"inV":89,"properties":{"weight":1}},{"id":4381,"inV":92,"properties":{"weight":1}},{"id":4382,"inV":79,"properties":{"weight":1}},{"id":4383,"inV":1,"properties":{"weight":1}},{"id":4384,"inV":41,"properties":{"weight":5}},{"id":4385,"inV":33,"properties":{"weight":1}},{"id":4386,"inV":292,"properties":{"weight":1}},{"id":4387,"inV":28,"properties":{"weight":2}},{"id":4388,"inV":172,"properties":{"weight":3}},{"id":4389,"inV":35,"properties":{"weight":1}},{"id":4332,"inV":153,"properties":{"weight":3}},{"id":4333,"inV":134,"properties":{"weight":1}},{"id":4334,"inV":94,"properties":{"weight":3}},{"id":4335,"inV":3,"properties":{"weight":1}},{"id":4336,"inV":148,"properties":{"weight":3}},{"id":4337,"inV":25,"properties":{"weight":2}},{"id":4338,"inV":70,"properties":{"weight":2}},{"id":4339,"inV":125,"properties":{"weight":1}},{"id":4340,"inV":20,"properties":{"weight":1}},{"id":4341,"inV":198,"properties":{"weight":2}},{"id":4342,"inV":114,"properties":{"weight":1}},{"id":4343,"inV":127,"properties":{"weight":1}},{"id":4344,"inV":13,"properties":{"weight":12}},{"id":4345,"inV":181,"properties":{"weight":4}},{"id":4346,"inV":32,"properties":{"weight":8}},{"id":4347,"inV":21,"properties":{"weight":3}},{"id":4348,"inV":61,"properties":{"weight":1}},{"id":4349,"inV":19,"properties":{"weight":1}},{"id":4350,"inV":26,"properties":{"weight":1}},{"id":4351,"inV":10,"properties":{"weight":2}}],"sungBy":[{"id":7674,"inV":340}],"writtenBy":[{"id":7673,"inV":446}]},"properties":{"name":[{"id":183,"value":"IKO IKO"}],"songType":[{"id":185,"value":"cover"}],"performances":[{"id":184,"value":185}]}}
-{"id":63,"label":"song","inE":{"followedBy":[{"id":1346,"outV":31,"properties":{"weight":2}},{"id":5442,"outV":239,"properties":{"weight":1}},{"id":69,"outV":46,"properties":{"weight":1}},{"id":4293,"outV":10,"properties":{"weight":3}},{"id":137,"outV":97,"properties":{"weight":2}},{"id":3529,"outV":223,"properties":{"weight":1}},{"id":650,"outV":23,"properties":{"weight":1}},{"id":5195,"outV":99,"properties":{"weight":1}},{"id":5774,"outV":76,"properties":{"weight":13}},{"id":2448,"outV":68,"properties":{"weight":1}},{"id":5588,"outV":42,"properties":{"weight":4}},{"id":3349,"outV":184,"properties":{"weight":5}},{"id":3669,"outV":24,"properties":{"weight":3}},{"id":2135,"outV":17,"properties":{"weight":1}},{"id":6488,"outV":187,"properties":{"weight":1}},{"id":4441,"outV":113,"properties":{"weight":1}},{"id":5274,"outV":32,"properties":{"weight":4}},{"id":3422,"outV":77,"properties":{"weight":2}},{"id":1700,"outV":124,"properties":{"weight":1}},{"id":4068,"outV":109,"properties":{"weight":3}},{"id":422,"outV":38,"properties":{"weight":1}},{"id":1192,"outV":26,"properties":{"weight":1}},{"id":2346,"outV":87,"properties":{"weight":1}},{"id":2796,"outV":15,"properties":{"weight":5}},{"id":2094,"outV":188,"properties":{"weight":2}},{"id":881,"outV":189,"properties":{"weight":1}},{"id":6258,"outV":117,"properties":{"weight":1}},{"id":1591,"outV":18,"properties":{"weight":2}},{"id":2297,"outV":25,"properties":{"weight":1}},{"id":5498,"outV":131,"properties":{"weight":2}},{"id":5755,"outV":129,"properties":{"weight":1}},{"id":4991,"outV":30,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":3216,"inV":26,"properties":{"weight":2}},{"id":3217,"inV":103,"properties":{"weight":4}},{"id":3218,"inV":101,"properties":{"weight":6}},{"id":3219,"inV":14,"properties":{"weight":2}},{"id":3220,"inV":76,"properties":{"weight":1}},{"id":3221,"inV":3,"properties":{"weight":1}},{"id":3222,"inV":153,"properties":{"weight":1}},{"id":3223,"inV":110,"properties":{"weight":1}},{"id":3224,"inV":15,"properties":{"weight":2}},{"id":3225,"inV":12,"properties":{"weight":4}},{"id":3226,"inV":32,"properties":{"weight":2}},{"id":3227,"inV":85,"properties":{"weight":7}},{"id":3228,"inV":189,"properties":{"weight":1}},{"id":3229,"inV":109,"properties":{"weight":1}},{"id":3230,"inV":181,"properties":{"weight":4}},{"id":3231,"inV":121,"properties":{"weight":1}},{"id":3232,"inV":112,"properties":{"weight":1}},{"id":3233,"inV":88,"properties":{"weight":2}},{"id":3234,"inV":21,"properties":{"weight":1}},{"id":3235,"inV":96,"properties":{"weight":1}},{"id":3236,"inV":49,"properties":{"weight":1}},{"id":3237,"inV":10,"properties":{"weight":3}},{"id":3238,"inV":18,"properties":{"weight":1}},{"id":3239,"inV":64,"properties":{"weight":1}},{"id":3240,"inV":71,"properties":{"weight":1}},{"id":3241,"inV":117,"properties":{"weight":3}},{"id":3242,"inV":30,"properties":{"weight":1}},{"id":3243,"inV":24,"properties":{"weight":1}},{"id":3244,"inV":68,"properties":{"weight":3}},{"id":3245,"inV":77,"properties":{"weight":2}},{"id":3246,"inV":188,"properties":{"weight":1}},{"id":3247,"inV":42,"properties":{"weight":3}},{"id":3248,"inV":57,"properties":{"weight":1}},{"id":3249,"inV":131,"properties":{"weight":1}},{"id":3250,"inV":43,"properties":{"weight":1}},{"id":3251,"inV":174,"properties":{"weight":2}},{"id":3252,"inV":158,"properties":{"weight":1}}],"sungBy":[{"id":7192,"inV":340}],"writtenBy":[{"id":7191,"inV":339}]},"properties":{"name":[{"id":186,"value":"HIGH TIME"}],"songType":[{"id":188,"value":"original"}],"performances":[{"id":187,"value":133}]}}
-{"id":64,"label":"song","inE":{"followedBy":[{"id":2560,"outV":57,"properties":{"weight":5}},{"id":2944,"outV":78,"properties":{"weight":2}},{"id":2818,"outV":15,"properties":{"weight":1}},{"id":4357,"outV":62,"properties":{"weight":3}},{"id":4487,"outV":202,"properties":{"weight":1}},{"id":6023,"outV":204,"properties":{"weight":7}},{"id":1289,"outV":27,"properties":{"weight":6}},{"id":3593,"outV":56,"properties":{"weight":1}},{"id":3466,"outV":58,"properties":{"weight":14}},{"id":6922,"outV":133,"properties":{"weight":1}},{"id":1037,"outV":73,"properties":{"weight":4}},{"id":3341,"outV":155,"properties":{"weight":1}},{"id":2062,"outV":92,"properties":{"weight":1}},{"id":1680,"outV":124,"properties":{"weight":8}},{"id":2321,"outV":25,"properties":{"weight":2}},{"id":658,"outV":23,"properties":{"weight":2}},{"id":1811,"outV":199,"properties":{"weight":1}},{"id":2452,"outV":68,"properties":{"weight":3}},{"id":3736,"outV":3,"properties":{"weight":2}},{"id":159,"outV":108,"properties":{"weight":2}},{"id":3239,"outV":63,"properties":{"weight":1}},{"id":3114,"outV":153,"properties":{"weight":7}},{"id":1841,"outV":275,"properties":{"weight":2}},{"id":306,"outV":5,"properties":{"weight":1}},{"id":4915,"outV":100,"properties":{"weight":2}},{"id":1076,"outV":227,"properties":{"weight":3}},{"id":4535,"outV":105,"properties":{"weight":1}},{"id":1208,"outV":26,"properties":{"weight":2}},{"id":5432,"outV":217,"properties":{"weight":2}},{"id":698,"outV":157,"properties":{"weight":1}},{"id":2491,"outV":90,"properties":{"weight":4}},{"id":6972,"outV":84,"properties":{"weight":1}},{"id":2880,"outV":101,"properties":{"weight":2}},{"id":2369,"outV":87,"properties":{"weight":8}},{"id":70,"outV":46,"properties":{"weight":3}},{"id":5066,"outV":128,"properties":{"weight":1}},{"id":588,"outV":120,"properties":{"weight":4}},{"id":1741,"outV":82,"properties":{"weight":3}},{"id":3917,"outV":51,"properties":{"weight":1}},{"id":463,"outV":193,"properties":{"weight":2}},{"id":4817,"outV":114,"properties":{"weight":9}},{"id":4949,"outV":86,"properties":{"weight":3}},{"id":6229,"outV":117,"properties":{"weight":1}},{"id":1495,"outV":164,"properties":{"weight":9}},{"id":5209,"outV":99,"properties":{"weight":2}},{"id":5339,"outV":165,"properties":{"weight":2}},{"id":5852,"outV":61,"properties":{"weight":2}},{"id":6621,"outV":127,"properties":{"weight":5}},{"id":3678,"outV":24,"properties":{"weight":1}},{"id":1631,"outV":210,"properties":{"weight":1}},{"id":3296,"outV":160,"properties":{"weight":8}},{"id":3814,"outV":88,"properties":{"weight":1}},{"id":6503,"outV":187,"properties":{"weight":1}},{"id":1128,"outV":59,"properties":{"weight":1}},{"id":4328,"outV":110,"properties":{"weight":1}},{"id":4201,"outV":54,"properties":{"weight":7}},{"id":747,"outV":80,"properties":{"weight":2}},{"id":3179,"outV":104,"properties":{"weight":3}},{"id":6124,"outV":72,"properties":{"weight":3}},{"id":5229,"outV":216,"properties":{"weight":1}},{"id":5615,"outV":42,"properties":{"weight":2}},{"id":1648,"outV":213,"properties":{"weight":7}},{"id":5236,"outV":214,"properties":{"weight":2}},{"id":5364,"outV":132,"properties":{"weight":1}},{"id":4982,"outV":236,"properties":{"weight":1}},{"id":887,"outV":140,"properties":{"weight":2}},{"id":1916,"outV":103,"properties":{"weight":1}},{"id":253,"outV":150,"properties":{"weight":14}},{"id":3327,"outV":268,"properties":{"weight":1}},{"id":6527,"outV":211,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":6823,"inV":210,"properties":{"weight":4}},{"id":6824,"inV":57,"properties":{"weight":6}},{"id":6825,"inV":51,"properties":{"weight":5}},{"id":6826,"inV":99,"properties":{"weight":7}},{"id":6827,"inV":72,"properties":{"weight":8}},{"id":6828,"inV":56,"properties":{"weight":4}},{"id":6829,"inV":73,"properties":{"weight":6}},{"id":6830,"inV":54,"properties":{"weight":1}},{"id":6831,"inV":19,"properties":{"weight":7}},{"id":6832,"inV":59,"properties":{"weight":67}},{"id":6833,"inV":82,"properties":{"weight":7}},{"id":6834,"inV":58,"properties":{"weight":1}},{"id":6835,"inV":12,"properties":{"weight":1}},{"id":6836,"inV":27,"properties":{"weight":3}},{"id":6837,"inV":180,"properties":{"weight":1}},{"id":6838,"inV":108,"properties":{"weight":2}},{"id":6839,"inV":100,"properties":{"weight":2}},{"id":6840,"inV":87,"properties":{"weight":3}},{"id":6841,"inV":110,"properties":{"weight":1}},{"id":6842,"inV":80,"properties":{"weight":3}},{"id":6843,"inV":69,"properties":{"weight":3}},{"id":6844,"inV":53,"properties":{"weight":2}},{"id":6845,"inV":68,"properties":{"weight":1}},{"id":6846,"inV":48,"properties":{"weight":4}},{"id":6847,"inV":17,"properties":{"weight":7}},{"id":6848,"inV":103,"properties":{"weight":1}},{"id":6849,"inV":242,"properties":{"weight":1}},{"id":6850,"inV":112,"properties":{"weight":1}},{"id":6851,"inV":60,"properties":{"weight":2}},{"id":6852,"inV":299,"properties":{"weight":1}},{"id":6853,"inV":91,"properties":{"weight":1}},{"id":6854,"inV":105,"properties":{"weight":1}},{"id":6855,"inV":4,"properties":{"weight":12}},{"id":6856,"inV":45,"properties":{"weight":1}},{"id":6857,"inV":49,"properties":{"weight":1}},{"id":6858,"inV":74,"properties":{"weight":1}},{"id":6859,"inV":10,"properties":{"weight":1}},{"id":6860,"inV":154,"properties":{"weight":1}},{"id":6861,"inV":23,"properties":{"weight":1}},{"id":6862,"inV":223,"properties":{"weight":1}},{"id":6863,"inV":75,"properties":{"weight":1}},{"id":6864,"inV":62,"properties":{"weight":3}},{"id":6865,"inV":171,"properties":{"weight":3}},{"id":6866,"inV":46,"properties":{"weight":1}},{"id":6867,"inV":78,"properties":{"weight":6}},{"id":6868,"inV":81,"properties":{"weight":1}},{"id":6869,"inV":34,"properties":{"weight":1}},{"id":6870,"inV":104,"properties":{"weight":1}},{"id":6871,"inV":31,"properties":{"weight":2}},{"id":6872,"inV":30,"properties":{"weight":1}},{"id":6873,"inV":167,"properties":{"weight":1}},{"id":6874,"inV":76,"properties":{"weight":1}},{"id":6875,"inV":84,"properties":{"weight":1}},{"id":6876,"inV":239,"properties":{"weight":1}},{"id":6877,"inV":40,"properties":{"weight":1}},{"id":6878,"inV":173,"properties":{"weight":1}},{"id":6879,"inV":191,"properties":{"weight":1}},{"id":6880,"inV":42,"properties":{"weight":1}},{"id":6881,"inV":32,"properties":{"weight":1}},{"id":6882,"inV":190,"properties":{"weight":1}},{"id":6883,"inV":272,"properties":{"weight":1}}],"sungBy":[{"id":7186,"inV":381}],"writtenBy":[{"id":7185,"inV":350}]},"properties":{"name":[{"id":189,"value":"HELL IN A BUCKET"}],"songType":[{"id":191,"value":"original"}],"performances":[{"id":190,"value":216}]}}
-{"id":65,"label":"song","inE":{"followedBy":[{"id":2625,"outV":158,"properties":{"weight":1}},{"id":2945,"outV":78,"properties":{"weight":1}},{"id":4801,"outV":114,"properties":{"weight":10}},{"id":3971,"outV":106,"properties":{"weight":1}},{"id":4356,"outV":62,"properties":{"weight":1}},{"id":1669,"outV":124,"properties":{"weight":9}},{"id":71,"outV":46,"properties":{"weight":1}},{"id":5127,"outV":222,"properties":{"weight":10}},{"id":2312,"outV":25,"properties":{"weight":5}},{"id":3021,"outV":14,"properties":{"weight":2}},{"id":6158,"outV":36,"properties":{"weight":1}},{"id":6611,"outV":127,"properties":{"weight":1}},{"id":3284,"outV":160,"properties":{"weight":15}},{"id":5848,"outV":61,"properties":{"weight":1}},{"id":3098,"outV":153,"properties":{"weight":15}},{"id":6362,"outV":21,"properties":{"weight":1}},{"id":1627,"outV":210,"properties":{"weight":4}},{"id":6107,"outV":72,"properties":{"weight":4}},{"id":6491,"outV":187,"properties":{"weight":1}},{"id":2460,"outV":68,"properties":{"weight":1}},{"id":7005,"outV":197,"properties":{"weight":1}},{"id":5280,"outV":32,"properties":{"weight":1}},{"id":801,"outV":122,"properties":{"weight":7}},{"id":5026,"outV":30,"properties":{"weight":1}},{"id":292,"outV":5,"properties":{"weight":1}},{"id":5988,"outV":50,"properties":{"weight":4}},{"id":6951,"outV":84,"properties":{"weight":1}},{"id":1644,"outV":213,"properties":{"weight":3}},{"id":2732,"outV":13,"properties":{"weight":2}},{"id":1902,"outV":103,"properties":{"weight":3}},{"id":2545,"outV":57,"properties":{"weight":3}},{"id":4082,"outV":109,"properties":{"weight":1}},{"id":565,"outV":120,"properties":{"weight":15}},{"id":5559,"outV":162,"properties":{"weight":1}},{"id":380,"outV":74,"properties":{"weight":2}},{"id":2492,"outV":90,"properties":{"weight":1}},{"id":6524,"outV":211,"properties":{"weight":2}},{"id":1534,"outV":164,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6379,"inV":26,"properties":{"weight":58}},{"id":6380,"inV":23,"properties":{"weight":59}},{"id":6381,"inV":80,"properties":{"weight":3}},{"id":6382,"inV":36,"properties":{"weight":1}},{"id":6383,"inV":114,"properties":{"weight":2}},{"id":6384,"inV":18,"properties":{"weight":1}},{"id":6385,"inV":38,"properties":{"weight":2}},{"id":6386,"inV":160,"properties":{"weight":1}},{"id":6387,"inV":50,"properties":{"weight":2}},{"id":6388,"inV":58,"properties":{"weight":1}},{"id":6389,"inV":116,"properties":{"weight":1}},{"id":6390,"inV":188,"properties":{"weight":1}},{"id":6391,"inV":19,"properties":{"weight":2}},{"id":6392,"inV":30,"properties":{"weight":1}}],"sungBy":[{"id":7048,"inV":340}],"writtenBy":[{"id":7047,"inV":339}]},"properties":{"name":[{"id":192,"value":"ALABAMA GETAWAY"}],"songType":[{"id":194,"value":"original"}],"performances":[{"id":193,"value":141}]}}
-{"id":66,"label":"song","inE":{"followedBy":[{"id":4503,"outV":202,"properties":{"weight":1}},{"id":4743,"outV":186,"properties":{"weight":3}},{"id":72,"outV":46,"properties":{"weight":1}},{"id":3032,"outV":14,"properties":{"weight":1}},{"id":1977,"outV":148,"properties":{"weight":1}},{"id":3550,"outV":201,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4000,"inV":153,"properties":{"weight":1}},{"id":4001,"inV":164,"properties":{"weight":1}},{"id":4002,"inV":114,"properties":{"weight":2}},{"id":4003,"inV":29,"properties":{"weight":1}},{"id":4004,"inV":26,"properties":{"weight":1}},{"id":3998,"inV":103,"properties":{"weight":1}},{"id":3999,"inV":112,"properties":{"weight":1}}],"sungBy":[{"id":7992,"inV":340}],"writtenBy":[{"id":7991,"inV":447}]},"properties":{"name":[{"id":195,"value":"VISIONS OF JOHANNA"}],"songType":[{"id":197,"value":"cover"}],"performances":[{"id":196,"value":8}]}}
-{"id":67,"label":"song","inE":{"followedBy":[{"id":1632,"outV":210,"properties":{"weight":1}},{"id":2882,"outV":101,"properties":{"weight":2}},{"id":5762,"outV":129,"properties":{"weight":1}},{"id":2568,"outV":57,"properties":{"weight":1}},{"id":6505,"outV":187,"properties":{"weight":1}},{"id":74,"outV":46,"properties":{"weight":1}},{"id":1643,"outV":213,"properties":{"weight":1}},{"id":1389,"outV":130,"properties":{"weight":1}},{"id":210,"outV":70,"properties":{"weight":5}},{"id":1682,"outV":124,"properties":{"weight":2}},{"id":6707,"outV":141,"properties":{"weight":1}},{"id":2740,"outV":13,"properties":{"weight":1}},{"id":5912,"outV":96,"properties":{"weight":27}},{"id":5817,"outV":76,"properties":{"weight":1}},{"id":1498,"outV":164,"properties":{"weight":2}},{"id":6427,"outV":134,"properties":{"weight":31}},{"id":3036,"outV":14,"properties":{"weight":1}},{"id":3997,"outV":247,"properties":{"weight":1}},{"id":5213,"outV":99,"properties":{"weight":1}},{"id":5567,"outV":162,"properties":{"weight":1}},{"id":6175,"outV":36,"properties":{"weight":2}},{"id":6367,"outV":21,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":960,"inV":13,"properties":{"weight":2}},{"id":961,"inV":59,"properties":{"weight":1}},{"id":962,"inV":5,"properties":{"weight":5}},{"id":963,"inV":165,"properties":{"weight":15}},{"id":964,"inV":127,"properties":{"weight":10}},{"id":965,"inV":150,"properties":{"weight":1}},{"id":966,"inV":123,"properties":{"weight":1}},{"id":967,"inV":232,"properties":{"weight":1}},{"id":968,"inV":62,"properties":{"weight":1}},{"id":969,"inV":92,"properties":{"weight":3}},{"id":970,"inV":70,"properties":{"weight":1}},{"id":941,"inV":96,"properties":{"weight":1}},{"id":942,"inV":74,"properties":{"weight":1}},{"id":943,"inV":23,"properties":{"weight":2}},{"id":944,"inV":128,"properties":{"weight":1}},{"id":945,"inV":21,"properties":{"weight":2}},{"id":946,"inV":61,"properties":{"weight":1}},{"id":947,"inV":94,"properties":{"weight":7}},{"id":948,"inV":148,"properties":{"weight":1}},{"id":949,"inV":32,"properties":{"weight":1}},{"id":950,"inV":29,"properties":{"weight":2}},{"id":951,"inV":19,"properties":{"weight":2}},{"id":952,"inV":49,"properties":{"weight":2}},{"id":953,"inV":134,"properties":{"weight":4}},{"id":954,"inV":130,"properties":{"weight":10}},{"id":955,"inV":75,"properties":{"weight":1}},{"id":956,"inV":125,"properties":{"weight":5}},{"id":957,"inV":57,"properties":{"weight":1}},{"id":958,"inV":88,"properties":{"weight":1}},{"id":959,"inV":110,"properties":{"weight":1}}]},"properties":{"name":[{"id":198,"value":"GIMME SOME LOVIN"}],"songType":[{"id":200,"value":""}],"performances":[{"id":199,"value":0}]}}
-{"id":68,"label":"song","inE":{"followedBy":[{"id":898,"outV":140,"properties":{"weight":1}},{"id":4355,"outV":62,"properties":{"weight":2}},{"id":132,"outV":97,"properties":{"weight":1}},{"id":6404,"outV":134,"properties":{"weight":1}},{"id":3973,"outV":106,"properties":{"weight":4}},{"id":5253,"outV":32,"properties":{"weight":3}},{"id":646,"outV":23,"properties":{"weight":2}},{"id":3718,"outV":3,"properties":{"weight":1}},{"id":398,"outV":74,"properties":{"weight":1}},{"id":4116,"outV":48,"properties":{"weight":9}},{"id":1174,"outV":26,"properties":{"weight":3}},{"id":153,"outV":108,"properties":{"weight":4}},{"id":1817,"outV":273,"properties":{"weight":2}},{"id":4635,"outV":154,"properties":{"weight":2}},{"id":2206,"outV":75,"properties":{"weight":7}},{"id":6560,"outV":172,"properties":{"weight":1}},{"id":4898,"outV":100,"properties":{"weight":21}},{"id":6050,"outV":115,"properties":{"weight":2}},{"id":421,"outV":38,"properties":{"weight":2}},{"id":5670,"outV":167,"properties":{"weight":1}},{"id":2088,"outV":188,"properties":{"weight":2}},{"id":2603,"outV":112,"properties":{"weight":2}},{"id":3244,"outV":63,"properties":{"weight":3}},{"id":4527,"outV":105,"properties":{"weight":10}},{"id":6580,"outV":116,"properties":{"weight":1}},{"id":4279,"outV":10,"properties":{"weight":2}},{"id":5309,"outV":170,"properties":{"weight":5}},{"id":6845,"outV":64,"properties":{"weight":1}},{"id":1598,"outV":18,"properties":{"weight":2}},{"id":3518,"outV":223,"properties":{"weight":1}},{"id":4798,"outV":114,"properties":{"weight":2}},{"id":1983,"outV":253,"properties":{"weight":1}},{"id":3904,"outV":51,"properties":{"weight":8}},{"id":6976,"outV":84,"properties":{"weight":1}},{"id":4417,"outV":198,"properties":{"weight":1}},{"id":2117,"outV":17,"properties":{"weight":25}},{"id":5190,"outV":99,"properties":{"weight":1}},{"id":6086,"outV":72,"properties":{"weight":1}},{"id":6471,"outV":187,"properties":{"weight":2}},{"id":3656,"outV":24,"properties":{"weight":7}},{"id":75,"outV":46,"properties":{"weight":2}},{"id":3531,"outV":201,"properties":{"weight":1}},{"id":5581,"outV":42,"properties":{"weight":1}},{"id":1999,"outV":152,"properties":{"weight":1}},{"id":2897,"outV":118,"properties":{"weight":1}},{"id":1106,"outV":59,"properties":{"weight":11}},{"id":3410,"outV":77,"properties":{"weight":1}},{"id":723,"outV":80,"properties":{"weight":18}},{"id":3155,"outV":104,"properties":{"weight":17}},{"id":4051,"outV":173,"properties":{"weight":2}},{"id":4180,"outV":54,"properties":{"weight":18}},{"id":2646,"outV":137,"properties":{"weight":2}},{"id":7002,"outV":197,"properties":{"weight":1}},{"id":4699,"outV":111,"properties":{"weight":2}},{"id":2526,"outV":57,"properties":{"weight":6}},{"id":5471,"outV":79,"properties":{"weight":1}},{"id":5983,"outV":50,"properties":{"weight":2}},{"id":5089,"outV":4,"properties":{"weight":2}},{"id":6754,"outV":53,"properties":{"weight":6}},{"id":2152,"outV":151,"properties":{"weight":1}},{"id":1513,"outV":164,"properties":{"weight":1}},{"id":3819,"outV":88,"properties":{"weight":1}},{"id":2797,"outV":15,"properties":{"weight":3}},{"id":2925,"outV":78,"properties":{"weight":4}},{"id":497,"outV":98,"properties":{"weight":8}},{"id":1265,"outV":27,"properties":{"weight":15}},{"id":2034,"outV":180,"properties":{"weight":3}},{"id":760,"outV":224,"properties":{"weight":2}},{"id":3449,"outV":58,"properties":{"weight":6}},{"id":1018,"outV":73,"properties":{"weight":16}},{"id":5500,"outV":131,"properties":{"weight":1}},{"id":3581,"outV":56,"properties":{"weight":20}},{"id":4479,"outV":202,"properties":{"weight":10}},{"id":6783,"outV":39,"properties":{"weight":5}}]},"outE":{"followedBy":[{"id":2432,"inV":105,"properties":{"weight":2}},{"id":2433,"inV":12,"properties":{"weight":1}},{"id":2434,"inV":27,"properties":{"weight":8}},{"id":2435,"inV":189,"properties":{"weight":1}},{"id":2436,"inV":103,"properties":{"weight":1}},{"id":2437,"inV":180,"properties":{"weight":3}},{"id":2438,"inV":273,"properties":{"weight":3}},{"id":2439,"inV":58,"properties":{"weight":3}},{"id":2440,"inV":111,"properties":{"weight":3}},{"id":2441,"inV":129,"properties":{"weight":5}},{"id":2442,"inV":197,"properties":{"weight":1}},{"id":2443,"inV":181,"properties":{"weight":1}},{"id":2444,"inV":106,"properties":{"weight":3}},{"id":2445,"inV":73,"properties":{"weight":11}},{"id":2446,"inV":170,"properties":{"weight":3}},{"id":2447,"inV":199,"properties":{"weight":1}},{"id":2448,"inV":63,"properties":{"weight":1}},{"id":2449,"inV":88,"properties":{"weight":2}},{"id":2450,"inV":53,"properties":{"weight":9}},{"id":2451,"inV":39,"properties":{"weight":2}},{"id":2452,"inV":64,"properties":{"weight":3}},{"id":2453,"inV":97,"properties":{"weight":2}},{"id":2454,"inV":72,"properties":{"weight":35}},{"id":2455,"inV":99,"properties":{"weight":8}},{"id":2456,"inV":108,"properties":{"weight":6}},{"id":2457,"inV":101,"properties":{"weight":2}},{"id":2458,"inV":26,"properties":{"weight":1}},{"id":2459,"inV":62,"properties":{"weight":2}},{"id":2460,"inV":65,"properties":{"weight":1}},{"id":2461,"inV":116,"properties":{"weight":1}},{"id":2462,"inV":75,"properties":{"weight":1}},{"id":2463,"inV":257,"properties":{"weight":1}},{"id":2464,"inV":4,"properties":{"weight":1}},{"id":2465,"inV":118,"properties":{"weight":1}},{"id":2466,"inV":167,"properties":{"weight":1}},{"id":2467,"inV":77,"properties":{"weight":1}},{"id":2468,"inV":87,"properties":{"weight":2}},{"id":2469,"inV":136,"properties":{"weight":1}},{"id":2470,"inV":152,"properties":{"weight":1}},{"id":2471,"inV":21,"properties":{"weight":1}},{"id":2472,"inV":175,"properties":{"weight":2}},{"id":2473,"inV":28,"properties":{"weight":1}},{"id":2474,"inV":202,"properties":{"weight":2}},{"id":2475,"inV":122,"properties":{"weight":1}},{"id":2476,"inV":76,"properties":{"weight":1}},{"id":2477,"inV":74,"properties":{"weight":1}},{"id":2478,"inV":96,"properties":{"weight":1}},{"id":2479,"inV":119,"properties":{"weight":1}},{"id":2480,"inV":5,"properties":{"weight":1}},{"id":2481,"inV":34,"properties":{"weight":1}},{"id":2482,"inV":83,"properties":{"weight":2}},{"id":2483,"inV":174,"properties":{"weight":1}},{"id":2484,"inV":217,"properties":{"weight":1}},{"id":2485,"inV":46,"properties":{"weight":1}},{"id":2486,"inV":176,"properties":{"weight":1}},{"id":2487,"inV":81,"properties":{"weight":1}},{"id":2488,"inV":9,"properties":{"weight":1}},{"id":2408,"inV":19,"properties":{"weight":5}},{"id":2409,"inV":104,"properties":{"weight":8}},{"id":2410,"inV":57,"properties":{"weight":34}},{"id":2411,"inV":15,"properties":{"weight":1}},{"id":2412,"inV":54,"properties":{"weight":28}},{"id":2413,"inV":17,"properties":{"weight":9}},{"id":2414,"inV":48,"properties":{"weight":10}},{"id":2415,"inV":100,"properties":{"weight":13}},{"id":2416,"inV":294,"properties":{"weight":1}},{"id":2417,"inV":51,"properties":{"weight":12}},{"id":2418,"inV":69,"properties":{"weight":1}},{"id":2419,"inV":98,"properties":{"weight":9}},{"id":2420,"inV":112,"properties":{"weight":4}},{"id":2421,"inV":82,"properties":{"weight":2}},{"id":2422,"inV":60,"properties":{"weight":1}},{"id":2423,"inV":59,"properties":{"weight":1}},{"id":2424,"inV":56,"properties":{"weight":20}},{"id":2425,"inV":80,"properties":{"weight":7}},{"id":2426,"inV":14,"properties":{"weight":4}},{"id":2427,"inV":10,"properties":{"weight":2}},{"id":2428,"inV":50,"properties":{"weight":3}},{"id":2429,"inV":24,"properties":{"weight":2}},{"id":2430,"inV":196,"properties":{"weight":3}},{"id":2431,"inV":18,"properties":{"weight":3}}],"sungBy":[{"id":7094,"inV":351}],"writtenBy":[{"id":7093,"inV":350}]},"properties":{"name":[{"id":201,"value":"CASSIDY"}],"songType":[{"id":203,"value":"original"}],"performances":[{"id":202,"value":334}]}}
-{"id":69,"label":"song","inE":{"followedBy":[{"id":1025,"outV":73,"properties":{"weight":1}},{"id":6401,"outV":134,"properties":{"weight":1}},{"id":642,"outV":23,"properties":{"weight":8}},{"id":4611,"outV":85,"properties":{"weight":1}},{"id":5767,"outV":76,"properties":{"weight":67}},{"id":3208,"outV":229,"properties":{"weight":4}},{"id":4367,"outV":62,"properties":{"weight":1}},{"id":1168,"outV":26,"properties":{"weight":5}},{"id":2704,"outV":13,"properties":{"weight":6}},{"id":403,"outV":38,"properties":{"weight":9}},{"id":6679,"outV":12,"properties":{"weight":3}},{"id":6168,"outV":36,"properties":{"weight":13}},{"id":1439,"outV":83,"properties":{"weight":2}},{"id":2336,"outV":290,"properties":{"weight":1}},{"id":2594,"outV":112,"properties":{"weight":1}},{"id":547,"outV":120,"properties":{"weight":12}},{"id":5667,"outV":167,"properties":{"weight":1}},{"id":3364,"outV":184,"properties":{"weight":1}},{"id":934,"outV":91,"properties":{"weight":1}},{"id":1958,"outV":148,"properties":{"weight":1}},{"id":1576,"outV":18,"properties":{"weight":3}},{"id":4648,"outV":154,"properties":{"weight":1}},{"id":4267,"outV":10,"properties":{"weight":2}},{"id":2220,"outV":75,"properties":{"weight":1}},{"id":6961,"outV":84,"properties":{"weight":3}},{"id":4786,"outV":114,"properties":{"weight":1}},{"id":3125,"outV":153,"properties":{"weight":1}},{"id":184,"outV":70,"properties":{"weight":2}},{"id":2361,"outV":87,"properties":{"weight":5}},{"id":3898,"outV":51,"properties":{"weight":1}},{"id":6843,"outV":64,"properties":{"weight":3}},{"id":3006,"outV":14,"properties":{"weight":2}},{"id":5062,"outV":257,"properties":{"weight":1}},{"id":76,"outV":46,"properties":{"weight":2}},{"id":848,"outV":171,"properties":{"weight":1}},{"id":337,"outV":34,"properties":{"weight":3}},{"id":5970,"outV":50,"properties":{"weight":7}},{"id":1748,"outV":82,"properties":{"weight":1}},{"id":5204,"outV":99,"properties":{"weight":1}},{"id":6487,"outV":187,"properties":{"weight":16}},{"id":5465,"outV":79,"properties":{"weight":1}},{"id":1882,"outV":103,"properties":{"weight":3}},{"id":1121,"outV":59,"properties":{"weight":3}},{"id":2786,"outV":15,"properties":{"weight":7}},{"id":5743,"outV":129,"properties":{"weight":1}},{"id":6895,"outV":93,"properties":{"weight":1}},{"id":240,"outV":145,"properties":{"weight":1}},{"id":2418,"outV":68,"properties":{"weight":1}},{"id":4085,"outV":109,"properties":{"weight":1}},{"id":6901,"outV":133,"properties":{"weight":1}},{"id":5110,"outV":4,"properties":{"weight":4}},{"id":4856,"outV":35,"properties":{"weight":1}},{"id":2174,"outV":208,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":5376,"inV":20,"properties":{"weight":1}},{"id":5377,"inV":50,"properties":{"weight":1}},{"id":5378,"inV":26,"properties":{"weight":3}},{"id":5379,"inV":15,"properties":{"weight":4}},{"id":5380,"inV":153,"properties":{"weight":3}},{"id":5381,"inV":290,"properties":{"weight":1}},{"id":5382,"inV":16,"properties":{"weight":4}},{"id":5383,"inV":25,"properties":{"weight":2}},{"id":5384,"inV":21,"properties":{"weight":20}},{"id":5385,"inV":18,"properties":{"weight":2}},{"id":5386,"inV":72,"properties":{"weight":1}},{"id":5387,"inV":4,"properties":{"weight":1}},{"id":5388,"inV":12,"properties":{"weight":1}},{"id":5389,"inV":39,"properties":{"weight":1}},{"id":5390,"inV":74,"properties":{"weight":5}},{"id":5391,"inV":54,"properties":{"weight":1}},{"id":5392,"inV":110,"properties":{"weight":5}},{"id":5393,"inV":76,"properties":{"weight":8}},{"id":5394,"inV":121,"properties":{"weight":1}},{"id":5395,"inV":120,"properties":{"weight":2}},{"id":5396,"inV":85,"properties":{"weight":59}},{"id":5397,"inV":62,"properties":{"weight":2}},{"id":5398,"inV":103,"properties":{"weight":1}},{"id":5399,"inV":49,"properties":{"weight":5}},{"id":5400,"inV":91,"properties":{"weight":5}},{"id":5401,"inV":181,"properties":{"weight":8}},{"id":5402,"inV":38,"properties":{"weight":1}},{"id":5403,"inV":83,"properties":{"weight":1}},{"id":5404,"inV":96,"properties":{"weight":11}},{"id":5405,"inV":60,"properties":{"weight":1}},{"id":5406,"inV":29,"properties":{"weight":1}},{"id":5407,"inV":102,"properties":{"weight":1}},{"id":5408,"inV":70,"properties":{"weight":2}},{"id":5409,"inV":106,"properties":{"weight":1}},{"id":5410,"inV":101,"properties":{"weight":1}},{"id":5411,"inV":286,"properties":{"weight":1}},{"id":5412,"inV":184,"properties":{"weight":1}},{"id":5413,"inV":238,"properties":{"weight":1}},{"id":5414,"inV":113,"properties":{"weight":3}},{"id":5415,"inV":36,"properties":{"weight":4}},{"id":5416,"inV":34,"properties":{"weight":1}},{"id":5417,"inV":89,"properties":{"weight":2}},{"id":5418,"inV":41,"properties":{"weight":6}},{"id":5419,"inV":28,"properties":{"weight":2}},{"id":5420,"inV":172,"properties":{"weight":1}},{"id":5374,"inV":13,"properties":{"weight":34}},{"id":5375,"inV":3,"properties":{"weight":1}}],"sungBy":[{"id":7324,"inV":340}],"writtenBy":[{"id":7323,"inV":339}]},"properties":{"name":[{"id":204,"value":"SHIP OF FOOLS"}],"songType":[{"id":206,"value":"original"}],"performances":[{"id":205,"value":225}]}}
-{"id":70,"label":"song","inE":{"followedBy":[{"id":2055,"outV":92,"properties":{"weight":1}},{"id":5895,"outV":96,"properties":{"weight":51}},{"id":3853,"outV":60,"properties":{"weight":2}},{"id":6797,"outV":39,"properties":{"weight":2}},{"id":3728,"outV":3,"properties":{"weight":2}},{"id":6423,"outV":134,"properties":{"weight":32}},{"id":6296,"outV":49,"properties":{"weight":3}},{"id":1433,"outV":83,"properties":{"weight":1}},{"id":6938,"outV":84,"properties":{"weight":1}},{"id":5150,"outV":125,"properties":{"weight":7}},{"id":799,"outV":122,"properties":{"weight":1}},{"id":4512,"outV":105,"properties":{"weight":4}},{"id":5408,"outV":69,"properties":{"weight":2}},{"id":1187,"outV":26,"properties":{"weight":2}},{"id":295,"outV":5,"properties":{"weight":13}},{"id":6311,"outV":123,"properties":{"weight":1}},{"id":1964,"outV":148,"properties":{"weight":4}},{"id":4653,"outV":154,"properties":{"weight":1}},{"id":3374,"outV":184,"properties":{"weight":1}},{"id":819,"outV":171,"properties":{"weight":1}},{"id":2742,"outV":13,"properties":{"weight":2}},{"id":1480,"outV":81,"properties":{"weight":1}},{"id":5449,"outV":231,"properties":{"weight":3}},{"id":970,"outV":67,"properties":{"weight":1}},{"id":5194,"outV":99,"properties":{"weight":1}},{"id":3915,"outV":51,"properties":{"weight":1}},{"id":5836,"outV":258,"properties":{"weight":1}},{"id":78,"outV":46,"properties":{"weight":1}},{"id":1870,"outV":94,"properties":{"weight":9}},{"id":2383,"outV":87,"properties":{"weight":1}},{"id":6354,"outV":21,"properties":{"weight":3}},{"id":6617,"outV":127,"properties":{"weight":1}},{"id":3164,"outV":104,"properties":{"weight":1}},{"id":4189,"outV":54,"properties":{"weight":1}},{"id":2143,"outV":286,"properties":{"weight":1}},{"id":5984,"outV":50,"properties":{"weight":1}},{"id":6498,"outV":187,"properties":{"weight":2}},{"id":2020,"outV":149,"properties":{"weight":3}},{"id":6120,"outV":72,"properties":{"weight":1}},{"id":1897,"outV":103,"properties":{"weight":2}},{"id":1387,"outV":130,"properties":{"weight":9}},{"id":2539,"outV":57,"properties":{"weight":15}},{"id":4716,"outV":186,"properties":{"weight":58}},{"id":2033,"outV":180,"properties":{"weight":1}},{"id":4081,"outV":109,"properties":{"weight":2}},{"id":4338,"outV":62,"properties":{"weight":2}},{"id":378,"outV":74,"properties":{"weight":6}},{"id":3578,"outV":56,"properties":{"weight":1}},{"id":1275,"outV":27,"properties":{"weight":1}},{"id":7035,"outV":89,"properties":{"weight":2}},{"id":252,"outV":150,"properties":{"weight":1}},{"id":5372,"outV":132,"properties":{"weight":1}},{"id":5757,"outV":129,"properties":{"weight":1}},{"id":2175,"outV":208,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":178,"inV":105,"properties":{"weight":2}},{"id":179,"inV":32,"properties":{"weight":1}},{"id":180,"inV":4,"properties":{"weight":46}},{"id":181,"inV":96,"properties":{"weight":4}},{"id":182,"inV":120,"properties":{"weight":7}},{"id":183,"inV":49,"properties":{"weight":1}},{"id":184,"inV":69,"properties":{"weight":2}},{"id":185,"inV":91,"properties":{"weight":1}},{"id":186,"inV":100,"properties":{"weight":1}},{"id":187,"inV":42,"properties":{"weight":1}},{"id":188,"inV":121,"properties":{"weight":1}},{"id":189,"inV":84,"properties":{"weight":2}},{"id":190,"inV":82,"properties":{"weight":1}},{"id":191,"inV":122,"properties":{"weight":2}},{"id":192,"inV":123,"properties":{"weight":1}},{"id":193,"inV":74,"properties":{"weight":4}},{"id":194,"inV":5,"properties":{"weight":8}},{"id":195,"inV":94,"properties":{"weight":30}},{"id":196,"inV":124,"properties":{"weight":1}},{"id":197,"inV":125,"properties":{"weight":27}},{"id":198,"inV":87,"properties":{"weight":1}},{"id":199,"inV":99,"properties":{"weight":1}},{"id":200,"inV":126,"properties":{"weight":1}},{"id":201,"inV":127,"properties":{"weight":18}},{"id":202,"inV":60,"properties":{"weight":4}},{"id":203,"inV":128,"properties":{"weight":1}},{"id":204,"inV":129,"properties":{"weight":3}},{"id":205,"inV":83,"properties":{"weight":1}},{"id":206,"inV":19,"properties":{"weight":1}},{"id":207,"inV":130,"properties":{"weight":21}},{"id":208,"inV":13,"properties":{"weight":2}},{"id":209,"inV":78,"properties":{"weight":1}},{"id":210,"inV":67,"properties":{"weight":5}},{"id":211,"inV":39,"properties":{"weight":1}},{"id":212,"inV":131,"properties":{"weight":1}},{"id":213,"inV":25,"properties":{"weight":1}},{"id":214,"inV":132,"properties":{"weight":13}},{"id":215,"inV":81,"properties":{"weight":1}},{"id":216,"inV":133,"properties":{"weight":1}},{"id":217,"inV":29,"properties":{"weight":1}},{"id":218,"inV":134,"properties":{"weight":4}},{"id":219,"inV":89,"properties":{"weight":1}},{"id":220,"inV":92,"properties":{"weight":20}},{"id":221,"inV":135,"properties":{"weight":1}},{"id":222,"inV":31,"properties":{"weight":1}},{"id":223,"inV":136,"properties":{"weight":6}},{"id":224,"inV":137,"properties":{"weight":2}},{"id":225,"inV":138,"properties":{"weight":9}},{"id":226,"inV":139,"properties":{"weight":1}},{"id":227,"inV":140,"properties":{"weight":2}},{"id":228,"inV":141,"properties":{"weight":1}},{"id":229,"inV":9,"properties":{"weight":1}}],"sungBy":[{"id":7196,"inV":351}],"writtenBy":[{"id":7195,"inV":350}]},"properties":{"name":[{"id":207,"value":"I NEED A MIRACLE"}],"songType":[{"id":209,"value":"original"}],"performances":[{"id":208,"value":271}]}}
-{"id":71,"label":"song","inE":{"followedBy":[{"id":3520,"outV":223,"properties":{"weight":3}},{"id":328,"outV":34,"properties":{"weight":1}},{"id":4490,"outV":202,"properties":{"weight":1}},{"id":3597,"outV":56,"properties":{"weight":3}},{"id":79,"outV":46,"properties":{"weight":1}},{"id":6802,"outV":39,"properties":{"weight":1}},{"id":2643,"outV":137,"properties":{"weight":1}},{"id":661,"outV":23,"properties":{"weight":1}},{"id":1302,"outV":27,"properties":{"weight":2}},{"id":2966,"outV":78,"properties":{"weight":1}},{"id":3478,"outV":58,"properties":{"weight":1}},{"id":5655,"outV":169,"properties":{"weight":1}},{"id":1689,"outV":124,"properties":{"weight":1}},{"id":2137,"outV":17,"properties":{"weight":1}},{"id":3930,"outV":51,"properties":{"weight":2}},{"id":2207,"outV":75,"properties":{"weight":2}},{"id":1057,"outV":73,"properties":{"weight":2}},{"id":4130,"outV":48,"properties":{"weight":4}},{"id":5285,"outV":32,"properties":{"weight":1}},{"id":3240,"outV":63,"properties":{"weight":1}},{"id":6761,"outV":53,"properties":{"weight":1}},{"id":2154,"outV":151,"properties":{"weight":1}},{"id":4204,"outV":54,"properties":{"weight":2}},{"id":1133,"outV":59,"properties":{"weight":1}},{"id":4018,"outV":191,"properties":{"weight":1}},{"id":6002,"outV":50,"properties":{"weight":1}},{"id":884,"outV":189,"properties":{"weight":1}},{"id":2744,"outV":13,"properties":{"weight":1}},{"id":3833,"outV":88,"properties":{"weight":1}},{"id":4921,"outV":100,"properties":{"weight":5}},{"id":3196,"outV":104,"properties":{"weight":4}},{"id":4540,"outV":105,"properties":{"weight":2}},{"id":4029,"outV":173,"properties":{"weight":1}},{"id":510,"outV":98,"properties":{"weight":3}},{"id":1470,"outV":81,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5160,"inV":75,"properties":{"weight":2}},{"id":5161,"inV":87,"properties":{"weight":1}},{"id":5162,"inV":72,"properties":{"weight":9}},{"id":5163,"inV":99,"properties":{"weight":2}},{"id":5164,"inV":184,"properties":{"weight":1}},{"id":5165,"inV":27,"properties":{"weight":5}},{"id":5166,"inV":54,"properties":{"weight":7}},{"id":5167,"inV":19,"properties":{"weight":1}},{"id":5168,"inV":96,"properties":{"weight":1}},{"id":5169,"inV":46,"properties":{"weight":1}},{"id":5170,"inV":62,"properties":{"weight":1}},{"id":5171,"inV":58,"properties":{"weight":3}},{"id":5172,"inV":53,"properties":{"weight":3}},{"id":5173,"inV":57,"properties":{"weight":6}},{"id":5174,"inV":51,"properties":{"weight":2}},{"id":5175,"inV":10,"properties":{"weight":1}},{"id":5176,"inV":81,"properties":{"weight":1}},{"id":5177,"inV":79,"properties":{"weight":2}},{"id":5178,"inV":170,"properties":{"weight":1}},{"id":5179,"inV":202,"properties":{"weight":2}},{"id":5180,"inV":89,"properties":{"weight":1}},{"id":5181,"inV":175,"properties":{"weight":1}},{"id":5182,"inV":105,"properties":{"weight":2}},{"id":5183,"inV":39,"properties":{"weight":1}}],"sungBy":[{"id":7530,"inV":351}],"writtenBy":[{"id":7529,"inV":447}]},"properties":{"name":[{"id":210,"value":"DESOLATION ROW"}],"songType":[{"id":212,"value":"cover"}],"performances":[{"id":211,"value":58}]}}
-{"id":72,"label":"song","inE":{"followedBy":[{"id":2946,"outV":78,"properties":{"weight":1}},{"id":5638,"outV":22,"properties":{"weight":1}},{"id":2313,"outV":25,"properties":{"weight":5}},{"id":5386,"outV":69,"properties":{"weight":1}},{"id":6157,"outV":36,"properties":{"weight":5}},{"id":5519,"outV":43,"properties":{"weight":7}},{"id":788,"outV":122,"properties":{"weight":1}},{"id":5269,"outV":32,"properties":{"weight":4}},{"id":6549,"outV":172,"properties":{"weight":1}},{"id":2454,"outV":68,"properties":{"weight":35}},{"id":4246,"outV":10,"properties":{"weight":4}},{"id":4504,"outV":202,"properties":{"weight":1}},{"id":1561,"outV":18,"properties":{"weight":5}},{"id":3099,"outV":153,"properties":{"weight":14}},{"id":2076,"outV":188,"properties":{"weight":3}},{"id":6044,"outV":115,"properties":{"weight":2}},{"id":413,"outV":38,"properties":{"weight":4}},{"id":3745,"outV":3,"properties":{"weight":1}},{"id":2978,"outV":8,"properties":{"weight":1}},{"id":6563,"outV":181,"properties":{"weight":1}},{"id":2729,"outV":13,"properties":{"weight":1}},{"id":5162,"outV":71,"properties":{"weight":9}},{"id":6827,"outV":64,"properties":{"weight":8}},{"id":2988,"outV":14,"properties":{"weight":26}},{"id":1200,"outV":26,"properties":{"weight":1}},{"id":2864,"outV":101,"properties":{"weight":16}},{"id":5808,"outV":76,"properties":{"weight":1}},{"id":5936,"outV":50,"properties":{"weight":8}},{"id":2610,"outV":158,"properties":{"weight":10}},{"id":3379,"outV":184,"properties":{"weight":3}},{"id":566,"outV":120,"properties":{"weight":17}},{"id":2358,"outV":87,"properties":{"weight":1}},{"id":3640,"outV":24,"properties":{"weight":3}},{"id":319,"outV":34,"properties":{"weight":3}},{"id":4802,"outV":114,"properties":{"weight":4}},{"id":5320,"outV":170,"properties":{"weight":1}},{"id":80,"outV":46,"properties":{"weight":4}},{"id":6225,"outV":117,"properties":{"weight":2}},{"id":978,"outV":11,"properties":{"weight":4}},{"id":2898,"outV":118,"properties":{"weight":1}},{"id":3794,"outV":88,"properties":{"weight":3}},{"id":5587,"outV":42,"properties":{"weight":6}},{"id":5333,"outV":165,"properties":{"weight":1}},{"id":5462,"outV":79,"properties":{"weight":6}},{"id":6614,"outV":127,"properties":{"weight":1}},{"id":4057,"outV":173,"properties":{"weight":2}},{"id":2778,"outV":15,"properties":{"weight":3}},{"id":2654,"outV":137,"properties":{"weight":1}},{"id":608,"outV":23,"properties":{"weight":3}},{"id":3429,"outV":77,"properties":{"weight":1}},{"id":358,"outV":74,"properties":{"weight":1}},{"id":1259,"outV":27,"properties":{"weight":2}},{"id":4844,"outV":119,"properties":{"weight":1}},{"id":6766,"outV":39,"properties":{"weight":1}},{"id":1904,"outV":103,"properties":{"weight":18}},{"id":2548,"outV":57,"properties":{"weight":4}},{"id":6645,"outV":12,"properties":{"weight":7}},{"id":4087,"outV":109,"properties":{"weight":1}},{"id":121,"outV":97,"properties":{"weight":3}},{"id":4222,"outV":54,"properties":{"weight":1}},{"id":6911,"outV":133,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6071,"inV":24,"properties":{"weight":3}},{"id":6072,"inV":11,"properties":{"weight":5}},{"id":6073,"inV":13,"properties":{"weight":13}},{"id":6074,"inV":12,"properties":{"weight":4}},{"id":6075,"inV":15,"properties":{"weight":4}},{"id":6076,"inV":25,"properties":{"weight":2}},{"id":6077,"inV":10,"properties":{"weight":5}},{"id":6078,"inV":89,"properties":{"weight":1}},{"id":6079,"inV":50,"properties":{"weight":15}},{"id":6080,"inV":18,"properties":{"weight":3}},{"id":6081,"inV":19,"properties":{"weight":24}},{"id":6082,"inV":22,"properties":{"weight":1}},{"id":6083,"inV":14,"properties":{"weight":9}},{"id":6084,"inV":20,"properties":{"weight":3}},{"id":6085,"inV":46,"properties":{"weight":6}},{"id":6086,"inV":68,"properties":{"weight":1}},{"id":6087,"inV":189,"properties":{"weight":1}},{"id":6088,"inV":84,"properties":{"weight":12}},{"id":6089,"inV":32,"properties":{"weight":9}},{"id":6090,"inV":160,"properties":{"weight":1}},{"id":6091,"inV":112,"properties":{"weight":2}},{"id":6092,"inV":76,"properties":{"weight":8}},{"id":6093,"inV":109,"properties":{"weight":1}},{"id":6094,"inV":85,"properties":{"weight":4}},{"id":6095,"inV":181,"properties":{"weight":5}},{"id":6096,"inV":123,"properties":{"weight":1}},{"id":6097,"inV":101,"properties":{"weight":2}},{"id":6098,"inV":38,"properties":{"weight":8}},{"id":6099,"inV":78,"properties":{"weight":7}},{"id":6100,"inV":103,"properties":{"weight":3}},{"id":6101,"inV":26,"properties":{"weight":2}},{"id":6102,"inV":59,"properties":{"weight":2}},{"id":6103,"inV":88,"properties":{"weight":1}},{"id":6104,"inV":73,"properties":{"weight":1}},{"id":6105,"inV":21,"properties":{"weight":1}},{"id":6106,"inV":98,"properties":{"weight":1}},{"id":6107,"inV":65,"properties":{"weight":4}},{"id":6108,"inV":62,"properties":{"weight":10}},{"id":6109,"inV":121,"properties":{"weight":1}},{"id":6110,"inV":82,"properties":{"weight":24}},{"id":6111,"inV":111,"properties":{"weight":1}},{"id":6112,"inV":87,"properties":{"weight":9}},{"id":6113,"inV":114,"properties":{"weight":3}},{"id":6114,"inV":153,"properties":{"weight":6}},{"id":6115,"inV":155,"properties":{"weight":2}},{"id":6116,"inV":97,"properties":{"weight":1}},{"id":6117,"inV":215,"properties":{"weight":4}},{"id":6118,"inV":213,"properties":{"weight":1}},{"id":6119,"inV":91,"properties":{"weight":1}},{"id":6120,"inV":70,"properties":{"weight":1}},{"id":6121,"inV":278,"properties":{"weight":1}},{"id":6122,"inV":74,"properties":{"weight":1}},{"id":6123,"inV":150,"properties":{"weight":1}},{"id":6124,"inV":64,"properties":{"weight":3}},{"id":6125,"inV":60,"properties":{"weight":3}},{"id":6126,"inV":4,"properties":{"weight":2}},{"id":6127,"inV":34,"properties":{"weight":12}},{"id":6128,"inV":337,"properties":{"weight":1}},{"id":6129,"inV":81,"properties":{"weight":5}},{"id":6130,"inV":167,"properties":{"weight":1}},{"id":6131,"inV":104,"properties":{"weight":1}},{"id":6132,"inV":83,"properties":{"weight":3}},{"id":6133,"inV":36,"properties":{"weight":3}},{"id":6134,"inV":217,"properties":{"weight":1}},{"id":6135,"inV":37,"properties":{"weight":2}},{"id":6136,"inV":35,"properties":{"weight":3}},{"id":6137,"inV":79,"properties":{"weight":2}},{"id":6138,"inV":176,"properties":{"weight":2}},{"id":6139,"inV":177,"properties":{"weight":1}}],"sungBy":[{"id":7536,"inV":340}],"writtenBy":[{"id":7535,"inV":446}]},"properties":{"name":[{"id":213,"value":"DONT EASE ME IN"}],"songType":[{"id":215,"value":"cover"}],"performances":[{"id":214,"value":316}]}}
-{"id":73,"label":"song","inE":{"followedBy":[{"id":131,"outV":97,"properties":{"weight":3}},{"id":3459,"outV":58,"properties":{"weight":2}},{"id":3587,"outV":56,"properties":{"weight":3}},{"id":1286,"outV":27,"properties":{"weight":1}},{"id":6791,"outV":39,"properties":{"weight":2}},{"id":651,"outV":23,"properties":{"weight":15}},{"id":2445,"outV":68,"properties":{"weight":11}},{"id":5266,"outV":32,"properties":{"weight":16}},{"id":6164,"outV":36,"properties":{"weight":1}},{"id":5015,"outV":30,"properties":{"weight":6}},{"id":154,"outV":108,"properties":{"weight":2}},{"id":4122,"outV":48,"properties":{"weight":2}},{"id":2079,"outV":188,"properties":{"weight":4}},{"id":416,"outV":38,"properties":{"weight":11}},{"id":6565,"outV":181,"properties":{"weight":1}},{"id":5543,"outV":126,"properties":{"weight":1}},{"id":5804,"outV":76,"properties":{"weight":2}},{"id":6060,"outV":115,"properties":{"weight":1}},{"id":6829,"outV":64,"properties":{"weight":6}},{"id":4398,"outV":40,"properties":{"weight":4}},{"id":3375,"outV":184,"properties":{"weight":5}},{"id":1201,"outV":26,"properties":{"weight":1}},{"id":2866,"outV":101,"properties":{"weight":2}},{"id":4276,"outV":10,"properties":{"weight":5}},{"id":1593,"outV":18,"properties":{"weight":7}},{"id":1338,"outV":31,"properties":{"weight":8}},{"id":6589,"outV":116,"properties":{"weight":1}},{"id":2125,"outV":17,"properties":{"weight":1}},{"id":3023,"outV":14,"properties":{"weight":8}},{"id":81,"outV":46,"properties":{"weight":1}},{"id":3665,"outV":24,"properties":{"weight":34}},{"id":5589,"outV":42,"properties":{"weight":6}},{"id":3798,"outV":88,"properties":{"weight":22}},{"id":6104,"outV":72,"properties":{"weight":1}},{"id":5721,"outV":20,"properties":{"weight":1}},{"id":6489,"outV":187,"properties":{"weight":1}},{"id":5467,"outV":79,"properties":{"weight":3}},{"id":6747,"outV":53,"properties":{"weight":1}},{"id":6236,"outV":117,"properties":{"weight":5}},{"id":4573,"outV":254,"properties":{"weight":1}},{"id":865,"outV":189,"properties":{"weight":9}},{"id":994,"outV":11,"properties":{"weight":1}},{"id":4709,"outV":111,"properties":{"weight":1}},{"id":3175,"outV":104,"properties":{"weight":3}},{"id":2153,"outV":151,"properties":{"weight":1}},{"id":5994,"outV":50,"properties":{"weight":9}},{"id":1901,"outV":103,"properties":{"weight":1}},{"id":2547,"outV":57,"properties":{"weight":3}},{"id":2807,"outV":15,"properties":{"weight":26}},{"id":4088,"outV":109,"properties":{"weight":5}},{"id":5499,"outV":131,"properties":{"weight":2}},{"id":508,"outV":98,"properties":{"weight":1}},{"id":3964,"outV":106,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":1024,"inV":18,"properties":{"weight":4}},{"id":1025,"inV":69,"properties":{"weight":1}},{"id":1026,"inV":13,"properties":{"weight":1}},{"id":1027,"inV":10,"properties":{"weight":5}},{"id":1028,"inV":12,"properties":{"weight":12}},{"id":1029,"inV":112,"properties":{"weight":6}},{"id":1030,"inV":27,"properties":{"weight":3}},{"id":1031,"inV":100,"properties":{"weight":1}},{"id":1032,"inV":4,"properties":{"weight":1}},{"id":1033,"inV":42,"properties":{"weight":3}},{"id":1034,"inV":74,"properties":{"weight":2}},{"id":1035,"inV":54,"properties":{"weight":3}},{"id":1036,"inV":97,"properties":{"weight":7}},{"id":1037,"inV":64,"properties":{"weight":4}},{"id":1038,"inV":99,"properties":{"weight":1}},{"id":1039,"inV":58,"properties":{"weight":2}},{"id":1040,"inV":53,"properties":{"weight":1}},{"id":1041,"inV":223,"properties":{"weight":1}},{"id":1042,"inV":39,"properties":{"weight":1}},{"id":1043,"inV":46,"properties":{"weight":2}},{"id":1044,"inV":238,"properties":{"weight":1}},{"id":1045,"inV":117,"properties":{"weight":15}},{"id":1046,"inV":23,"properties":{"weight":1}},{"id":1047,"inV":77,"properties":{"weight":1}},{"id":1048,"inV":34,"properties":{"weight":3}},{"id":1049,"inV":167,"properties":{"weight":1}},{"id":1050,"inV":116,"properties":{"weight":1}},{"id":1051,"inV":169,"properties":{"weight":1}},{"id":1052,"inV":30,"properties":{"weight":3}},{"id":1053,"inV":136,"properties":{"weight":1}},{"id":1054,"inV":115,"properties":{"weight":2}},{"id":1055,"inV":188,"properties":{"weight":6}},{"id":1056,"inV":239,"properties":{"weight":1}},{"id":1057,"inV":71,"properties":{"weight":2}},{"id":1058,"inV":124,"properties":{"weight":3}},{"id":1059,"inV":31,"properties":{"weight":2}},{"id":1060,"inV":40,"properties":{"weight":2}},{"id":1061,"inV":43,"properties":{"weight":3}},{"id":1062,"inV":15,"properties":{"weight":1}},{"id":1063,"inV":131,"properties":{"weight":1}},{"id":1064,"inV":11,"properties":{"weight":1}},{"id":1065,"inV":173,"properties":{"weight":1}},{"id":1066,"inV":202,"properties":{"weight":1}},{"id":1009,"inV":109,"properties":{"weight":7}},{"id":1010,"inV":181,"properties":{"weight":26}},{"id":1011,"inV":189,"properties":{"weight":9}},{"id":1012,"inV":103,"properties":{"weight":10}},{"id":1013,"inV":32,"properties":{"weight":3}},{"id":1014,"inV":26,"properties":{"weight":4}},{"id":1015,"inV":50,"properties":{"weight":4}},{"id":1016,"inV":88,"properties":{"weight":23}},{"id":1017,"inV":85,"properties":{"weight":2}},{"id":1018,"inV":68,"properties":{"weight":16}},{"id":1019,"inV":101,"properties":{"weight":23}},{"id":1020,"inV":38,"properties":{"weight":4}},{"id":1021,"inV":14,"properties":{"weight":20}},{"id":1022,"inV":121,"properties":{"weight":5}},{"id":1023,"inV":106,"properties":{"weight":1}}],"sungBy":[{"id":7054,"inV":340}],"writtenBy":[{"id":7053,"inV":339}]},"properties":{"name":[{"id":216,"value":"ALTHEA"}],"songType":[{"id":218,"value":"original"}],"performances":[{"id":217,"value":272}]}}
-{"id":74,"label":"song","inE":{"followedBy":[{"id":3968,"outV":106,"properties":{"weight":2}},{"id":3205,"outV":229,"properties":{"weight":1}},{"id":1158,"outV":26,"properties":{"weight":2}},{"id":1542,"outV":18,"properties":{"weight":1}},{"id":4742,"outV":186,"properties":{"weight":1}},{"id":1034,"outV":73,"properties":{"weight":2}},{"id":6154,"outV":36,"properties":{"weight":4}},{"id":653,"outV":23,"properties":{"weight":1}},{"id":5390,"outV":69,"properties":{"weight":5}},{"id":2575,"outV":57,"properties":{"weight":1}},{"id":6290,"outV":49,"properties":{"weight":1}},{"id":5268,"outV":32,"properties":{"weight":1}},{"id":277,"outV":5,"properties":{"weight":3}},{"id":6421,"outV":134,"properties":{"weight":2}},{"id":4760,"outV":37,"properties":{"weight":1}},{"id":5656,"outV":169,"properties":{"weight":1}},{"id":3865,"outV":60,"properties":{"weight":11}},{"id":1820,"outV":41,"properties":{"weight":7}},{"id":6942,"outV":84,"properties":{"weight":2}},{"id":4767,"outV":114,"properties":{"weight":13}},{"id":3490,"outV":58,"properties":{"weight":1}},{"id":549,"outV":120,"properties":{"weight":3}},{"id":2477,"outV":68,"properties":{"weight":1}},{"id":942,"outV":67,"properties":{"weight":1}},{"id":2353,"outV":87,"properties":{"weight":3}},{"id":5811,"outV":76,"properties":{"weight":4}},{"id":3384,"outV":184,"properties":{"weight":1}},{"id":6712,"outV":141,"properties":{"weight":1}},{"id":6329,"outV":21,"properties":{"weight":1}},{"id":701,"outV":206,"properties":{"weight":1}},{"id":2622,"outV":158,"properties":{"weight":1}},{"id":2879,"outV":101,"properties":{"weight":3}},{"id":193,"outV":70,"properties":{"weight":4}},{"id":1857,"outV":94,"properties":{"weight":2}},{"id":1477,"outV":81,"properties":{"weight":1}},{"id":1991,"outV":152,"properties":{"weight":1}},{"id":6983,"outV":175,"properties":{"weight":1}},{"id":841,"outV":171,"properties":{"weight":1}},{"id":6858,"outV":64,"properties":{"weight":1}},{"id":6604,"outV":127,"properties":{"weight":4}},{"id":461,"outV":139,"properties":{"weight":1}},{"id":82,"outV":46,"properties":{"weight":1}},{"id":338,"outV":34,"properties":{"weight":1}},{"id":1238,"outV":183,"properties":{"weight":1}},{"id":2009,"outV":149,"properties":{"weight":2}},{"id":3037,"outV":14,"properties":{"weight":1}},{"id":1246,"outV":27,"properties":{"weight":2}},{"id":1376,"outV":130,"properties":{"weight":1}},{"id":5216,"outV":99,"properties":{"weight":1}},{"id":2785,"outV":15,"properties":{"weight":1}},{"id":6499,"outV":187,"properties":{"weight":1}},{"id":5861,"outV":96,"properties":{"weight":14}},{"id":3049,"outV":153,"properties":{"weight":14}},{"id":6122,"outV":72,"properties":{"weight":1}},{"id":235,"outV":145,"properties":{"weight":1}},{"id":3696,"outV":3,"properties":{"weight":2}},{"id":5752,"outV":129,"properties":{"weight":3}},{"id":4603,"outV":85,"properties":{"weight":10}},{"id":2300,"outV":25,"properties":{"weight":7}},{"id":2686,"outV":13,"properties":{"weight":86}}]},"outE":{"followedBy":[{"id":384,"inV":181,"properties":{"weight":1}},{"id":385,"inV":76,"properties":{"weight":2}},{"id":386,"inV":29,"properties":{"weight":2}},{"id":387,"inV":129,"properties":{"weight":3}},{"id":388,"inV":182,"properties":{"weight":1}},{"id":389,"inV":183,"properties":{"weight":1}},{"id":390,"inV":184,"properties":{"weight":1}},{"id":391,"inV":91,"properties":{"weight":9}},{"id":392,"inV":92,"properties":{"weight":1}},{"id":393,"inV":123,"properties":{"weight":1}},{"id":394,"inV":19,"properties":{"weight":1}},{"id":395,"inV":101,"properties":{"weight":1}},{"id":396,"inV":36,"properties":{"weight":2}},{"id":397,"inV":172,"properties":{"weight":1}},{"id":398,"inV":68,"properties":{"weight":1}},{"id":399,"inV":41,"properties":{"weight":7}},{"id":400,"inV":185,"properties":{"weight":1}},{"id":401,"inV":186,"properties":{"weight":1}},{"id":353,"inV":4,"properties":{"weight":6}},{"id":354,"inV":127,"properties":{"weight":9}},{"id":355,"inV":18,"properties":{"weight":1}},{"id":356,"inV":49,"properties":{"weight":1}},{"id":357,"inV":26,"properties":{"weight":9}},{"id":358,"inV":72,"properties":{"weight":1}},{"id":359,"inV":114,"properties":{"weight":11}},{"id":360,"inV":148,"properties":{"weight":1}},{"id":361,"inV":23,"properties":{"weight":1}},{"id":362,"inV":78,"properties":{"weight":3}},{"id":363,"inV":130,"properties":{"weight":2}},{"id":364,"inV":3,"properties":{"weight":2}},{"id":365,"inV":122,"properties":{"weight":1}},{"id":366,"inV":13,"properties":{"weight":38}},{"id":367,"inV":157,"properties":{"weight":2}},{"id":368,"inV":16,"properties":{"weight":1}},{"id":369,"inV":25,"properties":{"weight":4}},{"id":370,"inV":53,"properties":{"weight":1}},{"id":371,"inV":125,"properties":{"weight":1}},{"id":372,"inV":50,"properties":{"weight":3}},{"id":373,"inV":32,"properties":{"weight":3}},{"id":374,"inV":103,"properties":{"weight":1}},{"id":375,"inV":96,"properties":{"weight":88}},{"id":376,"inV":15,"properties":{"weight":1}},{"id":377,"inV":85,"properties":{"weight":6}},{"id":378,"inV":70,"properties":{"weight":6}},{"id":379,"inV":180,"properties":{"weight":1}},{"id":380,"inV":65,"properties":{"weight":2}},{"id":381,"inV":12,"properties":{"weight":1}},{"id":382,"inV":21,"properties":{"weight":4}},{"id":383,"inV":153,"properties":{"weight":1}}],"sungBy":[{"id":7384,"inV":340}],"writtenBy":[{"id":7383,"inV":339}]},"properties":{"name":[{"id":219,"value":"UNCLE JOHNS BAND"}],"songType":[{"id":221,"value":"original"}],"performances":[{"id":220,"value":332}]}}
-{"id":75,"label":"song","inE":{"followedBy":[{"id":2819,"outV":15,"properties":{"weight":3}},{"id":5283,"outV":32,"properties":{"weight":4}},{"id":5603,"outV":42,"properties":{"weight":2}},{"id":3684,"outV":24,"properties":{"weight":5}},{"id":2373,"outV":87,"properties":{"weight":1}},{"id":3525,"outV":223,"properties":{"weight":1}},{"id":1606,"outV":18,"properties":{"weight":2}},{"id":4998,"outV":30,"properties":{"weight":6}},{"id":7046,"outV":269,"properties":{"weight":1}},{"id":5160,"outV":71,"properties":{"weight":2}},{"id":5995,"outV":50,"properties":{"weight":3}},{"id":140,"outV":97,"properties":{"weight":5}},{"id":3822,"outV":88,"properties":{"weight":4}},{"id":6223,"outV":117,"properties":{"weight":5}},{"id":6863,"outV":64,"properties":{"weight":1}},{"id":3408,"outV":77,"properties":{"weight":3}},{"id":84,"outV":46,"properties":{"weight":1}},{"id":1205,"outV":26,"properties":{"weight":2}},{"id":2743,"outV":13,"properties":{"weight":1}},{"id":955,"outV":67,"properties":{"weight":1}},{"id":5660,"outV":169,"properties":{"weight":1}},{"id":1917,"outV":103,"properties":{"weight":1}},{"id":2077,"outV":188,"properties":{"weight":2}},{"id":2462,"outV":68,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2196,"inV":10,"properties":{"weight":4}},{"id":2197,"inV":59,"properties":{"weight":1}},{"id":2198,"inV":103,"properties":{"weight":6}},{"id":2199,"inV":78,"properties":{"weight":1}},{"id":2200,"inV":46,"properties":{"weight":2}},{"id":2201,"inV":76,"properties":{"weight":2}},{"id":2202,"inV":30,"properties":{"weight":2}},{"id":2203,"inV":12,"properties":{"weight":3}},{"id":2204,"inV":117,"properties":{"weight":3}},{"id":2205,"inV":42,"properties":{"weight":1}},{"id":2206,"inV":68,"properties":{"weight":7}},{"id":2207,"inV":71,"properties":{"weight":2}},{"id":2208,"inV":101,"properties":{"weight":4}},{"id":2209,"inV":50,"properties":{"weight":1}},{"id":2210,"inV":116,"properties":{"weight":1}},{"id":2211,"inV":114,"properties":{"weight":1}},{"id":2212,"inV":223,"properties":{"weight":3}},{"id":2213,"inV":26,"properties":{"weight":1}},{"id":2214,"inV":106,"properties":{"weight":1}},{"id":2215,"inV":19,"properties":{"weight":1}},{"id":2216,"inV":85,"properties":{"weight":1}},{"id":2217,"inV":97,"properties":{"weight":1}},{"id":2218,"inV":188,"properties":{"weight":4}},{"id":2219,"inV":77,"properties":{"weight":2}},{"id":2220,"inV":69,"properties":{"weight":1}},{"id":2221,"inV":32,"properties":{"weight":1}},{"id":2222,"inV":112,"properties":{"weight":1}}],"sungBy":[{"id":7414,"inV":340}],"writtenBy":[{"id":7413,"inV":339}]},"properties":{"name":[{"id":222,"value":"WHEN PUSH COMES TO SHOVE"}],"songType":[{"id":224,"value":"original"}],"performances":[{"id":223,"value":58}]}}
-{"id":76,"label":"song","inE":{"followedBy":[{"id":385,"outV":74,"properties":{"weight":2}},{"id":3460,"outV":58,"properties":{"weight":1}},{"id":6405,"outV":134,"properties":{"weight":5}},{"id":1800,"outV":196,"properties":{"weight":1}},{"id":3976,"outV":106,"properties":{"weight":1}},{"id":4104,"outV":48,"properties":{"weight":1}},{"id":4363,"outV":62,"properties":{"weight":5}},{"id":4619,"outV":85,"properties":{"weight":1}},{"id":1422,"outV":83,"properties":{"weight":8}},{"id":6800,"outV":39,"properties":{"weight":2}},{"id":5393,"outV":69,"properties":{"weight":8}},{"id":3220,"outV":63,"properties":{"weight":1}},{"id":3860,"outV":60,"properties":{"weight":8}},{"id":4629,"outV":154,"properties":{"weight":11}},{"id":2711,"outV":13,"properties":{"weight":4}},{"id":2201,"outV":75,"properties":{"weight":2}},{"id":538,"outV":120,"properties":{"weight":1}},{"id":1178,"outV":26,"properties":{"weight":4}},{"id":923,"outV":91,"properties":{"weight":2}},{"id":6941,"outV":84,"properties":{"weight":21}},{"id":4899,"outV":100,"properties":{"weight":1}},{"id":3369,"outV":184,"properties":{"weight":4}},{"id":5673,"outV":167,"properties":{"weight":1}},{"id":6314,"outV":123,"properties":{"weight":1}},{"id":2859,"outV":101,"properties":{"weight":17}},{"id":2348,"outV":87,"properties":{"weight":13}},{"id":2476,"outV":68,"properties":{"weight":1}},{"id":431,"outV":38,"properties":{"weight":1}},{"id":6575,"outV":116,"properties":{"weight":1}},{"id":817,"outV":171,"properties":{"weight":38}},{"id":5553,"outV":166,"properties":{"weight":1}},{"id":2611,"outV":158,"properties":{"weight":1}},{"id":4536,"outV":105,"properties":{"weight":1}},{"id":5184,"outV":99,"properties":{"weight":18}},{"id":5059,"outV":257,"properties":{"weight":1}},{"id":6470,"outV":187,"properties":{"weight":32}},{"id":1737,"outV":82,"properties":{"weight":3}},{"id":1865,"outV":94,"properties":{"weight":1}},{"id":6092,"outV":72,"properties":{"weight":8}},{"id":4302,"outV":110,"properties":{"weight":6}},{"id":1616,"outV":210,"properties":{"weight":2}},{"id":1234,"outV":248,"properties":{"weight":1}},{"id":1108,"outV":59,"properties":{"weight":6}},{"id":3028,"outV":14,"properties":{"weight":1}},{"id":85,"outV":46,"properties":{"weight":1}},{"id":6743,"outV":53,"properties":{"weight":2}},{"id":1880,"outV":103,"properties":{"weight":15}},{"id":6874,"outV":64,"properties":{"weight":1}},{"id":3291,"outV":160,"properties":{"weight":1}},{"id":5981,"outV":50,"properties":{"weight":1}},{"id":2399,"outV":179,"properties":{"weight":1}},{"id":3168,"outV":104,"properties":{"weight":1}},{"id":1380,"outV":130,"properties":{"weight":1}},{"id":2532,"outV":57,"properties":{"weight":30}},{"id":1637,"outV":213,"properties":{"weight":2}},{"id":4197,"outV":54,"properties":{"weight":1}},{"id":5094,"outV":4,"properties":{"weight":5}},{"id":487,"outV":98,"properties":{"weight":4}},{"id":6888,"outV":93,"properties":{"weight":1}},{"id":5485,"outV":79,"properties":{"weight":1}},{"id":4975,"outV":236,"properties":{"weight":1}},{"id":5871,"outV":96,"properties":{"weight":4}},{"id":2163,"outV":151,"properties":{"weight":1}},{"id":2932,"outV":78,"properties":{"weight":11}},{"id":245,"outV":150,"properties":{"weight":1}},{"id":5237,"outV":32,"properties":{"weight":3}},{"id":2038,"outV":92,"properties":{"weight":1}},{"id":6903,"outV":133,"properties":{"weight":2}},{"id":1272,"outV":27,"properties":{"weight":1}},{"id":5756,"outV":129,"properties":{"weight":1}},{"id":2302,"outV":25,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5765,"inV":215,"properties":{"weight":8}},{"id":5766,"inV":100,"properties":{"weight":6}},{"id":5767,"inV":69,"properties":{"weight":67}},{"id":5768,"inV":49,"properties":{"weight":30}},{"id":5769,"inV":98,"properties":{"weight":17}},{"id":5770,"inV":154,"properties":{"weight":2}},{"id":5771,"inV":82,"properties":{"weight":12}},{"id":5772,"inV":59,"properties":{"weight":3}},{"id":5773,"inV":51,"properties":{"weight":2}},{"id":5774,"inV":63,"properties":{"weight":13}},{"id":5775,"inV":104,"properties":{"weight":11}},{"id":5776,"inV":121,"properties":{"weight":1}},{"id":5777,"inV":54,"properties":{"weight":5}},{"id":5778,"inV":83,"properties":{"weight":9}},{"id":5779,"inV":99,"properties":{"weight":1}},{"id":5780,"inV":130,"properties":{"weight":1}},{"id":5781,"inV":60,"properties":{"weight":11}},{"id":5782,"inV":48,"properties":{"weight":5}},{"id":5783,"inV":179,"properties":{"weight":1}},{"id":5784,"inV":96,"properties":{"weight":6}},{"id":5785,"inV":141,"properties":{"weight":2}},{"id":5786,"inV":56,"properties":{"weight":1}},{"id":5787,"inV":3,"properties":{"weight":2}},{"id":5788,"inV":196,"properties":{"weight":5}},{"id":5789,"inV":13,"properties":{"weight":3}},{"id":5790,"inV":78,"properties":{"weight":2}},{"id":5791,"inV":50,"properties":{"weight":1}},{"id":5792,"inV":91,"properties":{"weight":36}},{"id":5793,"inV":94,"properties":{"weight":1}},{"id":5794,"inV":110,"properties":{"weight":1}},{"id":5795,"inV":4,"properties":{"weight":2}},{"id":5796,"inV":27,"properties":{"weight":4}},{"id":5797,"inV":155,"properties":{"weight":1}},{"id":5798,"inV":120,"properties":{"weight":1}},{"id":5799,"inV":208,"properties":{"weight":3}},{"id":5800,"inV":108,"properties":{"weight":1}},{"id":5801,"inV":19,"properties":{"weight":5}},{"id":5802,"inV":84,"properties":{"weight":2}},{"id":5803,"inV":53,"properties":{"weight":2}},{"id":5804,"inV":73,"properties":{"weight":2}},{"id":5805,"inV":189,"properties":{"weight":1}},{"id":5806,"inV":227,"properties":{"weight":1}},{"id":5807,"inV":170,"properties":{"weight":6}},{"id":5808,"inV":72,"properties":{"weight":1}},{"id":5809,"inV":116,"properties":{"weight":4}},{"id":5810,"inV":106,"properties":{"weight":1}},{"id":5811,"inV":74,"properties":{"weight":4}},{"id":5812,"inV":88,"properties":{"weight":1}},{"id":5813,"inV":286,"properties":{"weight":1}},{"id":5814,"inV":39,"properties":{"weight":4}},{"id":5815,"inV":128,"properties":{"weight":2}},{"id":5816,"inV":278,"properties":{"weight":1}},{"id":5817,"inV":67,"properties":{"weight":1}},{"id":5818,"inV":134,"properties":{"weight":1}},{"id":5819,"inV":150,"properties":{"weight":2}},{"id":5820,"inV":14,"properties":{"weight":1}},{"id":5821,"inV":62,"properties":{"weight":4}},{"id":5822,"inV":123,"properties":{"weight":1}},{"id":5823,"inV":232,"properties":{"weight":2}},{"id":5824,"inV":118,"properties":{"weight":1}},{"id":5825,"inV":168,"properties":{"weight":1}},{"id":5826,"inV":86,"properties":{"weight":1}},{"id":5827,"inV":151,"properties":{"weight":1}},{"id":5828,"inV":38,"properties":{"weight":1}},{"id":5829,"inV":28,"properties":{"weight":4}},{"id":5830,"inV":137,"properties":{"weight":2}},{"id":5831,"inV":254,"properties":{"weight":1}},{"id":5832,"inV":9,"properties":{"weight":1}},{"id":5833,"inV":173,"properties":{"weight":2}},{"id":5834,"inV":174,"properties":{"weight":1}},{"id":5835,"inV":35,"properties":{"weight":1}}],"sungBy":[{"id":7884,"inV":351}],"writtenBy":[{"id":7883,"inV":446}]},"properties":{"name":[{"id":225,"value":"SAMSON AND DELILAH"}],"songType":[{"id":227,"value":"cover"}],"performances":[{"id":226,"value":364}]}}
-{"id":77,"label":"song","inE":{"followedBy":[{"id":4480,"outV":202,"properties":{"weight":4}},{"id":7040,"outV":269,"properties":{"weight":2}},{"id":4545,"outV":105,"properties":{"weight":2}},{"id":514,"outV":98,"properties":{"weight":3}},{"id":3780,"outV":168,"properties":{"weight":1}},{"id":4039,"outV":173,"properties":{"weight":1}},{"id":2959,"outV":78,"properties":{"weight":1}},{"id":1296,"outV":27,"properties":{"weight":5}},{"id":3600,"outV":56,"properties":{"weight":6}},{"id":2001,"outV":152,"properties":{"weight":1}},{"id":2067,"outV":188,"properties":{"weight":1}},{"id":5652,"outV":169,"properties":{"weight":3}},{"id":86,"outV":46,"properties":{"weight":1}},{"id":3926,"outV":51,"properties":{"weight":7}},{"id":1047,"outV":73,"properties":{"weight":1}},{"id":6807,"outV":39,"properties":{"weight":2}},{"id":4379,"outV":62,"properties":{"weight":1}},{"id":1692,"outV":124,"properties":{"weight":1}},{"id":2140,"outV":17,"properties":{"weight":2}},{"id":2467,"outV":68,"properties":{"weight":1}},{"id":2980,"outV":265,"properties":{"weight":1}},{"id":6758,"outV":53,"properties":{"weight":2}},{"id":4136,"outV":48,"properties":{"weight":7}},{"id":5290,"outV":32,"properties":{"weight":1}},{"id":2219,"outV":75,"properties":{"weight":2}},{"id":1132,"outV":59,"properties":{"weight":1}},{"id":3245,"outV":63,"properties":{"weight":2}},{"id":5677,"outV":167,"properties":{"weight":1}},{"id":4208,"outV":54,"properties":{"weight":2}},{"id":6001,"outV":50,"properties":{"weight":1}},{"id":6193,"outV":232,"properties":{"weight":1}},{"id":3826,"outV":88,"properties":{"weight":1}},{"id":3188,"outV":104,"properties":{"weight":4}},{"id":758,"outV":80,"properties":{"weight":1}},{"id":2045,"outV":92,"properties":{"weight":1}},{"id":3391,"outV":309,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3394,"inV":271,"properties":{"weight":1}},{"id":3395,"inV":311,"properties":{"weight":1}},{"id":3396,"inV":260,"properties":{"weight":1}},{"id":3397,"inV":269,"properties":{"weight":2}},{"id":3398,"inV":188,"properties":{"weight":1}},{"id":3399,"inV":170,"properties":{"weight":4}},{"id":3400,"inV":108,"properties":{"weight":2}},{"id":3401,"inV":54,"properties":{"weight":7}},{"id":3402,"inV":58,"properties":{"weight":8}},{"id":3403,"inV":51,"properties":{"weight":7}},{"id":3404,"inV":99,"properties":{"weight":1}},{"id":3405,"inV":57,"properties":{"weight":4}},{"id":3406,"inV":46,"properties":{"weight":2}},{"id":3407,"inV":53,"properties":{"weight":1}},{"id":3408,"inV":75,"properties":{"weight":3}},{"id":3409,"inV":56,"properties":{"weight":3}},{"id":3410,"inV":68,"properties":{"weight":1}},{"id":3411,"inV":106,"properties":{"weight":2}},{"id":3412,"inV":81,"properties":{"weight":2}},{"id":3413,"inV":105,"properties":{"weight":4}},{"id":3414,"inV":101,"properties":{"weight":1}},{"id":3415,"inV":78,"properties":{"weight":1}},{"id":3416,"inV":84,"properties":{"weight":1}},{"id":3417,"inV":96,"properties":{"weight":1}},{"id":3418,"inV":27,"properties":{"weight":2}},{"id":3419,"inV":168,"properties":{"weight":1}},{"id":3420,"inV":248,"properties":{"weight":1}},{"id":3421,"inV":215,"properties":{"weight":1}},{"id":3422,"inV":63,"properties":{"weight":2}},{"id":3423,"inV":202,"properties":{"weight":1}},{"id":3424,"inV":137,"properties":{"weight":1}},{"id":3425,"inV":26,"properties":{"weight":1}},{"id":3426,"inV":175,"properties":{"weight":1}},{"id":3427,"inV":254,"properties":{"weight":1}},{"id":3428,"inV":173,"properties":{"weight":1}},{"id":3429,"inV":72,"properties":{"weight":1}}]},"properties":{"name":[{"id":228,"value":"STUCK INSIDE OF MOBILE"}],"songType":[{"id":230,"value":""}],"performances":[{"id":229,"value":0}]}}
-{"id":78,"label":"song","inE":{"followedBy":[{"id":1153,"outV":26,"properties":{"weight":4}},{"id":771,"outV":122,"properties":{"weight":2}},{"id":5508,"outV":131,"properties":{"weight":1}},{"id":6021,"outV":204,"properties":{"weight":3}},{"id":136,"outV":97,"properties":{"weight":1}},{"id":6408,"outV":134,"properties":{"weight":1}},{"id":5131,"outV":222,"properties":{"weight":1}},{"id":1676,"outV":124,"properties":{"weight":7}},{"id":6035,"outV":115,"properties":{"weight":1}},{"id":3093,"outV":153,"properties":{"weight":4}},{"id":5013,"outV":30,"properties":{"weight":1}},{"id":2199,"outV":75,"properties":{"weight":1}},{"id":5275,"outV":32,"properties":{"weight":1}},{"id":2972,"outV":255,"properties":{"weight":1}},{"id":5790,"outV":76,"properties":{"weight":2}},{"id":4768,"outV":114,"properties":{"weight":6}},{"id":2087,"outV":188,"properties":{"weight":1}},{"id":2350,"outV":87,"properties":{"weight":5}},{"id":436,"outV":38,"properties":{"weight":5}},{"id":564,"outV":120,"properties":{"weight":2}},{"id":2868,"outV":101,"properties":{"weight":1}},{"id":4534,"outV":105,"properties":{"weight":1}},{"id":695,"outV":157,"properties":{"weight":1}},{"id":1079,"outV":227,"properties":{"weight":1}},{"id":5560,"outV":162,"properties":{"weight":4}},{"id":1352,"outV":31,"properties":{"weight":2}},{"id":6217,"outV":336,"properties":{"weight":1}},{"id":5199,"outV":99,"properties":{"weight":3}},{"id":209,"outV":70,"properties":{"weight":1}},{"id":465,"outV":193,"properties":{"weight":1}},{"id":4946,"outV":86,"properties":{"weight":2}},{"id":1363,"outV":130,"properties":{"weight":1}},{"id":6099,"outV":72,"properties":{"weight":7}},{"id":6867,"outV":64,"properties":{"weight":6}},{"id":4310,"outV":110,"properties":{"weight":2}},{"id":87,"outV":46,"properties":{"weight":4}},{"id":3415,"outV":77,"properties":{"weight":1}},{"id":6232,"outV":117,"properties":{"weight":2}},{"id":1625,"outV":210,"properties":{"weight":2}},{"id":3673,"outV":24,"properties":{"weight":3}},{"id":5851,"outV":61,"properties":{"weight":1}},{"id":6492,"outV":187,"properties":{"weight":1}},{"id":1888,"outV":103,"properties":{"weight":5}},{"id":3808,"outV":88,"properties":{"weight":3}},{"id":5986,"outV":50,"properties":{"weight":5}},{"id":739,"outV":80,"properties":{"weight":1}},{"id":3300,"outV":160,"properties":{"weight":8}},{"id":616,"outV":23,"properties":{"weight":2}},{"id":362,"outV":74,"properties":{"weight":3}},{"id":4972,"outV":236,"properties":{"weight":3}},{"id":3697,"outV":3,"properties":{"weight":3}},{"id":1522,"outV":164,"properties":{"weight":1}},{"id":2549,"outV":57,"properties":{"weight":6}},{"id":1654,"outV":213,"properties":{"weight":2}},{"id":2808,"outV":15,"properties":{"weight":1}},{"id":6904,"outV":133,"properties":{"weight":2}},{"id":250,"outV":150,"properties":{"weight":3}},{"id":2298,"outV":25,"properties":{"weight":2}},{"id":5116,"outV":4,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2944,"inV":64,"properties":{"weight":2}},{"id":2945,"inV":65,"properties":{"weight":1}},{"id":2946,"inV":72,"properties":{"weight":1}},{"id":2947,"inV":106,"properties":{"weight":1}},{"id":2948,"inV":88,"properties":{"weight":16}},{"id":2949,"inV":212,"properties":{"weight":1}},{"id":2950,"inV":100,"properties":{"weight":1}},{"id":2951,"inV":245,"properties":{"weight":2}},{"id":2952,"inV":103,"properties":{"weight":1}},{"id":2953,"inV":48,"properties":{"weight":1}},{"id":2954,"inV":85,"properties":{"weight":1}},{"id":2955,"inV":20,"properties":{"weight":1}},{"id":2956,"inV":171,"properties":{"weight":1}},{"id":2957,"inV":51,"properties":{"weight":1}},{"id":2958,"inV":151,"properties":{"weight":1}},{"id":2959,"inV":77,"properties":{"weight":1}},{"id":2960,"inV":83,"properties":{"weight":1}},{"id":2961,"inV":30,"properties":{"weight":8}},{"id":2962,"inV":79,"properties":{"weight":3}},{"id":2963,"inV":92,"properties":{"weight":1}},{"id":2964,"inV":169,"properties":{"weight":1}},{"id":2965,"inV":38,"properties":{"weight":2}},{"id":2966,"inV":71,"properties":{"weight":1}},{"id":2967,"inV":31,"properties":{"weight":10}},{"id":2968,"inV":46,"properties":{"weight":1}},{"id":2969,"inV":40,"properties":{"weight":1}},{"id":2970,"inV":188,"properties":{"weight":1}},{"id":2971,"inV":56,"properties":{"weight":1}},{"id":2916,"inV":24,"properties":{"weight":2}},{"id":2917,"inV":10,"properties":{"weight":10}},{"id":2918,"inV":234,"properties":{"weight":1}},{"id":2919,"inV":22,"properties":{"weight":1}},{"id":2920,"inV":11,"properties":{"weight":2}},{"id":2921,"inV":49,"properties":{"weight":1}},{"id":2922,"inV":153,"properties":{"weight":1}},{"id":2923,"inV":112,"properties":{"weight":6}},{"id":2924,"inV":15,"properties":{"weight":3}},{"id":2925,"inV":68,"properties":{"weight":4}},{"id":2926,"inV":13,"properties":{"weight":3}},{"id":2927,"inV":121,"properties":{"weight":1}},{"id":2928,"inV":32,"properties":{"weight":17}},{"id":2929,"inV":23,"properties":{"weight":4}},{"id":2930,"inV":80,"properties":{"weight":1}},{"id":2931,"inV":189,"properties":{"weight":1}},{"id":2932,"inV":76,"properties":{"weight":11}},{"id":2933,"inV":181,"properties":{"weight":3}},{"id":2934,"inV":12,"properties":{"weight":1}},{"id":2935,"inV":14,"properties":{"weight":1}},{"id":2936,"inV":27,"properties":{"weight":1}},{"id":2937,"inV":25,"properties":{"weight":1}},{"id":2938,"inV":98,"properties":{"weight":1}},{"id":2939,"inV":50,"properties":{"weight":1}},{"id":2940,"inV":39,"properties":{"weight":1}},{"id":2941,"inV":26,"properties":{"weight":3}},{"id":2942,"inV":17,"properties":{"weight":1}},{"id":2943,"inV":97,"properties":{"weight":2}}],"sungBy":[{"id":7506,"inV":340}],"writtenBy":[{"id":7505,"inV":446}]},"properties":{"name":[{"id":231,"value":"COLD RAIN AND SNOW"}],"songType":[{"id":233,"value":"cover"}],"performances":[{"id":232,"value":241}]}}
-{"id":79,"label":"song","inE":{"followedBy":[{"id":3136,"outV":153,"properties":{"weight":1}},{"id":4929,"outV":100,"properties":{"weight":3}},{"id":5122,"outV":4,"properties":{"weight":1}},{"id":4548,"outV":105,"properties":{"weight":1}},{"id":4485,"outV":202,"properties":{"weight":4}},{"id":1223,"outV":26,"properties":{"weight":1}},{"id":2634,"outV":137,"properties":{"weight":2}},{"id":3787,"outV":168,"properties":{"weight":1}},{"id":3533,"outV":201,"properties":{"weight":1}},{"id":270,"outV":150,"properties":{"weight":1}},{"id":1230,"outV":248,"properties":{"weight":1}},{"id":2574,"outV":57,"properties":{"weight":2}},{"id":2962,"outV":78,"properties":{"weight":3}},{"id":4948,"outV":86,"properties":{"weight":3}},{"id":1301,"outV":27,"properties":{"weight":3}},{"id":3606,"outV":56,"properties":{"weight":1}},{"id":89,"outV":46,"properties":{"weight":2}},{"id":3931,"outV":51,"properties":{"weight":7}},{"id":5659,"outV":169,"properties":{"weight":2}},{"id":606,"outV":120,"properties":{"weight":3}},{"id":4382,"outV":62,"properties":{"weight":1}},{"id":6048,"outV":115,"properties":{"weight":2}},{"id":1441,"outV":83,"properties":{"weight":1}},{"id":6817,"outV":39,"properties":{"weight":1}},{"id":2914,"outV":118,"properties":{"weight":1}},{"id":3491,"outV":58,"properties":{"weight":3}},{"id":4135,"outV":48,"properties":{"weight":1}},{"id":6759,"outV":53,"properties":{"weight":1}},{"id":5228,"outV":216,"properties":{"weight":1}},{"id":4973,"outV":236,"properties":{"weight":2}},{"id":5613,"outV":42,"properties":{"weight":1}},{"id":4210,"outV":54,"properties":{"weight":6}},{"id":6642,"outV":127,"properties":{"weight":1}},{"id":756,"outV":80,"properties":{"weight":1}},{"id":1657,"outV":213,"properties":{"weight":1}},{"id":5177,"outV":71,"properties":{"weight":2}},{"id":6137,"outV":72,"properties":{"weight":2}},{"id":890,"outV":140,"properties":{"weight":2}},{"id":3770,"outV":3,"properties":{"weight":2}},{"id":6971,"outV":84,"properties":{"weight":1}},{"id":4031,"outV":173,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5453,"inV":38,"properties":{"weight":1}},{"id":5454,"inV":118,"properties":{"weight":1}},{"id":5455,"inV":57,"properties":{"weight":4}},{"id":5456,"inV":58,"properties":{"weight":5}},{"id":5457,"inV":19,"properties":{"weight":4}},{"id":5458,"inV":81,"properties":{"weight":2}},{"id":5459,"inV":88,"properties":{"weight":1}},{"id":5460,"inV":56,"properties":{"weight":1}},{"id":5461,"inV":100,"properties":{"weight":2}},{"id":5462,"inV":72,"properties":{"weight":6}},{"id":5463,"inV":51,"properties":{"weight":3}},{"id":5464,"inV":54,"properties":{"weight":3}},{"id":5465,"inV":69,"properties":{"weight":1}},{"id":5466,"inV":48,"properties":{"weight":1}},{"id":5467,"inV":73,"properties":{"weight":3}},{"id":5468,"inV":116,"properties":{"weight":1}},{"id":5469,"inV":27,"properties":{"weight":1}},{"id":5470,"inV":104,"properties":{"weight":2}},{"id":5471,"inV":68,"properties":{"weight":1}},{"id":5472,"inV":285,"properties":{"weight":1}},{"id":5473,"inV":99,"properties":{"weight":1}},{"id":5474,"inV":4,"properties":{"weight":1}},{"id":5475,"inV":60,"properties":{"weight":3}},{"id":5476,"inV":59,"properties":{"weight":5}},{"id":5477,"inV":46,"properties":{"weight":3}},{"id":5478,"inV":34,"properties":{"weight":2}},{"id":5479,"inV":82,"properties":{"weight":3}},{"id":5480,"inV":41,"properties":{"weight":1}},{"id":5481,"inV":62,"properties":{"weight":2}},{"id":5482,"inV":172,"properties":{"weight":1}},{"id":5483,"inV":192,"properties":{"weight":1}},{"id":5484,"inV":171,"properties":{"weight":1}},{"id":5485,"inV":76,"properties":{"weight":1}},{"id":5486,"inV":42,"properties":{"weight":1}},{"id":5487,"inV":37,"properties":{"weight":1}},{"id":5488,"inV":105,"properties":{"weight":1}},{"id":5489,"inV":175,"properties":{"weight":1}},{"id":5490,"inV":173,"properties":{"weight":2}},{"id":5491,"inV":53,"properties":{"weight":1}},{"id":5492,"inV":40,"properties":{"weight":1}}],"sungBy":[{"id":7290,"inV":408}],"writtenBy":[{"id":7289,"inV":350}]},"properties":{"name":[{"id":234,"value":"PICASSO MOON"}],"songType":[{"id":236,"value":"original"}],"performances":[{"id":235,"value":77}]}}
-{"id":80,"label":"song","inE":{"followedBy":[{"id":1344,"outV":31,"properties":{"weight":3}},{"id":1793,"outV":196,"properties":{"weight":1}},{"id":5569,"outV":316,"properties":{"weight":1}},{"id":130,"outV":97,"properties":{"weight":1}},{"id":3010,"outV":14,"properties":{"weight":8}},{"id":4995,"outV":30,"properties":{"weight":6}},{"id":5507,"outV":131,"properties":{"weight":1}},{"id":517,"outV":98,"properties":{"weight":2}},{"id":4806,"outV":114,"properties":{"weight":2}},{"id":4362,"outV":62,"properties":{"weight":1}},{"id":4426,"outV":212,"properties":{"weight":1}},{"id":5259,"outV":32,"properties":{"weight":16}},{"id":4238,"outV":10,"properties":{"weight":6}},{"id":5967,"outV":50,"properties":{"weight":15}},{"id":3280,"outV":160,"properties":{"weight":3}},{"id":530,"outV":120,"properties":{"weight":7}},{"id":1556,"outV":18,"properties":{"weight":2}},{"id":4313,"outV":110,"properties":{"weight":4}},{"id":90,"outV":46,"properties":{"weight":1}},{"id":6682,"outV":12,"properties":{"weight":2}},{"id":3101,"outV":153,"properties":{"weight":1}},{"id":5597,"outV":42,"properties":{"weight":1}},{"id":2078,"outV":188,"properties":{"weight":2}},{"id":5727,"outV":20,"properties":{"weight":1}},{"id":4704,"outV":111,"properties":{"weight":3}},{"id":1185,"outV":26,"properties":{"weight":11}},{"id":3809,"outV":88,"properties":{"weight":8}},{"id":4065,"outV":109,"properties":{"weight":1}},{"id":802,"outV":122,"properties":{"weight":2}},{"id":5028,"outV":303,"properties":{"weight":1}},{"id":998,"outV":11,"properties":{"weight":2}},{"id":3174,"outV":104,"properties":{"weight":1}},{"id":2343,"outV":87,"properties":{"weight":1}},{"id":4395,"outV":40,"properties":{"weight":2}},{"id":2285,"outV":25,"properties":{"weight":1}},{"id":4845,"outV":119,"properties":{"weight":1}},{"id":6381,"outV":65,"properties":{"weight":3}},{"id":430,"outV":38,"properties":{"weight":4}},{"id":2930,"outV":78,"properties":{"weight":1}},{"id":2675,"outV":13,"properties":{"weight":1}},{"id":632,"outV":23,"properties":{"weight":11}},{"id":2425,"outV":68,"properties":{"weight":7}},{"id":3321,"outV":252,"properties":{"weight":1}},{"id":5049,"outV":209,"properties":{"weight":1}},{"id":3642,"outV":24,"properties":{"weight":5}},{"id":6586,"outV":116,"properties":{"weight":1}},{"id":6842,"outV":64,"properties":{"weight":3}},{"id":6780,"outV":39,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":711,"inV":25,"properties":{"weight":1}},{"id":712,"inV":120,"properties":{"weight":1}},{"id":713,"inV":21,"properties":{"weight":1}},{"id":714,"inV":11,"properties":{"weight":5}},{"id":715,"inV":218,"properties":{"weight":1}},{"id":716,"inV":14,"properties":{"weight":10}},{"id":717,"inV":10,"properties":{"weight":9}},{"id":718,"inV":20,"properties":{"weight":2}},{"id":719,"inV":153,"properties":{"weight":1}},{"id":720,"inV":22,"properties":{"weight":2}},{"id":721,"inV":13,"properties":{"weight":1}},{"id":722,"inV":3,"properties":{"weight":1}},{"id":723,"inV":68,"properties":{"weight":18}},{"id":724,"inV":85,"properties":{"weight":2}},{"id":725,"inV":103,"properties":{"weight":2}},{"id":726,"inV":109,"properties":{"weight":3}},{"id":727,"inV":112,"properties":{"weight":6}},{"id":728,"inV":24,"properties":{"weight":3}},{"id":729,"inV":18,"properties":{"weight":5}},{"id":730,"inV":12,"properties":{"weight":12}},{"id":731,"inV":42,"properties":{"weight":8}},{"id":732,"inV":155,"properties":{"weight":1}},{"id":733,"inV":189,"properties":{"weight":1}},{"id":734,"inV":198,"properties":{"weight":3}},{"id":735,"inV":111,"properties":{"weight":6}},{"id":736,"inV":222,"properties":{"weight":1}},{"id":737,"inV":197,"properties":{"weight":2}},{"id":738,"inV":32,"properties":{"weight":8}},{"id":739,"inV":78,"properties":{"weight":1}},{"id":740,"inV":88,"properties":{"weight":9}},{"id":741,"inV":180,"properties":{"weight":1}},{"id":742,"inV":181,"properties":{"weight":1}},{"id":743,"inV":121,"properties":{"weight":2}},{"id":744,"inV":58,"properties":{"weight":2}},{"id":745,"inV":97,"properties":{"weight":4}},{"id":746,"inV":15,"properties":{"weight":1}},{"id":747,"inV":64,"properties":{"weight":2}},{"id":748,"inV":223,"properties":{"weight":1}},{"id":749,"inV":56,"properties":{"weight":2}},{"id":750,"inV":48,"properties":{"weight":1}},{"id":751,"inV":106,"properties":{"weight":2}},{"id":752,"inV":116,"properties":{"weight":1}},{"id":753,"inV":188,"properties":{"weight":7}},{"id":754,"inV":117,"properties":{"weight":3}},{"id":755,"inV":31,"properties":{"weight":1}},{"id":756,"inV":79,"properties":{"weight":1}},{"id":757,"inV":101,"properties":{"weight":1}},{"id":758,"inV":77,"properties":{"weight":1}},{"id":759,"inV":43,"properties":{"weight":1}}],"sungBy":[{"id":7128,"inV":340}],"writtenBy":[{"id":7127,"inV":339}]},"properties":{"name":[{"id":237,"value":"DIRE WOLF"}],"songType":[{"id":239,"value":"original"}],"performances":[{"id":238,"value":226}]}}
-{"id":81,"label":"song","inE":{"followedBy":[{"id":1921,"outV":103,"properties":{"weight":2}},{"id":2885,"outV":101,"properties":{"weight":7}},{"id":4613,"outV":85,"properties":{"weight":2}},{"id":6025,"outV":204,"properties":{"weight":2}},{"id":2573,"outV":57,"properties":{"weight":5}},{"id":2254,"outV":29,"properties":{"weight":1}},{"id":4751,"outV":37,"properties":{"weight":1}},{"id":1873,"outV":94,"properties":{"weight":1}},{"id":5458,"outV":79,"properties":{"weight":2}},{"id":3412,"outV":77,"properties":{"weight":2}},{"id":6868,"outV":64,"properties":{"weight":1}},{"id":215,"outV":70,"properties":{"weight":1}},{"id":91,"outV":46,"properties":{"weight":2}},{"id":1438,"outV":83,"properties":{"weight":1}},{"id":1758,"outV":28,"properties":{"weight":1}},{"id":3488,"outV":58,"properties":{"weight":3}},{"id":4832,"outV":114,"properties":{"weight":1}},{"id":5668,"outV":167,"properties":{"weight":1}},{"id":6181,"outV":36,"properties":{"weight":2}},{"id":3305,"outV":160,"properties":{"weight":1}},{"id":1707,"outV":124,"properties":{"weight":1}},{"id":3760,"outV":3,"properties":{"weight":1}},{"id":6129,"outV":72,"properties":{"weight":5}},{"id":1330,"outV":31,"properties":{"weight":1}},{"id":5554,"outV":166,"properties":{"weight":1}},{"id":691,"outV":157,"properties":{"weight":1}},{"id":3124,"outV":153,"properties":{"weight":2}},{"id":4661,"outV":154,"properties":{"weight":1}},{"id":4725,"outV":186,"properties":{"weight":1}},{"id":2487,"outV":68,"properties":{"weight":1}},{"id":5176,"outV":71,"properties":{"weight":1}},{"id":6008,"outV":50,"properties":{"weight":1}},{"id":313,"outV":34,"properties":{"weight":22}},{"id":6970,"outV":84,"properties":{"weight":1}},{"id":1211,"outV":26,"properties":{"weight":6}},{"id":2749,"outV":13,"properties":{"weight":1}},{"id":2623,"outV":158,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1472,"inV":19,"properties":{"weight":1}},{"id":1473,"inV":62,"properties":{"weight":1}},{"id":1474,"inV":92,"properties":{"weight":1}},{"id":1475,"inV":89,"properties":{"weight":1}},{"id":1476,"inV":26,"properties":{"weight":1}},{"id":1477,"inV":74,"properties":{"weight":1}},{"id":1478,"inV":85,"properties":{"weight":2}},{"id":1479,"inV":36,"properties":{"weight":6}},{"id":1480,"inV":70,"properties":{"weight":1}},{"id":1481,"inV":229,"properties":{"weight":2}},{"id":1482,"inV":40,"properties":{"weight":1}},{"id":1483,"inV":46,"properties":{"weight":1}},{"id":1484,"inV":41,"properties":{"weight":1}},{"id":1485,"inV":35,"properties":{"weight":2}},{"id":1486,"inV":37,"properties":{"weight":2}},{"id":1487,"inV":258,"properties":{"weight":1}},{"id":1488,"inV":158,"properties":{"weight":1}},{"id":1489,"inV":177,"properties":{"weight":1}},{"id":1451,"inV":14,"properties":{"weight":12}},{"id":1452,"inV":96,"properties":{"weight":10}},{"id":1453,"inV":164,"properties":{"weight":1}},{"id":1454,"inV":13,"properties":{"weight":10}},{"id":1455,"inV":91,"properties":{"weight":3}},{"id":1456,"inV":82,"properties":{"weight":2}},{"id":1457,"inV":23,"properties":{"weight":1}},{"id":1458,"inV":60,"properties":{"weight":2}},{"id":1459,"inV":34,"properties":{"weight":5}},{"id":1460,"inV":83,"properties":{"weight":2}},{"id":1461,"inV":32,"properties":{"weight":1}},{"id":1462,"inV":88,"properties":{"weight":1}},{"id":1463,"inV":30,"properties":{"weight":1}},{"id":1464,"inV":3,"properties":{"weight":1}},{"id":1465,"inV":120,"properties":{"weight":1}},{"id":1466,"inV":257,"properties":{"weight":1}},{"id":1467,"inV":50,"properties":{"weight":1}},{"id":1468,"inV":118,"properties":{"weight":2}},{"id":1469,"inV":4,"properties":{"weight":1}},{"id":1470,"inV":71,"properties":{"weight":1}},{"id":1471,"inV":49,"properties":{"weight":1}}],"sungBy":[{"id":7166,"inV":340}],"writtenBy":[{"id":7165,"inV":339}]},"properties":{"name":[{"id":240,"value":"FOOLISH HEART"}],"songType":[{"id":242,"value":"original"}],"performances":[{"id":241,"value":87}]}}
-{"id":82,"label":"song","inE":{"followedBy":[{"id":6146,"outV":36,"properties":{"weight":7}},{"id":261,"outV":150,"properties":{"weight":1}},{"id":1797,"outV":196,"properties":{"weight":3}},{"id":3975,"outV":106,"properties":{"weight":1}},{"id":3080,"outV":153,"properties":{"weight":13}},{"id":5897,"outV":96,"properties":{"weight":1}},{"id":5771,"outV":76,"properties":{"weight":12}},{"id":5645,"outV":22,"properties":{"weight":3}},{"id":2706,"outV":13,"properties":{"weight":3}},{"id":3481,"outV":58,"properties":{"weight":8}},{"id":6681,"outV":12,"properties":{"weight":1}},{"id":795,"outV":122,"properties":{"weight":1}},{"id":2845,"outV":101,"properties":{"weight":21}},{"id":1184,"outV":26,"properties":{"weight":27}},{"id":1824,"outV":41,"properties":{"weight":1}},{"id":3362,"outV":184,"properties":{"weight":6}},{"id":2595,"outV":112,"properties":{"weight":1}},{"id":6312,"outV":123,"properties":{"weight":1}},{"id":1578,"outV":18,"properties":{"weight":2}},{"id":427,"outV":38,"properties":{"weight":1}},{"id":3755,"outV":3,"properties":{"weight":1}},{"id":4269,"outV":10,"properties":{"weight":4}},{"id":558,"outV":120,"properties":{"weight":3}},{"id":1456,"outV":81,"properties":{"weight":2}},{"id":6833,"outV":64,"properties":{"weight":7}},{"id":5683,"outV":167,"properties":{"weight":1}},{"id":3255,"outV":285,"properties":{"weight":1}},{"id":312,"outV":34,"properties":{"weight":7}},{"id":3004,"outV":14,"properties":{"weight":6}},{"id":190,"outV":70,"properties":{"weight":1}},{"id":5570,"outV":42,"properties":{"weight":2}},{"id":3652,"outV":24,"properties":{"weight":1}},{"id":3909,"outV":51,"properties":{"weight":1}},{"id":844,"outV":171,"properties":{"weight":1}},{"id":2381,"outV":87,"properties":{"weight":2}},{"id":5197,"outV":99,"properties":{"weight":10}},{"id":4174,"outV":54,"properties":{"weight":1}},{"id":3151,"outV":104,"properties":{"weight":1}},{"id":6736,"outV":53,"properties":{"weight":1}},{"id":5713,"outV":20,"properties":{"weight":1}},{"id":5969,"outV":50,"properties":{"weight":9}},{"id":1618,"outV":210,"properties":{"weight":4}},{"id":6483,"outV":187,"properties":{"weight":6}},{"id":1878,"outV":103,"properties":{"weight":31}},{"id":6360,"outV":21,"properties":{"weight":1}},{"id":1754,"outV":28,"properties":{"weight":1}},{"id":92,"outV":46,"properties":{"weight":2}},{"id":6110,"outV":72,"properties":{"weight":24}},{"id":4319,"outV":110,"properties":{"weight":2}},{"id":2400,"outV":179,"properties":{"weight":1}},{"id":2784,"outV":15,"properties":{"weight":3}},{"id":5344,"outV":165,"properties":{"weight":1}},{"id":1122,"outV":59,"properties":{"weight":1}},{"id":2915,"outV":118,"properties":{"weight":1}},{"id":5479,"outV":79,"properties":{"weight":3}},{"id":2537,"outV":57,"properties":{"weight":31}},{"id":1002,"outV":176,"properties":{"weight":1}},{"id":5100,"outV":4,"properties":{"weight":3}},{"id":3567,"outV":56,"properties":{"weight":2}},{"id":2288,"outV":25,"properties":{"weight":2}},{"id":4592,"outV":85,"properties":{"weight":8}},{"id":2161,"outV":151,"properties":{"weight":1}},{"id":4979,"outV":236,"properties":{"weight":1}},{"id":2421,"outV":68,"properties":{"weight":2}},{"id":5240,"outV":32,"properties":{"weight":4}},{"id":4475,"outV":202,"properties":{"weight":1}},{"id":6781,"outV":39,"properties":{"weight":1}},{"id":4095,"outV":109,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1728,"inV":32,"properties":{"weight":1}},{"id":1729,"inV":103,"properties":{"weight":2}},{"id":1730,"inV":121,"properties":{"weight":4}},{"id":1731,"inV":14,"properties":{"weight":4}},{"id":1732,"inV":133,"properties":{"weight":1}},{"id":1733,"inV":110,"properties":{"weight":2}},{"id":1734,"inV":215,"properties":{"weight":1}},{"id":1735,"inV":3,"properties":{"weight":1}},{"id":1736,"inV":171,"properties":{"weight":239}},{"id":1737,"inV":76,"properties":{"weight":3}},{"id":1738,"inV":5,"properties":{"weight":1}},{"id":1739,"inV":87,"properties":{"weight":8}},{"id":1740,"inV":183,"properties":{"weight":1}},{"id":1741,"inV":64,"properties":{"weight":3}},{"id":1742,"inV":83,"properties":{"weight":2}},{"id":1743,"inV":88,"properties":{"weight":1}},{"id":1744,"inV":85,"properties":{"weight":2}},{"id":1745,"inV":231,"properties":{"weight":1}},{"id":1746,"inV":153,"properties":{"weight":1}},{"id":1747,"inV":60,"properties":{"weight":1}},{"id":1748,"inV":69,"properties":{"weight":1}},{"id":1749,"inV":34,"properties":{"weight":1}},{"id":1711,"inV":21,"properties":{"weight":2}},{"id":1712,"inV":15,"properties":{"weight":4}},{"id":1713,"inV":170,"properties":{"weight":1}},{"id":1714,"inV":10,"properties":{"weight":3}},{"id":1715,"inV":98,"properties":{"weight":1}},{"id":1716,"inV":18,"properties":{"weight":3}},{"id":1717,"inV":59,"properties":{"weight":1}},{"id":1718,"inV":50,"properties":{"weight":2}},{"id":1719,"inV":51,"properties":{"weight":1}},{"id":1720,"inV":24,"properties":{"weight":4}},{"id":1721,"inV":25,"properties":{"weight":2}},{"id":1722,"inV":12,"properties":{"weight":1}},{"id":1723,"inV":57,"properties":{"weight":1}},{"id":1724,"inV":49,"properties":{"weight":2}},{"id":1725,"inV":13,"properties":{"weight":3}},{"id":1726,"inV":26,"properties":{"weight":3}},{"id":1727,"inV":104,"properties":{"weight":1}}],"sungBy":[{"id":7320,"inV":340}],"writtenBy":[{"id":7319,"inV":339}]},"properties":{"name":[{"id":243,"value":"SCARLET BEGONIAS"}],"songType":[{"id":245,"value":"original"}],"performances":[{"id":244,"value":316}]}}
-{"id":83,"label":"song","inE":{"followedBy":[{"id":2690,"outV":13,"properties":{"weight":13}},{"id":3203,"outV":229,"properties":{"weight":2}},{"id":3716,"outV":3,"properties":{"weight":3}},{"id":5641,"outV":22,"properties":{"weight":1}},{"id":1162,"outV":26,"properties":{"weight":14}},{"id":6668,"outV":12,"properties":{"weight":3}},{"id":269,"outV":150,"properties":{"weight":1}},{"id":4365,"outV":62,"properties":{"weight":1}},{"id":2960,"outV":78,"properties":{"weight":1}},{"id":6160,"outV":36,"properties":{"weight":8}},{"id":4753,"outV":37,"properties":{"weight":1}},{"id":6289,"outV":49,"properties":{"weight":2}},{"id":5778,"outV":76,"properties":{"weight":9}},{"id":2837,"outV":101,"properties":{"weight":6}},{"id":280,"outV":5,"properties":{"weight":1}},{"id":2584,"outV":112,"properties":{"weight":1}},{"id":5403,"outV":69,"properties":{"weight":1}},{"id":6814,"outV":39,"properties":{"weight":1}},{"id":1951,"outV":148,"properties":{"weight":14}},{"id":1568,"outV":18,"properties":{"weight":4}},{"id":417,"outV":38,"properties":{"weight":2}},{"id":4651,"outV":154,"properties":{"weight":1}},{"id":812,"outV":122,"properties":{"weight":1}},{"id":6317,"outV":123,"properties":{"weight":1}},{"id":2482,"outV":68,"properties":{"weight":2}},{"id":1460,"outV":81,"properties":{"weight":2}},{"id":6069,"outV":296,"properties":{"weight":1}},{"id":2620,"outV":158,"properties":{"weight":1}},{"id":6204,"outV":319,"properties":{"weight":3}},{"id":1855,"outV":94,"properties":{"weight":2}},{"id":3008,"outV":14,"properties":{"weight":8}},{"id":322,"outV":34,"properties":{"weight":5}},{"id":6338,"outV":21,"properties":{"weight":11}},{"id":3651,"outV":24,"properties":{"weight":1}},{"id":4680,"outV":33,"properties":{"weight":1}},{"id":6475,"outV":187,"properties":{"weight":1}},{"id":205,"outV":70,"properties":{"weight":1}},{"id":5965,"outV":50,"properties":{"weight":3}},{"id":1742,"outV":82,"properties":{"weight":2}},{"id":1233,"outV":248,"properties":{"weight":1}},{"id":5714,"outV":20,"properties":{"weight":1}},{"id":3162,"outV":104,"properties":{"weight":1}},{"id":1371,"outV":130,"properties":{"weight":1}},{"id":2011,"outV":149,"properties":{"weight":1}},{"id":4315,"outV":110,"properties":{"weight":1}},{"id":93,"outV":46,"properties":{"weight":4}},{"id":1886,"outV":103,"properties":{"weight":4}},{"id":2782,"outV":15,"properties":{"weight":2}},{"id":4833,"outV":114,"properties":{"weight":1}},{"id":1762,"outV":28,"properties":{"weight":2}},{"id":5219,"outV":99,"properties":{"weight":2}},{"id":868,"outV":189,"properties":{"weight":1}},{"id":2276,"outV":25,"properties":{"weight":4}},{"id":2533,"outV":57,"properties":{"weight":4}},{"id":486,"outV":98,"properties":{"weight":1}},{"id":4584,"outV":85,"properties":{"weight":177}},{"id":5865,"outV":96,"properties":{"weight":7}},{"id":1005,"outV":176,"properties":{"weight":2}},{"id":6893,"outV":93,"properties":{"weight":1}},{"id":7021,"outV":89,"properties":{"weight":9}},{"id":6132,"outV":72,"properties":{"weight":3}},{"id":4857,"outV":35,"properties":{"weight":3}},{"id":4218,"outV":54,"properties":{"weight":1}},{"id":2173,"outV":16,"properties":{"weight":1}},{"id":3071,"outV":153,"properties":{"weight":5}}]},"outE":{"followedBy":[{"id":1408,"inV":127,"properties":{"weight":4}},{"id":1409,"inV":130,"properties":{"weight":9}},{"id":1410,"inV":12,"properties":{"weight":1}},{"id":1411,"inV":13,"properties":{"weight":7}},{"id":1412,"inV":3,"properties":{"weight":6}},{"id":1413,"inV":195,"properties":{"weight":1}},{"id":1414,"inV":15,"properties":{"weight":2}},{"id":1415,"inV":114,"properties":{"weight":2}},{"id":1416,"inV":98,"properties":{"weight":1}},{"id":1417,"inV":26,"properties":{"weight":2}},{"id":1418,"inV":96,"properties":{"weight":211}},{"id":1419,"inV":103,"properties":{"weight":1}},{"id":1420,"inV":110,"properties":{"weight":5}},{"id":1421,"inV":101,"properties":{"weight":1}},{"id":1422,"inV":76,"properties":{"weight":8}},{"id":1423,"inV":85,"properties":{"weight":14}},{"id":1424,"inV":181,"properties":{"weight":2}},{"id":1425,"inV":116,"properties":{"weight":3}},{"id":1426,"inV":102,"properties":{"weight":1}},{"id":1427,"inV":21,"properties":{"weight":1}},{"id":1428,"inV":242,"properties":{"weight":1}},{"id":1429,"inV":5,"properties":{"weight":3}},{"id":1430,"inV":183,"properties":{"weight":1}},{"id":1431,"inV":125,"properties":{"weight":1}},{"id":1432,"inV":231,"properties":{"weight":1}},{"id":1433,"inV":70,"properties":{"weight":1}},{"id":1434,"inV":89,"properties":{"weight":1}},{"id":1435,"inV":36,"properties":{"weight":4}},{"id":1436,"inV":14,"properties":{"weight":7}},{"id":1437,"inV":29,"properties":{"weight":1}},{"id":1438,"inV":81,"properties":{"weight":1}},{"id":1439,"inV":69,"properties":{"weight":2}},{"id":1440,"inV":30,"properties":{"weight":1}},{"id":1441,"inV":79,"properties":{"weight":1}},{"id":1442,"inV":41,"properties":{"weight":4}},{"id":1443,"inV":28,"properties":{"weight":3}},{"id":1444,"inV":229,"properties":{"weight":2}},{"id":1445,"inV":37,"properties":{"weight":1}},{"id":1446,"inV":46,"properties":{"weight":1}},{"id":1447,"inV":49,"properties":{"weight":1}},{"id":1448,"inV":43,"properties":{"weight":1}},{"id":1449,"inV":171,"properties":{"weight":1}},{"id":1450,"inV":176,"properties":{"weight":1}},{"id":1403,"inV":94,"properties":{"weight":12}},{"id":1404,"inV":129,"properties":{"weight":24}},{"id":1405,"inV":16,"properties":{"weight":5}},{"id":1406,"inV":148,"properties":{"weight":3}},{"id":1407,"inV":153,"properties":{"weight":9}}],"sungBy":[{"id":7158,"inV":340}],"writtenBy":[{"id":7157,"inV":339}]},"properties":{"name":[{"id":246,"value":"EYES OF THE WORLD"}],"songType":[{"id":248,"value":"original"}],"performances":[{"id":247,"value":381}]}}
-{"id":84,"label":"song","inE":{"followedBy":[{"id":2306,"outV":25,"properties":{"weight":10}},{"id":6148,"outV":36,"properties":{"weight":3}},{"id":1670,"outV":124,"properties":{"weight":7}},{"id":3464,"outV":58,"properties":{"weight":2}},{"id":267,"outV":150,"properties":{"weight":1}},{"id":2059,"outV":92,"properties":{"weight":2}},{"id":1806,"outV":196,"properties":{"weight":1}},{"id":144,"outV":107,"properties":{"weight":1}},{"id":6416,"outV":134,"properties":{"weight":1}},{"id":3092,"outV":153,"properties":{"weight":5}},{"id":800,"outV":122,"properties":{"weight":1}},{"id":1188,"outV":26,"properties":{"weight":6}},{"id":2726,"outV":13,"properties":{"weight":5}},{"id":5802,"outV":76,"properties":{"weight":2}},{"id":3372,"outV":184,"properties":{"weight":3}},{"id":2351,"outV":87,"properties":{"weight":3}},{"id":690,"outV":157,"properties":{"weight":1}},{"id":2867,"outV":101,"properties":{"weight":4}},{"id":570,"outV":120,"properties":{"weight":6}},{"id":3771,"outV":3,"properties":{"weight":1}},{"id":189,"outV":70,"properties":{"weight":2}},{"id":2493,"outV":90,"properties":{"weight":2}},{"id":5565,"outV":162,"properties":{"weight":2}},{"id":4808,"outV":114,"properties":{"weight":4}},{"id":6088,"outV":72,"properties":{"weight":12}},{"id":6474,"outV":187,"properties":{"weight":5}},{"id":3532,"outV":201,"properties":{"weight":1}},{"id":464,"outV":193,"properties":{"weight":1}},{"id":1617,"outV":210,"properties":{"weight":2}},{"id":4945,"outV":86,"properties":{"weight":1}},{"id":5202,"outV":99,"properties":{"weight":7}},{"id":6355,"outV":21,"properties":{"weight":1}},{"id":3288,"outV":160,"properties":{"weight":10}},{"id":3416,"outV":77,"properties":{"weight":1}},{"id":3674,"outV":24,"properties":{"weight":1}},{"id":6875,"outV":64,"properties":{"weight":1}},{"id":5853,"outV":61,"properties":{"weight":1}},{"id":5982,"outV":50,"properties":{"weight":2}},{"id":95,"outV":46,"properties":{"weight":2}},{"id":6629,"outV":127,"properties":{"weight":2}},{"id":1899,"outV":103,"properties":{"weight":5}},{"id":6891,"outV":93,"properties":{"weight":1}},{"id":878,"outV":189,"properties":{"weight":1}},{"id":2543,"outV":57,"properties":{"weight":12}},{"id":5104,"outV":4,"properties":{"weight":1}},{"id":5616,"outV":42,"properties":{"weight":1}},{"id":4980,"outV":236,"properties":{"weight":1}},{"id":4086,"outV":109,"properties":{"weight":1}},{"id":4600,"outV":85,"properties":{"weight":1}},{"id":1530,"outV":164,"properties":{"weight":3}},{"id":6012,"outV":204,"properties":{"weight":6}},{"id":893,"outV":140,"properties":{"weight":1}},{"id":6909,"outV":133,"properties":{"weight":1}},{"id":5887,"outV":96,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":6928,"inV":289,"properties":{"weight":2}},{"id":6929,"inV":112,"properties":{"weight":3}},{"id":6930,"inV":96,"properties":{"weight":3}},{"id":6931,"inV":13,"properties":{"weight":7}},{"id":6932,"inV":125,"properties":{"weight":1}},{"id":6933,"inV":32,"properties":{"weight":14}},{"id":6934,"inV":153,"properties":{"weight":1}},{"id":6935,"inV":12,"properties":{"weight":5}},{"id":6936,"inV":208,"properties":{"weight":3}},{"id":6937,"inV":120,"properties":{"weight":1}},{"id":6938,"inV":70,"properties":{"weight":1}},{"id":6939,"inV":109,"properties":{"weight":3}},{"id":6940,"inV":4,"properties":{"weight":5}},{"id":6941,"inV":76,"properties":{"weight":21}},{"id":6942,"inV":74,"properties":{"weight":2}},{"id":6943,"inV":123,"properties":{"weight":1}},{"id":6944,"inV":154,"properties":{"weight":3}},{"id":6945,"inV":114,"properties":{"weight":1}},{"id":6946,"inV":50,"properties":{"weight":2}},{"id":6947,"inV":59,"properties":{"weight":1}},{"id":6948,"inV":26,"properties":{"weight":4}},{"id":6949,"inV":23,"properties":{"weight":5}},{"id":6950,"inV":85,"properties":{"weight":4}},{"id":6951,"inV":65,"properties":{"weight":1}},{"id":6952,"inV":181,"properties":{"weight":7}},{"id":6953,"inV":88,"properties":{"weight":15}},{"id":6954,"inV":14,"properties":{"weight":4}},{"id":6955,"inV":17,"properties":{"weight":1}},{"id":6956,"inV":10,"properties":{"weight":1}},{"id":6957,"inV":31,"properties":{"weight":6}},{"id":6958,"inV":91,"properties":{"weight":2}},{"id":6959,"inV":97,"properties":{"weight":1}},{"id":6960,"inV":106,"properties":{"weight":1}},{"id":6961,"inV":69,"properties":{"weight":3}},{"id":6962,"inV":56,"properties":{"weight":1}},{"id":6963,"inV":60,"properties":{"weight":2}},{"id":6964,"inV":49,"properties":{"weight":1}},{"id":6965,"inV":312,"properties":{"weight":1}},{"id":6966,"inV":42,"properties":{"weight":1}},{"id":6967,"inV":36,"properties":{"weight":1}},{"id":6968,"inV":30,"properties":{"weight":8}},{"id":6969,"inV":62,"properties":{"weight":1}},{"id":6970,"inV":81,"properties":{"weight":1}},{"id":6971,"inV":79,"properties":{"weight":1}},{"id":6972,"inV":64,"properties":{"weight":1}},{"id":6973,"inV":239,"properties":{"weight":2}},{"id":6974,"inV":89,"properties":{"weight":1}},{"id":6975,"inV":40,"properties":{"weight":4}},{"id":6976,"inV":68,"properties":{"weight":1}},{"id":6977,"inV":137,"properties":{"weight":1}}],"sungBy":[{"id":7322,"inV":340}],"writtenBy":[{"id":7321,"inV":339}]},"properties":{"name":[{"id":249,"value":"SHAKEDOWN STREET"}],"songType":[{"id":251,"value":"original"}],"performances":[{"id":250,"value":163}]}}
-{"id":85,"label":"song","inE":{"followedBy":[{"id":6528,"outV":211,"properties":{"weight":1}},{"id":2180,"outV":208,"properties":{"weight":5}},{"id":3972,"outV":106,"properties":{"weight":3}},{"id":4869,"outV":35,"properties":{"weight":1}},{"id":1801,"outV":196,"properties":{"weight":1}},{"id":4361,"outV":62,"properties":{"weight":6}},{"id":2954,"outV":78,"properties":{"weight":1}},{"id":3852,"outV":60,"properties":{"weight":16}},{"id":1423,"outV":83,"properties":{"weight":14}},{"id":914,"outV":91,"properties":{"weight":5}},{"id":4115,"outV":48,"properties":{"weight":4}},{"id":6291,"outV":49,"properties":{"weight":1}},{"id":4756,"outV":37,"properties":{"weight":5}},{"id":5396,"outV":69,"properties":{"weight":59}},{"id":6036,"outV":115,"properties":{"weight":2}},{"id":6805,"outV":39,"properties":{"weight":2}},{"id":3227,"outV":63,"properties":{"weight":7}},{"id":6556,"outV":172,"properties":{"weight":1}},{"id":4637,"outV":154,"properties":{"weight":19}},{"id":5664,"outV":169,"properties":{"weight":1}},{"id":4516,"outV":105,"properties":{"weight":3}},{"id":2341,"outV":87,"properties":{"weight":11}},{"id":2725,"outV":13,"properties":{"weight":2}},{"id":6950,"outV":84,"properties":{"weight":4}},{"id":2216,"outV":75,"properties":{"weight":1}},{"id":4904,"outV":100,"properties":{"weight":8}},{"id":6568,"outV":116,"properties":{"weight":4}},{"id":555,"outV":120,"properties":{"weight":1}},{"id":6316,"outV":123,"properties":{"weight":1}},{"id":813,"outV":171,"properties":{"weight":68}},{"id":5678,"outV":167,"properties":{"weight":1}},{"id":6703,"outV":141,"properties":{"weight":1}},{"id":304,"outV":5,"properties":{"weight":1}},{"id":3378,"outV":184,"properties":{"weight":1}},{"id":1216,"outV":26,"properties":{"weight":1}},{"id":5058,"outV":257,"properties":{"weight":1}},{"id":5315,"outV":170,"properties":{"weight":1}},{"id":1478,"outV":81,"properties":{"weight":2}},{"id":5193,"outV":99,"properties":{"weight":1}},{"id":2122,"outV":17,"properties":{"weight":1}},{"id":4042,"outV":173,"properties":{"weight":1}},{"id":3022,"outV":14,"properties":{"weight":2}},{"id":6094,"outV":72,"properties":{"weight":4}},{"id":1744,"outV":82,"properties":{"weight":2}},{"id":5840,"outV":258,"properties":{"weight":1}},{"id":6992,"outV":175,"properties":{"weight":1}},{"id":6739,"outV":53,"properties":{"weight":1}},{"id":724,"outV":80,"properties":{"weight":2}},{"id":6484,"outV":187,"properties":{"weight":34}},{"id":4566,"outV":254,"properties":{"weight":1}},{"id":3159,"outV":104,"properties":{"weight":9}},{"id":4184,"outV":54,"properties":{"weight":4}},{"id":1114,"outV":59,"properties":{"weight":4}},{"id":6618,"outV":127,"properties":{"weight":1}},{"id":1757,"outV":28,"properties":{"weight":3}},{"id":2909,"outV":118,"properties":{"weight":1}},{"id":4317,"outV":110,"properties":{"weight":2}},{"id":96,"outV":46,"properties":{"weight":2}},{"id":2403,"outV":45,"properties":{"weight":1}},{"id":4837,"outV":114,"properties":{"weight":1}},{"id":5093,"outV":4,"properties":{"weight":4}},{"id":1894,"outV":103,"properties":{"weight":1}},{"id":4074,"outV":109,"properties":{"weight":1}},{"id":494,"outV":98,"properties":{"weight":18}},{"id":1270,"outV":27,"properties":{"weight":6}},{"id":2168,"outV":151,"properties":{"weight":1}},{"id":377,"outV":74,"properties":{"weight":6}},{"id":1017,"outV":73,"properties":{"weight":2}},{"id":3577,"outV":56,"properties":{"weight":2}},{"id":2043,"outV":92,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4608,"inV":231,"properties":{"weight":1}},{"id":4609,"inV":92,"properties":{"weight":1}},{"id":4610,"inV":141,"properties":{"weight":2}},{"id":4611,"inV":69,"properties":{"weight":1}},{"id":4612,"inV":89,"properties":{"weight":4}},{"id":4613,"inV":81,"properties":{"weight":2}},{"id":4614,"inV":184,"properties":{"weight":1}},{"id":4615,"inV":28,"properties":{"weight":1}},{"id":4616,"inV":40,"properties":{"weight":1}},{"id":4617,"inV":137,"properties":{"weight":1}},{"id":4618,"inV":172,"properties":{"weight":1}},{"id":4619,"inV":76,"properties":{"weight":1}},{"id":4584,"inV":83,"properties":{"weight":177}},{"id":4585,"inV":49,"properties":{"weight":66}},{"id":4586,"inV":96,"properties":{"weight":36}},{"id":4587,"inV":148,"properties":{"weight":7}},{"id":4588,"inV":21,"properties":{"weight":5}},{"id":4589,"inV":59,"properties":{"weight":2}},{"id":4590,"inV":120,"properties":{"weight":1}},{"id":4591,"inV":91,"properties":{"weight":33}},{"id":4592,"inV":82,"properties":{"weight":8}},{"id":4593,"inV":13,"properties":{"weight":2}},{"id":4594,"inV":4,"properties":{"weight":1}},{"id":4595,"inV":57,"properties":{"weight":1}},{"id":4596,"inV":3,"properties":{"weight":3}},{"id":4597,"inV":54,"properties":{"weight":1}},{"id":4598,"inV":196,"properties":{"weight":1}},{"id":4599,"inV":94,"properties":{"weight":1}},{"id":4600,"inV":84,"properties":{"weight":1}},{"id":4601,"inV":154,"properties":{"weight":3}},{"id":4602,"inV":134,"properties":{"weight":1}},{"id":4603,"inV":74,"properties":{"weight":10}},{"id":4604,"inV":5,"properties":{"weight":2}},{"id":4605,"inV":33,"properties":{"weight":2}},{"id":4606,"inV":60,"properties":{"weight":5}},{"id":4607,"inV":167,"properties":{"weight":1}}],"sungBy":[{"id":7154,"inV":351}],"writtenBy":[{"id":7153,"inV":350}]},"properties":{"name":[{"id":252,"value":"ESTIMATED PROPHET"}],"songType":[{"id":254,"value":"original"}],"performances":[{"id":253,"value":390}]}}
-{"id":86,"label":"song","inE":{"followedBy":[{"id":1520,"outV":164,"properties":{"weight":7}},{"id":3761,"outV":3,"properties":{"weight":5}},{"id":98,"outV":46,"properties":{"weight":1}},{"id":4834,"outV":114,"properties":{"weight":4}},{"id":5826,"outV":76,"properties":{"weight":1}},{"id":2388,"outV":87,"properties":{"weight":1}},{"id":3126,"outV":153,"properties":{"weight":12}},{"id":600,"outV":120,"properties":{"weight":1}},{"id":2329,"outV":25,"properties":{"weight":1}},{"id":6633,"outV":127,"properties":{"weight":3}},{"id":445,"outV":38,"properties":{"weight":1}},{"id":6815,"outV":39,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4938,"inV":38,"properties":{"weight":6}},{"id":4939,"inV":215,"properties":{"weight":5}},{"id":4940,"inV":50,"properties":{"weight":5}},{"id":4941,"inV":4,"properties":{"weight":2}},{"id":4942,"inV":151,"properties":{"weight":1}},{"id":4943,"inV":188,"properties":{"weight":1}},{"id":4944,"inV":167,"properties":{"weight":1}},{"id":4945,"inV":84,"properties":{"weight":1}},{"id":4946,"inV":78,"properties":{"weight":2}},{"id":4947,"inV":13,"properties":{"weight":1}},{"id":4948,"inV":79,"properties":{"weight":3}},{"id":4949,"inV":64,"properties":{"weight":3}},{"id":4950,"inV":24,"properties":{"weight":1}},{"id":4951,"inV":90,"properties":{"weight":2}},{"id":4952,"inV":88,"properties":{"weight":1}},{"id":4953,"inV":9,"properties":{"weight":2}},{"id":4954,"inV":87,"properties":{"weight":1}}],"sungBy":[{"id":8012,"inV":453}],"writtenBy":[{"id":8011,"inV":490}]},"properties":{"name":[{"id":255,"value":"THE WEIGHT"}],"songType":[{"id":257,"value":"cover"}],"performances":[{"id":256,"value":41}]}}
-{"id":87,"label":"song","inE":{"followedBy":[{"id":6914,"outV":133,"properties":{"weight":2}},{"id":135,"outV":97,"properties":{"weight":2}},{"id":2319,"outV":25,"properties":{"weight":5}},{"id":1686,"outV":124,"properties":{"weight":8}},{"id":3734,"outV":3,"properties":{"weight":13}},{"id":6040,"outV":115,"properties":{"weight":1}},{"id":3483,"outV":58,"properties":{"weight":1}},{"id":6171,"outV":36,"properties":{"weight":1}},{"id":672,"outV":23,"properties":{"weight":1}},{"id":2468,"outV":68,"properties":{"weight":2}},{"id":3109,"outV":153,"properties":{"weight":17}},{"id":5925,"outV":96,"properties":{"weight":2}},{"id":5161,"outV":71,"properties":{"weight":1}},{"id":810,"outV":122,"properties":{"weight":1}},{"id":5421,"outV":335,"properties":{"weight":1}},{"id":1075,"outV":227,"properties":{"weight":2}},{"id":693,"outV":157,"properties":{"weight":1}},{"id":2871,"outV":101,"properties":{"weight":9}},{"id":6840,"outV":64,"properties":{"weight":3}},{"id":5433,"outV":217,"properties":{"weight":2}},{"id":2619,"outV":158,"properties":{"weight":1}},{"id":2237,"outV":29,"properties":{"weight":6}},{"id":318,"outV":34,"properties":{"weight":3}},{"id":1215,"outV":26,"properties":{"weight":2}},{"id":4287,"outV":10,"properties":{"weight":2}},{"id":5696,"outV":330,"properties":{"weight":1}},{"id":2499,"outV":90,"properties":{"weight":2}},{"id":198,"outV":70,"properties":{"weight":1}},{"id":584,"outV":120,"properties":{"weight":8}},{"id":1739,"outV":82,"properties":{"weight":8}},{"id":4813,"outV":114,"properties":{"weight":11}},{"id":466,"outV":193,"properties":{"weight":1}},{"id":1875,"outV":94,"properties":{"weight":1}},{"id":3029,"outV":14,"properties":{"weight":1}},{"id":5207,"outV":99,"properties":{"weight":3}},{"id":4954,"outV":86,"properties":{"weight":1}},{"id":5338,"outV":165,"properties":{"weight":4}},{"id":3293,"outV":160,"properties":{"weight":8}},{"id":4957,"outV":332,"properties":{"weight":1}},{"id":6493,"outV":187,"properties":{"weight":4}},{"id":1630,"outV":210,"properties":{"weight":3}},{"id":1503,"outV":164,"properties":{"weight":1}},{"id":6112,"outV":72,"properties":{"weight":9}},{"id":6369,"outV":21,"properties":{"weight":1}},{"id":6626,"outV":127,"properties":{"weight":3}},{"id":99,"outV":46,"properties":{"weight":2}},{"id":4324,"outV":110,"properties":{"weight":1}},{"id":4708,"outV":111,"properties":{"weight":1}},{"id":6885,"outV":93,"properties":{"weight":2}},{"id":1639,"outV":213,"properties":{"weight":6}},{"id":5224,"outV":216,"properties":{"weight":1}},{"id":5614,"outV":42,"properties":{"weight":1}},{"id":4978,"outV":236,"properties":{"weight":3}},{"id":888,"outV":140,"properties":{"weight":1}},{"id":1913,"outV":103,"properties":{"weight":6}},{"id":2557,"outV":57,"properties":{"weight":10}},{"id":5373,"outV":132,"properties":{"weight":1}},{"id":254,"outV":150,"properties":{"weight":6}},{"id":6014,"outV":204,"properties":{"weight":10}}]},"outE":{"followedBy":[{"id":2340,"inV":96,"properties":{"weight":2}},{"id":2341,"inV":85,"properties":{"weight":11}},{"id":2342,"inV":106,"properties":{"weight":1}},{"id":2343,"inV":80,"properties":{"weight":1}},{"id":2344,"inV":29,"properties":{"weight":1}},{"id":2345,"inV":4,"properties":{"weight":2}},{"id":2346,"inV":63,"properties":{"weight":1}},{"id":2347,"inV":13,"properties":{"weight":8}},{"id":2348,"inV":76,"properties":{"weight":13}},{"id":2349,"inV":181,"properties":{"weight":1}},{"id":2350,"inV":78,"properties":{"weight":5}},{"id":2351,"inV":84,"properties":{"weight":3}},{"id":2352,"inV":97,"properties":{"weight":1}},{"id":2353,"inV":74,"properties":{"weight":3}},{"id":2354,"inV":19,"properties":{"weight":2}},{"id":2355,"inV":88,"properties":{"weight":15}},{"id":2356,"inV":26,"properties":{"weight":2}},{"id":2357,"inV":32,"properties":{"weight":15}},{"id":2358,"inV":72,"properties":{"weight":1}},{"id":2359,"inV":91,"properties":{"weight":6}},{"id":2360,"inV":114,"properties":{"weight":1}},{"id":2361,"inV":69,"properties":{"weight":5}},{"id":2362,"inV":23,"properties":{"weight":28}},{"id":2363,"inV":268,"properties":{"weight":1}},{"id":2364,"inV":210,"properties":{"weight":1}},{"id":2365,"inV":38,"properties":{"weight":7}},{"id":2366,"inV":62,"properties":{"weight":2}},{"id":2367,"inV":171,"properties":{"weight":2}},{"id":2368,"inV":110,"properties":{"weight":1}},{"id":2369,"inV":64,"properties":{"weight":8}},{"id":2370,"inV":223,"properties":{"weight":1}},{"id":2371,"inV":21,"properties":{"weight":2}},{"id":2372,"inV":61,"properties":{"weight":1}},{"id":2373,"inV":75,"properties":{"weight":1}},{"id":2374,"inV":101,"properties":{"weight":1}},{"id":2375,"inV":14,"properties":{"weight":8}},{"id":2376,"inV":160,"properties":{"weight":5}},{"id":2377,"inV":50,"properties":{"weight":3}},{"id":2378,"inV":30,"properties":{"weight":11}},{"id":2379,"inV":204,"properties":{"weight":3}},{"id":2380,"inV":165,"properties":{"weight":2}},{"id":2381,"inV":82,"properties":{"weight":2}},{"id":2382,"inV":151,"properties":{"weight":1}},{"id":2383,"inV":70,"properties":{"weight":1}},{"id":2384,"inV":152,"properties":{"weight":1}},{"id":2385,"inV":213,"properties":{"weight":1}},{"id":2386,"inV":31,"properties":{"weight":10}},{"id":2387,"inV":112,"properties":{"weight":1}},{"id":2388,"inV":86,"properties":{"weight":1}},{"id":2389,"inV":164,"properties":{"weight":1}},{"id":2390,"inV":215,"properties":{"weight":1}},{"id":2391,"inV":36,"properties":{"weight":1}},{"id":2392,"inV":10,"properties":{"weight":1}},{"id":2393,"inV":291,"properties":{"weight":1}},{"id":2394,"inV":292,"properties":{"weight":1}}],"sungBy":[{"id":7376,"inV":340}],"writtenBy":[{"id":7375,"inV":339}]},"properties":{"name":[{"id":258,"value":"TOUCH OF GREY"}],"songType":[{"id":260,"value":"original"}],"performances":[{"id":259,"value":213}]}}
-{"id":88,"label":"song","inE":{"followedBy":[{"id":1280,"outV":27,"properties":{"weight":5}},{"id":2561,"outV":57,"properties":{"weight":1}},{"id":3585,"outV":56,"properties":{"weight":13}},{"id":3970,"outV":106,"properties":{"weight":1}},{"id":2948,"outV":78,"properties":{"weight":16}},{"id":6020,"outV":204,"properties":{"weight":3}},{"id":4358,"outV":62,"properties":{"weight":11}},{"id":263,"outV":150,"properties":{"weight":1}},{"id":2058,"outV":92,"properties":{"weight":2}},{"id":6795,"outV":39,"properties":{"weight":1}},{"id":3854,"outV":60,"properties":{"weight":1}},{"id":655,"outV":23,"properties":{"weight":7}},{"id":2449,"outV":68,"properties":{"weight":2}},{"id":4498,"outV":202,"properties":{"weight":1}},{"id":4120,"outV":48,"properties":{"weight":16}},{"id":1694,"outV":124,"properties":{"weight":1}},{"id":5278,"outV":32,"properties":{"weight":2}},{"id":3233,"outV":63,"properties":{"weight":2}},{"id":164,"outV":108,"properties":{"weight":1}},{"id":420,"outV":38,"properties":{"weight":4}},{"id":6953,"outV":84,"properties":{"weight":15}},{"id":1199,"outV":26,"properties":{"weight":2}},{"id":4655,"outV":154,"properties":{"weight":16}},{"id":4913,"outV":100,"properties":{"weight":4}},{"id":2355,"outV":87,"properties":{"weight":15}},{"id":5812,"outV":76,"properties":{"weight":1}},{"id":1462,"outV":81,"properties":{"weight":1}},{"id":4022,"outV":191,"properties":{"weight":1}},{"id":3513,"outV":223,"properties":{"weight":2}},{"id":4282,"outV":10,"properties":{"weight":1}},{"id":4539,"outV":105,"properties":{"weight":2}},{"id":958,"outV":67,"properties":{"weight":1}},{"id":5568,"outV":162,"properties":{"weight":1}},{"id":1602,"outV":18,"properties":{"weight":2}},{"id":3782,"outV":168,"properties":{"weight":1}},{"id":5319,"outV":170,"properties":{"weight":1}},{"id":3912,"outV":51,"properties":{"weight":3}},{"id":2126,"outV":17,"properties":{"weight":8}},{"id":1743,"outV":82,"properties":{"weight":1}},{"id":5459,"outV":79,"properties":{"weight":1}},{"id":3670,"outV":24,"properties":{"weight":4}},{"id":6103,"outV":72,"properties":{"weight":1}},{"id":4824,"outV":114,"properties":{"weight":1}},{"id":4952,"outV":86,"properties":{"weight":1}},{"id":1116,"outV":59,"properties":{"weight":7}},{"id":6748,"outV":53,"properties":{"weight":4}},{"id":3171,"outV":104,"properties":{"weight":12}},{"id":5987,"outV":50,"properties":{"weight":6}},{"id":740,"outV":80,"properties":{"weight":9}},{"id":101,"outV":46,"properties":{"weight":1}},{"id":4199,"outV":54,"properties":{"weight":4}},{"id":5105,"outV":4,"properties":{"weight":9}},{"id":2036,"outV":180,"properties":{"weight":1}},{"id":117,"outV":97,"properties":{"weight":1}},{"id":1016,"outV":73,"properties":{"weight":23}},{"id":3448,"outV":58,"properties":{"weight":8}},{"id":1402,"outV":190,"properties":{"weight":1}},{"id":507,"outV":98,"properties":{"weight":4}},{"id":1787,"outV":259,"properties":{"weight":3}},{"id":2812,"outV":15,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3790,"inV":54,"properties":{"weight":21}},{"id":3791,"inV":53,"properties":{"weight":7}},{"id":3792,"inV":100,"properties":{"weight":32}},{"id":3793,"inV":27,"properties":{"weight":16}},{"id":3794,"inV":72,"properties":{"weight":3}},{"id":3795,"inV":58,"properties":{"weight":16}},{"id":3796,"inV":14,"properties":{"weight":1}},{"id":3797,"inV":56,"properties":{"weight":13}},{"id":3798,"inV":73,"properties":{"weight":22}},{"id":3799,"inV":19,"properties":{"weight":7}},{"id":3800,"inV":106,"properties":{"weight":3}},{"id":3801,"inV":48,"properties":{"weight":9}},{"id":3802,"inV":39,"properties":{"weight":6}},{"id":3803,"inV":17,"properties":{"weight":4}},{"id":3804,"inV":180,"properties":{"weight":1}},{"id":3805,"inV":152,"properties":{"weight":1}},{"id":3806,"inV":57,"properties":{"weight":3}},{"id":3807,"inV":18,"properties":{"weight":1}},{"id":3808,"inV":78,"properties":{"weight":3}},{"id":3809,"inV":80,"properties":{"weight":8}},{"id":3810,"inV":12,"properties":{"weight":6}},{"id":3811,"inV":4,"properties":{"weight":2}},{"id":3812,"inV":108,"properties":{"weight":8}},{"id":3813,"inV":104,"properties":{"weight":8}},{"id":3814,"inV":64,"properties":{"weight":1}},{"id":3815,"inV":62,"properties":{"weight":3}},{"id":3816,"inV":105,"properties":{"weight":21}},{"id":3817,"inV":101,"properties":{"weight":1}},{"id":3818,"inV":97,"properties":{"weight":1}},{"id":3819,"inV":68,"properties":{"weight":1}},{"id":3820,"inV":10,"properties":{"weight":1}},{"id":3821,"inV":322,"properties":{"weight":1}},{"id":3822,"inV":75,"properties":{"weight":4}},{"id":3823,"inV":46,"properties":{"weight":2}},{"id":3824,"inV":223,"properties":{"weight":2}},{"id":3825,"inV":51,"properties":{"weight":2}},{"id":3826,"inV":77,"properties":{"weight":1}},{"id":3827,"inV":188,"properties":{"weight":4}},{"id":3828,"inV":151,"properties":{"weight":1}},{"id":3829,"inV":202,"properties":{"weight":6}},{"id":3830,"inV":131,"properties":{"weight":1}},{"id":3831,"inV":189,"properties":{"weight":1}},{"id":3832,"inV":112,"properties":{"weight":1}},{"id":3833,"inV":71,"properties":{"weight":1}},{"id":3834,"inV":137,"properties":{"weight":3}},{"id":3835,"inV":173,"properties":{"weight":6}},{"id":3836,"inV":115,"properties":{"weight":2}},{"id":3837,"inV":254,"properties":{"weight":2}},{"id":3838,"inV":119,"properties":{"weight":1}}],"sungBy":[{"id":7740,"inV":553}],"writtenBy":[{"id":7739,"inV":520}]},"properties":{"name":[{"id":261,"value":"LITTLE RED ROOSTER"}],"songType":[{"id":263,"value":"cover"}],"performances":[{"id":262,"value":272}]}}
-{"id":89,"label":"song","inE":{"followedBy":[{"id":1984,"outV":152,"properties":{"weight":1}},{"id":770,"outV":122,"properties":{"weight":1}},{"id":1475,"outV":81,"properties":{"weight":1}},{"id":324,"outV":34,"properties":{"weight":2}},{"id":4612,"outV":85,"properties":{"weight":4}},{"id":6661,"outV":12,"properties":{"weight":4}},{"id":2762,"outV":15,"properties":{"weight":7}},{"id":2571,"outV":57,"properties":{"weight":1}},{"id":4683,"outV":33,"properties":{"weight":1}},{"id":1167,"outV":26,"properties":{"weight":1}},{"id":1552,"outV":18,"properties":{"weight":3}},{"id":1936,"outV":148,"properties":{"weight":4}},{"id":1361,"outV":130,"properties":{"weight":1}},{"id":2836,"outV":101,"properties":{"weight":4}},{"id":6613,"outV":127,"properties":{"weight":1}},{"id":2006,"outV":149,"properties":{"weight":1}},{"id":1434,"outV":83,"properties":{"weight":1}},{"id":219,"outV":70,"properties":{"weight":1}},{"id":4252,"outV":10,"properties":{"weight":3}},{"id":4380,"outV":62,"properties":{"weight":1}},{"id":1251,"outV":27,"properties":{"weight":3}},{"id":1827,"outV":41,"properties":{"weight":1}},{"id":3875,"outV":60,"properties":{"weight":1}},{"id":4963,"outV":207,"properties":{"weight":2}},{"id":5859,"outV":96,"properties":{"weight":10}},{"id":103,"outV":46,"properties":{"weight":1}},{"id":3112,"outV":153,"properties":{"weight":1}},{"id":2985,"outV":14,"properties":{"weight":2}},{"id":5417,"outV":69,"properties":{"weight":2}},{"id":2282,"outV":25,"properties":{"weight":3}},{"id":5674,"outV":167,"properties":{"weight":1}},{"id":4715,"outV":186,"properties":{"weight":6}},{"id":625,"outV":23,"properties":{"weight":2}},{"id":562,"outV":120,"properties":{"weight":1}},{"id":5939,"outV":50,"properties":{"weight":4}},{"id":3316,"outV":252,"properties":{"weight":1}},{"id":3636,"outV":24,"properties":{"weight":1}},{"id":6068,"outV":296,"properties":{"weight":1}},{"id":3894,"outV":51,"properties":{"weight":1}},{"id":6327,"outV":21,"properties":{"weight":3}},{"id":5624,"outV":22,"properties":{"weight":1}},{"id":2171,"outV":16,"properties":{"weight":2}},{"id":2748,"outV":13,"properties":{"weight":5}},{"id":5180,"outV":71,"properties":{"weight":1}},{"id":6078,"outV":72,"properties":{"weight":1}},{"id":6974,"outV":84,"properties":{"weight":1}},{"id":6719,"outV":53,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":7006,"inV":127,"properties":{"weight":11}},{"id":7007,"inV":26,"properties":{"weight":2}},{"id":7008,"inV":16,"properties":{"weight":1}},{"id":7009,"inV":22,"properties":{"weight":1}},{"id":7010,"inV":94,"properties":{"weight":3}},{"id":7011,"inV":3,"properties":{"weight":2}},{"id":7012,"inV":153,"properties":{"weight":7}},{"id":7013,"inV":12,"properties":{"weight":1}},{"id":7014,"inV":96,"properties":{"weight":28}},{"id":7015,"inV":141,"properties":{"weight":1}},{"id":7016,"inV":18,"properties":{"weight":3}},{"id":7017,"inV":57,"properties":{"weight":1}},{"id":7018,"inV":160,"properties":{"weight":1}},{"id":7019,"inV":39,"properties":{"weight":1}},{"id":7020,"inV":296,"properties":{"weight":3}},{"id":7021,"inV":83,"properties":{"weight":9}},{"id":7022,"inV":21,"properties":{"weight":1}},{"id":7023,"inV":206,"properties":{"weight":1}},{"id":7024,"inV":49,"properties":{"weight":1}},{"id":7025,"inV":129,"properties":{"weight":1}},{"id":7026,"inV":149,"properties":{"weight":1}},{"id":7027,"inV":148,"properties":{"weight":1}},{"id":7028,"inV":130,"properties":{"weight":1}},{"id":7029,"inV":4,"properties":{"weight":1}},{"id":7030,"inV":50,"properties":{"weight":1}},{"id":7031,"inV":13,"properties":{"weight":4}},{"id":7032,"inV":140,"properties":{"weight":2}},{"id":7033,"inV":29,"properties":{"weight":2}},{"id":7034,"inV":91,"properties":{"weight":2}},{"id":7035,"inV":70,"properties":{"weight":2}},{"id":7036,"inV":134,"properties":{"weight":2}},{"id":7037,"inV":201,"properties":{"weight":2}},{"id":7038,"inV":36,"properties":{"weight":1}},{"id":7039,"inV":165,"properties":{"weight":1}}],"sungBy":[{"id":7122,"inV":340}],"writtenBy":[{"id":7121,"inV":339}]},"properties":{"name":[{"id":264,"value":"DARK STAR"}],"songType":[{"id":266,"value":"original"}],"performances":[{"id":265,"value":219}]}}
-{"id":90,"label":"song","inE":{"followedBy":[{"id":6530,"outV":211,"properties":{"weight":1}},{"id":260,"outV":150,"properties":{"weight":4}},{"id":5158,"outV":125,"properties":{"weight":1}},{"id":6886,"outV":93,"properties":{"weight":1}},{"id":104,"outV":46,"properties":{"weight":1}},{"id":3304,"outV":160,"properties":{"weight":6}},{"id":3754,"outV":3,"properties":{"weight":2}},{"id":6026,"outV":204,"properties":{"weight":8}},{"id":2060,"outV":92,"properties":{"weight":1}},{"id":6636,"outV":127,"properties":{"weight":2}},{"id":1517,"outV":164,"properties":{"weight":1}},{"id":6513,"outV":187,"properties":{"weight":1}},{"id":1074,"outV":227,"properties":{"weight":1}},{"id":1651,"outV":213,"properties":{"weight":1}},{"id":597,"outV":120,"properties":{"weight":2}},{"id":4981,"outV":236,"properties":{"weight":1}},{"id":694,"outV":157,"properties":{"weight":3}},{"id":4951,"outV":86,"properties":{"weight":2}},{"id":3128,"outV":153,"properties":{"weight":2}},{"id":4828,"outV":114,"properties":{"weight":2}},{"id":1695,"outV":124,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":2496,"inV":31,"properties":{"weight":1}},{"id":2497,"inV":151,"properties":{"weight":1}},{"id":2498,"inV":50,"properties":{"weight":4}},{"id":2499,"inV":87,"properties":{"weight":2}},{"id":2500,"inV":21,"properties":{"weight":1}},{"id":2501,"inV":291,"properties":{"weight":1}},{"id":2502,"inV":190,"properties":{"weight":1}},{"id":2503,"inV":30,"properties":{"weight":1}},{"id":2489,"inV":38,"properties":{"weight":19}},{"id":2490,"inV":154,"properties":{"weight":3}},{"id":2491,"inV":64,"properties":{"weight":4}},{"id":2492,"inV":65,"properties":{"weight":1}},{"id":2493,"inV":84,"properties":{"weight":2}},{"id":2494,"inV":4,"properties":{"weight":3}},{"id":2495,"inV":62,"properties":{"weight":1}}]},"properties":{"name":[{"id":267,"value":"LET THE GOOD TIMES ROLL"}],"songType":[{"id":269,"value":""}],"performances":[{"id":268,"value":0}]}}
-{"id":91,"label":"song","inE":{"followedBy":[{"id":1792,"outV":196,"properties":{"weight":6}},{"id":2181,"outV":208,"properties":{"weight":4}},{"id":391,"outV":74,"properties":{"weight":9}},{"id":3207,"outV":229,"properties":{"weight":1}},{"id":648,"outV":23,"properties":{"weight":1}},{"id":3977,"outV":106,"properties":{"weight":1}},{"id":6153,"outV":36,"properties":{"weight":28}},{"id":6414,"outV":134,"properties":{"weight":1}},{"id":3096,"outV":153,"properties":{"weight":1}},{"id":5400,"outV":69,"properties":{"weight":5}},{"id":4764,"outV":37,"properties":{"weight":1}},{"id":6812,"outV":39,"properties":{"weight":1}},{"id":541,"outV":120,"properties":{"weight":6}},{"id":1821,"outV":41,"properties":{"weight":7}},{"id":798,"outV":122,"properties":{"weight":1}},{"id":2718,"outV":13,"properties":{"weight":42}},{"id":3870,"outV":60,"properties":{"weight":1}},{"id":6558,"outV":172,"properties":{"weight":3}},{"id":415,"outV":38,"properties":{"weight":1}},{"id":5792,"outV":76,"properties":{"weight":36}},{"id":4646,"outV":154,"properties":{"weight":2}},{"id":3368,"outV":184,"properties":{"weight":1}},{"id":6572,"outV":116,"properties":{"weight":1}},{"id":6958,"outV":84,"properties":{"weight":2}},{"id":1455,"outV":81,"properties":{"weight":3}},{"id":2865,"outV":101,"properties":{"weight":3}},{"id":818,"outV":171,"properties":{"weight":2}},{"id":5685,"outV":167,"properties":{"weight":1}},{"id":2359,"outV":87,"properties":{"weight":6}},{"id":185,"outV":70,"properties":{"weight":1}},{"id":4794,"outV":114,"properties":{"weight":1}},{"id":5316,"outV":170,"properties":{"weight":2}},{"id":6853,"outV":64,"properties":{"weight":1}},{"id":334,"outV":34,"properties":{"weight":1}},{"id":6351,"outV":21,"properties":{"weight":8}},{"id":2641,"outV":137,"properties":{"weight":1}},{"id":6738,"outV":53,"properties":{"weight":1}},{"id":6485,"outV":187,"properties":{"weight":5}},{"id":3034,"outV":14,"properties":{"weight":29}},{"id":1115,"outV":59,"properties":{"weight":1}},{"id":1759,"outV":28,"properties":{"weight":2}},{"id":3167,"outV":104,"properties":{"weight":1}},{"id":4063,"outV":109,"properties":{"weight":2}},{"id":2144,"outV":286,"properties":{"weight":1}},{"id":4193,"outV":54,"properties":{"weight":1}},{"id":4321,"outV":110,"properties":{"weight":2}},{"id":4449,"outV":113,"properties":{"weight":1}},{"id":3683,"outV":24,"properties":{"weight":1}},{"id":1892,"outV":103,"properties":{"weight":2}},{"id":6119,"outV":72,"properties":{"weight":1}},{"id":872,"outV":189,"properties":{"weight":1}},{"id":1384,"outV":130,"properties":{"weight":1}},{"id":2540,"outV":57,"properties":{"weight":5}},{"id":109,"outV":46,"properties":{"weight":1}},{"id":4591,"outV":85,"properties":{"weight":33}},{"id":2801,"outV":15,"properties":{"weight":1}},{"id":499,"outV":98,"properties":{"weight":1}},{"id":5882,"outV":96,"properties":{"weight":9}},{"id":7034,"outV":89,"properties":{"weight":2}},{"id":2301,"outV":25,"properties":{"weight":2}},{"id":4862,"outV":35,"properties":{"weight":1}},{"id":1279,"outV":27,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":910,"inV":3,"properties":{"weight":3}},{"id":911,"inV":125,"properties":{"weight":1}},{"id":912,"inV":13,"properties":{"weight":59}},{"id":913,"inV":25,"properties":{"weight":3}},{"id":914,"inV":85,"properties":{"weight":5}},{"id":915,"inV":4,"properties":{"weight":2}},{"id":916,"inV":12,"properties":{"weight":1}},{"id":917,"inV":32,"properties":{"weight":1}},{"id":918,"inV":127,"properties":{"weight":4}},{"id":919,"inV":230,"properties":{"weight":1}},{"id":920,"inV":26,"properties":{"weight":1}},{"id":921,"inV":59,"properties":{"weight":1}},{"id":922,"inV":99,"properties":{"weight":1}},{"id":923,"inV":76,"properties":{"weight":2}},{"id":924,"inV":153,"properties":{"weight":3}},{"id":925,"inV":96,"properties":{"weight":192}},{"id":926,"inV":114,"properties":{"weight":1}},{"id":927,"inV":181,"properties":{"weight":3}},{"id":928,"inV":101,"properties":{"weight":1}},{"id":929,"inV":116,"properties":{"weight":1}},{"id":930,"inV":183,"properties":{"weight":4}},{"id":931,"inV":29,"properties":{"weight":1}},{"id":932,"inV":21,"properties":{"weight":1}},{"id":933,"inV":5,"properties":{"weight":1}},{"id":934,"inV":69,"properties":{"weight":1}},{"id":935,"inV":148,"properties":{"weight":1}},{"id":936,"inV":231,"properties":{"weight":1}},{"id":937,"inV":123,"properties":{"weight":1}},{"id":938,"inV":38,"properties":{"weight":1}},{"id":939,"inV":41,"properties":{"weight":1}},{"id":940,"inV":186,"properties":{"weight":2}}],"sungBy":[{"id":7360,"inV":340}],"writtenBy":[{"id":7359,"inV":339}]},"properties":{"name":[{"id":270,"value":"TERRAPIN STATION"}],"songType":[{"id":272,"value":"original"}],"performances":[{"id":271,"value":302}]}}
-{"id":92,"label":"song","inE":{"followedBy":[{"id":320,"outV":34,"properties":{"weight":4}},{"id":4864,"outV":35,"properties":{"weight":2}},{"id":4609,"outV":85,"properties":{"weight":1}},{"id":1474,"outV":81,"properties":{"weight":1}},{"id":2627,"outV":158,"properties":{"weight":2}},{"id":4739,"outV":186,"properties":{"weight":1}},{"id":5351,"outV":165,"properties":{"weight":10}},{"id":5927,"outV":96,"properties":{"weight":2}},{"id":392,"outV":74,"properties":{"weight":1}},{"id":969,"outV":67,"properties":{"weight":3}},{"id":458,"outV":139,"properties":{"weight":1}},{"id":110,"outV":46,"properties":{"weight":1}},{"id":1967,"outV":148,"properties":{"weight":4}},{"id":6512,"outV":187,"properties":{"weight":2}},{"id":2963,"outV":78,"properties":{"weight":1}},{"id":309,"outV":5,"properties":{"weight":1}},{"id":2905,"outV":118,"properties":{"weight":1}},{"id":3545,"outV":201,"properties":{"weight":6}},{"id":2747,"outV":13,"properties":{"weight":1}},{"id":220,"outV":70,"properties":{"weight":20}},{"id":4381,"outV":62,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2048,"inV":153,"properties":{"weight":11}},{"id":2049,"inV":96,"properties":{"weight":2}},{"id":2050,"inV":26,"properties":{"weight":1}},{"id":2051,"inV":3,"properties":{"weight":4}},{"id":2052,"inV":46,"properties":{"weight":1}},{"id":2053,"inV":25,"properties":{"weight":1}},{"id":2054,"inV":49,"properties":{"weight":1}},{"id":2055,"inV":70,"properties":{"weight":1}},{"id":2056,"inV":93,"properties":{"weight":1}},{"id":2057,"inV":120,"properties":{"weight":1}},{"id":2058,"inV":88,"properties":{"weight":2}},{"id":2059,"inV":84,"properties":{"weight":2}},{"id":2060,"inV":90,"properties":{"weight":1}},{"id":2061,"inV":20,"properties":{"weight":1}},{"id":2062,"inV":64,"properties":{"weight":1}},{"id":2063,"inV":4,"properties":{"weight":1}},{"id":2038,"inV":76,"properties":{"weight":1}},{"id":2039,"inV":164,"properties":{"weight":11}},{"id":2040,"inV":21,"properties":{"weight":2}},{"id":2041,"inV":114,"properties":{"weight":7}},{"id":2042,"inV":133,"properties":{"weight":1}},{"id":2043,"inV":85,"properties":{"weight":1}},{"id":2044,"inV":13,"properties":{"weight":2}},{"id":2045,"inV":77,"properties":{"weight":1}},{"id":2046,"inV":151,"properties":{"weight":1}},{"id":2047,"inV":29,"properties":{"weight":7}}],"sungBy":[{"id":7338,"inV":340}],"writtenBy":[{"id":7337,"inV":339}]},"properties":{"name":[{"id":273,"value":"STANDING ON THE MOON"}],"songType":[{"id":275,"value":"original"}],"performances":[{"id":274,"value":75}]}}
-{"id":93,"label":"song","inE":{"followedBy":[{"id":1524,"outV":164,"properties":{"weight":2}},{"id":1924,"outV":103,"properties":{"weight":1}},{"id":4836,"outV":114,"properties":{"weight":2}},{"id":2583,"outV":57,"properties":{"weight":1}},{"id":2056,"outV":92,"properties":{"weight":1}},{"id":1228,"outV":26,"properties":{"weight":1}},{"id":5549,"outV":166,"properties":{"weight":1}},{"id":2334,"outV":25,"properties":{"weight":1}},{"id":3310,"outV":160,"properties":{"weight":2}},{"id":111,"outV":46,"properties":{"weight":1}},{"id":3951,"outV":138,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6884,"inV":124,"properties":{"weight":1}},{"id":6885,"inV":87,"properties":{"weight":2}},{"id":6886,"inV":90,"properties":{"weight":1}},{"id":6887,"inV":215,"properties":{"weight":1}},{"id":6888,"inV":76,"properties":{"weight":1}},{"id":6889,"inV":50,"properties":{"weight":1}},{"id":6890,"inV":259,"properties":{"weight":1}},{"id":6891,"inV":84,"properties":{"weight":1}},{"id":6892,"inV":34,"properties":{"weight":1}},{"id":6893,"inV":83,"properties":{"weight":1}},{"id":6894,"inV":38,"properties":{"weight":1}},{"id":6895,"inV":69,"properties":{"weight":1}},{"id":6896,"inV":46,"properties":{"weight":1}}],"sungBy":[{"id":7858,"inV":453}],"writtenBy":[{"id":7857,"inV":480}]},"properties":{"name":[{"id":276,"value":"RAIN"}],"songType":[{"id":278,"value":"cover"}],"performances":[{"id":277,"value":12}]}}
-{"id":94,"label":"song","inE":{"followedBy":[{"id":2688,"outV":13,"properties":{"weight":4}},{"id":6336,"outV":21,"properties":{"weight":24}},{"id":2626,"outV":158,"properties":{"weight":2}},{"id":6210,"outV":319,"properties":{"weight":2}},{"id":6466,"outV":187,"properties":{"weight":1}},{"id":195,"outV":70,"properties":{"weight":30}},{"id":4675,"outV":33,"properties":{"weight":2}},{"id":3846,"outV":60,"properties":{"weight":1}},{"id":5958,"outV":50,"properties":{"weight":2}},{"id":5639,"outV":22,"properties":{"weight":1}},{"id":1544,"outV":18,"properties":{"weight":2}},{"id":6536,"outV":242,"properties":{"weight":1}},{"id":2249,"outV":29,"properties":{"weight":1}},{"id":5706,"outV":20,"properties":{"weight":1}},{"id":1933,"outV":148,"properties":{"weight":84}},{"id":3085,"outV":153,"properties":{"weight":2}},{"id":6161,"outV":36,"properties":{"weight":1}},{"id":3539,"outV":201,"properties":{"weight":15}},{"id":6419,"outV":134,"properties":{"weight":6}},{"id":1364,"outV":130,"properties":{"weight":2}},{"id":2773,"outV":15,"properties":{"weight":4}},{"id":4439,"outV":113,"properties":{"weight":3}},{"id":2843,"outV":101,"properties":{"weight":6}},{"id":5340,"outV":165,"properties":{"weight":28}},{"id":4255,"outV":10,"properties":{"weight":3}},{"id":5793,"outV":76,"properties":{"weight":1}},{"id":610,"outV":23,"properties":{"weight":1}},{"id":1890,"outV":103,"properties":{"weight":1}},{"id":7010,"outV":89,"properties":{"weight":3}},{"id":1320,"outV":31,"properties":{"weight":2}},{"id":5037,"outV":276,"properties":{"weight":1}},{"id":4334,"outV":62,"properties":{"weight":3}},{"id":303,"outV":5,"properties":{"weight":5}},{"id":3631,"outV":24,"properties":{"weight":2}},{"id":112,"outV":46,"properties":{"weight":1}},{"id":4722,"outV":186,"properties":{"weight":3}},{"id":6770,"outV":39,"properties":{"weight":1}},{"id":947,"outV":67,"properties":{"weight":7}},{"id":5363,"outV":132,"properties":{"weight":1}},{"id":5877,"outV":96,"properties":{"weight":18}},{"id":4599,"outV":85,"properties":{"weight":1}},{"id":4855,"outV":35,"properties":{"weight":1}},{"id":1403,"outV":83,"properties":{"weight":12}},{"id":1531,"outV":164,"properties":{"weight":1}},{"id":3709,"outV":3,"properties":{"weight":26}},{"id":1151,"outV":26,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1856,"inV":25,"properties":{"weight":54}},{"id":1857,"inV":74,"properties":{"weight":2}},{"id":1858,"inV":12,"properties":{"weight":2}},{"id":1859,"inV":23,"properties":{"weight":1}},{"id":1860,"inV":10,"properties":{"weight":1}},{"id":1861,"inV":114,"properties":{"weight":13}},{"id":1862,"inV":3,"properties":{"weight":10}},{"id":1863,"inV":148,"properties":{"weight":2}},{"id":1864,"inV":133,"properties":{"weight":3}},{"id":1865,"inV":76,"properties":{"weight":1}},{"id":1866,"inV":110,"properties":{"weight":1}},{"id":1867,"inV":5,"properties":{"weight":15}},{"id":1868,"inV":154,"properties":{"weight":1}},{"id":1869,"inV":120,"properties":{"weight":19}},{"id":1870,"inV":70,"properties":{"weight":9}},{"id":1871,"inV":29,"properties":{"weight":43}},{"id":1872,"inV":164,"properties":{"weight":24}},{"id":1873,"inV":81,"properties":{"weight":1}},{"id":1874,"inV":162,"properties":{"weight":1}},{"id":1875,"inV":87,"properties":{"weight":1}},{"id":1845,"inV":21,"properties":{"weight":8}},{"id":1846,"inV":50,"properties":{"weight":5}},{"id":1847,"inV":15,"properties":{"weight":6}},{"id":1848,"inV":19,"properties":{"weight":1}},{"id":1849,"inV":18,"properties":{"weight":6}},{"id":1850,"inV":39,"properties":{"weight":1}},{"id":1851,"inV":153,"properties":{"weight":80}},{"id":1852,"inV":13,"properties":{"weight":4}},{"id":1853,"inV":9,"properties":{"weight":1}},{"id":1854,"inV":16,"properties":{"weight":2}},{"id":1855,"inV":83,"properties":{"weight":2}}],"sungBy":[{"id":7340,"inV":340}],"writtenBy":[{"id":7339,"inV":339}]},"properties":{"name":[{"id":279,"value":"STELLA BLUE"}],"songType":[{"id":281,"value":"original"}],"performances":[{"id":280,"value":328}]}}
-{"id":95,"label":"song","inE":{"followedBy":[{"id":1979,"outV":280,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":113,"inV":96,"properties":{"weight":1}}],"sungBy":[{"id":8016,"inV":533}],"writtenBy":[{"id":8015,"inV":791}]},"properties":{"name":[{"id":282,"value":"WHATS GOING ON"}],"songType":[{"id":284,"value":"cover"}],"performances":[{"id":283,"value":1}]}}
-{"id":96,"label":"song","inE":{"followedBy":[{"id":2049,"outV":92,"properties":{"weight":2}},{"id":3842,"outV":60,"properties":{"weight":10}},{"id":6531,"outV":242,"properties":{"weight":2}},{"id":6149,"outV":36,"properties":{"weight":41}},{"id":6277,"outV":49,"properties":{"weight":168}},{"id":520,"outV":203,"properties":{"weight":1}},{"id":1418,"outV":83,"properties":{"weight":211}},{"id":3211,"outV":229,"properties":{"weight":2}},{"id":5133,"outV":222,"properties":{"weight":1}},{"id":1937,"outV":148,"properties":{"weight":28}},{"id":3089,"outV":153,"properties":{"weight":1}},{"id":6930,"outV":84,"properties":{"weight":3}},{"id":2323,"outV":25,"properties":{"weight":1}},{"id":6420,"outV":134,"properties":{"weight":1}},{"id":6804,"outV":39,"properties":{"weight":2}},{"id":6551,"outV":172,"properties":{"weight":5}},{"id":5784,"outV":76,"properties":{"weight":6}},{"id":4762,"outV":37,"properties":{"weight":2}},{"id":1819,"outV":41,"properties":{"weight":38}},{"id":5404,"outV":69,"properties":{"weight":11}},{"id":285,"outV":5,"properties":{"weight":10}},{"id":925,"outV":91,"properties":{"weight":192}},{"id":545,"outV":120,"properties":{"weight":1}},{"id":2337,"outV":278,"properties":{"weight":3}},{"id":2977,"outV":8,"properties":{"weight":1}},{"id":3235,"outV":63,"properties":{"weight":1}},{"id":4643,"outV":154,"properties":{"weight":9}},{"id":2340,"outV":87,"properties":{"weight":2}},{"id":6309,"outV":123,"properties":{"weight":10}},{"id":6566,"outV":181,"properties":{"weight":1}},{"id":2855,"outV":101,"properties":{"weight":18}},{"id":6567,"outV":116,"properties":{"weight":7}},{"id":4392,"outV":40,"properties":{"weight":1}},{"id":1194,"outV":26,"properties":{"weight":1}},{"id":6699,"outV":141,"properties":{"weight":5}},{"id":1068,"outV":227,"properties":{"weight":1}},{"id":1452,"outV":81,"properties":{"weight":10}},{"id":941,"outV":67,"properties":{"weight":1}},{"id":2478,"outV":68,"properties":{"weight":1}},{"id":5422,"outV":102,"properties":{"weight":1}},{"id":5168,"outV":71,"properties":{"weight":1}},{"id":6320,"outV":21,"properties":{"weight":72}},{"id":1844,"outV":275,"properties":{"weight":1}},{"id":181,"outV":70,"properties":{"weight":4}},{"id":3381,"outV":184,"properties":{"weight":1}},{"id":2231,"outV":215,"properties":{"weight":2}},{"id":6199,"outV":319,"properties":{"weight":1}},{"id":5690,"outV":159,"properties":{"weight":1}},{"id":1980,"outV":281,"properties":{"weight":1}},{"id":447,"outV":38,"properties":{"weight":1}},{"id":4672,"outV":33,"properties":{"weight":17}},{"id":834,"outV":171,"properties":{"weight":20}},{"id":3778,"outV":168,"properties":{"weight":2}},{"id":2243,"outV":29,"properties":{"weight":2}},{"id":6979,"outV":175,"properties":{"weight":7}},{"id":5447,"outV":231,"properties":{"weight":4}},{"id":6599,"outV":127,"properties":{"weight":2}},{"id":456,"outV":139,"properties":{"weight":8}},{"id":5064,"outV":128,"properties":{"weight":2}},{"id":4299,"outV":110,"properties":{"weight":15}},{"id":3534,"outV":201,"properties":{"weight":1}},{"id":6482,"outV":187,"properties":{"weight":7}},{"id":4436,"outV":113,"properties":{"weight":19}},{"id":5332,"outV":238,"properties":{"weight":1}},{"id":3030,"outV":14,"properties":{"weight":1}},{"id":1239,"outV":183,"properties":{"weight":14}},{"id":3417,"outV":77,"properties":{"weight":1}},{"id":348,"outV":178,"properties":{"weight":1}},{"id":5214,"outV":99,"properties":{"weight":1}},{"id":607,"outV":182,"properties":{"weight":1}},{"id":2656,"outV":137,"properties":{"weight":1}},{"id":1761,"outV":28,"properties":{"weight":1}},{"id":2017,"outV":149,"properties":{"weight":2}},{"id":5729,"outV":274,"properties":{"weight":3}},{"id":1378,"outV":130,"properties":{"weight":5}},{"id":2147,"outV":228,"properties":{"weight":1}},{"id":2662,"outV":13,"properties":{"weight":157}},{"id":7014,"outV":89,"properties":{"weight":28}},{"id":2407,"outV":6,"properties":{"weight":1}},{"id":4455,"outV":163,"properties":{"weight":1}},{"id":4586,"outV":85,"properties":{"weight":36}},{"id":5099,"outV":4,"properties":{"weight":1}},{"id":239,"outV":145,"properties":{"weight":1}},{"id":113,"outV":95,"properties":{"weight":1}},{"id":375,"outV":74,"properties":{"weight":88}},{"id":2167,"outV":151,"properties":{"weight":1}},{"id":2551,"outV":57,"properties":{"weight":3}},{"id":5751,"outV":129,"properties":{"weight":21}},{"id":3324,"outV":230,"properties":{"weight":1}},{"id":4860,"outV":35,"properties":{"weight":2}},{"id":3710,"outV":3,"properties":{"weight":7}},{"id":6142,"outV":289,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5888,"inV":171,"properties":{"weight":2}},{"id":5889,"inV":289,"properties":{"weight":3}},{"id":5890,"inV":154,"properties":{"weight":1}},{"id":5891,"inV":141,"properties":{"weight":7}},{"id":5892,"inV":181,"properties":{"weight":8}},{"id":5893,"inV":109,"properties":{"weight":1}},{"id":5894,"inV":49,"properties":{"weight":4}},{"id":5895,"inV":70,"properties":{"weight":51}},{"id":5896,"inV":36,"properties":{"weight":5}},{"id":5897,"inV":82,"properties":{"weight":1}},{"id":5898,"inV":149,"properties":{"weight":23}},{"id":5899,"inV":159,"properties":{"weight":2}},{"id":5900,"inV":281,"properties":{"weight":1}},{"id":5901,"inV":8,"properties":{"weight":1}},{"id":5902,"inV":319,"properties":{"weight":4}},{"id":5903,"inV":116,"properties":{"weight":1}},{"id":5904,"inV":29,"properties":{"weight":26}},{"id":5905,"inV":129,"properties":{"weight":15}},{"id":5906,"inV":127,"properties":{"weight":10}},{"id":5907,"inV":233,"properties":{"weight":1}},{"id":5908,"inV":323,"properties":{"weight":1}},{"id":5909,"inV":209,"properties":{"weight":1}},{"id":5910,"inV":183,"properties":{"weight":1}},{"id":5911,"inV":115,"properties":{"weight":2}},{"id":5912,"inV":67,"properties":{"weight":27}},{"id":5913,"inV":162,"properties":{"weight":1}},{"id":5914,"inV":132,"properties":{"weight":6}},{"id":5915,"inV":238,"properties":{"weight":2}},{"id":5916,"inV":242,"properties":{"weight":1}},{"id":5917,"inV":102,"properties":{"weight":1}},{"id":5918,"inV":33,"properties":{"weight":1}},{"id":5919,"inV":117,"properties":{"weight":1}},{"id":5920,"inV":204,"properties":{"weight":1}},{"id":5921,"inV":60,"properties":{"weight":2}},{"id":5922,"inV":165,"properties":{"weight":11}},{"id":5923,"inV":231,"properties":{"weight":30}},{"id":5924,"inV":113,"properties":{"weight":1}},{"id":5925,"inV":87,"properties":{"weight":2}},{"id":5926,"inV":135,"properties":{"weight":1}},{"id":5927,"inV":92,"properties":{"weight":2}},{"id":5928,"inV":186,"properties":{"weight":324}},{"id":5929,"inV":201,"properties":{"weight":1}},{"id":5930,"inV":279,"properties":{"weight":1}},{"id":5931,"inV":304,"properties":{"weight":1}},{"id":5859,"inV":89,"properties":{"weight":10}},{"id":5860,"inV":148,"properties":{"weight":219}},{"id":5861,"inV":74,"properties":{"weight":14}},{"id":5862,"inV":153,"properties":{"weight":4}},{"id":5863,"inV":50,"properties":{"weight":2}},{"id":5864,"inV":19,"properties":{"weight":1}},{"id":5865,"inV":83,"properties":{"weight":7}},{"id":5866,"inV":21,"properties":{"weight":96}},{"id":5867,"inV":3,"properties":{"weight":116}},{"id":5868,"inV":145,"properties":{"weight":1}},{"id":5869,"inV":178,"properties":{"weight":4}},{"id":5870,"inV":134,"properties":{"weight":159}},{"id":5871,"inV":76,"properties":{"weight":4}},{"id":5872,"inV":120,"properties":{"weight":3}},{"id":5873,"inV":104,"properties":{"weight":1}},{"id":5874,"inV":130,"properties":{"weight":41}},{"id":5875,"inV":101,"properties":{"weight":6}},{"id":5876,"inV":98,"properties":{"weight":1}},{"id":5877,"inV":94,"properties":{"weight":18}},{"id":5878,"inV":100,"properties":{"weight":1}},{"id":5879,"inV":5,"properties":{"weight":22}},{"id":5880,"inV":133,"properties":{"weight":1}},{"id":5881,"inV":62,"properties":{"weight":15}},{"id":5882,"inV":91,"properties":{"weight":9}},{"id":5883,"inV":327,"properties":{"weight":3}},{"id":5884,"inV":147,"properties":{"weight":1}},{"id":5885,"inV":125,"properties":{"weight":20}},{"id":5886,"inV":13,"properties":{"weight":15}},{"id":5887,"inV":84,"properties":{"weight":3}}],"sungBy":[{"id":7138,"inV":342}],"writtenBy":[{"id":7137,"inV":342}]},"properties":{"name":[{"id":285,"value":"DRUMS"}],"songType":[{"id":287,"value":"original"}],"performances":[{"id":286,"value":1386}]}}
-{"id":97,"label":"song","inE":{"followedBy":[{"id":3840,"outV":261,"properties":{"weight":1}},{"id":3523,"outV":223,"properties":{"weight":1}},{"id":3590,"outV":56,"properties":{"weight":4}},{"id":1287,"outV":27,"properties":{"weight":6}},{"id":3978,"outV":106,"properties":{"weight":2}},{"id":6218,"outV":117,"properties":{"weight":1}},{"id":5067,"outV":128,"properties":{"weight":1}},{"id":1036,"outV":73,"properties":{"weight":7}},{"id":3916,"outV":51,"properties":{"weight":7}},{"id":6796,"outV":39,"properties":{"weight":3}},{"id":1998,"outV":152,"properties":{"weight":1}},{"id":3470,"outV":58,"properties":{"weight":3}},{"id":4366,"outV":62,"properties":{"weight":2}},{"id":2129,"outV":17,"properties":{"weight":2}},{"id":2453,"outV":68,"properties":{"weight":2}},{"id":6041,"outV":115,"properties":{"weight":1}},{"id":4507,"outV":244,"properties":{"weight":1}},{"id":158,"outV":108,"properties":{"weight":3}},{"id":4126,"outV":48,"properties":{"weight":6}},{"id":6752,"outV":53,"properties":{"weight":3}},{"id":6116,"outV":72,"properties":{"weight":1}},{"id":6500,"outV":187,"properties":{"weight":1}},{"id":1319,"outV":31,"properties":{"weight":1}},{"id":745,"outV":80,"properties":{"weight":4}},{"id":2217,"outV":75,"properties":{"weight":1}},{"id":3178,"outV":104,"properties":{"weight":4}},{"id":3818,"outV":88,"properties":{"weight":1}},{"id":4202,"outV":54,"properties":{"weight":9}},{"id":1197,"outV":26,"properties":{"weight":2}},{"id":5997,"outV":50,"properties":{"weight":2}},{"id":6959,"outV":84,"properties":{"weight":1}},{"id":2352,"outV":87,"properties":{"weight":1}},{"id":5424,"outV":102,"properties":{"weight":2}},{"id":4530,"outV":105,"properties":{"weight":2}},{"id":5106,"outV":4,"properties":{"weight":1}},{"id":4916,"outV":100,"properties":{"weight":8}},{"id":2037,"outV":180,"properties":{"weight":1}},{"id":3382,"outV":184,"properties":{"weight":1}},{"id":4988,"outV":30,"properties":{"weight":1}},{"id":2813,"outV":15,"properties":{"weight":1}},{"id":2943,"outV":78,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":128,"inV":4,"properties":{"weight":1}},{"id":129,"inV":103,"properties":{"weight":1}},{"id":130,"inV":80,"properties":{"weight":1}},{"id":131,"inV":73,"properties":{"weight":3}},{"id":132,"inV":68,"properties":{"weight":1}},{"id":133,"inV":56,"properties":{"weight":6}},{"id":134,"inV":27,"properties":{"weight":7}},{"id":135,"inV":87,"properties":{"weight":2}},{"id":136,"inV":78,"properties":{"weight":1}},{"id":137,"inV":63,"properties":{"weight":2}},{"id":138,"inV":104,"properties":{"weight":2}},{"id":139,"inV":105,"properties":{"weight":1}},{"id":140,"inV":75,"properties":{"weight":5}},{"id":141,"inV":39,"properties":{"weight":1}},{"id":142,"inV":106,"properties":{"weight":2}},{"id":143,"inV":23,"properties":{"weight":1}},{"id":114,"inV":98,"properties":{"weight":5}},{"id":115,"inV":58,"properties":{"weight":10}},{"id":116,"inV":53,"properties":{"weight":13}},{"id":117,"inV":88,"properties":{"weight":1}},{"id":118,"inV":54,"properties":{"weight":8}},{"id":119,"inV":57,"properties":{"weight":7}},{"id":120,"inV":99,"properties":{"weight":4}},{"id":121,"inV":72,"properties":{"weight":3}},{"id":122,"inV":100,"properties":{"weight":8}},{"id":123,"inV":14,"properties":{"weight":1}},{"id":124,"inV":101,"properties":{"weight":2}},{"id":125,"inV":102,"properties":{"weight":1}},{"id":126,"inV":19,"properties":{"weight":1}},{"id":127,"inV":48,"properties":{"weight":3}}],"sungBy":[{"id":7266,"inV":351}],"writtenBy":[{"id":7265,"inV":350}]},"properties":{"name":[{"id":288,"value":"MY BROTHER ESAU"}],"songType":[{"id":290,"value":"original"}],"performances":[{"id":289,"value":104}]}}
-{"id":98,"label":"song","inE":{"followedBy":[{"id":3649,"outV":24,"properties":{"weight":10}},{"id":5249,"outV":32,"properties":{"weight":12}},{"id":643,"outV":23,"properties":{"weight":2}},{"id":3588,"outV":56,"properties":{"weight":1}},{"id":839,"outV":171,"properties":{"weight":1}},{"id":1351,"outV":31,"properties":{"weight":1}},{"id":1416,"outV":83,"properties":{"weight":1}},{"id":5769,"outV":76,"properties":{"weight":17}},{"id":5643,"outV":22,"properties":{"weight":1}},{"id":6925,"outV":245,"properties":{"weight":1}},{"id":1102,"outV":59,"properties":{"weight":2}},{"id":5968,"outV":50,"properties":{"weight":7}},{"id":1169,"outV":26,"properties":{"weight":4}},{"id":4177,"outV":54,"properties":{"weight":1}},{"id":5715,"outV":20,"properties":{"weight":2}},{"id":1876,"outV":103,"properties":{"weight":4}},{"id":4628,"outV":154,"properties":{"weight":1}},{"id":6677,"outV":12,"properties":{"weight":5}},{"id":4695,"outV":111,"properties":{"weight":5}},{"id":536,"outV":120,"properties":{"weight":8}},{"id":3992,"outV":106,"properties":{"weight":1}},{"id":7000,"outV":197,"properties":{"weight":3}},{"id":6106,"outV":72,"properties":{"weight":1}},{"id":5599,"outV":42,"properties":{"weight":2}},{"id":2848,"outV":101,"properties":{"weight":1}},{"id":3361,"outV":184,"properties":{"weight":3}},{"id":2787,"outV":15,"properties":{"weight":10}},{"id":1574,"outV":18,"properties":{"weight":4}},{"id":4268,"outV":10,"properties":{"weight":8}},{"id":6253,"outV":117,"properties":{"weight":2}},{"id":4079,"outV":109,"properties":{"weight":2}},{"id":433,"outV":38,"properties":{"weight":2}},{"id":114,"outV":97,"properties":{"weight":5}},{"id":2290,"outV":25,"properties":{"weight":1}},{"id":1715,"outV":82,"properties":{"weight":1}},{"id":2099,"outV":188,"properties":{"weight":2}},{"id":2419,"outV":68,"properties":{"weight":9}},{"id":5876,"outV":96,"properties":{"weight":1}},{"id":2938,"outV":78,"properties":{"weight":1}},{"id":3002,"outV":14,"properties":{"weight":3}},{"id":3515,"outV":223,"properties":{"weight":1}},{"id":6779,"outV":39,"properties":{"weight":1}},{"id":4990,"outV":30,"properties":{"weight":7}},{"id":4415,"outV":198,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":512,"inV":200,"properties":{"weight":1}},{"id":513,"inV":117,"properties":{"weight":4}},{"id":514,"inV":77,"properties":{"weight":3}},{"id":515,"inV":188,"properties":{"weight":4}},{"id":516,"inV":201,"properties":{"weight":1}},{"id":517,"inV":80,"properties":{"weight":2}},{"id":518,"inV":202,"properties":{"weight":1}},{"id":471,"inV":24,"properties":{"weight":3}},{"id":472,"inV":16,"properties":{"weight":2}},{"id":473,"inV":18,"properties":{"weight":6}},{"id":474,"inV":26,"properties":{"weight":1}},{"id":475,"inV":17,"properties":{"weight":1}},{"id":476,"inV":15,"properties":{"weight":3}},{"id":477,"inV":22,"properties":{"weight":2}},{"id":478,"inV":50,"properties":{"weight":7}},{"id":479,"inV":20,"properties":{"weight":3}},{"id":480,"inV":27,"properties":{"weight":2}},{"id":481,"inV":13,"properties":{"weight":3}},{"id":482,"inV":12,"properties":{"weight":8}},{"id":483,"inV":39,"properties":{"weight":1}},{"id":484,"inV":21,"properties":{"weight":2}},{"id":485,"inV":10,"properties":{"weight":4}},{"id":486,"inV":83,"properties":{"weight":1}},{"id":487,"inV":76,"properties":{"weight":4}},{"id":488,"inV":121,"properties":{"weight":4}},{"id":489,"inV":14,"properties":{"weight":3}},{"id":490,"inV":110,"properties":{"weight":4}},{"id":491,"inV":25,"properties":{"weight":1}},{"id":492,"inV":3,"properties":{"weight":1}},{"id":493,"inV":103,"properties":{"weight":5}},{"id":494,"inV":85,"properties":{"weight":18}},{"id":495,"inV":101,"properties":{"weight":7}},{"id":496,"inV":196,"properties":{"weight":2}},{"id":497,"inV":68,"properties":{"weight":8}},{"id":498,"inV":109,"properties":{"weight":1}},{"id":499,"inV":91,"properties":{"weight":1}},{"id":500,"inV":32,"properties":{"weight":7}},{"id":501,"inV":197,"properties":{"weight":3}},{"id":502,"inV":42,"properties":{"weight":5}},{"id":503,"inV":198,"properties":{"weight":2}},{"id":504,"inV":111,"properties":{"weight":3}},{"id":505,"inV":181,"properties":{"weight":4}},{"id":506,"inV":199,"properties":{"weight":1}},{"id":507,"inV":88,"properties":{"weight":4}},{"id":508,"inV":73,"properties":{"weight":1}},{"id":509,"inV":49,"properties":{"weight":1}},{"id":510,"inV":71,"properties":{"weight":3}},{"id":511,"inV":124,"properties":{"weight":1}}],"sungBy":[{"id":7204,"inV":339}],"writtenBy":[{"id":7203,"inV":339}]},"properties":{"name":[{"id":291,"value":"IT MUST HAVE BEEN THE ROSES"}],"songType":[{"id":293,"value":"original"}],"performances":[{"id":292,"value":159}]}}
-{"id":99,"label":"song","inE":{"followedBy":[{"id":6789,"outV":39,"properties":{"weight":1}},{"id":199,"outV":70,"properties":{"weight":1}},{"id":3404,"outV":77,"properties":{"weight":1}},{"id":1038,"outV":73,"properties":{"weight":1}},{"id":4305,"outV":110,"properties":{"weight":1}},{"id":5779,"outV":76,"properties":{"weight":1}},{"id":1173,"outV":26,"properties":{"weight":2}},{"id":2710,"outV":13,"properties":{"weight":3}},{"id":2455,"outV":68,"properties":{"weight":8}},{"id":6169,"outV":36,"properties":{"weight":1}},{"id":922,"outV":91,"properties":{"weight":1}},{"id":5594,"outV":42,"properties":{"weight":3}},{"id":6234,"outV":117,"properties":{"weight":1}},{"id":797,"outV":122,"properties":{"weight":2}},{"id":3357,"outV":184,"properties":{"weight":11}},{"id":6750,"outV":53,"properties":{"weight":1}},{"id":1887,"outV":103,"properties":{"weight":10}},{"id":3679,"outV":24,"properties":{"weight":1}},{"id":3104,"outV":153,"properties":{"weight":1}},{"id":5473,"outV":79,"properties":{"weight":1}},{"id":3938,"outV":51,"properties":{"weight":1}},{"id":5282,"outV":32,"properties":{"weight":1}},{"id":2854,"outV":101,"properties":{"weight":6}},{"id":5992,"outV":50,"properties":{"weight":2}},{"id":2794,"outV":15,"properties":{"weight":3}},{"id":6826,"outV":64,"properties":{"weight":7}},{"id":5163,"outV":71,"properties":{"weight":2}},{"id":434,"outV":38,"properties":{"weight":2}},{"id":4788,"outV":114,"properties":{"weight":2}},{"id":2293,"outV":25,"properties":{"weight":1}},{"id":3509,"outV":223,"properties":{"weight":1}},{"id":120,"outV":97,"properties":{"weight":4}},{"id":3001,"outV":14,"properties":{"weight":26}},{"id":4286,"outV":10,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5184,"inV":76,"properties":{"weight":18}},{"id":5185,"inV":112,"properties":{"weight":3}},{"id":5186,"inV":103,"properties":{"weight":3}},{"id":5187,"inV":121,"properties":{"weight":1}},{"id":5188,"inV":3,"properties":{"weight":1}},{"id":5189,"inV":101,"properties":{"weight":2}},{"id":5190,"inV":68,"properties":{"weight":1}},{"id":5191,"inV":50,"properties":{"weight":2}},{"id":5192,"inV":18,"properties":{"weight":1}},{"id":5193,"inV":85,"properties":{"weight":1}},{"id":5194,"inV":70,"properties":{"weight":1}},{"id":5195,"inV":63,"properties":{"weight":1}},{"id":5196,"inV":22,"properties":{"weight":2}},{"id":5197,"inV":82,"properties":{"weight":10}},{"id":5198,"inV":170,"properties":{"weight":1}},{"id":5199,"inV":78,"properties":{"weight":3}},{"id":5200,"inV":19,"properties":{"weight":19}},{"id":5201,"inV":38,"properties":{"weight":2}},{"id":5202,"inV":84,"properties":{"weight":7}},{"id":5203,"inV":13,"properties":{"weight":2}},{"id":5204,"inV":69,"properties":{"weight":1}},{"id":5205,"inV":215,"properties":{"weight":6}},{"id":5206,"inV":4,"properties":{"weight":1}},{"id":5207,"inV":87,"properties":{"weight":3}},{"id":5208,"inV":59,"properties":{"weight":1}},{"id":5209,"inV":64,"properties":{"weight":2}},{"id":5210,"inV":62,"properties":{"weight":2}},{"id":5211,"inV":211,"properties":{"weight":2}},{"id":5212,"inV":21,"properties":{"weight":1}},{"id":5213,"inV":67,"properties":{"weight":1}},{"id":5214,"inV":96,"properties":{"weight":1}},{"id":5215,"inV":171,"properties":{"weight":1}},{"id":5216,"inV":74,"properties":{"weight":1}},{"id":5217,"inV":39,"properties":{"weight":1}},{"id":5218,"inV":26,"properties":{"weight":2}},{"id":5219,"inV":83,"properties":{"weight":2}},{"id":5220,"inV":153,"properties":{"weight":1}},{"id":5221,"inV":36,"properties":{"weight":1}}],"sungBy":[{"id":7246,"inV":340}],"writtenBy":[{"id":7245,"inV":339}]},"properties":{"name":[{"id":294,"value":"MIGHT AS WELL"}],"songType":[{"id":296,"value":"original"}],"performances":[{"id":295,"value":111}]}}
-{"id":100,"label":"song","inE":{"followedBy":[{"id":1538,"outV":18,"properties":{"weight":16}},{"id":1794,"outV":196,"properties":{"weight":2}},{"id":2178,"outV":208,"properties":{"weight":2}},{"id":3332,"outV":155,"properties":{"weight":1}},{"id":2950,"outV":78,"properties":{"weight":1}},{"id":5766,"outV":76,"properties":{"weight":6}},{"id":1031,"outV":73,"properties":{"weight":1}},{"id":5258,"outV":32,"properties":{"weight":11}},{"id":4240,"outV":10,"properties":{"weight":21}},{"id":5009,"outV":30,"properties":{"weight":4}},{"id":6033,"outV":115,"properties":{"weight":1}},{"id":5523,"outV":43,"properties":{"weight":1}},{"id":3348,"outV":184,"properties":{"weight":7}},{"id":5658,"outV":169,"properties":{"weight":1}},{"id":4124,"outV":48,"properties":{"weight":1}},{"id":2591,"outV":112,"properties":{"weight":1}},{"id":544,"outV":120,"properties":{"weight":5}},{"id":1699,"outV":124,"properties":{"weight":1}},{"id":2083,"outV":188,"properties":{"weight":4}},{"id":5541,"outV":126,"properties":{"weight":1}},{"id":3625,"outV":24,"properties":{"weight":17}},{"id":4393,"outV":40,"properties":{"weight":3}},{"id":6839,"outV":64,"properties":{"weight":2}},{"id":3000,"outV":14,"properties":{"weight":12}},{"id":186,"outV":70,"properties":{"weight":1}},{"id":1341,"outV":31,"properties":{"weight":3}},{"id":448,"outV":38,"properties":{"weight":2}},{"id":5572,"outV":42,"properties":{"weight":13}},{"id":5700,"outV":20,"properties":{"weight":4}},{"id":329,"outV":34,"properties":{"weight":1}},{"id":2768,"outV":15,"properties":{"weight":24}},{"id":3792,"outV":88,"properties":{"weight":32}},{"id":2130,"outV":17,"properties":{"weight":1}},{"id":2003,"outV":152,"properties":{"weight":1}},{"id":5461,"outV":79,"properties":{"weight":2}},{"id":2263,"outV":25,"properties":{"weight":2}},{"id":1881,"outV":103,"properties":{"weight":4}},{"id":4059,"outV":109,"properties":{"weight":10}},{"id":4316,"outV":110,"properties":{"weight":2}},{"id":4574,"outV":254,"properties":{"weight":1}},{"id":4958,"outV":207,"properties":{"weight":3}},{"id":991,"outV":11,"properties":{"weight":1}},{"id":867,"outV":189,"properties":{"weight":3}},{"id":1635,"outV":210,"properties":{"weight":1}},{"id":3941,"outV":51,"properties":{"weight":1}},{"id":3176,"outV":104,"properties":{"weight":2}},{"id":6249,"outV":117,"properties":{"weight":5}},{"id":2667,"outV":13,"properties":{"weight":5}},{"id":1774,"outV":234,"properties":{"weight":2}},{"id":2415,"outV":68,"properties":{"weight":13}},{"id":6767,"outV":39,"properties":{"weight":2}},{"id":3313,"outV":252,"properties":{"weight":1}},{"id":628,"outV":23,"properties":{"weight":5}},{"id":3957,"outV":106,"properties":{"weight":1}},{"id":5878,"outV":96,"properties":{"weight":1}},{"id":122,"outV":97,"properties":{"weight":8}},{"id":1146,"outV":26,"properties":{"weight":13}},{"id":5626,"outV":22,"properties":{"weight":2}},{"id":6650,"outV":12,"properties":{"weight":7}},{"id":5503,"outV":131,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":4870,"inV":122,"properties":{"weight":1}},{"id":4871,"inV":39,"properties":{"weight":2}},{"id":4872,"inV":15,"properties":{"weight":9}},{"id":4873,"inV":46,"properties":{"weight":2}},{"id":4874,"inV":13,"properties":{"weight":6}},{"id":4875,"inV":25,"properties":{"weight":3}},{"id":4876,"inV":11,"properties":{"weight":2}},{"id":4877,"inV":50,"properties":{"weight":8}},{"id":4878,"inV":10,"properties":{"weight":19}},{"id":4879,"inV":113,"properties":{"weight":1}},{"id":4880,"inV":19,"properties":{"weight":1}},{"id":4881,"inV":14,"properties":{"weight":20}},{"id":4882,"inV":152,"properties":{"weight":1}},{"id":4883,"inV":234,"properties":{"weight":1}},{"id":4884,"inV":54,"properties":{"weight":2}},{"id":4885,"inV":18,"properties":{"weight":11}},{"id":4886,"inV":22,"properties":{"weight":2}},{"id":4887,"inV":24,"properties":{"weight":15}},{"id":4888,"inV":21,"properties":{"weight":1}},{"id":4889,"inV":23,"properties":{"weight":3}},{"id":4890,"inV":55,"properties":{"weight":1}},{"id":4891,"inV":49,"properties":{"weight":1}},{"id":4892,"inV":26,"properties":{"weight":5}},{"id":4893,"inV":12,"properties":{"weight":7}},{"id":4894,"inV":20,"properties":{"weight":1}},{"id":4895,"inV":42,"properties":{"weight":14}},{"id":4896,"inV":101,"properties":{"weight":15}},{"id":4897,"inV":121,"properties":{"weight":13}},{"id":4898,"inV":68,"properties":{"weight":21}},{"id":4899,"inV":76,"properties":{"weight":1}},{"id":4900,"inV":32,"properties":{"weight":11}},{"id":4901,"inV":112,"properties":{"weight":10}},{"id":4902,"inV":103,"properties":{"weight":12}},{"id":4903,"inV":120,"properties":{"weight":2}},{"id":4904,"inV":85,"properties":{"weight":8}},{"id":4905,"inV":110,"properties":{"weight":2}},{"id":4906,"inV":109,"properties":{"weight":6}},{"id":4907,"inV":208,"properties":{"weight":1}},{"id":4908,"inV":189,"properties":{"weight":1}},{"id":4909,"inV":181,"properties":{"weight":4}},{"id":4910,"inV":106,"properties":{"weight":2}},{"id":4911,"inV":27,"properties":{"weight":1}},{"id":4912,"inV":17,"properties":{"weight":1}},{"id":4913,"inV":88,"properties":{"weight":4}},{"id":4914,"inV":31,"properties":{"weight":1}},{"id":4915,"inV":64,"properties":{"weight":2}},{"id":4916,"inV":97,"properties":{"weight":8}},{"id":4917,"inV":38,"properties":{"weight":1}},{"id":4918,"inV":163,"properties":{"weight":1}},{"id":4919,"inV":223,"properties":{"weight":2}},{"id":4920,"inV":114,"properties":{"weight":1}},{"id":4921,"inV":71,"properties":{"weight":5}},{"id":4922,"inV":283,"properties":{"weight":1}},{"id":4923,"inV":117,"properties":{"weight":8}},{"id":4924,"inV":48,"properties":{"weight":1}},{"id":4925,"inV":34,"properties":{"weight":2}},{"id":4926,"inV":188,"properties":{"weight":3}},{"id":4927,"inV":167,"properties":{"weight":1}},{"id":4928,"inV":124,"properties":{"weight":2}},{"id":4929,"inV":79,"properties":{"weight":3}},{"id":4930,"inV":40,"properties":{"weight":1}},{"id":4931,"inV":175,"properties":{"weight":1}},{"id":4932,"inV":254,"properties":{"weight":2}},{"id":4933,"inV":115,"properties":{"weight":1}},{"id":4934,"inV":43,"properties":{"weight":1}},{"id":4935,"inV":158,"properties":{"weight":1}},{"id":4936,"inV":33,"properties":{"weight":1}}],"sungBy":[{"id":7084,"inV":340}],"writtenBy":[{"id":7083,"inV":339}]},"properties":{"name":[{"id":297,"value":"BROWN EYED WOMEN"}],"songType":[{"id":299,"value":"original"}],"performances":[{"id":298,"value":347}]}}
-{"id":101,"label":"song","inE":{"followedBy":[{"id":3848,"outV":60,"properties":{"weight":1}},{"id":395,"outV":74,"properties":{"weight":1}},{"id":1421,"outV":83,"properties":{"weight":1}},{"id":145,"outV":108,"properties":{"weight":6}},{"id":4497,"outV":202,"properties":{"weight":3}},{"id":3218,"outV":63,"properties":{"weight":6}},{"id":4626,"outV":154,"properties":{"weight":2}},{"id":6803,"outV":39,"properties":{"weight":2}},{"id":2457,"outV":68,"properties":{"weight":2}},{"id":3356,"outV":184,"properties":{"weight":4}},{"id":928,"outV":91,"properties":{"weight":1}},{"id":2208,"outV":75,"properties":{"weight":4}},{"id":4128,"outV":48,"properties":{"weight":6}},{"id":4896,"outV":100,"properties":{"weight":15}},{"id":6049,"outV":115,"properties":{"weight":6}},{"id":5410,"outV":69,"properties":{"weight":1}},{"id":1586,"outV":18,"properties":{"weight":1}},{"id":4531,"outV":105,"properties":{"weight":3}},{"id":3254,"outV":285,"properties":{"weight":2}},{"id":832,"outV":171,"properties":{"weight":1}},{"id":5312,"outV":170,"properties":{"weight":7}},{"id":3009,"outV":14,"properties":{"weight":1}},{"id":4036,"outV":173,"properties":{"weight":3}},{"id":5189,"outV":99,"properties":{"weight":2}},{"id":2374,"outV":87,"properties":{"weight":1}},{"id":2631,"outV":137,"properties":{"weight":2}},{"id":3913,"outV":51,"properties":{"weight":15}},{"id":6346,"outV":21,"properties":{"weight":1}},{"id":2123,"outV":17,"properties":{"weight":1}},{"id":6480,"outV":187,"properties":{"weight":1}},{"id":6097,"outV":72,"properties":{"weight":2}},{"id":3154,"outV":104,"properties":{"weight":6}},{"id":6226,"outV":117,"properties":{"weight":4}},{"id":4181,"outV":54,"properties":{"weight":22}},{"id":2902,"outV":118,"properties":{"weight":1}},{"id":3414,"outV":77,"properties":{"weight":1}},{"id":1111,"outV":59,"properties":{"weight":1}},{"id":6746,"outV":53,"properties":{"weight":10}},{"id":2398,"outV":179,"properties":{"weight":1}},{"id":2531,"outV":57,"properties":{"weight":2}},{"id":1381,"outV":130,"properties":{"weight":1}},{"id":870,"outV":189,"properties":{"weight":2}},{"id":3817,"outV":88,"properties":{"weight":1}},{"id":3566,"outV":56,"properties":{"weight":9}},{"id":495,"outV":98,"properties":{"weight":7}},{"id":5875,"outV":96,"properties":{"weight":6}},{"id":757,"outV":80,"properties":{"weight":1}},{"id":1269,"outV":27,"properties":{"weight":20}},{"id":2805,"outV":15,"properties":{"weight":2}},{"id":2170,"outV":16,"properties":{"weight":46}},{"id":1019,"outV":73,"properties":{"weight":23}},{"id":3963,"outV":106,"properties":{"weight":3}},{"id":124,"outV":97,"properties":{"weight":2}},{"id":3453,"outV":58,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":2830,"inV":13,"properties":{"weight":8}},{"id":2831,"inV":153,"properties":{"weight":5}},{"id":2832,"inV":5,"properties":{"weight":3}},{"id":2833,"inV":15,"properties":{"weight":1}},{"id":2834,"inV":122,"properties":{"weight":3}},{"id":2835,"inV":26,"properties":{"weight":2}},{"id":2836,"inV":89,"properties":{"weight":4}},{"id":2837,"inV":83,"properties":{"weight":6}},{"id":2838,"inV":130,"properties":{"weight":8}},{"id":2839,"inV":49,"properties":{"weight":8}},{"id":2840,"inV":9,"properties":{"weight":2}},{"id":2841,"inV":19,"properties":{"weight":18}},{"id":2842,"inV":51,"properties":{"weight":2}},{"id":2843,"inV":94,"properties":{"weight":6}},{"id":2844,"inV":14,"properties":{"weight":1}},{"id":2845,"inV":82,"properties":{"weight":21}},{"id":2846,"inV":129,"properties":{"weight":2}},{"id":2847,"inV":148,"properties":{"weight":1}},{"id":2848,"inV":98,"properties":{"weight":1}},{"id":2849,"inV":209,"properties":{"weight":1}},{"id":2850,"inV":149,"properties":{"weight":1}},{"id":2851,"inV":25,"properties":{"weight":1}},{"id":2852,"inV":18,"properties":{"weight":1}},{"id":2853,"inV":54,"properties":{"weight":2}},{"id":2854,"inV":99,"properties":{"weight":6}},{"id":2855,"inV":96,"properties":{"weight":18}},{"id":2856,"inV":110,"properties":{"weight":2}},{"id":2857,"inV":179,"properties":{"weight":1}},{"id":2858,"inV":59,"properties":{"weight":1}},{"id":2859,"inV":76,"properties":{"weight":17}},{"id":2860,"inV":57,"properties":{"weight":24}},{"id":2861,"inV":4,"properties":{"weight":6}},{"id":2862,"inV":154,"properties":{"weight":3}},{"id":2863,"inV":134,"properties":{"weight":1}},{"id":2864,"inV":72,"properties":{"weight":16}},{"id":2865,"inV":91,"properties":{"weight":3}},{"id":2866,"inV":73,"properties":{"weight":2}},{"id":2867,"inV":84,"properties":{"weight":4}},{"id":2868,"inV":78,"properties":{"weight":1}},{"id":2869,"inV":155,"properties":{"weight":1}},{"id":2870,"inV":210,"properties":{"weight":4}},{"id":2871,"inV":87,"properties":{"weight":9}},{"id":2872,"inV":215,"properties":{"weight":6}},{"id":2873,"inV":199,"properties":{"weight":1}},{"id":2874,"inV":127,"properties":{"weight":1}},{"id":2875,"inV":62,"properties":{"weight":8}},{"id":2876,"inV":61,"properties":{"weight":1}},{"id":2877,"inV":150,"properties":{"weight":1}},{"id":2878,"inV":299,"properties":{"weight":1}},{"id":2879,"inV":74,"properties":{"weight":3}},{"id":2880,"inV":64,"properties":{"weight":2}},{"id":2881,"inV":36,"properties":{"weight":1}},{"id":2882,"inV":67,"properties":{"weight":2}},{"id":2883,"inV":60,"properties":{"weight":2}},{"id":2884,"inV":114,"properties":{"weight":1}},{"id":2885,"inV":81,"properties":{"weight":7}},{"id":2886,"inV":46,"properties":{"weight":4}},{"id":2887,"inV":34,"properties":{"weight":4}},{"id":2888,"inV":118,"properties":{"weight":1}},{"id":2889,"inV":167,"properties":{"weight":1}},{"id":2890,"inV":151,"properties":{"weight":1}},{"id":2891,"inV":248,"properties":{"weight":1}},{"id":2892,"inV":50,"properties":{"weight":1}},{"id":2893,"inV":41,"properties":{"weight":1}},{"id":2894,"inV":39,"properties":{"weight":1}},{"id":2895,"inV":158,"properties":{"weight":1}},{"id":2896,"inV":21,"properties":{"weight":1}}],"sungBy":[{"id":7226,"inV":351}],"writtenBy":[{"id":7225,"inV":350}]},"properties":{"name":[{"id":300,"value":"LET IT GROW"}],"songType":[{"id":302,"value":"original"}],"performances":[{"id":301,"value":276}]}}
-{"id":102,"label":"song","inE":{"followedBy":[{"id":1426,"outV":83,"properties":{"weight":1}},{"id":3468,"outV":58,"properties":{"weight":1}},{"id":125,"outV":97,"properties":{"weight":1}},{"id":3677,"outV":24,"properties":{"weight":1}},{"id":5917,"outV":96,"properties":{"weight":1}},{"id":5407,"outV":69,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5424,"inV":97,"properties":{"weight":2}},{"id":5425,"inV":4,"properties":{"weight":1}},{"id":5426,"inV":5,"properties":{"weight":1}},{"id":5422,"inV":96,"properties":{"weight":1}},{"id":5423,"inV":49,"properties":{"weight":1}}]},"properties":{"name":[{"id":303,"value":"MAYBE YOU KNOW HOW I FEEL"}],"songType":[{"id":305,"value":""}],"performances":[{"id":304,"value":0}]}}
-{"id":103,"label":"song","inE":{"followedBy":[{"id":2176,"outV":208,"properties":{"weight":2}},{"id":2816,"outV":15,"properties":{"weight":1}},{"id":129,"outV":97,"properties":{"weight":1}},{"id":259,"outV":150,"properties":{"weight":1}},{"id":2436,"outV":68,"properties":{"weight":1}},{"id":3717,"outV":3,"properties":{"weight":2}},{"id":2952,"outV":78,"properties":{"weight":1}},{"id":4488,"outV":202,"properties":{"weight":4}},{"id":6793,"outV":39,"properties":{"weight":1}},{"id":1802,"outV":196,"properties":{"weight":1}},{"id":4106,"outV":48,"properties":{"weight":8}},{"id":1419,"outV":83,"properties":{"weight":1}},{"id":1675,"outV":124,"properties":{"weight":1}},{"id":4621,"outV":154,"properties":{"weight":5}},{"id":3217,"outV":63,"properties":{"weight":4}},{"id":6417,"outV":134,"properties":{"weight":1}},{"id":3475,"outV":58,"properties":{"weight":11}},{"id":148,"outV":108,"properties":{"weight":3}},{"id":2198,"outV":75,"properties":{"weight":6}},{"id":5398,"outV":69,"properties":{"weight":1}},{"id":3353,"outV":184,"properties":{"weight":2}},{"id":3998,"outV":66,"properties":{"weight":1}},{"id":6046,"outV":115,"properties":{"weight":3}},{"id":2719,"outV":13,"properties":{"weight":1}},{"id":546,"outV":120,"properties":{"weight":2}},{"id":1957,"outV":148,"properties":{"weight":1}},{"id":4518,"outV":105,"properties":{"weight":5}},{"id":4902,"outV":100,"properties":{"weight":12}},{"id":2097,"outV":188,"properties":{"weight":1}},{"id":2612,"outV":158,"properties":{"weight":1}},{"id":1589,"outV":18,"properties":{"weight":2}},{"id":2230,"outV":215,"properties":{"weight":1}},{"id":4790,"outV":114,"properties":{"weight":2}},{"id":4024,"outV":173,"properties":{"weight":1}},{"id":5566,"outV":162,"properties":{"weight":1}},{"id":3007,"outV":14,"properties":{"weight":1}},{"id":3903,"outV":51,"properties":{"weight":8}},{"id":6848,"outV":64,"properties":{"weight":1}},{"id":1729,"outV":82,"properties":{"weight":2}},{"id":5186,"outV":99,"properties":{"weight":3}},{"id":5061,"outV":257,"properties":{"weight":1}},{"id":2630,"outV":137,"properties":{"weight":4}},{"id":4294,"outV":10,"properties":{"weight":1}},{"id":6982,"outV":175,"properties":{"weight":1}},{"id":2119,"outV":17,"properties":{"weight":3}},{"id":5323,"outV":170,"properties":{"weight":2}},{"id":4306,"outV":110,"properties":{"weight":1}},{"id":4179,"outV":54,"properties":{"weight":27}},{"id":6100,"outV":72,"properties":{"weight":3}},{"id":725,"outV":80,"properties":{"weight":2}},{"id":1621,"outV":210,"properties":{"weight":1}},{"id":6741,"outV":53,"properties":{"weight":12}},{"id":1110,"outV":59,"properties":{"weight":4}},{"id":3161,"outV":104,"properties":{"weight":5}},{"id":4064,"outV":109,"properties":{"weight":6}},{"id":3299,"outV":160,"properties":{"weight":1}},{"id":4579,"outV":254,"properties":{"weight":1}},{"id":5091,"outV":4,"properties":{"weight":1}},{"id":6243,"outV":117,"properties":{"weight":1}},{"id":2536,"outV":57,"properties":{"weight":5}},{"id":1514,"outV":164,"properties":{"weight":1}},{"id":876,"outV":189,"properties":{"weight":1}},{"id":493,"outV":98,"properties":{"weight":5}},{"id":4848,"outV":119,"properties":{"weight":1}},{"id":5235,"outV":214,"properties":{"weight":1}},{"id":1012,"outV":73,"properties":{"weight":10}},{"id":3573,"outV":56,"properties":{"weight":10}},{"id":374,"outV":74,"properties":{"weight":1}},{"id":2295,"outV":25,"properties":{"weight":3}},{"id":3959,"outV":106,"properties":{"weight":3}},{"id":1660,"outV":263,"properties":{"weight":1}},{"id":1278,"outV":27,"properties":{"weight":8}},{"id":5247,"outV":32,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":1920,"inV":62,"properties":{"weight":5}},{"id":1921,"inV":81,"properties":{"weight":2}},{"id":1922,"inV":158,"properties":{"weight":1}},{"id":1923,"inV":9,"properties":{"weight":3}},{"id":1924,"inV":93,"properties":{"weight":1}},{"id":1925,"inV":104,"properties":{"weight":1}},{"id":1926,"inV":229,"properties":{"weight":1}},{"id":1876,"inV":98,"properties":{"weight":4}},{"id":1877,"inV":17,"properties":{"weight":2}},{"id":1878,"inV":82,"properties":{"weight":31}},{"id":1879,"inV":48,"properties":{"weight":2}},{"id":1880,"inV":76,"properties":{"weight":15}},{"id":1881,"inV":100,"properties":{"weight":4}},{"id":1882,"inV":69,"properties":{"weight":3}},{"id":1883,"inV":60,"properties":{"weight":3}},{"id":1884,"inV":59,"properties":{"weight":11}},{"id":1885,"inV":13,"properties":{"weight":3}},{"id":1886,"inV":83,"properties":{"weight":4}},{"id":1887,"inV":99,"properties":{"weight":10}},{"id":1888,"inV":78,"properties":{"weight":5}},{"id":1889,"inV":215,"properties":{"weight":7}},{"id":1890,"inV":94,"properties":{"weight":1}},{"id":1891,"inV":4,"properties":{"weight":19}},{"id":1892,"inV":91,"properties":{"weight":2}},{"id":1893,"inV":54,"properties":{"weight":1}},{"id":1894,"inV":85,"properties":{"weight":1}},{"id":1895,"inV":27,"properties":{"weight":1}},{"id":1896,"inV":50,"properties":{"weight":5}},{"id":1897,"inV":70,"properties":{"weight":2}},{"id":1898,"inV":120,"properties":{"weight":1}},{"id":1899,"inV":84,"properties":{"weight":5}},{"id":1900,"inV":19,"properties":{"weight":22}},{"id":1901,"inV":73,"properties":{"weight":1}},{"id":1902,"inV":65,"properties":{"weight":3}},{"id":1903,"inV":26,"properties":{"weight":1}},{"id":1904,"inV":72,"properties":{"weight":18}},{"id":1905,"inV":38,"properties":{"weight":1}},{"id":1906,"inV":154,"properties":{"weight":2}},{"id":1907,"inV":123,"properties":{"weight":1}},{"id":1908,"inV":57,"properties":{"weight":4}},{"id":1909,"inV":12,"properties":{"weight":1}},{"id":1910,"inV":56,"properties":{"weight":1}},{"id":1911,"inV":112,"properties":{"weight":1}},{"id":1912,"inV":115,"properties":{"weight":1}},{"id":1913,"inV":87,"properties":{"weight":6}},{"id":1914,"inV":36,"properties":{"weight":2}},{"id":1915,"inV":131,"properties":{"weight":1}},{"id":1916,"inV":64,"properties":{"weight":1}},{"id":1917,"inV":75,"properties":{"weight":1}},{"id":1918,"inV":46,"properties":{"weight":4}},{"id":1919,"inV":34,"properties":{"weight":8}}],"sungBy":[{"id":7264,"inV":351}],"writtenBy":[{"id":7263,"inV":350}]},"properties":{"name":[{"id":306,"value":"THE MUSIC NEVER STOPPED"}],"songType":[{"id":308,"value":"original"}],"performances":[{"id":307,"value":234}]}}
-{"id":104,"label":"song","inE":{"followedBy":[{"id":5248,"outV":32,"properties":{"weight":32}},{"id":1157,"outV":26,"properties":{"weight":18}},{"id":1925,"outV":103,"properties":{"weight":1}},{"id":4997,"outV":30,"properties":{"weight":11}},{"id":649,"outV":23,"properties":{"weight":22}},{"id":138,"outV":97,"properties":{"weight":2}},{"id":5775,"outV":76,"properties":{"weight":11}},{"id":3985,"outV":106,"properties":{"weight":1}},{"id":4241,"outV":10,"properties":{"weight":5}},{"id":5650,"outV":169,"properties":{"weight":1}},{"id":406,"outV":38,"properties":{"weight":19}},{"id":6678,"outV":12,"properties":{"weight":4}},{"id":3351,"outV":184,"properties":{"weight":3}},{"id":5529,"outV":43,"properties":{"weight":1}},{"id":542,"outV":120,"properties":{"weight":7}},{"id":5540,"outV":126,"properties":{"weight":1}},{"id":1067,"outV":240,"properties":{"weight":1}},{"id":1580,"outV":18,"properties":{"weight":9}},{"id":1709,"outV":124,"properties":{"weight":1}},{"id":4014,"outV":292,"properties":{"weight":1}},{"id":5934,"outV":50,"properties":{"weight":29}},{"id":5039,"outV":291,"properties":{"weight":1}},{"id":4402,"outV":40,"properties":{"weight":1}},{"id":1331,"outV":31,"properties":{"weight":5}},{"id":3003,"outV":14,"properties":{"weight":2}},{"id":6459,"outV":187,"properties":{"weight":1}},{"id":1727,"outV":82,"properties":{"weight":1}},{"id":2757,"outV":15,"properties":{"weight":17}},{"id":5573,"outV":42,"properties":{"weight":3}},{"id":3655,"outV":24,"properties":{"weight":11}},{"id":3530,"outV":223,"properties":{"weight":1}},{"id":4687,"outV":33,"properties":{"weight":1}},{"id":4816,"outV":114,"properties":{"weight":1}},{"id":2901,"outV":118,"properties":{"weight":1}},{"id":6870,"outV":64,"properties":{"weight":1}},{"id":6231,"outV":117,"properties":{"weight":3}},{"id":2267,"outV":25,"properties":{"weight":1}},{"id":7003,"outV":197,"properties":{"weight":1}},{"id":988,"outV":11,"properties":{"weight":2}},{"id":4060,"outV":109,"properties":{"weight":5}},{"id":5724,"outV":20,"properties":{"weight":1}},{"id":5470,"outV":79,"properties":{"weight":2}},{"id":3813,"outV":88,"properties":{"weight":8}},{"id":4325,"outV":110,"properties":{"weight":1}},{"id":2663,"outV":13,"properties":{"weight":1}},{"id":4200,"outV":54,"properties":{"weight":1}},{"id":2409,"outV":68,"properties":{"weight":8}},{"id":2032,"outV":180,"properties":{"weight":1}},{"id":5873,"outV":96,"properties":{"weight":1}},{"id":6131,"outV":72,"properties":{"weight":1}},{"id":3068,"outV":153,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3200,"inV":158,"properties":{"weight":1}},{"id":3201,"inV":31,"properties":{"weight":4}},{"id":3202,"inV":137,"properties":{"weight":1}},{"id":3142,"inV":10,"properties":{"weight":4}},{"id":3143,"inV":26,"properties":{"weight":4}},{"id":3144,"inV":12,"properties":{"weight":24}},{"id":3145,"inV":13,"properties":{"weight":4}},{"id":3146,"inV":11,"properties":{"weight":3}},{"id":3147,"inV":15,"properties":{"weight":2}},{"id":3148,"inV":18,"properties":{"weight":19}},{"id":3149,"inV":3,"properties":{"weight":1}},{"id":3150,"inV":50,"properties":{"weight":4}},{"id":3151,"inV":82,"properties":{"weight":1}},{"id":3152,"inV":110,"properties":{"weight":5}},{"id":3153,"inV":121,"properties":{"weight":8}},{"id":3154,"inV":101,"properties":{"weight":6}},{"id":3155,"inV":68,"properties":{"weight":17}},{"id":3156,"inV":14,"properties":{"weight":6}},{"id":3157,"inV":112,"properties":{"weight":17}},{"id":3158,"inV":196,"properties":{"weight":2}},{"id":3159,"inV":85,"properties":{"weight":9}},{"id":3160,"inV":32,"properties":{"weight":14}},{"id":3161,"inV":103,"properties":{"weight":5}},{"id":3162,"inV":83,"properties":{"weight":1}},{"id":3163,"inV":42,"properties":{"weight":11}},{"id":3164,"inV":70,"properties":{"weight":1}},{"id":3165,"inV":109,"properties":{"weight":7}},{"id":3166,"inV":189,"properties":{"weight":1}},{"id":3167,"inV":91,"properties":{"weight":1}},{"id":3168,"inV":76,"properties":{"weight":1}},{"id":3169,"inV":111,"properties":{"weight":2}},{"id":3170,"inV":106,"properties":{"weight":4}},{"id":3171,"inV":88,"properties":{"weight":12}},{"id":3172,"inV":48,"properties":{"weight":1}},{"id":3173,"inV":39,"properties":{"weight":2}},{"id":3174,"inV":80,"properties":{"weight":1}},{"id":3175,"inV":73,"properties":{"weight":3}},{"id":3176,"inV":100,"properties":{"weight":2}},{"id":3177,"inV":27,"properties":{"weight":3}},{"id":3178,"inV":97,"properties":{"weight":4}},{"id":3179,"inV":64,"properties":{"weight":3}},{"id":3180,"inV":245,"properties":{"weight":1}},{"id":3181,"inV":58,"properties":{"weight":1}},{"id":3182,"inV":184,"properties":{"weight":1}},{"id":3183,"inV":181,"properties":{"weight":1}},{"id":3184,"inV":56,"properties":{"weight":1}},{"id":3185,"inV":115,"properties":{"weight":1}},{"id":3186,"inV":223,"properties":{"weight":1}},{"id":3187,"inV":188,"properties":{"weight":9}},{"id":3188,"inV":77,"properties":{"weight":4}},{"id":3189,"inV":34,"properties":{"weight":1}},{"id":3190,"inV":21,"properties":{"weight":1}},{"id":3191,"inV":117,"properties":{"weight":7}},{"id":3192,"inV":30,"properties":{"weight":1}},{"id":3193,"inV":118,"properties":{"weight":2}},{"id":3194,"inV":24,"properties":{"weight":4}},{"id":3195,"inV":54,"properties":{"weight":1}},{"id":3196,"inV":71,"properties":{"weight":4}},{"id":3197,"inV":239,"properties":{"weight":1}},{"id":3198,"inV":43,"properties":{"weight":1}},{"id":3199,"inV":33,"properties":{"weight":1}}],"sungBy":[{"id":7172,"inV":376}],"writtenBy":[{"id":7171,"inV":339}]},"properties":{"name":[{"id":309,"value":"FRIEND OF THE DEVIL"}],"songType":[{"id":311,"value":"original"}],"performances":[{"id":310,"value":304}]}}
-{"id":105,"label":"song","inE":{"followedBy":[{"id":2432,"outV":68,"properties":{"weight":2}},{"id":6593,"outV":116,"properties":{"weight":1}},{"id":6854,"outV":64,"properties":{"weight":1}},{"id":5511,"outV":131,"properties":{"weight":1}},{"id":3018,"outV":14,"properties":{"weight":11}},{"id":139,"outV":97,"properties":{"weight":1}},{"id":5003,"outV":30,"properties":{"weight":4}},{"id":4428,"outV":299,"properties":{"weight":1}},{"id":5580,"outV":42,"properties":{"weight":5}},{"id":5261,"outV":32,"properties":{"weight":16}},{"id":3663,"outV":24,"properties":{"weight":3}},{"id":4691,"outV":33,"properties":{"weight":2}},{"id":3413,"outV":77,"properties":{"weight":4}},{"id":2070,"outV":188,"properties":{"weight":3}},{"id":3990,"outV":106,"properties":{"weight":1}},{"id":663,"outV":23,"properties":{"weight":4}},{"id":6039,"outV":115,"properties":{"weight":1}},{"id":6810,"outV":39,"properties":{"weight":1}},{"id":5662,"outV":169,"properties":{"weight":1}},{"id":4575,"outV":254,"properties":{"weight":2}},{"id":2913,"outV":118,"properties":{"weight":1}},{"id":5985,"outV":50,"properties":{"weight":3}},{"id":6690,"outV":12,"properties":{"weight":1}},{"id":163,"outV":108,"properties":{"weight":1}},{"id":6244,"outV":117,"properties":{"weight":3}},{"id":1189,"outV":26,"properties":{"weight":2}},{"id":1000,"outV":11,"properties":{"weight":1}},{"id":2024,"outV":283,"properties":{"weight":1}},{"id":3816,"outV":88,"properties":{"weight":21}},{"id":5544,"outV":126,"properties":{"weight":1}},{"id":4075,"outV":109,"properties":{"weight":3}},{"id":2604,"outV":112,"properties":{"weight":1}},{"id":557,"outV":120,"properties":{"weight":2}},{"id":1326,"outV":31,"properties":{"weight":2}},{"id":5038,"outV":291,"properties":{"weight":1}},{"id":4271,"outV":10,"properties":{"weight":7}},{"id":5488,"outV":79,"properties":{"weight":1}},{"id":178,"outV":70,"properties":{"weight":2}},{"id":1587,"outV":18,"properties":{"weight":5}},{"id":4403,"outV":40,"properties":{"weight":4}},{"id":2804,"outV":15,"properties":{"weight":8}},{"id":438,"outV":38,"properties":{"weight":7}},{"id":3385,"outV":184,"properties":{"weight":1}},{"id":5182,"outV":71,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":4510,"inV":50,"properties":{"weight":5}},{"id":4511,"inV":32,"properties":{"weight":7}},{"id":4512,"inV":70,"properties":{"weight":4}},{"id":4513,"inV":110,"properties":{"weight":1}},{"id":4514,"inV":42,"properties":{"weight":4}},{"id":4515,"inV":109,"properties":{"weight":10}},{"id":4516,"inV":85,"properties":{"weight":3}},{"id":4517,"inV":14,"properties":{"weight":6}},{"id":4518,"inV":103,"properties":{"weight":5}},{"id":4519,"inV":21,"properties":{"weight":1}},{"id":4520,"inV":112,"properties":{"weight":6}},{"id":4521,"inV":10,"properties":{"weight":3}},{"id":4522,"inV":12,"properties":{"weight":12}},{"id":4523,"inV":208,"properties":{"weight":2}},{"id":4524,"inV":18,"properties":{"weight":3}},{"id":4525,"inV":181,"properties":{"weight":1}},{"id":4526,"inV":189,"properties":{"weight":1}},{"id":4527,"inV":68,"properties":{"weight":10}},{"id":4528,"inV":121,"properties":{"weight":1}},{"id":4529,"inV":26,"properties":{"weight":5}},{"id":4530,"inV":97,"properties":{"weight":2}},{"id":4531,"inV":101,"properties":{"weight":3}},{"id":4532,"inV":62,"properties":{"weight":1}},{"id":4533,"inV":46,"properties":{"weight":1}},{"id":4534,"inV":78,"properties":{"weight":1}},{"id":4535,"inV":64,"properties":{"weight":1}},{"id":4536,"inV":76,"properties":{"weight":1}},{"id":4537,"inV":24,"properties":{"weight":2}},{"id":4538,"inV":116,"properties":{"weight":1}},{"id":4539,"inV":88,"properties":{"weight":2}},{"id":4540,"inV":71,"properties":{"weight":2}},{"id":4541,"inV":117,"properties":{"weight":6}},{"id":4542,"inV":30,"properties":{"weight":2}},{"id":4543,"inV":269,"properties":{"weight":1}},{"id":4544,"inV":188,"properties":{"weight":10}},{"id":4545,"inV":77,"properties":{"weight":2}},{"id":4546,"inV":57,"properties":{"weight":2}},{"id":4547,"inV":31,"properties":{"weight":2}},{"id":4548,"inV":79,"properties":{"weight":1}},{"id":4549,"inV":53,"properties":{"weight":1}},{"id":4550,"inV":40,"properties":{"weight":2}},{"id":4551,"inV":43,"properties":{"weight":1}},{"id":4552,"inV":11,"properties":{"weight":3}},{"id":4553,"inV":158,"properties":{"weight":1}},{"id":4554,"inV":254,"properties":{"weight":1}},{"id":4555,"inV":202,"properties":{"weight":1}},{"id":4556,"inV":119,"properties":{"weight":1}},{"id":4557,"inV":51,"properties":{"weight":1}},{"id":4558,"inV":19,"properties":{"weight":1}}],"sungBy":[{"id":7332,"inV":340}],"writtenBy":[{"id":7331,"inV":339}]},"properties":{"name":[{"id":312,"value":"STAGGER LEE"}],"songType":[{"id":314,"value":"original"}],"performances":[{"id":313,"value":146}]}}
-{"id":106,"label":"song","inE":{"followedBy":[{"id":4994,"outV":30,"properties":{"weight":4}},{"id":2947,"outV":78,"properties":{"weight":1}},{"id":6788,"outV":39,"properties":{"weight":2}},{"id":1288,"outV":27,"properties":{"weight":1}},{"id":843,"outV":171,"properties":{"weight":1}},{"id":2444,"outV":68,"properties":{"weight":3}},{"id":142,"outV":97,"properties":{"weight":2}},{"id":1615,"outV":210,"properties":{"weight":1}},{"id":3024,"outV":14,"properties":{"weight":3}},{"id":3921,"outV":51,"properties":{"weight":4}},{"id":3411,"outV":77,"properties":{"weight":2}},{"id":4373,"outV":62,"properties":{"weight":1}},{"id":6486,"outV":187,"properties":{"weight":3}},{"id":3800,"outV":88,"properties":{"weight":3}},{"id":5273,"outV":32,"properties":{"weight":2}},{"id":410,"outV":38,"properties":{"weight":1}},{"id":6172,"outV":36,"properties":{"weight":1}},{"id":6045,"outV":115,"properties":{"weight":1}},{"id":2975,"outV":200,"properties":{"weight":1}},{"id":161,"outV":108,"properties":{"weight":2}},{"id":5409,"outV":69,"properties":{"weight":1}},{"id":3170,"outV":104,"properties":{"weight":4}},{"id":4196,"outV":54,"properties":{"weight":2}},{"id":3685,"outV":24,"properties":{"weight":3}},{"id":5605,"outV":42,"properties":{"weight":1}},{"id":2214,"outV":75,"properties":{"weight":1}},{"id":2342,"outV":87,"properties":{"weight":1}},{"id":6250,"outV":117,"properties":{"weight":1}},{"id":4652,"outV":154,"properties":{"weight":1}},{"id":4910,"outV":100,"properties":{"weight":2}},{"id":751,"outV":80,"properties":{"weight":2}},{"id":6960,"outV":84,"properties":{"weight":1}},{"id":3377,"outV":184,"properties":{"weight":4}},{"id":5810,"outV":76,"properties":{"weight":1}},{"id":4277,"outV":10,"properties":{"weight":1}},{"id":2810,"outV":15,"properties":{"weight":2}},{"id":4090,"outV":109,"properties":{"weight":2}},{"id":1595,"outV":18,"properties":{"weight":1}},{"id":1023,"outV":73,"properties":{"weight":1}},{"id":3583,"outV":56,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":3968,"inV":74,"properties":{"weight":2}},{"id":3969,"inV":19,"properties":{"weight":1}},{"id":3970,"inV":88,"properties":{"weight":1}},{"id":3971,"inV":65,"properties":{"weight":1}},{"id":3972,"inV":85,"properties":{"weight":3}},{"id":3973,"inV":68,"properties":{"weight":4}},{"id":3974,"inV":13,"properties":{"weight":2}},{"id":3975,"inV":82,"properties":{"weight":1}},{"id":3976,"inV":76,"properties":{"weight":1}},{"id":3977,"inV":91,"properties":{"weight":1}},{"id":3978,"inV":97,"properties":{"weight":2}},{"id":3979,"inV":48,"properties":{"weight":3}},{"id":3980,"inV":49,"properties":{"weight":2}},{"id":3981,"inV":21,"properties":{"weight":1}},{"id":3982,"inV":51,"properties":{"weight":3}},{"id":3983,"inV":58,"properties":{"weight":2}},{"id":3984,"inV":117,"properties":{"weight":4}},{"id":3985,"inV":104,"properties":{"weight":1}},{"id":3986,"inV":12,"properties":{"weight":1}},{"id":3987,"inV":57,"properties":{"weight":1}},{"id":3988,"inV":50,"properties":{"weight":1}},{"id":3989,"inV":39,"properties":{"weight":2}},{"id":3990,"inV":105,"properties":{"weight":1}},{"id":3991,"inV":46,"properties":{"weight":1}},{"id":3992,"inV":98,"properties":{"weight":1}},{"id":3993,"inV":188,"properties":{"weight":3}},{"id":3994,"inV":168,"properties":{"weight":1}},{"id":3995,"inV":108,"properties":{"weight":1}},{"id":3996,"inV":17,"properties":{"weight":1}},{"id":3956,"inV":54,"properties":{"weight":2}},{"id":3957,"inV":100,"properties":{"weight":1}},{"id":3958,"inV":38,"properties":{"weight":2}},{"id":3959,"inV":103,"properties":{"weight":3}},{"id":3960,"inV":181,"properties":{"weight":3}},{"id":3961,"inV":32,"properties":{"weight":2}},{"id":3962,"inV":14,"properties":{"weight":2}},{"id":3963,"inV":101,"properties":{"weight":3}},{"id":3964,"inV":73,"properties":{"weight":2}},{"id":3965,"inV":121,"properties":{"weight":2}},{"id":3966,"inV":53,"properties":{"weight":1}},{"id":3967,"inV":27,"properties":{"weight":1}}],"sungBy":[{"id":7160,"inV":352}],"writtenBy":[{"id":7159,"inV":352}]},"properties":{"name":[{"id":315,"value":"FAR FROM ME"}],"songType":[{"id":317,"value":"original"}],"performances":[{"id":316,"value":74}]}}
-{"id":107,"label":"song","inE":{"followedBy":[{"id":231,"outV":142,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":144,"inV":84,"properties":{"weight":1}}]},"properties":{"name":[{"id":318,"value":"BANKS OF OHIO"}],"songType":[{"id":320,"value":""}],"performances":[{"id":319,"value":0}]}}
-{"id":108,"label":"song","inE":{"followedBy":[{"id":4288,"outV":10,"properties":{"weight":2}},{"id":5250,"outV":32,"properties":{"weight":7}},{"id":3400,"outV":77,"properties":{"weight":2}},{"id":3594,"outV":56,"properties":{"weight":1}},{"id":4811,"outV":114,"properties":{"weight":1}},{"id":6220,"outV":117,"properties":{"weight":1}},{"id":2829,"outV":298,"properties":{"weight":1}},{"id":5582,"outV":42,"properties":{"weight":3}},{"id":6927,"outV":245,"properties":{"weight":1}},{"id":659,"outV":23,"properties":{"weight":3}},{"id":2456,"outV":68,"properties":{"weight":6}},{"id":3995,"outV":106,"properties":{"weight":1}},{"id":3676,"outV":24,"properties":{"weight":4}},{"id":5538,"outV":126,"properties":{"weight":1}},{"id":3812,"outV":88,"properties":{"weight":8}},{"id":5800,"outV":76,"properties":{"weight":1}},{"id":4329,"outV":110,"properties":{"weight":1}},{"id":5993,"outV":50,"properties":{"weight":2}},{"id":428,"outV":38,"properties":{"weight":2}},{"id":1581,"outV":18,"properties":{"weight":4}},{"id":1198,"outV":26,"properties":{"weight":1}},{"id":2798,"outV":15,"properties":{"weight":6}},{"id":3508,"outV":223,"properties":{"weight":2}},{"id":6838,"outV":64,"properties":{"weight":2}},{"id":4989,"outV":30,"properties":{"weight":1}},{"id":3839,"outV":261,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":145,"inV":101,"properties":{"weight":6}},{"id":146,"inV":109,"properties":{"weight":1}},{"id":147,"inV":110,"properties":{"weight":1}},{"id":148,"inV":103,"properties":{"weight":3}},{"id":149,"inV":50,"properties":{"weight":2}},{"id":150,"inV":56,"properties":{"weight":1}},{"id":151,"inV":10,"properties":{"weight":3}},{"id":152,"inV":42,"properties":{"weight":3}},{"id":153,"inV":68,"properties":{"weight":4}},{"id":154,"inV":73,"properties":{"weight":2}},{"id":155,"inV":12,"properties":{"weight":6}},{"id":156,"inV":111,"properties":{"weight":1}},{"id":157,"inV":32,"properties":{"weight":5}},{"id":158,"inV":97,"properties":{"weight":3}},{"id":159,"inV":64,"properties":{"weight":2}},{"id":160,"inV":14,"properties":{"weight":2}},{"id":161,"inV":106,"properties":{"weight":2}},{"id":162,"inV":57,"properties":{"weight":1}},{"id":163,"inV":105,"properties":{"weight":1}},{"id":164,"inV":88,"properties":{"weight":1}},{"id":165,"inV":112,"properties":{"weight":2}},{"id":166,"inV":30,"properties":{"weight":1}},{"id":167,"inV":24,"properties":{"weight":1}},{"id":168,"inV":113,"properties":{"weight":1}},{"id":169,"inV":114,"properties":{"weight":1}},{"id":170,"inV":115,"properties":{"weight":1}},{"id":171,"inV":54,"properties":{"weight":1}},{"id":172,"inV":46,"properties":{"weight":1}},{"id":173,"inV":116,"properties":{"weight":1}},{"id":174,"inV":117,"properties":{"weight":2}},{"id":175,"inV":26,"properties":{"weight":1}},{"id":176,"inV":118,"properties":{"weight":1}},{"id":177,"inV":119,"properties":{"weight":1}}],"sungBy":[{"id":7136,"inV":340}],"writtenBy":[{"id":7135,"inV":339}]},"properties":{"name":[{"id":321,"value":"DUPREES DIAMOND BLUES"}],"songType":[{"id":323,"value":"original"}],"performances":[{"id":322,"value":80}]}}
-{"id":109,"label":"song","inE":{"followedBy":[{"id":2305,"outV":25,"properties":{"weight":2}},{"id":1795,"outV":196,"properties":{"weight":2}},{"id":6787,"outV":39,"properties":{"weight":1}},{"id":3908,"outV":51,"properties":{"weight":5}},{"id":5893,"outV":96,"properties":{"weight":1}},{"id":3337,"outV":155,"properties":{"weight":1}},{"id":3658,"outV":24,"properties":{"weight":2}},{"id":2124,"outV":17,"properties":{"weight":1}},{"id":6093,"outV":72,"properties":{"weight":1}},{"id":4112,"outV":48,"properties":{"weight":8}},{"id":146,"outV":108,"properties":{"weight":1}},{"id":726,"outV":80,"properties":{"weight":3}},{"id":3094,"outV":153,"properties":{"weight":1}},{"id":5270,"outV":32,"properties":{"weight":2}},{"id":1112,"outV":59,"properties":{"weight":1}},{"id":4185,"outV":54,"properties":{"weight":11}},{"id":6939,"outV":84,"properties":{"weight":3}},{"id":3165,"outV":104,"properties":{"weight":7}},{"id":3229,"outV":63,"properties":{"weight":1}},{"id":2530,"outV":57,"properties":{"weight":3}},{"id":2723,"outV":13,"properties":{"weight":2}},{"id":4515,"outV":105,"properties":{"weight":10}},{"id":3365,"outV":184,"properties":{"weight":1}},{"id":873,"outV":189,"properties":{"weight":1}},{"id":4906,"outV":100,"properties":{"weight":6}},{"id":6315,"outV":123,"properties":{"weight":1}},{"id":2799,"outV":15,"properties":{"weight":1}},{"id":1009,"outV":73,"properties":{"weight":7}},{"id":4273,"outV":10,"properties":{"weight":1}},{"id":498,"outV":98,"properties":{"weight":1}},{"id":1267,"outV":27,"properties":{"weight":3}},{"id":3447,"outV":58,"properties":{"weight":2}},{"id":3575,"outV":56,"properties":{"weight":5}},{"id":829,"outV":171,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4096,"inV":39,"properties":{"weight":1}},{"id":4058,"inV":54,"properties":{"weight":3}},{"id":4059,"inV":100,"properties":{"weight":10}},{"id":4060,"inV":104,"properties":{"weight":5}},{"id":4061,"inV":49,"properties":{"weight":1}},{"id":4062,"inV":48,"properties":{"weight":7}},{"id":4063,"inV":91,"properties":{"weight":2}},{"id":4064,"inV":103,"properties":{"weight":6}},{"id":4065,"inV":80,"properties":{"weight":1}},{"id":4066,"inV":27,"properties":{"weight":6}},{"id":4067,"inV":155,"properties":{"weight":1}},{"id":4068,"inV":63,"properties":{"weight":3}},{"id":4069,"inV":56,"properties":{"weight":3}},{"id":4070,"inV":51,"properties":{"weight":4}},{"id":4071,"inV":196,"properties":{"weight":2}},{"id":4072,"inV":12,"properties":{"weight":1}},{"id":4073,"inV":24,"properties":{"weight":2}},{"id":4074,"inV":85,"properties":{"weight":1}},{"id":4075,"inV":105,"properties":{"weight":3}},{"id":4076,"inV":121,"properties":{"weight":1}},{"id":4077,"inV":17,"properties":{"weight":1}},{"id":4078,"inV":57,"properties":{"weight":7}},{"id":4079,"inV":98,"properties":{"weight":2}},{"id":4080,"inV":32,"properties":{"weight":1}},{"id":4081,"inV":70,"properties":{"weight":2}},{"id":4082,"inV":65,"properties":{"weight":1}},{"id":4083,"inV":19,"properties":{"weight":4}},{"id":4084,"inV":4,"properties":{"weight":1}},{"id":4085,"inV":69,"properties":{"weight":1}},{"id":4086,"inV":84,"properties":{"weight":1}},{"id":4087,"inV":72,"properties":{"weight":1}},{"id":4088,"inV":73,"properties":{"weight":5}},{"id":4089,"inV":180,"properties":{"weight":1}},{"id":4090,"inV":106,"properties":{"weight":2}},{"id":4091,"inV":189,"properties":{"weight":1}},{"id":4092,"inV":14,"properties":{"weight":1}},{"id":4093,"inV":116,"properties":{"weight":1}},{"id":4094,"inV":58,"properties":{"weight":2}},{"id":4095,"inV":82,"properties":{"weight":1}}],"sungBy":[{"id":7288,"inV":354}],"writtenBy":[{"id":7287,"inV":407}]},"properties":{"name":[{"id":324,"value":"PASSENGER"}],"songType":[{"id":326,"value":"original"}],"performances":[{"id":325,"value":98}]}}
-{"id":110,"label":"song","inE":{"followedBy":[{"id":2368,"outV":87,"properties":{"weight":1}},{"id":3713,"outV":3,"properties":{"weight":4}},{"id":3843,"outV":60,"properties":{"weight":1}},{"id":1733,"outV":82,"properties":{"weight":2}},{"id":3910,"outV":51,"properties":{"weight":1}},{"id":5256,"outV":32,"properties":{"weight":1}},{"id":1866,"outV":94,"properties":{"weight":1}},{"id":1803,"outV":196,"properties":{"weight":1}},{"id":1420,"outV":83,"properties":{"weight":5}},{"id":1679,"outV":124,"properties":{"weight":1}},{"id":4623,"outV":154,"properties":{"weight":6}},{"id":3152,"outV":104,"properties":{"weight":5}},{"id":5392,"outV":69,"properties":{"weight":5}},{"id":3473,"outV":58,"properties":{"weight":1}},{"id":147,"outV":108,"properties":{"weight":1}},{"id":2709,"outV":13,"properties":{"weight":1}},{"id":1175,"outV":26,"properties":{"weight":1}},{"id":3223,"outV":63,"properties":{"weight":1}},{"id":5976,"outV":50,"properties":{"weight":2}},{"id":4825,"outV":114,"properties":{"weight":1}},{"id":1629,"outV":210,"properties":{"weight":2}},{"id":3360,"outV":184,"properties":{"weight":1}},{"id":4192,"outV":54,"properties":{"weight":3}},{"id":1377,"outV":130,"properties":{"weight":4}},{"id":3297,"outV":160,"properties":{"weight":2}},{"id":4513,"outV":105,"properties":{"weight":1}},{"id":5794,"outV":76,"properties":{"weight":1}},{"id":548,"outV":120,"properties":{"weight":1}},{"id":1638,"outV":213,"properties":{"weight":1}},{"id":2856,"outV":101,"properties":{"weight":2}},{"id":4905,"outV":100,"properties":{"weight":2}},{"id":6697,"outV":141,"properties":{"weight":2}},{"id":490,"outV":98,"properties":{"weight":4}},{"id":3116,"outV":153,"properties":{"weight":1}},{"id":5101,"outV":4,"properties":{"weight":1}},{"id":2544,"outV":57,"properties":{"weight":1}},{"id":1073,"outV":227,"properties":{"weight":1}},{"id":6897,"outV":147,"properties":{"weight":1}},{"id":3576,"outV":56,"properties":{"weight":1}},{"id":1273,"outV":27,"properties":{"weight":1}},{"id":6841,"outV":64,"properties":{"weight":1}},{"id":6905,"outV":133,"properties":{"weight":1}},{"id":826,"outV":171,"properties":{"weight":4}},{"id":959,"outV":67,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4299,"inV":96,"properties":{"weight":15}},{"id":4300,"inV":5,"properties":{"weight":1}},{"id":4301,"inV":130,"properties":{"weight":7}},{"id":4302,"inV":76,"properties":{"weight":6}},{"id":4303,"inV":25,"properties":{"weight":5}},{"id":4304,"inV":3,"properties":{"weight":1}},{"id":4305,"inV":99,"properties":{"weight":1}},{"id":4306,"inV":103,"properties":{"weight":1}},{"id":4307,"inV":179,"properties":{"weight":3}},{"id":4308,"inV":134,"properties":{"weight":5}},{"id":4309,"inV":153,"properties":{"weight":1}},{"id":4310,"inV":78,"properties":{"weight":2}},{"id":4311,"inV":26,"properties":{"weight":1}},{"id":4312,"inV":13,"properties":{"weight":1}},{"id":4313,"inV":80,"properties":{"weight":4}},{"id":4314,"inV":147,"properties":{"weight":1}},{"id":4315,"inV":83,"properties":{"weight":1}},{"id":4316,"inV":100,"properties":{"weight":2}},{"id":4317,"inV":85,"properties":{"weight":2}},{"id":4318,"inV":215,"properties":{"weight":1}},{"id":4319,"inV":82,"properties":{"weight":2}},{"id":4320,"inV":57,"properties":{"weight":3}},{"id":4321,"inV":91,"properties":{"weight":2}},{"id":4322,"inV":154,"properties":{"weight":4}},{"id":4323,"inV":53,"properties":{"weight":1}},{"id":4324,"inV":87,"properties":{"weight":1}},{"id":4325,"inV":104,"properties":{"weight":1}},{"id":4326,"inV":58,"properties":{"weight":1}},{"id":4327,"inV":4,"properties":{"weight":2}},{"id":4328,"inV":64,"properties":{"weight":1}},{"id":4329,"inV":108,"properties":{"weight":1}},{"id":4330,"inV":150,"properties":{"weight":1}},{"id":4331,"inV":116,"properties":{"weight":1}}]},"properties":{"name":[{"id":327,"value":"DANCIN IN THE STREETS"}],"songType":[{"id":329,"value":""}],"performances":[{"id":328,"value":0}]}}
-{"id":111,"label":"song","inE":{"followedBy":[{"id":1120,"outV":59,"properties":{"weight":3}},{"id":3169,"outV":104,"properties":{"weight":2}},{"id":1666,"outV":124,"properties":{"weight":1}},{"id":4804,"outV":114,"properties":{"weight":1}},{"id":2440,"outV":68,"properties":{"weight":3}},{"id":2127,"outV":17,"properties":{"weight":3}},{"id":3279,"outV":160,"properties":{"weight":2}},{"id":1810,"outV":199,"properties":{"weight":2}},{"id":5749,"outV":129,"properties":{"weight":3}},{"id":504,"outV":98,"properties":{"weight":3}},{"id":1816,"outV":273,"properties":{"weight":1}},{"id":761,"outV":224,"properties":{"weight":1}},{"id":156,"outV":108,"properties":{"weight":1}},{"id":3100,"outV":153,"properties":{"weight":1}},{"id":4285,"outV":10,"properties":{"weight":1}},{"id":574,"outV":120,"properties":{"weight":1}},{"id":735,"outV":80,"properties":{"weight":6}},{"id":5311,"outV":170,"properties":{"weight":3}},{"id":6111,"outV":72,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4704,"inV":80,"properties":{"weight":3}},{"id":4705,"inV":8,"properties":{"weight":1}},{"id":4706,"inV":10,"properties":{"weight":3}},{"id":4707,"inV":27,"properties":{"weight":1}},{"id":4708,"inV":87,"properties":{"weight":1}},{"id":4709,"inV":73,"properties":{"weight":1}},{"id":4710,"inV":121,"properties":{"weight":1}},{"id":4711,"inV":42,"properties":{"weight":1}},{"id":4695,"inV":98,"properties":{"weight":5}},{"id":4696,"inV":58,"properties":{"weight":10}},{"id":4697,"inV":198,"properties":{"weight":1}},{"id":4698,"inV":273,"properties":{"weight":3}},{"id":4699,"inV":68,"properties":{"weight":2}},{"id":4700,"inV":170,"properties":{"weight":2}},{"id":4701,"inV":199,"properties":{"weight":2}},{"id":4702,"inV":32,"properties":{"weight":1}},{"id":4703,"inV":197,"properties":{"weight":1}}],"sungBy":[{"id":7822,"inV":507}],"writtenBy":[{"id":7821,"inV":446}]},"properties":{"name":[{"id":330,"value":"ON THE ROAD AGAIN"}],"songType":[{"id":332,"value":"cover"}],"performances":[{"id":331,"value":38}]}}
-{"id":112,"label":"song","inE":{"followedBy":[{"id":2304,"outV":25,"properties":{"weight":2}},{"id":6785,"outV":39,"properties":{"weight":1}},{"id":3458,"outV":58,"properties":{"weight":1}},{"id":1029,"outV":73,"properties":{"weight":6}},{"id":1285,"outV":27,"properties":{"weight":2}},{"id":647,"outV":23,"properties":{"weight":6}},{"id":6929,"outV":84,"properties":{"weight":3}},{"id":4118,"outV":48,"properties":{"weight":6}},{"id":5018,"outV":30,"properties":{"weight":1}},{"id":1180,"outV":26,"properties":{"weight":5}},{"id":4638,"outV":154,"properties":{"weight":11}},{"id":3999,"outV":66,"properties":{"weight":1}},{"id":5279,"outV":32,"properties":{"weight":2}},{"id":3232,"outV":63,"properties":{"weight":1}},{"id":165,"outV":108,"properties":{"weight":2}},{"id":4901,"outV":100,"properties":{"weight":10}},{"id":4520,"outV":105,"properties":{"weight":6}},{"id":429,"outV":38,"properties":{"weight":1}},{"id":2222,"outV":75,"properties":{"weight":1}},{"id":4272,"outV":10,"properties":{"weight":2}},{"id":5302,"outV":170,"properties":{"weight":1}},{"id":5687,"outV":167,"properties":{"weight":1}},{"id":1597,"outV":18,"properties":{"weight":1}},{"id":6590,"outV":116,"properties":{"weight":1}},{"id":3519,"outV":223,"properties":{"weight":1}},{"id":3905,"outV":51,"properties":{"weight":8}},{"id":5185,"outV":99,"properties":{"weight":3}},{"id":6850,"outV":64,"properties":{"weight":1}},{"id":4424,"outV":212,"properties":{"weight":1}},{"id":6472,"outV":187,"properties":{"weight":1}},{"id":2121,"outV":17,"properties":{"weight":31}},{"id":6091,"outV":72,"properties":{"weight":2}},{"id":3661,"outV":24,"properties":{"weight":6}},{"id":4047,"outV":173,"properties":{"weight":1}},{"id":1107,"outV":59,"properties":{"weight":16}},{"id":2387,"outV":87,"properties":{"weight":1}},{"id":3157,"outV":104,"properties":{"weight":17}},{"id":727,"outV":80,"properties":{"weight":6}},{"id":5977,"outV":50,"properties":{"weight":5}},{"id":6749,"outV":53,"properties":{"weight":2}},{"id":5086,"outV":4,"properties":{"weight":4}},{"id":4191,"outV":54,"properties":{"weight":8}},{"id":2528,"outV":57,"properties":{"weight":3}},{"id":4576,"outV":254,"properties":{"weight":1}},{"id":2923,"outV":78,"properties":{"weight":6}},{"id":2420,"outV":68,"properties":{"weight":4}},{"id":1911,"outV":103,"properties":{"weight":1}},{"id":3832,"outV":88,"properties":{"weight":1}},{"id":3579,"outV":56,"properties":{"weight":7}}]},"outE":{"followedBy":[{"id":2592,"inV":294,"properties":{"weight":1}},{"id":2593,"inV":59,"properties":{"weight":1}},{"id":2594,"inV":69,"properties":{"weight":1}},{"id":2595,"inV":82,"properties":{"weight":1}},{"id":2596,"inV":42,"properties":{"weight":1}},{"id":2597,"inV":15,"properties":{"weight":35}},{"id":2598,"inV":12,"properties":{"weight":7}},{"id":2599,"inV":56,"properties":{"weight":2}},{"id":2600,"inV":196,"properties":{"weight":1}},{"id":2601,"inV":18,"properties":{"weight":1}},{"id":2602,"inV":24,"properties":{"weight":130}},{"id":2603,"inV":68,"properties":{"weight":2}},{"id":2604,"inV":105,"properties":{"weight":1}},{"id":2605,"inV":39,"properties":{"weight":1}},{"id":2606,"inV":131,"properties":{"weight":3}},{"id":2584,"inV":83,"properties":{"weight":1}},{"id":2585,"inV":57,"properties":{"weight":6}},{"id":2586,"inV":27,"properties":{"weight":2}},{"id":2587,"inV":51,"properties":{"weight":5}},{"id":2588,"inV":17,"properties":{"weight":3}},{"id":2589,"inV":54,"properties":{"weight":4}},{"id":2590,"inV":60,"properties":{"weight":1}},{"id":2591,"inV":100,"properties":{"weight":1}}],"sungBy":[{"id":7762,"inV":351}],"writtenBy":[{"id":7761,"inV":650}]},"properties":{"name":[{"id":333,"value":"MAMA TRIED"}],"songType":[{"id":335,"value":"cover"}],"performances":[{"id":334,"value":302}]}}
-{"id":113,"label":"song","inE":{"followedBy":[{"id":4676,"outV":33,"properties":{"weight":2}},{"id":5924,"outV":96,"properties":{"weight":1}},{"id":6293,"outV":49,"properties":{"weight":8}},{"id":5414,"outV":69,"properties":{"weight":3}},{"id":3591,"outV":56,"properties":{"weight":1}},{"id":168,"outV":108,"properties":{"weight":1}},{"id":6987,"outV":175,"properties":{"weight":1}},{"id":6364,"outV":21,"properties":{"weight":28}},{"id":4013,"outV":292,"properties":{"weight":1}},{"id":6430,"outV":134,"properties":{"weight":1}},{"id":4879,"outV":100,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4448,"inV":34,"properties":{"weight":1}},{"id":4449,"inV":91,"properties":{"weight":1}},{"id":4450,"inV":19,"properties":{"weight":1}},{"id":4451,"inV":21,"properties":{"weight":1}},{"id":4435,"inV":225,"properties":{"weight":1}},{"id":4436,"inV":96,"properties":{"weight":19}},{"id":4437,"inV":33,"properties":{"weight":2}},{"id":4438,"inV":62,"properties":{"weight":1}},{"id":4439,"inV":94,"properties":{"weight":3}},{"id":4440,"inV":125,"properties":{"weight":3}},{"id":4441,"inV":63,"properties":{"weight":1}},{"id":4442,"inV":127,"properties":{"weight":1}},{"id":4443,"inV":141,"properties":{"weight":4}},{"id":4444,"inV":278,"properties":{"weight":1}},{"id":4445,"inV":57,"properties":{"weight":1}},{"id":4446,"inV":49,"properties":{"weight":6}},{"id":4447,"inV":5,"properties":{"weight":1}}],"sungBy":[{"id":7920,"inV":476}],"writtenBy":[{"id":7919,"inV":737}]},"properties":{"name":[{"id":336,"value":"SMOKESTACK LIGHTNING"}],"songType":[{"id":338,"value":"cover"}],"performances":[{"id":337,"value":60}]}}
-{"id":114,"label":"song","inE":{"followedBy":[{"id":4225,"outV":317,"properties":{"weight":1}},{"id":4482,"outV":202,"properties":{"weight":1}},{"id":1415,"outV":83,"properties":{"weight":2}},{"id":776,"outV":122,"properties":{"weight":12}},{"id":3340,"outV":155,"properties":{"weight":1}},{"id":4625,"outV":154,"properties":{"weight":2}},{"id":275,"outV":5,"properties":{"weight":40}},{"id":1942,"outV":148,"properties":{"weight":1}},{"id":1303,"outV":27,"properties":{"weight":1}},{"id":1687,"outV":124,"properties":{"weight":2}},{"id":926,"outV":91,"properties":{"weight":1}},{"id":3486,"outV":58,"properties":{"weight":1}},{"id":2720,"outV":13,"properties":{"weight":4}},{"id":3873,"outV":60,"properties":{"weight":1}},{"id":6945,"outV":84,"properties":{"weight":1}},{"id":4002,"outV":66,"properties":{"weight":2}},{"id":5154,"outV":125,"properties":{"weight":10}},{"id":2211,"outV":75,"properties":{"weight":1}},{"id":169,"outV":108,"properties":{"weight":1}},{"id":5546,"outV":166,"properties":{"weight":1}},{"id":2360,"outV":87,"properties":{"weight":1}},{"id":4920,"outV":100,"properties":{"weight":1}},{"id":3259,"outV":146,"properties":{"weight":1}},{"id":572,"outV":120,"properties":{"weight":9}},{"id":702,"outV":206,"properties":{"weight":2}},{"id":3262,"outV":160,"properties":{"weight":1}},{"id":1218,"outV":26,"properties":{"weight":1}},{"id":2244,"outV":29,"properties":{"weight":11}},{"id":2884,"outV":101,"properties":{"weight":1}},{"id":1861,"outV":94,"properties":{"weight":13}},{"id":4423,"outV":212,"properties":{"weight":1}},{"id":3786,"outV":168,"properties":{"weight":1}},{"id":5069,"outV":128,"properties":{"weight":1}},{"id":6349,"outV":21,"properties":{"weight":1}},{"id":6608,"outV":127,"properties":{"weight":14}},{"id":2002,"outV":152,"properties":{"weight":1}},{"id":1492,"outV":164,"properties":{"weight":3}},{"id":2265,"outV":25,"properties":{"weight":31}},{"id":1375,"outV":130,"properties":{"weight":6}},{"id":6113,"outV":72,"properties":{"weight":3}},{"id":6757,"outV":53,"properties":{"weight":1}},{"id":359,"outV":74,"properties":{"weight":11}},{"id":3946,"outV":138,"properties":{"weight":4}},{"id":5610,"outV":42,"properties":{"weight":1}},{"id":237,"outV":145,"properties":{"weight":1}},{"id":3054,"outV":153,"properties":{"weight":40}},{"id":5742,"outV":129,"properties":{"weight":5}},{"id":6510,"outV":187,"properties":{"weight":1}},{"id":3695,"outV":3,"properties":{"weight":30}},{"id":6383,"outV":65,"properties":{"weight":2}},{"id":5107,"outV":4,"properties":{"weight":2}},{"id":6900,"outV":133,"properties":{"weight":2}},{"id":4213,"outV":54,"properties":{"weight":1}},{"id":4342,"outV":62,"properties":{"weight":1}},{"id":2041,"outV":92,"properties":{"weight":7}},{"id":6013,"outV":204,"properties":{"weight":1}},{"id":6397,"outV":136,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4765,"inV":26,"properties":{"weight":30}},{"id":4766,"inV":122,"properties":{"weight":9}},{"id":4767,"inV":74,"properties":{"weight":13}},{"id":4768,"inV":78,"properties":{"weight":6}},{"id":4769,"inV":11,"properties":{"weight":1}},{"id":4770,"inV":19,"properties":{"weight":4}},{"id":4771,"inV":13,"properties":{"weight":3}},{"id":4772,"inV":4,"properties":{"weight":25}},{"id":4773,"inV":23,"properties":{"weight":3}},{"id":4774,"inV":252,"properties":{"weight":1}},{"id":4775,"inV":21,"properties":{"weight":5}},{"id":4776,"inV":15,"properties":{"weight":1}},{"id":4777,"inV":53,"properties":{"weight":1}},{"id":4778,"inV":24,"properties":{"weight":1}},{"id":4779,"inV":12,"properties":{"weight":3}},{"id":4780,"inV":157,"properties":{"weight":1}},{"id":4781,"inV":202,"properties":{"weight":1}},{"id":4782,"inV":39,"properties":{"weight":1}},{"id":4783,"inV":20,"properties":{"weight":1}},{"id":4784,"inV":10,"properties":{"weight":1}},{"id":4785,"inV":54,"properties":{"weight":1}},{"id":4786,"inV":69,"properties":{"weight":1}},{"id":4787,"inV":159,"properties":{"weight":1}},{"id":4788,"inV":99,"properties":{"weight":2}},{"id":4789,"inV":3,"properties":{"weight":2}},{"id":4790,"inV":103,"properties":{"weight":2}},{"id":4791,"inV":134,"properties":{"weight":1}},{"id":4792,"inV":32,"properties":{"weight":5}},{"id":4793,"inV":50,"properties":{"weight":17}},{"id":4794,"inV":91,"properties":{"weight":1}},{"id":4795,"inV":215,"properties":{"weight":3}},{"id":4796,"inV":154,"properties":{"weight":8}},{"id":4797,"inV":153,"properties":{"weight":2}},{"id":4798,"inV":68,"properties":{"weight":2}},{"id":4799,"inV":214,"properties":{"weight":1}},{"id":4800,"inV":59,"properties":{"weight":5}},{"id":4801,"inV":65,"properties":{"weight":10}},{"id":4802,"inV":72,"properties":{"weight":4}},{"id":4803,"inV":160,"properties":{"weight":8}},{"id":4804,"inV":111,"properties":{"weight":1}},{"id":4805,"inV":62,"properties":{"weight":4}},{"id":4806,"inV":80,"properties":{"weight":2}},{"id":4807,"inV":124,"properties":{"weight":14}},{"id":4808,"inV":84,"properties":{"weight":4}},{"id":4809,"inV":38,"properties":{"weight":3}},{"id":4810,"inV":180,"properties":{"weight":1}},{"id":4811,"inV":108,"properties":{"weight":1}},{"id":4812,"inV":211,"properties":{"weight":1}},{"id":4813,"inV":87,"properties":{"weight":11}},{"id":4814,"inV":162,"properties":{"weight":2}},{"id":4815,"inV":210,"properties":{"weight":7}},{"id":4816,"inV":104,"properties":{"weight":1}},{"id":4817,"inV":64,"properties":{"weight":9}},{"id":4818,"inV":61,"properties":{"weight":2}},{"id":4819,"inV":242,"properties":{"weight":1}},{"id":4820,"inV":299,"properties":{"weight":1}},{"id":4821,"inV":171,"properties":{"weight":1}},{"id":4822,"inV":213,"properties":{"weight":2}},{"id":4823,"inV":60,"properties":{"weight":2}},{"id":4824,"inV":88,"properties":{"weight":1}},{"id":4825,"inV":110,"properties":{"weight":1}},{"id":4826,"inV":330,"properties":{"weight":1}},{"id":4827,"inV":150,"properties":{"weight":3}},{"id":4828,"inV":90,"properties":{"weight":2}},{"id":4829,"inV":204,"properties":{"weight":6}},{"id":4830,"inV":46,"properties":{"weight":5}},{"id":4831,"inV":222,"properties":{"weight":1}},{"id":4832,"inV":81,"properties":{"weight":1}},{"id":4833,"inV":83,"properties":{"weight":1}},{"id":4834,"inV":86,"properties":{"weight":4}},{"id":4835,"inV":42,"properties":{"weight":3}},{"id":4836,"inV":93,"properties":{"weight":2}},{"id":4837,"inV":85,"properties":{"weight":1}},{"id":4838,"inV":185,"properties":{"weight":2}},{"id":4839,"inV":236,"properties":{"weight":2}},{"id":4840,"inV":216,"properties":{"weight":4}},{"id":4841,"inV":217,"properties":{"weight":1}},{"id":4842,"inV":227,"properties":{"weight":1}},{"id":4843,"inV":30,"properties":{"weight":1}}],"sungBy":[{"id":7276,"inV":351}],"writtenBy":[{"id":7275,"inV":351}]},"properties":{"name":[{"id":339,"value":"ONE MORE SATURDAY NIGHT"}],"songType":[{"id":341,"value":"original"}],"performances":[{"id":340,"value":340}]}}
-{"id":115,"label":"song","inE":{"followedBy":[{"id":4034,"outV":173,"properties":{"weight":3}},{"id":4292,"outV":10,"properties":{"weight":2}},{"id":4933,"outV":100,"properties":{"weight":1}},{"id":327,"outV":34,"properties":{"weight":1}},{"id":1290,"outV":27,"properties":{"weight":7}},{"id":3471,"outV":58,"properties":{"weight":1}},{"id":2644,"outV":137,"properties":{"weight":4}},{"id":3607,"outV":56,"properties":{"weight":2}},{"id":5911,"outV":96,"properties":{"weight":2}},{"id":1054,"outV":73,"properties":{"weight":2}},{"id":5023,"outV":30,"properties":{"weight":1}},{"id":1507,"outV":164,"properties":{"weight":1}},{"id":3940,"outV":51,"properties":{"weight":1}},{"id":999,"outV":11,"properties":{"weight":4}},{"id":5287,"outV":32,"properties":{"weight":3}},{"id":5608,"outV":42,"properties":{"weight":3}},{"id":6760,"outV":53,"properties":{"weight":1}},{"id":170,"outV":108,"properties":{"weight":1}},{"id":3690,"outV":24,"properties":{"weight":1}},{"id":4394,"outV":40,"properties":{"weight":1}},{"id":4140,"outV":48,"properties":{"weight":2}},{"id":3503,"outV":192,"properties":{"weight":1}},{"id":6511,"outV":187,"properties":{"weight":1}},{"id":3185,"outV":104,"properties":{"weight":1}},{"id":4214,"outV":54,"properties":{"weight":2}},{"id":1912,"outV":103,"properties":{"weight":1}},{"id":3836,"outV":88,"properties":{"weight":2}},{"id":1342,"outV":31,"properties":{"weight":2}},{"id":2815,"outV":15,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":6032,"inV":5,"properties":{"weight":1}},{"id":6033,"inV":100,"properties":{"weight":1}},{"id":6034,"inV":14,"properties":{"weight":1}},{"id":6035,"inV":78,"properties":{"weight":1}},{"id":6036,"inV":85,"properties":{"weight":2}},{"id":6037,"inV":125,"properties":{"weight":1}},{"id":6038,"inV":57,"properties":{"weight":2}},{"id":6039,"inV":105,"properties":{"weight":1}},{"id":6040,"inV":87,"properties":{"weight":1}},{"id":6041,"inV":97,"properties":{"weight":1}},{"id":6042,"inV":151,"properties":{"weight":1}},{"id":6043,"inV":58,"properties":{"weight":2}},{"id":6044,"inV":72,"properties":{"weight":2}},{"id":6045,"inV":106,"properties":{"weight":1}},{"id":6046,"inV":103,"properties":{"weight":3}},{"id":6047,"inV":54,"properties":{"weight":4}},{"id":6048,"inV":79,"properties":{"weight":2}},{"id":6049,"inV":101,"properties":{"weight":6}},{"id":6050,"inV":68,"properties":{"weight":2}},{"id":6051,"inV":124,"properties":{"weight":1}},{"id":6052,"inV":48,"properties":{"weight":2}},{"id":6053,"inV":170,"properties":{"weight":1}},{"id":6054,"inV":43,"properties":{"weight":1}},{"id":6055,"inV":173,"properties":{"weight":2}},{"id":6056,"inV":11,"properties":{"weight":2}},{"id":6057,"inV":42,"properties":{"weight":1}},{"id":6058,"inV":117,"properties":{"weight":1}},{"id":6059,"inV":27,"properties":{"weight":3}},{"id":6060,"inV":73,"properties":{"weight":1}},{"id":6061,"inV":158,"properties":{"weight":2}},{"id":6062,"inV":137,"properties":{"weight":2}},{"id":6063,"inV":202,"properties":{"weight":1}},{"id":6064,"inV":10,"properties":{"weight":1}},{"id":6065,"inV":26,"properties":{"weight":1}},{"id":6066,"inV":53,"properties":{"weight":1}}]},"properties":{"name":[{"id":342,"value":"TOM THUMB BLUES"}],"songType":[{"id":344,"value":""}],"performances":[{"id":343,"value":0}]}}
-{"id":116,"label":"song","inE":{"followedBy":[{"id":3456,"outV":58,"properties":{"weight":1}},{"id":4679,"outV":33,"properties":{"weight":1}},{"id":840,"outV":171,"properties":{"weight":2}},{"id":3596,"outV":56,"properties":{"weight":1}},{"id":5903,"outV":96,"properties":{"weight":1}},{"id":1425,"outV":83,"properties":{"weight":3}},{"id":3923,"outV":51,"properties":{"weight":1}},{"id":6422,"outV":134,"properties":{"weight":1}},{"id":3672,"outV":24,"properties":{"weight":2}},{"id":1050,"outV":73,"properties":{"weight":1}},{"id":668,"outV":23,"properties":{"weight":1}},{"id":5468,"outV":79,"properties":{"weight":1}},{"id":5596,"outV":42,"properties":{"weight":1}},{"id":2461,"outV":68,"properties":{"weight":1}},{"id":6495,"outV":187,"properties":{"weight":1}},{"id":929,"outV":91,"properties":{"weight":1}},{"id":1697,"outV":124,"properties":{"weight":1}},{"id":290,"outV":5,"properties":{"weight":1}},{"id":2210,"outV":75,"properties":{"weight":1}},{"id":1511,"outV":164,"properties":{"weight":1}},{"id":1129,"outV":59,"properties":{"weight":2}},{"id":4331,"outV":110,"properties":{"weight":1}},{"id":1196,"outV":26,"properties":{"weight":1}},{"id":173,"outV":108,"properties":{"weight":1}},{"id":752,"outV":80,"properties":{"weight":1}},{"id":5809,"outV":76,"properties":{"weight":4}},{"id":4660,"outV":154,"properties":{"weight":1}},{"id":1333,"outV":31,"properties":{"weight":1}},{"id":6389,"outV":65,"properties":{"weight":1}},{"id":4278,"outV":10,"properties":{"weight":1}},{"id":441,"outV":38,"properties":{"weight":3}},{"id":697,"outV":157,"properties":{"weight":1}},{"id":4538,"outV":105,"properties":{"weight":1}},{"id":4093,"outV":109,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6592,"inV":20,"properties":{"weight":1}},{"id":6593,"inV":105,"properties":{"weight":1}},{"id":6567,"inV":96,"properties":{"weight":7}},{"id":6568,"inV":85,"properties":{"weight":4}},{"id":6569,"inV":39,"properties":{"weight":3}},{"id":6570,"inV":181,"properties":{"weight":3}},{"id":6571,"inV":127,"properties":{"weight":1}},{"id":6572,"inV":91,"properties":{"weight":1}},{"id":6573,"inV":49,"properties":{"weight":1}},{"id":6574,"inV":51,"properties":{"weight":1}},{"id":6575,"inV":76,"properties":{"weight":1}},{"id":6576,"inV":12,"properties":{"weight":1}},{"id":6577,"inV":62,"properties":{"weight":2}},{"id":6578,"inV":46,"properties":{"weight":2}},{"id":6579,"inV":18,"properties":{"weight":1}},{"id":6580,"inV":68,"properties":{"weight":1}},{"id":6581,"inV":117,"properties":{"weight":2}},{"id":6582,"inV":38,"properties":{"weight":1}},{"id":6583,"inV":17,"properties":{"weight":1}},{"id":6584,"inV":27,"properties":{"weight":1}},{"id":6585,"inV":164,"properties":{"weight":1}},{"id":6586,"inV":80,"properties":{"weight":1}},{"id":6587,"inV":53,"properties":{"weight":1}},{"id":6588,"inV":168,"properties":{"weight":2}},{"id":6589,"inV":73,"properties":{"weight":1}},{"id":6590,"inV":112,"properties":{"weight":1}},{"id":6591,"inV":215,"properties":{"weight":1}}]},"properties":{"name":[{"id":345,"value":"GOOD TIME BLUES"}],"songType":[{"id":347,"value":""}],"performances":[{"id":346,"value":0}]}}
-{"id":117,"label":"song","inE":{"followedBy":[{"id":513,"outV":98,"properties":{"weight":4}},{"id":2821,"outV":15,"properties":{"weight":1}},{"id":4486,"outV":202,"properties":{"weight":4}},{"id":903,"outV":174,"properties":{"weight":1}},{"id":1294,"outV":27,"properties":{"weight":11}},{"id":5007,"outV":30,"properties":{"weight":2}},{"id":3984,"outV":106,"properties":{"weight":4}},{"id":3601,"outV":56,"properties":{"weight":3}},{"id":1045,"outV":73,"properties":{"weight":15}},{"id":2581,"outV":57,"properties":{"weight":1}},{"id":5653,"outV":169,"properties":{"weight":2}},{"id":665,"outV":23,"properties":{"weight":1}},{"id":3482,"outV":58,"properties":{"weight":1}},{"id":2204,"outV":75,"properties":{"weight":3}},{"id":4509,"outV":244,"properties":{"weight":1}},{"id":5919,"outV":96,"properties":{"weight":1}},{"id":6816,"outV":39,"properties":{"weight":1}},{"id":4131,"outV":48,"properties":{"weight":5}},{"id":5672,"outV":167,"properties":{"weight":2}},{"id":3241,"outV":63,"properties":{"weight":3}},{"id":6058,"outV":115,"properties":{"weight":1}},{"id":1324,"outV":31,"properties":{"weight":1}},{"id":174,"outV":108,"properties":{"weight":2}},{"id":4658,"outV":154,"properties":{"weight":2}},{"id":6581,"outV":116,"properties":{"weight":2}},{"id":4025,"outV":173,"properties":{"weight":5}},{"id":4923,"outV":100,"properties":{"weight":8}},{"id":4541,"outV":105,"properties":{"weight":6}},{"id":1982,"outV":253,"properties":{"weight":1}},{"id":3779,"outV":168,"properties":{"weight":1}},{"id":4291,"outV":10,"properties":{"weight":2}},{"id":710,"outV":221,"properties":{"weight":1}},{"id":3528,"outV":223,"properties":{"weight":1}},{"id":331,"outV":34,"properties":{"weight":1}},{"id":5324,"outV":170,"properties":{"weight":2}},{"id":3920,"outV":51,"properties":{"weight":7}},{"id":4694,"outV":33,"properties":{"weight":1}},{"id":2649,"outV":137,"properties":{"weight":2}},{"id":4572,"outV":254,"properties":{"weight":1}},{"id":2910,"outV":118,"properties":{"weight":1}},{"id":3691,"outV":24,"properties":{"weight":1}},{"id":4206,"outV":54,"properties":{"weight":5}},{"id":5998,"outV":50,"properties":{"weight":1}},{"id":754,"outV":80,"properties":{"weight":3}},{"id":882,"outV":189,"properties":{"weight":2}},{"id":4850,"outV":119,"properties":{"weight":1}},{"id":1399,"outV":190,"properties":{"weight":1}},{"id":3191,"outV":104,"properties":{"weight":7}},{"id":5115,"outV":4,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6218,"inV":97,"properties":{"weight":1}},{"id":6219,"inV":151,"properties":{"weight":1}},{"id":6220,"inV":108,"properties":{"weight":1}},{"id":6221,"inV":59,"properties":{"weight":1}},{"id":6222,"inV":58,"properties":{"weight":33}},{"id":6223,"inV":75,"properties":{"weight":5}},{"id":6224,"inV":125,"properties":{"weight":1}},{"id":6225,"inV":72,"properties":{"weight":2}},{"id":6226,"inV":101,"properties":{"weight":4}},{"id":6227,"inV":24,"properties":{"weight":1}},{"id":6228,"inV":53,"properties":{"weight":2}},{"id":6229,"inV":64,"properties":{"weight":1}},{"id":6230,"inV":27,"properties":{"weight":6}},{"id":6231,"inV":104,"properties":{"weight":3}},{"id":6232,"inV":78,"properties":{"weight":2}},{"id":6233,"inV":30,"properties":{"weight":1}},{"id":6234,"inV":99,"properties":{"weight":1}},{"id":6235,"inV":57,"properties":{"weight":3}},{"id":6236,"inV":73,"properties":{"weight":5}},{"id":6237,"inV":51,"properties":{"weight":6}},{"id":6238,"inV":257,"properties":{"weight":1}},{"id":6239,"inV":118,"properties":{"weight":1}},{"id":6240,"inV":39,"properties":{"weight":3}},{"id":6241,"inV":54,"properties":{"weight":8}},{"id":6242,"inV":56,"properties":{"weight":3}},{"id":6243,"inV":103,"properties":{"weight":1}},{"id":6244,"inV":105,"properties":{"weight":3}},{"id":6245,"inV":168,"properties":{"weight":1}},{"id":6246,"inV":170,"properties":{"weight":1}},{"id":6247,"inV":48,"properties":{"weight":2}},{"id":6248,"inV":202,"properties":{"weight":6}},{"id":6249,"inV":100,"properties":{"weight":5}},{"id":6250,"inV":106,"properties":{"weight":1}},{"id":6251,"inV":215,"properties":{"weight":1}},{"id":6252,"inV":62,"properties":{"weight":1}},{"id":6253,"inV":98,"properties":{"weight":2}},{"id":6254,"inV":175,"properties":{"weight":1}},{"id":6255,"inV":285,"properties":{"weight":1}},{"id":6256,"inV":10,"properties":{"weight":1}},{"id":6257,"inV":137,"properties":{"weight":5}},{"id":6258,"inV":63,"properties":{"weight":1}},{"id":6259,"inV":150,"properties":{"weight":4}},{"id":6260,"inV":173,"properties":{"weight":1}},{"id":6261,"inV":236,"properties":{"weight":1}},{"id":6262,"inV":140,"properties":{"weight":1}}],"sungBy":[{"id":8020,"inV":351}],"writtenBy":[{"id":8019,"inV":447}]},"properties":{"name":[{"id":348,"value":"WHEN I PAINT MY MASTERPIECE"}],"songType":[{"id":350,"value":"cover"}],"performances":[{"id":349,"value":144}]}}
-{"id":118,"label":"song","inE":{"followedBy":[{"id":5824,"outV":76,"properties":{"weight":1}},{"id":2081,"outV":188,"properties":{"weight":3}},{"id":2465,"outV":68,"properties":{"weight":1}},{"id":4483,"outV":202,"properties":{"weight":1}},{"id":2888,"outV":101,"properties":{"weight":1}},{"id":5293,"outV":32,"properties":{"weight":1}},{"id":1134,"outV":59,"properties":{"weight":1}},{"id":5454,"outV":79,"properties":{"weight":1}},{"id":176,"outV":108,"properties":{"weight":1}},{"id":5008,"outV":30,"properties":{"weight":2}},{"id":6515,"outV":187,"properties":{"weight":1}},{"id":3193,"outV":104,"properties":{"weight":2}},{"id":1468,"outV":81,"properties":{"weight":2}},{"id":5725,"outV":20,"properties":{"weight":1}},{"id":5119,"outV":4,"properties":{"weight":1}},{"id":6239,"outV":117,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2912,"inV":48,"properties":{"weight":1}},{"id":2913,"inV":105,"properties":{"weight":1}},{"id":2914,"inV":79,"properties":{"weight":1}},{"id":2915,"inV":82,"properties":{"weight":1}},{"id":2897,"inV":68,"properties":{"weight":1}},{"id":2898,"inV":72,"properties":{"weight":1}},{"id":2899,"inV":60,"properties":{"weight":1}},{"id":2900,"inV":54,"properties":{"weight":1}},{"id":2901,"inV":104,"properties":{"weight":1}},{"id":2902,"inV":101,"properties":{"weight":1}},{"id":2903,"inV":34,"properties":{"weight":1}},{"id":2904,"inV":21,"properties":{"weight":1}},{"id":2905,"inV":92,"properties":{"weight":1}},{"id":2906,"inV":27,"properties":{"weight":1}},{"id":2907,"inV":188,"properties":{"weight":3}},{"id":2908,"inV":13,"properties":{"weight":1}},{"id":2909,"inV":85,"properties":{"weight":1}},{"id":2910,"inV":117,"properties":{"weight":1}},{"id":2911,"inV":53,"properties":{"weight":1}}],"sungBy":[{"id":7210,"inV":352}],"writtenBy":[{"id":7209,"inV":350}]},"properties":{"name":[{"id":351,"value":"JUST A LITTLE LIGHT"}],"songType":[{"id":353,"value":"original"}],"performances":[{"id":352,"value":21}]}}
-{"id":119,"label":"song","inE":{"followedBy":[{"id":177,"outV":108,"properties":{"weight":1}},{"id":4055,"outV":173,"properties":{"weight":2}},{"id":4506,"outV":202,"properties":{"weight":1}},{"id":3500,"outV":58,"properties":{"weight":1}},{"id":4556,"outV":105,"properties":{"weight":1}},{"id":4221,"outV":54,"properties":{"weight":1}},{"id":5533,"outV":43,"properties":{"weight":1}},{"id":3838,"outV":88,"properties":{"weight":1}},{"id":2479,"outV":68,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4848,"inV":103,"properties":{"weight":1}},{"id":4849,"inV":57,"properties":{"weight":2}},{"id":4850,"inV":117,"properties":{"weight":1}},{"id":4851,"inV":18,"properties":{"weight":1}},{"id":4852,"inV":39,"properties":{"weight":1}},{"id":4844,"inV":72,"properties":{"weight":1}},{"id":4845,"inV":80,"properties":{"weight":1}},{"id":4846,"inV":13,"properties":{"weight":1}},{"id":4847,"inV":158,"properties":{"weight":1}}],"sungBy":[{"id":7098,"inV":354}],"writtenBy":[{"id":7097,"inV":354}]},"properties":{"name":[{"id":354,"value":"CHILDHOODS END"}],"songType":[{"id":356,"value":"original"}],"performances":[{"id":355,"value":11}]}}
-{"id":120,"label":"song","inE":{"followedBy":[{"id":257,"outV":150,"properties":{"weight":1}},{"id":6017,"outV":204,"properties":{"weight":1}},{"id":6403,"outV":134,"properties":{"weight":4}},{"id":4164,"outV":54,"properties":{"weight":1}},{"id":6724,"outV":53,"properties":{"weight":1}},{"id":2246,"outV":29,"properties":{"weight":5}},{"id":1671,"outV":124,"properties":{"weight":1}},{"id":2311,"outV":25,"properties":{"weight":71}},{"id":712,"outV":80,"properties":{"weight":1}},{"id":2057,"outV":92,"properties":{"weight":1}},{"id":1869,"outV":94,"properties":{"weight":19}},{"id":1550,"outV":18,"properties":{"weight":1}},{"id":2638,"outV":137,"properties":{"weight":1}},{"id":2191,"outV":235,"properties":{"weight":1}},{"id":6352,"outV":21,"properties":{"weight":1}},{"id":5395,"outV":69,"properties":{"weight":2}},{"id":6612,"outV":127,"properties":{"weight":5}},{"id":6937,"outV":84,"properties":{"weight":1}},{"id":5980,"outV":50,"properties":{"weight":1}},{"id":5149,"outV":125,"properties":{"weight":16}},{"id":288,"outV":5,"properties":{"weight":16}},{"id":5090,"outV":4,"properties":{"weight":77}},{"id":2534,"outV":57,"properties":{"weight":2}},{"id":5798,"outV":76,"properties":{"weight":1}},{"id":1959,"outV":148,"properties":{"weight":1}},{"id":4903,"outV":100,"properties":{"weight":2}},{"id":232,"outV":144,"properties":{"weight":4}},{"id":3945,"outV":138,"properties":{"weight":4}},{"id":6441,"outV":187,"properties":{"weight":1}},{"id":234,"outV":145,"properties":{"weight":1}},{"id":1386,"outV":130,"properties":{"weight":23}},{"id":1898,"outV":103,"properties":{"weight":1}},{"id":3756,"outV":3,"properties":{"weight":1}},{"id":3373,"outV":184,"properties":{"weight":1}},{"id":3630,"outV":24,"properties":{"weight":1}},{"id":4590,"outV":85,"properties":{"weight":1}},{"id":815,"outV":171,"properties":{"weight":7}},{"id":2671,"outV":13,"properties":{"weight":9}},{"id":5872,"outV":96,"properties":{"weight":3}},{"id":182,"outV":70,"properties":{"weight":7}},{"id":3062,"outV":153,"properties":{"weight":3}},{"id":6710,"outV":141,"properties":{"weight":1}},{"id":889,"outV":140,"properties":{"weight":5}},{"id":1465,"outV":81,"properties":{"weight":1}},{"id":6906,"outV":133,"properties":{"weight":1}},{"id":6396,"outV":136,"properties":{"weight":3}},{"id":766,"outV":122,"properties":{"weight":5}},{"id":5631,"outV":22,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":522,"inV":19,"properties":{"weight":2}},{"id":523,"inV":27,"properties":{"weight":5}},{"id":524,"inV":164,"properties":{"weight":1}},{"id":525,"inV":12,"properties":{"weight":1}},{"id":526,"inV":3,"properties":{"weight":2}},{"id":527,"inV":145,"properties":{"weight":1}},{"id":528,"inV":39,"properties":{"weight":1}},{"id":529,"inV":122,"properties":{"weight":13}},{"id":530,"inV":80,"properties":{"weight":7}},{"id":531,"inV":14,"properties":{"weight":1}},{"id":532,"inV":127,"properties":{"weight":1}},{"id":533,"inV":13,"properties":{"weight":1}},{"id":534,"inV":206,"properties":{"weight":1}},{"id":535,"inV":207,"properties":{"weight":1}},{"id":536,"inV":98,"properties":{"weight":8}},{"id":537,"inV":141,"properties":{"weight":1}},{"id":538,"inV":76,"properties":{"weight":1}},{"id":539,"inV":48,"properties":{"weight":6}},{"id":540,"inV":17,"properties":{"weight":1}},{"id":541,"inV":91,"properties":{"weight":6}},{"id":542,"inV":104,"properties":{"weight":7}},{"id":543,"inV":196,"properties":{"weight":3}},{"id":544,"inV":100,"properties":{"weight":5}},{"id":545,"inV":96,"properties":{"weight":1}},{"id":546,"inV":103,"properties":{"weight":2}},{"id":547,"inV":69,"properties":{"weight":12}},{"id":548,"inV":110,"properties":{"weight":1}},{"id":549,"inV":74,"properties":{"weight":3}},{"id":550,"inV":51,"properties":{"weight":1}},{"id":551,"inV":59,"properties":{"weight":3}},{"id":552,"inV":153,"properties":{"weight":1}},{"id":553,"inV":56,"properties":{"weight":2}},{"id":554,"inV":26,"properties":{"weight":6}},{"id":555,"inV":85,"properties":{"weight":1}},{"id":556,"inV":208,"properties":{"weight":6}},{"id":557,"inV":105,"properties":{"weight":2}},{"id":558,"inV":82,"properties":{"weight":3}},{"id":559,"inV":50,"properties":{"weight":12}},{"id":560,"inV":18,"properties":{"weight":1}},{"id":561,"inV":54,"properties":{"weight":1}},{"id":562,"inV":89,"properties":{"weight":1}},{"id":563,"inV":154,"properties":{"weight":3}},{"id":564,"inV":78,"properties":{"weight":2}},{"id":565,"inV":65,"properties":{"weight":15}},{"id":566,"inV":72,"properties":{"weight":17}},{"id":567,"inV":32,"properties":{"weight":6}},{"id":568,"inV":23,"properties":{"weight":2}},{"id":569,"inV":123,"properties":{"weight":2}},{"id":570,"inV":84,"properties":{"weight":6}},{"id":571,"inV":49,"properties":{"weight":1}},{"id":572,"inV":114,"properties":{"weight":9}},{"id":573,"inV":160,"properties":{"weight":18}},{"id":574,"inV":111,"properties":{"weight":1}},{"id":575,"inV":209,"properties":{"weight":1}},{"id":576,"inV":162,"properties":{"weight":7}},{"id":577,"inV":38,"properties":{"weight":9}},{"id":578,"inV":170,"properties":{"weight":1}},{"id":579,"inV":133,"properties":{"weight":1}},{"id":580,"inV":124,"properties":{"weight":11}},{"id":581,"inV":180,"properties":{"weight":1}},{"id":582,"inV":210,"properties":{"weight":11}},{"id":583,"inV":4,"properties":{"weight":2}},{"id":584,"inV":87,"properties":{"weight":8}},{"id":585,"inV":211,"properties":{"weight":2}},{"id":586,"inV":62,"properties":{"weight":2}},{"id":587,"inV":212,"properties":{"weight":1}},{"id":588,"inV":64,"properties":{"weight":4}},{"id":589,"inV":46,"properties":{"weight":2}},{"id":590,"inV":213,"properties":{"weight":6}},{"id":591,"inV":150,"properties":{"weight":2}},{"id":592,"inV":155,"properties":{"weight":1}},{"id":593,"inV":144,"properties":{"weight":4}},{"id":594,"inV":204,"properties":{"weight":7}},{"id":595,"inV":165,"properties":{"weight":1}},{"id":596,"inV":132,"properties":{"weight":1}},{"id":597,"inV":90,"properties":{"weight":2}},{"id":598,"inV":140,"properties":{"weight":2}},{"id":599,"inV":214,"properties":{"weight":1}},{"id":600,"inV":86,"properties":{"weight":1}},{"id":601,"inV":42,"properties":{"weight":1}},{"id":602,"inV":215,"properties":{"weight":1}},{"id":603,"inV":216,"properties":{"weight":3}},{"id":604,"inV":217,"properties":{"weight":2}},{"id":605,"inV":193,"properties":{"weight":1}},{"id":606,"inV":79,"properties":{"weight":3}}],"sungBy":[{"id":7588,"inV":553}],"writtenBy":[{"id":7587,"inV":552}]},"properties":{"name":[{"id":357,"value":"GOOD LOVING"}],"songType":[{"id":359,"value":"cover"}],"performances":[{"id":358,"value":428}]}}
-{"id":121,"label":"song","inE":{"followedBy":[{"id":1730,"outV":82,"properties":{"weight":4}},{"id":3906,"outV":51,"properties":{"weight":4}},{"id":3011,"outV":14,"properties":{"weight":3}},{"id":5187,"outV":99,"properties":{"weight":1}},{"id":5317,"outV":170,"properties":{"weight":1}},{"id":6790,"outV":39,"properties":{"weight":1}},{"id":2120,"outV":17,"properties":{"weight":3}},{"id":5576,"outV":42,"properties":{"weight":4}},{"id":3465,"outV":58,"properties":{"weight":3}},{"id":3850,"outV":60,"properties":{"weight":1}},{"id":4110,"outV":48,"properties":{"weight":6}},{"id":5263,"outV":32,"properties":{"weight":1}},{"id":5776,"outV":76,"properties":{"weight":1}},{"id":3153,"outV":104,"properties":{"weight":8}},{"id":5394,"outV":69,"properties":{"weight":1}},{"id":3668,"outV":24,"properties":{"weight":1}},{"id":6740,"outV":53,"properties":{"weight":4}},{"id":1109,"outV":59,"properties":{"weight":2}},{"id":4188,"outV":54,"properties":{"weight":11}},{"id":6109,"outV":72,"properties":{"weight":1}},{"id":3231,"outV":63,"properties":{"weight":1}},{"id":5087,"outV":4,"properties":{"weight":1}},{"id":4897,"outV":100,"properties":{"weight":13}},{"id":4710,"outV":111,"properties":{"weight":1}},{"id":743,"outV":80,"properties":{"weight":2}},{"id":2535,"outV":57,"properties":{"weight":6}},{"id":488,"outV":98,"properties":{"weight":4}},{"id":4076,"outV":109,"properties":{"weight":1}},{"id":2927,"outV":78,"properties":{"weight":1}},{"id":4528,"outV":105,"properties":{"weight":1}},{"id":4275,"outV":10,"properties":{"weight":1}},{"id":1268,"outV":27,"properties":{"weight":2}},{"id":3574,"outV":56,"properties":{"weight":7}},{"id":188,"outV":70,"properties":{"weight":1}},{"id":3965,"outV":106,"properties":{"weight":2}},{"id":1022,"outV":73,"properties":{"weight":5}},{"id":1599,"outV":18,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6762,"inV":184,"properties":{"weight":111}}],"sungBy":[{"id":7220,"inV":351}],"writtenBy":[{"id":7219,"inV":350}]},"properties":{"name":[{"id":360,"value":"LAZY LIGHTNING"}],"songType":[{"id":362,"value":"original"}],"performances":[{"id":361,"value":111}]}}
-{"id":122,"label":"song","inE":{"followedBy":[{"id":704,"outV":206,"properties":{"weight":1}},{"id":6721,"outV":53,"properties":{"weight":2}},{"id":1539,"outV":18,"properties":{"weight":6}},{"id":3267,"outV":160,"properties":{"weight":1}},{"id":4870,"outV":100,"properties":{"weight":1}},{"id":2759,"outV":15,"properties":{"weight":3}},{"id":5642,"outV":22,"properties":{"weight":1}},{"id":529,"outV":120,"properties":{"weight":13}},{"id":1681,"outV":124,"properties":{"weight":1}},{"id":2834,"outV":101,"properties":{"weight":3}},{"id":6163,"outV":36,"properties":{"weight":1}},{"id":6548,"outV":55,"properties":{"weight":1}},{"id":2261,"outV":25,"properties":{"weight":16}},{"id":278,"outV":5,"properties":{"weight":3}},{"id":4248,"outV":10,"properties":{"weight":2}},{"id":4766,"outV":114,"properties":{"weight":9}},{"id":5153,"outV":125,"properties":{"weight":1}},{"id":2661,"outV":13,"properties":{"weight":17}},{"id":3557,"outV":56,"properties":{"weight":1}},{"id":5097,"outV":4,"properties":{"weight":1}},{"id":5737,"outV":129,"properties":{"weight":1}},{"id":2986,"outV":14,"properties":{"weight":1}},{"id":2475,"outV":68,"properties":{"weight":1}},{"id":3051,"outV":153,"properties":{"weight":31}},{"id":365,"outV":74,"properties":{"weight":1}},{"id":621,"outV":23,"properties":{"weight":1}},{"id":3629,"outV":24,"properties":{"weight":2}},{"id":4148,"outV":218,"properties":{"weight":2}},{"id":3897,"outV":51,"properties":{"weight":1}},{"id":3707,"outV":3,"properties":{"weight":2}},{"id":5947,"outV":50,"properties":{"weight":2}},{"id":4732,"outV":186,"properties":{"weight":1}},{"id":191,"outV":70,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":768,"inV":26,"properties":{"weight":18}},{"id":769,"inV":15,"properties":{"weight":3}},{"id":770,"inV":89,"properties":{"weight":1}},{"id":771,"inV":78,"properties":{"weight":2}},{"id":772,"inV":39,"properties":{"weight":1}},{"id":773,"inV":4,"properties":{"weight":9}},{"id":774,"inV":153,"properties":{"weight":3}},{"id":775,"inV":13,"properties":{"weight":1}},{"id":776,"inV":114,"properties":{"weight":12}},{"id":777,"inV":21,"properties":{"weight":7}},{"id":778,"inV":49,"properties":{"weight":3}},{"id":779,"inV":164,"properties":{"weight":1}},{"id":780,"inV":225,"properties":{"weight":1}},{"id":781,"inV":27,"properties":{"weight":2}},{"id":782,"inV":226,"properties":{"weight":1}},{"id":783,"inV":12,"properties":{"weight":1}},{"id":784,"inV":53,"properties":{"weight":1}},{"id":785,"inV":24,"properties":{"weight":1}},{"id":786,"inV":25,"properties":{"weight":4}},{"id":787,"inV":9,"properties":{"weight":3}},{"id":788,"inV":72,"properties":{"weight":1}},{"id":789,"inV":54,"properties":{"weight":1}},{"id":790,"inV":19,"properties":{"weight":1}},{"id":791,"inV":157,"properties":{"weight":3}},{"id":792,"inV":127,"properties":{"weight":1}},{"id":793,"inV":55,"properties":{"weight":1}},{"id":794,"inV":195,"properties":{"weight":1}},{"id":795,"inV":82,"properties":{"weight":1}},{"id":796,"inV":50,"properties":{"weight":4}},{"id":797,"inV":99,"properties":{"weight":2}},{"id":798,"inV":91,"properties":{"weight":1}},{"id":799,"inV":70,"properties":{"weight":1}},{"id":800,"inV":84,"properties":{"weight":1}},{"id":801,"inV":65,"properties":{"weight":7}},{"id":802,"inV":80,"properties":{"weight":2}},{"id":803,"inV":180,"properties":{"weight":1}},{"id":804,"inV":38,"properties":{"weight":4}},{"id":805,"inV":32,"properties":{"weight":1}},{"id":806,"inV":197,"properties":{"weight":1}},{"id":807,"inV":22,"properties":{"weight":1}},{"id":808,"inV":154,"properties":{"weight":1}},{"id":809,"inV":162,"properties":{"weight":1}},{"id":810,"inV":87,"properties":{"weight":1}},{"id":811,"inV":29,"properties":{"weight":1}},{"id":812,"inV":83,"properties":{"weight":1}},{"id":766,"inV":120,"properties":{"weight":5}},{"id":767,"inV":23,"properties":{"weight":11}}],"sungBy":[{"id":7092,"inV":340}],"writtenBy":[{"id":7091,"inV":339}]},"properties":{"name":[{"id":363,"value":"CASEY JONES"}],"songType":[{"id":365,"value":"original"}],"performances":[{"id":364,"value":312}]}}
-{"id":123,"label":"song","inE":{"followedBy":[{"id":192,"outV":70,"properties":{"weight":1}},{"id":5730,"outV":274,"properties":{"weight":1}},{"id":966,"outV":67,"properties":{"weight":1}},{"id":393,"outV":74,"properties":{"weight":1}},{"id":937,"outV":91,"properties":{"weight":1}},{"id":2665,"outV":13,"properties":{"weight":3}},{"id":3371,"outV":184,"properties":{"weight":1}},{"id":4747,"outV":241,"properties":{"weight":1}},{"id":1836,"outV":41,"properties":{"weight":1}},{"id":6190,"outV":2,"properties":{"weight":1}},{"id":6096,"outV":72,"properties":{"weight":1}},{"id":3729,"outV":3,"properties":{"weight":1}},{"id":6673,"outV":12,"properties":{"weight":2}},{"id":3858,"outV":60,"properties":{"weight":1}},{"id":1907,"outV":103,"properties":{"weight":1}},{"id":569,"outV":120,"properties":{"weight":2}},{"id":3289,"outV":160,"properties":{"weight":1}},{"id":6301,"outV":49,"properties":{"weight":1}},{"id":5822,"outV":76,"properties":{"weight":1}},{"id":6943,"outV":84,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6305,"inV":49,"properties":{"weight":1}},{"id":6306,"inV":282,"properties":{"weight":1}},{"id":6307,"inV":130,"properties":{"weight":1}},{"id":6308,"inV":19,"properties":{"weight":1}},{"id":6309,"inV":96,"properties":{"weight":10}},{"id":6310,"inV":3,"properties":{"weight":1}},{"id":6311,"inV":70,"properties":{"weight":1}},{"id":6312,"inV":82,"properties":{"weight":1}},{"id":6313,"inV":50,"properties":{"weight":2}},{"id":6314,"inV":76,"properties":{"weight":1}},{"id":6315,"inV":109,"properties":{"weight":1}},{"id":6316,"inV":85,"properties":{"weight":1}},{"id":6317,"inV":83,"properties":{"weight":1}},{"id":6318,"inV":38,"properties":{"weight":1}}],"sungBy":[{"id":7206,"inV":342}],"writtenBy":[{"id":7205,"inV":384}]},"properties":{"name":[{"id":366,"value":"JAM"}],"songType":[{"id":368,"value":"original"}],"performances":[{"id":367,"value":24}]}}
-{"id":124,"label":"song","inE":{"followedBy":[{"id":4928,"outV":100,"properties":{"weight":2}},{"id":6912,"outV":133,"properties":{"weight":1}},{"id":1345,"outV":31,"properties":{"weight":1}},{"id":196,"outV":70,"properties":{"weight":1}},{"id":580,"outV":120,"properties":{"weight":11}},{"id":4807,"outV":114,"properties":{"weight":14}},{"id":2826,"outV":15,"properties":{"weight":1}},{"id":2317,"outV":25,"properties":{"weight":7}},{"id":1236,"outV":249,"properties":{"weight":1}},{"id":2004,"outV":251,"properties":{"weight":1}},{"id":5335,"outV":165,"properties":{"weight":1}},{"id":3611,"outV":56,"properties":{"weight":2}},{"id":1500,"outV":164,"properties":{"weight":15}},{"id":3105,"outV":153,"properties":{"weight":30}},{"id":1058,"outV":73,"properties":{"weight":3}},{"id":6051,"outV":115,"properties":{"weight":1}},{"id":1636,"outV":260,"properties":{"weight":1}},{"id":6884,"outV":93,"properties":{"weight":1}},{"id":4391,"outV":40,"properties":{"weight":1}},{"id":6634,"outV":127,"properties":{"weight":1}},{"id":299,"outV":5,"properties":{"weight":3}},{"id":2096,"outV":188,"properties":{"weight":1}},{"id":3955,"outV":322,"properties":{"weight":1}},{"id":5561,"outV":162,"properties":{"weight":4}},{"id":3261,"outV":287,"properties":{"weight":1}},{"id":511,"outV":98,"properties":{"weight":1}},{"id":3711,"outV":3,"properties":{"weight":15}}]},"outE":{"followedBy":[{"id":1665,"inV":26,"properties":{"weight":1}},{"id":1666,"inV":111,"properties":{"weight":1}},{"id":1667,"inV":4,"properties":{"weight":15}},{"id":1668,"inV":50,"properties":{"weight":10}},{"id":1669,"inV":65,"properties":{"weight":9}},{"id":1670,"inV":84,"properties":{"weight":7}},{"id":1671,"inV":120,"properties":{"weight":1}},{"id":1672,"inV":154,"properties":{"weight":2}},{"id":1673,"inV":38,"properties":{"weight":8}},{"id":1674,"inV":32,"properties":{"weight":5}},{"id":1675,"inV":103,"properties":{"weight":1}},{"id":1676,"inV":78,"properties":{"weight":7}},{"id":1677,"inV":31,"properties":{"weight":1}},{"id":1678,"inV":62,"properties":{"weight":3}},{"id":1679,"inV":110,"properties":{"weight":1}},{"id":1680,"inV":64,"properties":{"weight":8}},{"id":1681,"inV":122,"properties":{"weight":1}},{"id":1682,"inV":67,"properties":{"weight":2}},{"id":1683,"inV":268,"properties":{"weight":1}},{"id":1684,"inV":3,"properties":{"weight":1}},{"id":1685,"inV":242,"properties":{"weight":1}},{"id":1686,"inV":87,"properties":{"weight":8}},{"id":1687,"inV":114,"properties":{"weight":2}},{"id":1688,"inV":48,"properties":{"weight":1}},{"id":1689,"inV":71,"properties":{"weight":1}},{"id":1690,"inV":269,"properties":{"weight":1}},{"id":1691,"inV":270,"properties":{"weight":1}},{"id":1692,"inV":77,"properties":{"weight":1}},{"id":1693,"inV":271,"properties":{"weight":1}},{"id":1694,"inV":88,"properties":{"weight":1}},{"id":1695,"inV":90,"properties":{"weight":2}},{"id":1696,"inV":153,"properties":{"weight":1}},{"id":1697,"inV":116,"properties":{"weight":1}},{"id":1698,"inV":54,"properties":{"weight":2}},{"id":1699,"inV":100,"properties":{"weight":1}},{"id":1700,"inV":63,"properties":{"weight":1}},{"id":1701,"inV":58,"properties":{"weight":1}},{"id":1702,"inV":12,"properties":{"weight":1}},{"id":1703,"inV":137,"properties":{"weight":2}},{"id":1704,"inV":40,"properties":{"weight":1}},{"id":1705,"inV":51,"properties":{"weight":1}},{"id":1706,"inV":56,"properties":{"weight":1}},{"id":1707,"inV":81,"properties":{"weight":1}},{"id":1708,"inV":57,"properties":{"weight":1}},{"id":1709,"inV":104,"properties":{"weight":1}},{"id":1710,"inV":215,"properties":{"weight":1}}]},"properties":{"name":[{"id":369,"value":"BABY BLUE"}],"songType":[{"id":371,"value":""}],"performances":[{"id":370,"value":0}]}}
-{"id":125,"label":"song","inE":{"followedBy":[{"id":640,"outV":23,"properties":{"weight":1}},{"id":4673,"outV":33,"properties":{"weight":4}},{"id":6145,"outV":289,"properties":{"weight":1}},{"id":6209,"outV":319,"properties":{"weight":4}},{"id":197,"outV":70,"properties":{"weight":27}},{"id":2245,"outV":29,"properties":{"weight":7}},{"id":3721,"outV":3,"properties":{"weight":54}},{"id":5963,"outV":50,"properties":{"weight":1}},{"id":6155,"outV":36,"properties":{"weight":5}},{"id":911,"outV":91,"properties":{"weight":1}},{"id":6224,"outV":117,"properties":{"weight":1}},{"id":3540,"outV":201,"properties":{"weight":11}},{"id":6932,"outV":84,"properties":{"weight":1}},{"id":6037,"outV":115,"properties":{"weight":1}},{"id":1431,"outV":83,"properties":{"weight":1}},{"id":4440,"outV":113,"properties":{"weight":3}},{"id":5337,"outV":165,"properties":{"weight":23}},{"id":6426,"outV":134,"properties":{"weight":8}},{"id":1948,"outV":148,"properties":{"weight":35}},{"id":3103,"outV":153,"properties":{"weight":2}},{"id":4639,"outV":154,"properties":{"weight":1}},{"id":3618,"outV":24,"properties":{"weight":2}},{"id":2724,"outV":13,"properties":{"weight":9}},{"id":1573,"outV":18,"properties":{"weight":2}},{"id":2789,"outV":15,"properties":{"weight":1}},{"id":294,"outV":5,"properties":{"weight":5}},{"id":4266,"outV":10,"properties":{"weight":1}},{"id":3570,"outV":56,"properties":{"weight":1}},{"id":371,"outV":74,"properties":{"weight":1}},{"id":4339,"outV":62,"properties":{"weight":1}},{"id":1334,"outV":31,"properties":{"weight":1}},{"id":5366,"outV":132,"properties":{"weight":1}},{"id":5497,"outV":131,"properties":{"weight":1}},{"id":956,"outV":67,"properties":{"weight":5}},{"id":5885,"outV":96,"properties":{"weight":20}},{"id":6333,"outV":21,"properties":{"weight":32}}]},"outE":{"followedBy":[{"id":5152,"inV":162,"properties":{"weight":1}},{"id":5153,"inV":122,"properties":{"weight":1}},{"id":5154,"inV":114,"properties":{"weight":10}},{"id":5155,"inV":164,"properties":{"weight":20}},{"id":5156,"inV":29,"properties":{"weight":22}},{"id":5157,"inV":242,"properties":{"weight":1}},{"id":5158,"inV":90,"properties":{"weight":1}},{"id":5159,"inV":50,"properties":{"weight":1}},{"id":5136,"inV":22,"properties":{"weight":1}},{"id":5137,"inV":21,"properties":{"weight":6}},{"id":5138,"inV":148,"properties":{"weight":1}},{"id":5139,"inV":24,"properties":{"weight":1}},{"id":5140,"inV":23,"properties":{"weight":1}},{"id":5141,"inV":15,"properties":{"weight":2}},{"id":5142,"inV":13,"properties":{"weight":11}},{"id":5143,"inV":133,"properties":{"weight":4}},{"id":5144,"inV":25,"properties":{"weight":87}},{"id":5145,"inV":18,"properties":{"weight":1}},{"id":5146,"inV":16,"properties":{"weight":1}},{"id":5147,"inV":153,"properties":{"weight":69}},{"id":5148,"inV":3,"properties":{"weight":4}},{"id":5149,"inV":120,"properties":{"weight":16}},{"id":5150,"inV":70,"properties":{"weight":7}},{"id":5151,"inV":5,"properties":{"weight":6}}],"sungBy":[{"id":7070,"inV":340}],"writtenBy":[{"id":7069,"inV":339}]},"properties":{"name":[{"id":372,"value":"BLACK PETER"}],"songType":[{"id":374,"value":"original"}],"performances":[{"id":373,"value":343}]}}
-{"id":126,"label":"song","inE":{"followedBy":[{"id":200,"outV":70,"properties":{"weight":1}},{"id":4203,"outV":54,"properties":{"weight":1}},{"id":6926,"outV":245,"properties":{"weight":7}}]},"outE":{"followedBy":[{"id":5537,"inV":49,"properties":{"weight":1}},{"id":5538,"inV":108,"properties":{"weight":1}},{"id":5539,"inV":245,"properties":{"weight":1}},{"id":5540,"inV":104,"properties":{"weight":1}},{"id":5541,"inV":100,"properties":{"weight":1}},{"id":5542,"inV":51,"properties":{"weight":1}},{"id":5543,"inV":73,"properties":{"weight":1}},{"id":5544,"inV":105,"properties":{"weight":1}},{"id":5545,"inV":58,"properties":{"weight":1}}]},"properties":{"name":[{"id":375,"value":"AINT SUPERSTITIOUS"}],"songType":[{"id":377,"value":""}],"performances":[{"id":376,"value":0}]}}
-{"id":127,"label":"song","inE":{"followedBy":[{"id":1408,"outV":83,"properties":{"weight":4}},{"id":5056,"outV":209,"properties":{"weight":1}},{"id":2563,"outV":57,"properties":{"weight":1}},{"id":3715,"outV":3,"properties":{"weight":10}},{"id":6339,"outV":21,"properties":{"weight":9}},{"id":964,"outV":67,"properties":{"weight":10}},{"id":2628,"outV":158,"properties":{"weight":1}},{"id":6212,"outV":319,"properties":{"weight":1}},{"id":2247,"outV":29,"properties":{"weight":1}},{"id":201,"outV":70,"properties":{"weight":18}},{"id":1929,"outV":148,"properties":{"weight":24}},{"id":459,"outV":139,"properties":{"weight":2}},{"id":5906,"outV":96,"properties":{"weight":10}},{"id":532,"outV":120,"properties":{"weight":1}},{"id":3541,"outV":201,"properties":{"weight":7}},{"id":918,"outV":91,"properties":{"weight":4}},{"id":792,"outV":122,"properties":{"weight":1}},{"id":4442,"outV":113,"properties":{"weight":1}},{"id":7006,"outV":89,"properties":{"weight":11}},{"id":354,"outV":74,"properties":{"weight":9}},{"id":6434,"outV":134,"properties":{"weight":1}},{"id":291,"outV":5,"properties":{"weight":6}},{"id":5347,"outV":165,"properties":{"weight":21}},{"id":1321,"outV":31,"properties":{"weight":1}},{"id":6571,"outV":116,"properties":{"weight":1}},{"id":685,"outV":157,"properties":{"weight":1}},{"id":6067,"outV":296,"properties":{"weight":1}},{"id":2292,"outV":25,"properties":{"weight":2}},{"id":4724,"outV":186,"properties":{"weight":1}},{"id":4343,"outV":62,"properties":{"weight":1}},{"id":5111,"outV":4,"properties":{"weight":2}},{"id":2682,"outV":13,"properties":{"weight":6}},{"id":2874,"outV":101,"properties":{"weight":1}},{"id":3069,"outV":153,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":6594,"inV":13,"properties":{"weight":6}},{"id":6595,"inV":153,"properties":{"weight":30}},{"id":6596,"inV":47,"properties":{"weight":1}},{"id":6597,"inV":25,"properties":{"weight":17}},{"id":6598,"inV":12,"properties":{"weight":1}},{"id":6599,"inV":96,"properties":{"weight":2}},{"id":6600,"inV":49,"properties":{"weight":1}},{"id":6601,"inV":148,"properties":{"weight":1}},{"id":6602,"inV":23,"properties":{"weight":1}},{"id":6603,"inV":10,"properties":{"weight":4}},{"id":6604,"inV":74,"properties":{"weight":4}},{"id":6605,"inV":21,"properties":{"weight":1}},{"id":6606,"inV":24,"properties":{"weight":1}},{"id":6607,"inV":59,"properties":{"weight":1}},{"id":6608,"inV":114,"properties":{"weight":14}},{"id":6609,"inV":26,"properties":{"weight":3}},{"id":6610,"inV":215,"properties":{"weight":2}},{"id":6611,"inV":65,"properties":{"weight":1}},{"id":6612,"inV":120,"properties":{"weight":5}},{"id":6613,"inV":89,"properties":{"weight":1}},{"id":6614,"inV":72,"properties":{"weight":1}},{"id":6615,"inV":162,"properties":{"weight":3}},{"id":6616,"inV":29,"properties":{"weight":14}},{"id":6617,"inV":70,"properties":{"weight":1}},{"id":6618,"inV":85,"properties":{"weight":1}},{"id":6619,"inV":61,"properties":{"weight":2}},{"id":6620,"inV":165,"properties":{"weight":2}},{"id":6621,"inV":64,"properties":{"weight":5}},{"id":6622,"inV":164,"properties":{"weight":8}},{"id":6623,"inV":3,"properties":{"weight":3}},{"id":6624,"inV":213,"properties":{"weight":2}},{"id":6625,"inV":133,"properties":{"weight":2}},{"id":6626,"inV":87,"properties":{"weight":3}},{"id":6627,"inV":321,"properties":{"weight":1}},{"id":6628,"inV":150,"properties":{"weight":2}},{"id":6629,"inV":84,"properties":{"weight":2}},{"id":6630,"inV":157,"properties":{"weight":1}},{"id":6631,"inV":46,"properties":{"weight":2}},{"id":6632,"inV":160,"properties":{"weight":2}},{"id":6633,"inV":86,"properties":{"weight":3}},{"id":6634,"inV":124,"properties":{"weight":1}},{"id":6635,"inV":227,"properties":{"weight":3}},{"id":6636,"inV":90,"properties":{"weight":2}},{"id":6637,"inV":185,"properties":{"weight":4}},{"id":6638,"inV":193,"properties":{"weight":1}},{"id":6639,"inV":216,"properties":{"weight":1}},{"id":6640,"inV":38,"properties":{"weight":1}},{"id":6641,"inV":30,"properties":{"weight":1}},{"id":6642,"inV":79,"properties":{"weight":1}},{"id":6643,"inV":50,"properties":{"weight":2}}],"sungBy":[{"id":7786,"inV":340}],"writtenBy":[{"id":7785,"inV":662}]},"properties":{"name":[{"id":378,"value":"MORNING DEW"}],"songType":[{"id":380,"value":"cover"}],"performances":[{"id":379,"value":254}]}}
-{"id":128,"label":"song","inE":{"followedBy":[{"id":944,"outV":67,"properties":{"weight":1}},{"id":1603,"outV":18,"properties":{"weight":1}},{"id":2739,"outV":13,"properties":{"weight":1}},{"id":5815,"outV":76,"properties":{"weight":2}},{"id":203,"outV":70,"properties":{"weight":1}},{"id":3741,"outV":3,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":5063,"inV":227,"properties":{"weight":1}},{"id":5064,"inV":96,"properties":{"weight":2}},{"id":5065,"inV":153,"properties":{"weight":1}},{"id":5066,"inV":64,"properties":{"weight":1}},{"id":5067,"inV":97,"properties":{"weight":1}},{"id":5068,"inV":61,"properties":{"weight":1}},{"id":5069,"inV":114,"properties":{"weight":1}},{"id":5070,"inV":21,"properties":{"weight":1}}],"sungBy":[{"id":7898,"inV":726}],"writtenBy":[{"id":7897,"inV":447}]},"properties":{"name":[{"id":381,"value":"SHE BELONGS TO ME"}],"songType":[{"id":383,"value":"cover"}],"performances":[{"id":382,"value":10}]}}
-{"id":129,"label":"song","inE":{"followedBy":[{"id":641,"outV":23,"properties":{"weight":1}},{"id":6178,"outV":36,"properties":{"weight":1}},{"id":387,"outV":74,"properties":{"weight":3}},{"id":6469,"outV":187,"properties":{"weight":1}},{"id":2441,"outV":68,"properties":{"weight":5}},{"id":1962,"outV":148,"properties":{"weight":4}},{"id":5354,"outV":165,"properties":{"weight":4}},{"id":2731,"outV":13,"properties":{"weight":29}},{"id":204,"outV":70,"properties":{"weight":3}},{"id":4719,"outV":186,"properties":{"weight":6}},{"id":5103,"outV":4,"properties":{"weight":1}},{"id":6415,"outV":134,"properties":{"weight":4}},{"id":5905,"outV":96,"properties":{"weight":15}},{"id":7025,"outV":89,"properties":{"weight":1}},{"id":3730,"outV":3,"properties":{"weight":1}},{"id":6995,"outV":197,"properties":{"weight":2}},{"id":3543,"outV":201,"properties":{"weight":3}},{"id":5051,"outV":209,"properties":{"weight":3}},{"id":1404,"outV":83,"properties":{"weight":24}},{"id":4636,"outV":154,"properties":{"weight":1}},{"id":2846,"outV":101,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":5760,"inV":165,"properties":{"weight":1}},{"id":5761,"inV":132,"properties":{"weight":1}},{"id":5762,"inV":67,"properties":{"weight":1}},{"id":5763,"inV":134,"properties":{"weight":1}},{"id":5764,"inV":164,"properties":{"weight":1}},{"id":5731,"inV":25,"properties":{"weight":11}},{"id":5732,"inV":153,"properties":{"weight":13}},{"id":5733,"inV":26,"properties":{"weight":3}},{"id":5734,"inV":52,"properties":{"weight":1}},{"id":5735,"inV":15,"properties":{"weight":2}},{"id":5736,"inV":55,"properties":{"weight":1}},{"id":5737,"inV":122,"properties":{"weight":1}},{"id":5738,"inV":21,"properties":{"weight":2}},{"id":5739,"inV":23,"properties":{"weight":1}},{"id":5740,"inV":130,"properties":{"weight":1}},{"id":5741,"inV":13,"properties":{"weight":12}},{"id":5742,"inV":114,"properties":{"weight":5}},{"id":5743,"inV":69,"properties":{"weight":1}},{"id":5744,"inV":49,"properties":{"weight":1}},{"id":5745,"inV":3,"properties":{"weight":1}},{"id":5746,"inV":209,"properties":{"weight":2}},{"id":5747,"inV":197,"properties":{"weight":1}},{"id":5748,"inV":222,"properties":{"weight":3}},{"id":5749,"inV":111,"properties":{"weight":3}},{"id":5750,"inV":199,"properties":{"weight":1}},{"id":5751,"inV":96,"properties":{"weight":21}},{"id":5752,"inV":74,"properties":{"weight":3}},{"id":5753,"inV":29,"properties":{"weight":8}},{"id":5754,"inV":183,"properties":{"weight":1}},{"id":5755,"inV":63,"properties":{"weight":1}},{"id":5756,"inV":76,"properties":{"weight":1}},{"id":5757,"inV":70,"properties":{"weight":1}},{"id":5758,"inV":163,"properties":{"weight":1}},{"id":5759,"inV":5,"properties":{"weight":6}}],"sungBy":[{"id":7102,"inV":340}],"writtenBy":[{"id":7101,"inV":339}]},"properties":{"name":[{"id":384,"value":"CHINA DOLL"}],"songType":[{"id":386,"value":"original"}],"performances":[{"id":385,"value":114}]}}
-{"id":130,"label":"song","inE":{"followedBy":[{"id":1409,"outV":83,"properties":{"weight":9}},{"id":2689,"outV":13,"properties":{"weight":11}},{"id":4737,"outV":186,"properties":{"weight":3}},{"id":4674,"outV":33,"properties":{"weight":1}},{"id":6915,"outV":133,"properties":{"weight":1}},{"id":6150,"outV":36,"properties":{"weight":8}},{"id":3847,"outV":60,"properties":{"weight":1}},{"id":1930,"outV":148,"properties":{"weight":143}},{"id":3722,"outV":3,"properties":{"weight":26}},{"id":5452,"outV":231,"properties":{"weight":1}},{"id":6284,"outV":49,"properties":{"weight":1}},{"id":6412,"outV":134,"properties":{"weight":10}},{"id":4301,"outV":110,"properties":{"weight":7}},{"id":207,"outV":70,"properties":{"weight":21}},{"id":5780,"outV":76,"properties":{"weight":1}},{"id":2838,"outV":101,"properties":{"weight":8}},{"id":3544,"outV":201,"properties":{"weight":4}},{"id":6552,"outV":172,"properties":{"weight":1}},{"id":2010,"outV":149,"properties":{"weight":3}},{"id":2401,"outV":179,"properties":{"weight":1}},{"id":5345,"outV":165,"properties":{"weight":3}},{"id":2339,"outV":278,"properties":{"weight":1}},{"id":6307,"outV":123,"properties":{"weight":1}},{"id":293,"outV":5,"properties":{"weight":3}},{"id":1830,"outV":41,"properties":{"weight":1}},{"id":363,"outV":74,"properties":{"weight":2}},{"id":5740,"outV":129,"properties":{"weight":1}},{"id":2286,"outV":25,"properties":{"weight":1}},{"id":5874,"outV":96,"properties":{"weight":41}},{"id":7028,"outV":89,"properties":{"weight":1}},{"id":6200,"outV":319,"properties":{"weight":2}},{"id":954,"outV":67,"properties":{"weight":10}},{"id":2172,"outV":16,"properties":{"weight":1}},{"id":2238,"outV":29,"properties":{"weight":3}},{"id":6334,"outV":21,"properties":{"weight":34}},{"id":5055,"outV":209,"properties":{"weight":1}},{"id":6655,"outV":12,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1357,"inV":153,"properties":{"weight":81}},{"id":1358,"inV":3,"properties":{"weight":18}},{"id":1359,"inV":27,"properties":{"weight":1}},{"id":1360,"inV":10,"properties":{"weight":2}},{"id":1361,"inV":89,"properties":{"weight":1}},{"id":1362,"inV":50,"properties":{"weight":3}},{"id":1363,"inV":78,"properties":{"weight":1}},{"id":1364,"inV":94,"properties":{"weight":2}},{"id":1365,"inV":12,"properties":{"weight":2}},{"id":1366,"inV":13,"properties":{"weight":12}},{"id":1367,"inV":22,"properties":{"weight":2}},{"id":1368,"inV":21,"properties":{"weight":10}},{"id":1369,"inV":25,"properties":{"weight":77}},{"id":1370,"inV":51,"properties":{"weight":1}},{"id":1371,"inV":83,"properties":{"weight":1}},{"id":1372,"inV":15,"properties":{"weight":1}},{"id":1373,"inV":5,"properties":{"weight":11}},{"id":1374,"inV":149,"properties":{"weight":1}},{"id":1375,"inV":114,"properties":{"weight":6}},{"id":1376,"inV":74,"properties":{"weight":1}},{"id":1377,"inV":110,"properties":{"weight":4}},{"id":1378,"inV":96,"properties":{"weight":5}},{"id":1379,"inV":141,"properties":{"weight":1}},{"id":1380,"inV":76,"properties":{"weight":1}},{"id":1381,"inV":101,"properties":{"weight":1}},{"id":1382,"inV":148,"properties":{"weight":4}},{"id":1383,"inV":154,"properties":{"weight":4}},{"id":1384,"inV":91,"properties":{"weight":1}},{"id":1385,"inV":26,"properties":{"weight":1}},{"id":1386,"inV":120,"properties":{"weight":23}},{"id":1387,"inV":70,"properties":{"weight":9}},{"id":1388,"inV":29,"properties":{"weight":54}},{"id":1389,"inV":67,"properties":{"weight":1}},{"id":1390,"inV":160,"properties":{"weight":1}},{"id":1391,"inV":164,"properties":{"weight":18}},{"id":1392,"inV":133,"properties":{"weight":3}},{"id":1393,"inV":165,"properties":{"weight":1}},{"id":1394,"inV":227,"properties":{"weight":1}},{"id":1395,"inV":42,"properties":{"weight":1}}],"sungBy":[{"id":7406,"inV":340}],"writtenBy":[{"id":7405,"inV":339}]},"properties":{"name":[{"id":387,"value":"WHARF RAT"}],"songType":[{"id":389,"value":"original"}],"performances":[{"id":388,"value":394}]}}
-{"id":131,"label":"song","inE":{"followedBy":[{"id":2657,"outV":137,"properties":{"weight":1}},{"id":6691,"outV":12,"properties":{"weight":14}},{"id":1509,"outV":164,"properties":{"weight":1}},{"id":2566,"outV":57,"properties":{"weight":1}},{"id":1063,"outV":73,"properties":{"weight":1}},{"id":3751,"outV":3,"properties":{"weight":1}},{"id":2824,"outV":15,"properties":{"weight":4}},{"id":3689,"outV":24,"properties":{"weight":9}},{"id":2606,"outV":112,"properties":{"weight":3}},{"id":3249,"outV":63,"properties":{"weight":1}},{"id":212,"outV":70,"properties":{"weight":1}},{"id":3830,"outV":88,"properties":{"weight":1}},{"id":1915,"outV":103,"properties":{"weight":1}},{"id":4220,"outV":54,"properties":{"weight":1}},{"id":1662,"outV":264,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5504,"inV":27,"properties":{"weight":1}},{"id":5505,"inV":51,"properties":{"weight":4}},{"id":5506,"inV":202,"properties":{"weight":3}},{"id":5507,"inV":80,"properties":{"weight":1}},{"id":5508,"inV":78,"properties":{"weight":1}},{"id":5509,"inV":56,"properties":{"weight":1}},{"id":5510,"inV":54,"properties":{"weight":2}},{"id":5511,"inV":105,"properties":{"weight":1}},{"id":5512,"inV":150,"properties":{"weight":1}},{"id":5513,"inV":254,"properties":{"weight":2}},{"id":5514,"inV":173,"properties":{"weight":1}},{"id":5515,"inV":48,"properties":{"weight":2}},{"id":5493,"inV":39,"properties":{"weight":4}},{"id":5494,"inV":287,"properties":{"weight":1}},{"id":5495,"inV":266,"properties":{"weight":1}},{"id":5496,"inV":250,"properties":{"weight":1}},{"id":5497,"inV":125,"properties":{"weight":1}},{"id":5498,"inV":63,"properties":{"weight":2}},{"id":5499,"inV":73,"properties":{"weight":2}},{"id":5500,"inV":68,"properties":{"weight":1}},{"id":5501,"inV":188,"properties":{"weight":1}},{"id":5502,"inV":58,"properties":{"weight":4}},{"id":5503,"inV":100,"properties":{"weight":3}}],"sungBy":[{"id":7760,"inV":453}],"writtenBy":[{"id":7759,"inV":447}]},"properties":{"name":[{"id":390,"value":"MAGGIES FARM"}],"songType":[{"id":392,"value":"cover"}],"performances":[{"id":391,"value":43}]}}
-{"id":132,"label":"song","inE":{"followedBy":[{"id":1968,"outV":148,"properties":{"weight":1}},{"id":5761,"outV":129,"properties":{"weight":1}},{"id":6433,"outV":134,"properties":{"weight":4}},{"id":596,"outV":120,"properties":{"weight":1}},{"id":214,"outV":70,"properties":{"weight":13}},{"id":4296,"outV":135,"properties":{"weight":1}},{"id":5352,"outV":165,"properties":{"weight":1}},{"id":5914,"outV":96,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":5359,"inV":21,"properties":{"weight":2}},{"id":5360,"inV":150,"properties":{"weight":3}},{"id":5361,"inV":164,"properties":{"weight":5}},{"id":5362,"inV":165,"properties":{"weight":2}},{"id":5363,"inV":94,"properties":{"weight":1}},{"id":5364,"inV":64,"properties":{"weight":1}},{"id":5365,"inV":29,"properties":{"weight":3}},{"id":5366,"inV":125,"properties":{"weight":1}},{"id":5367,"inV":3,"properties":{"weight":1}},{"id":5368,"inV":153,"properties":{"weight":3}},{"id":5369,"inV":135,"properties":{"weight":1}},{"id":5370,"inV":5,"properties":{"weight":2}},{"id":5371,"inV":25,"properties":{"weight":1}},{"id":5372,"inV":70,"properties":{"weight":1}},{"id":5373,"inV":87,"properties":{"weight":1}}],"sungBy":[{"id":7614,"inV":461}],"writtenBy":[{"id":7613,"inV":480}]},"properties":{"name":[{"id":393,"value":"HEY JUDE"}],"songType":[{"id":395,"value":"cover"}],"performances":[{"id":394,"value":3}]}}
-{"id":133,"label":"song","inE":{"followedBy":[{"id":6625,"outV":127,"properties":{"weight":2}},{"id":579,"outV":120,"properties":{"weight":1}},{"id":1732,"outV":82,"properties":{"weight":1}},{"id":2182,"outV":208,"properties":{"weight":1}},{"id":1864,"outV":94,"properties":{"weight":3}},{"id":3306,"outV":160,"properties":{"weight":1}},{"id":2315,"outV":25,"properties":{"weight":6}},{"id":3084,"outV":153,"properties":{"weight":1}},{"id":2733,"outV":13,"properties":{"weight":1}},{"id":2255,"outV":29,"properties":{"weight":1}},{"id":1392,"outV":130,"properties":{"weight":3}},{"id":279,"outV":5,"properties":{"weight":2}},{"id":5143,"outV":125,"properties":{"weight":4}},{"id":216,"outV":70,"properties":{"weight":1}},{"id":5880,"outV":96,"properties":{"weight":1}},{"id":2042,"outV":92,"properties":{"weight":1}},{"id":2556,"outV":57,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6912,"inV":124,"properties":{"weight":1}},{"id":6913,"inV":62,"properties":{"weight":1}},{"id":6914,"inV":87,"properties":{"weight":2}},{"id":6915,"inV":130,"properties":{"weight":1}},{"id":6916,"inV":38,"properties":{"weight":1}},{"id":6917,"inV":46,"properties":{"weight":3}},{"id":6918,"inV":61,"properties":{"weight":1}},{"id":6919,"inV":150,"properties":{"weight":1}},{"id":6920,"inV":213,"properties":{"weight":1}},{"id":6921,"inV":335,"properties":{"weight":1}},{"id":6922,"inV":64,"properties":{"weight":1}},{"id":6900,"inV":114,"properties":{"weight":2}},{"id":6901,"inV":69,"properties":{"weight":1}},{"id":6902,"inV":25,"properties":{"weight":1}},{"id":6903,"inV":76,"properties":{"weight":2}},{"id":6904,"inV":78,"properties":{"weight":2}},{"id":6905,"inV":110,"properties":{"weight":1}},{"id":6906,"inV":120,"properties":{"weight":1}},{"id":6907,"inV":162,"properties":{"weight":2}},{"id":6908,"inV":160,"properties":{"weight":2}},{"id":6909,"inV":84,"properties":{"weight":1}},{"id":6910,"inV":164,"properties":{"weight":1}},{"id":6911,"inV":72,"properties":{"weight":1}}],"sungBy":[{"id":7348,"inV":351}],"writtenBy":[{"id":7347,"inV":367}]},"properties":{"name":[{"id":396,"value":"SUNSHINE DAYDREAM"}],"songType":[{"id":398,"value":"original"}],"performances":[{"id":397,"value":31}]}}
-{"id":134,"label":"song","inE":{"followedBy":[{"id":2241,"outV":29,"properties":{"weight":1}},{"id":5763,"outV":129,"properties":{"weight":1}},{"id":3719,"outV":3,"properties":{"weight":2}},{"id":5451,"outV":231,"properties":{"weight":2}},{"id":5328,"outV":238,"properties":{"weight":1}},{"id":2708,"outV":13,"properties":{"weight":9}},{"id":4308,"outV":110,"properties":{"weight":5}},{"id":1176,"outV":26,"properties":{"weight":2}},{"id":5336,"outV":165,"properties":{"weight":1}},{"id":218,"outV":70,"properties":{"weight":4}},{"id":6170,"outV":36,"properties":{"weight":1}},{"id":3549,"outV":201,"properties":{"weight":1}},{"id":2015,"outV":149,"properties":{"weight":3}},{"id":4005,"outV":323,"properties":{"weight":1}},{"id":296,"outV":5,"properties":{"weight":1}},{"id":1960,"outV":148,"properties":{"weight":6}},{"id":4712,"outV":186,"properties":{"weight":45}},{"id":4333,"outV":62,"properties":{"weight":1}},{"id":5870,"outV":96,"properties":{"weight":159}},{"id":2863,"outV":101,"properties":{"weight":1}},{"id":1141,"outV":246,"properties":{"weight":1}},{"id":4791,"outV":114,"properties":{"weight":1}},{"id":953,"outV":67,"properties":{"weight":4}},{"id":4602,"outV":85,"properties":{"weight":1}},{"id":5818,"outV":76,"properties":{"weight":1}},{"id":7036,"outV":89,"properties":{"weight":2}},{"id":5693,"outV":159,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6401,"inV":69,"properties":{"weight":1}},{"id":6402,"inV":148,"properties":{"weight":18}},{"id":6403,"inV":120,"properties":{"weight":4}},{"id":6404,"inV":68,"properties":{"weight":1}},{"id":6405,"inV":76,"properties":{"weight":5}},{"id":6406,"inV":153,"properties":{"weight":7}},{"id":6407,"inV":13,"properties":{"weight":24}},{"id":6408,"inV":78,"properties":{"weight":1}},{"id":6409,"inV":25,"properties":{"weight":5}},{"id":6410,"inV":26,"properties":{"weight":1}},{"id":6411,"inV":149,"properties":{"weight":1}},{"id":6412,"inV":130,"properties":{"weight":10}},{"id":6413,"inV":21,"properties":{"weight":18}},{"id":6414,"inV":91,"properties":{"weight":1}},{"id":6415,"inV":129,"properties":{"weight":4}},{"id":6416,"inV":84,"properties":{"weight":1}},{"id":6417,"inV":103,"properties":{"weight":1}},{"id":6418,"inV":36,"properties":{"weight":1}},{"id":6419,"inV":94,"properties":{"weight":6}},{"id":6420,"inV":96,"properties":{"weight":1}},{"id":6421,"inV":74,"properties":{"weight":2}},{"id":6422,"inV":116,"properties":{"weight":1}},{"id":6423,"inV":70,"properties":{"weight":32}},{"id":6424,"inV":29,"properties":{"weight":23}},{"id":6425,"inV":3,"properties":{"weight":2}},{"id":6426,"inV":125,"properties":{"weight":8}},{"id":6427,"inV":67,"properties":{"weight":31}},{"id":6428,"inV":278,"properties":{"weight":1}},{"id":6429,"inV":61,"properties":{"weight":1}},{"id":6430,"inV":113,"properties":{"weight":1}},{"id":6431,"inV":5,"properties":{"weight":2}},{"id":6432,"inV":165,"properties":{"weight":34}},{"id":6433,"inV":132,"properties":{"weight":4}},{"id":6434,"inV":127,"properties":{"weight":1}},{"id":6435,"inV":137,"properties":{"weight":1}},{"id":6436,"inV":140,"properties":{"weight":3}}],"sungBy":[{"id":7412,"inV":375}],"writtenBy":[{"id":7411,"inV":339}]},"properties":{"name":[{"id":399,"value":"THE WHEEL"}],"songType":[{"id":401,"value":"original"}],"performances":[{"id":400,"value":258}]}}
-{"id":135,"label":"song","inE":{"followedBy":[{"id":1969,"outV":148,"properties":{"weight":1}},{"id":5926,"outV":96,"properties":{"weight":1}},{"id":5369,"outV":132,"properties":{"weight":1}},{"id":221,"outV":70,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4295,"inV":164,"properties":{"weight":1}},{"id":4296,"inV":132,"properties":{"weight":1}},{"id":4297,"inV":153,"properties":{"weight":1}},{"id":4298,"inV":25,"properties":{"weight":1}}],"sungBy":[{"id":7524,"inV":340}],"writtenBy":[{"id":7523,"inV":511}]},"properties":{"name":[{"id":402,"value":"DEATH DONT HAVE NO MERCY"}],"songType":[{"id":404,"value":"cover"}],"performances":[{"id":403,"value":49}]}}
-{"id":136,"label":"song","inE":{"followedBy":[{"id":2752,"outV":13,"properties":{"weight":1}},{"id":3538,"outV":201,"properties":{"weight":1}},{"id":4211,"outV":54,"properties":{"weight":1}},{"id":2469,"outV":68,"properties":{"weight":1}},{"id":5353,"outV":165,"properties":{"weight":1}},{"id":1053,"outV":73,"properties":{"weight":1}},{"id":223,"outV":70,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":6400,"inV":25,"properties":{"weight":1}},{"id":6393,"inV":34,"properties":{"weight":2}},{"id":6394,"inV":19,"properties":{"weight":1}},{"id":6395,"inV":29,"properties":{"weight":2}},{"id":6396,"inV":120,"properties":{"weight":3}},{"id":6397,"inV":114,"properties":{"weight":1}},{"id":6398,"inV":49,"properties":{"weight":1}},{"id":6399,"inV":153,"properties":{"weight":1}}],"sungBy":[{"id":7334,"inV":416},{"id":7930,"inV":416}],"writtenBy":[{"id":7333,"inV":416},{"id":7929,"inV":743}]},"properties":{"name":[{"id":405,"value":"STANDER ON THE MOUNTAIN"}],"songType":[{"id":407,"value":"cover"}],"performances":[{"id":406,"value":3}]}}
-{"id":137,"label":"song","inE":{"followedBy":[{"id":6977,"outV":84,"properties":{"weight":1}},{"id":3202,"outV":104,"properties":{"weight":1}},{"id":5830,"outV":76,"properties":{"weight":2}},{"id":4617,"outV":85,"properties":{"weight":1}},{"id":1611,"outV":18,"properties":{"weight":1}},{"id":2828,"outV":15,"properties":{"weight":1}},{"id":3212,"outV":229,"properties":{"weight":1}},{"id":4686,"outV":33,"properties":{"weight":1}},{"id":5524,"outV":43,"properties":{"weight":1}},{"id":853,"outV":171,"properties":{"weight":1}},{"id":4761,"outV":37,"properties":{"weight":1}},{"id":1756,"outV":28,"properties":{"weight":1}},{"id":5021,"outV":30,"properties":{"weight":4}},{"id":224,"outV":70,"properties":{"weight":2}},{"id":3424,"outV":77,"properties":{"weight":1}},{"id":4578,"outV":254,"properties":{"weight":2}},{"id":6435,"outV":134,"properties":{"weight":1}},{"id":677,"outV":23,"properties":{"weight":1}},{"id":1703,"outV":124,"properties":{"weight":2}},{"id":6183,"outV":36,"properties":{"weight":1}},{"id":3499,"outV":58,"properties":{"weight":1}},{"id":5355,"outV":165,"properties":{"weight":1}},{"id":5294,"outV":32,"properties":{"weight":3}},{"id":6062,"outV":115,"properties":{"weight":2}},{"id":6257,"outV":117,"properties":{"weight":5}},{"id":2098,"outV":188,"properties":{"weight":2}},{"id":5618,"outV":42,"properties":{"weight":4}},{"id":1972,"outV":148,"properties":{"weight":1}},{"id":2614,"outV":158,"properties":{"weight":2}},{"id":3834,"outV":88,"properties":{"weight":3}},{"id":1343,"outV":31,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":2630,"inV":103,"properties":{"weight":4}},{"id":2631,"inV":101,"properties":{"weight":2}},{"id":2632,"inV":188,"properties":{"weight":1}},{"id":2633,"inV":164,"properties":{"weight":1}},{"id":2634,"inV":79,"properties":{"weight":2}},{"id":2635,"inV":153,"properties":{"weight":1}},{"id":2636,"inV":28,"properties":{"weight":3}},{"id":2637,"inV":41,"properties":{"weight":1}},{"id":2638,"inV":120,"properties":{"weight":1}},{"id":2639,"inV":29,"properties":{"weight":1}},{"id":2640,"inV":36,"properties":{"weight":2}},{"id":2641,"inV":91,"properties":{"weight":1}},{"id":2642,"inV":165,"properties":{"weight":1}},{"id":2643,"inV":71,"properties":{"weight":1}},{"id":2644,"inV":115,"properties":{"weight":4}},{"id":2645,"inV":21,"properties":{"weight":3}},{"id":2646,"inV":68,"properties":{"weight":2}},{"id":2647,"inV":12,"properties":{"weight":1}},{"id":2648,"inV":32,"properties":{"weight":1}},{"id":2649,"inV":117,"properties":{"weight":2}},{"id":2650,"inV":43,"properties":{"weight":2}},{"id":2651,"inV":26,"properties":{"weight":7}},{"id":2652,"inV":54,"properties":{"weight":1}},{"id":2653,"inV":158,"properties":{"weight":2}},{"id":2654,"inV":72,"properties":{"weight":1}},{"id":2655,"inV":58,"properties":{"weight":1}},{"id":2656,"inV":96,"properties":{"weight":1}},{"id":2657,"inV":131,"properties":{"weight":1}},{"id":2658,"inV":176,"properties":{"weight":1}},{"id":2659,"inV":37,"properties":{"weight":1}}],"sungBy":[{"id":7328,"inV":340}],"writtenBy":[{"id":7327,"inV":339}]},"properties":{"name":[{"id":408,"value":"SO MANY ROADS"}],"songType":[{"id":410,"value":"original"}],"performances":[{"id":409,"value":55}]}}
-{"id":138,"label":"song","inE":{"followedBy":[{"id":225,"outV":70,"properties":{"weight":9}},{"id":1973,"outV":148,"properties":{"weight":5}},{"id":2615,"outV":158,"properties":{"weight":2}},{"id":1834,"outV":41,"properties":{"weight":1}},{"id":3546,"outV":201,"properties":{"weight":6}},{"id":1771,"outV":28,"properties":{"weight":2}},{"id":4733,"outV":186,"properties":{"weight":8}},{"id":5357,"outV":165,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":3942,"inV":29,"properties":{"weight":12}},{"id":3943,"inV":153,"properties":{"weight":5}},{"id":3944,"inV":25,"properties":{"weight":3}},{"id":3945,"inV":120,"properties":{"weight":4}},{"id":3946,"inV":114,"properties":{"weight":4}},{"id":3947,"inV":164,"properties":{"weight":3}},{"id":3948,"inV":3,"properties":{"weight":4}},{"id":3949,"inV":166,"properties":{"weight":2}},{"id":3950,"inV":9,"properties":{"weight":1}},{"id":3951,"inV":93,"properties":{"weight":1}}]},"properties":{"name":[{"id":411,"value":"THE DAYS BETWEEN"}],"songType":[{"id":413,"value":""}],"performances":[{"id":412,"value":0}]}}
-{"id":139,"label":"song","inE":{"followedBy":[{"id":6304,"outV":49,"properties":{"weight":3}},{"id":2145,"outV":286,"properties":{"weight":1}},{"id":226,"outV":70,"properties":{"weight":1}},{"id":4726,"outV":186,"properties":{"weight":1}},{"id":6214,"outV":319,"properties":{"weight":1}},{"id":6375,"outV":21,"properties":{"weight":4}},{"id":4456,"outV":329,"properties":{"weight":1}},{"id":3548,"outV":201,"properties":{"weight":2}},{"id":6988,"outV":175,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":455,"inV":13,"properties":{"weight":1}},{"id":456,"inV":96,"properties":{"weight":8}},{"id":457,"inV":28,"properties":{"weight":1}},{"id":458,"inV":92,"properties":{"weight":1}},{"id":459,"inV":127,"properties":{"weight":2}},{"id":460,"inV":49,"properties":{"weight":2}},{"id":461,"inV":74,"properties":{"weight":1}},{"id":462,"inV":35,"properties":{"weight":1}}],"sungBy":[{"id":7954,"inV":340}],"writtenBy":[{"id":7953,"inV":758}]},"properties":{"name":[{"id":414,"value":"THAT WOULD BE SOMETHING"}],"songType":[{"id":416,"value":"cover"}],"performances":[{"id":415,"value":17}]}}
-{"id":140,"label":"song","inE":{"followedBy":[{"id":227,"outV":70,"properties":{"weight":2}},{"id":6436,"outV":134,"properties":{"weight":3}},{"id":2629,"outV":158,"properties":{"weight":1}},{"id":1832,"outV":41,"properties":{"weight":1}},{"id":1770,"outV":28,"properties":{"weight":1}},{"id":1516,"outV":164,"properties":{"weight":1}},{"id":5358,"outV":165,"properties":{"weight":3}},{"id":5839,"outV":258,"properties":{"weight":1}},{"id":2258,"outV":29,"properties":{"weight":1}},{"id":3762,"outV":3,"properties":{"weight":1}},{"id":6773,"outV":39,"properties":{"weight":1}},{"id":310,"outV":5,"properties":{"weight":1}},{"id":598,"outV":120,"properties":{"weight":2}},{"id":1974,"outV":148,"properties":{"weight":2}},{"id":6262,"outV":117,"properties":{"weight":1}},{"id":7032,"outV":89,"properties":{"weight":2}},{"id":3130,"outV":153,"properties":{"weight":1}},{"id":4730,"outV":186,"properties":{"weight":3}},{"id":3547,"outV":201,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":896,"inV":153,"properties":{"weight":5}},{"id":897,"inV":50,"properties":{"weight":2}},{"id":898,"inV":68,"properties":{"weight":1}},{"id":899,"inV":4,"properties":{"weight":1}},{"id":885,"inV":26,"properties":{"weight":1}},{"id":886,"inV":13,"properties":{"weight":1}},{"id":887,"inV":64,"properties":{"weight":2}},{"id":888,"inV":87,"properties":{"weight":1}},{"id":889,"inV":120,"properties":{"weight":5}},{"id":890,"inV":79,"properties":{"weight":2}},{"id":891,"inV":3,"properties":{"weight":2}},{"id":892,"inV":33,"properties":{"weight":1}},{"id":893,"inV":84,"properties":{"weight":1}},{"id":894,"inV":164,"properties":{"weight":3}},{"id":895,"inV":29,"properties":{"weight":4}}],"sungBy":[{"id":7058,"inV":340}],"writtenBy":[{"id":7057,"inV":339}]},"properties":{"name":[{"id":417,"value":"ATTICS OF MY LIFE"}],"songType":[{"id":419,"value":"original"}],"performances":[{"id":418,"value":48}]}}
-{"id":141,"label":"song","inE":{"followedBy":[{"id":609,"outV":23,"properties":{"weight":1}},{"id":2721,"outV":13,"properties":{"weight":4}},{"id":4610,"outV":85,"properties":{"weight":2}},{"id":1379,"outV":130,"properties":{"weight":1}},{"id":5891,"outV":96,"properties":{"weight":7}},{"id":228,"outV":70,"properties":{"weight":1}},{"id":3845,"outV":60,"properties":{"weight":1}},{"id":4678,"outV":33,"properties":{"weight":1}},{"id":7015,"outV":89,"properties":{"weight":1}},{"id":3723,"outV":3,"properties":{"weight":2}},{"id":6159,"outV":36,"properties":{"weight":4}},{"id":3474,"outV":58,"properties":{"weight":1}},{"id":4723,"outV":186,"properties":{"weight":1}},{"id":1940,"outV":148,"properties":{"weight":9}},{"id":6359,"outV":21,"properties":{"weight":5}},{"id":537,"outV":120,"properties":{"weight":1}},{"id":3065,"outV":153,"properties":{"weight":2}},{"id":5785,"outV":76,"properties":{"weight":2}},{"id":4443,"outV":113,"properties":{"weight":4}},{"id":414,"outV":38,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6692,"inV":3,"properties":{"weight":2}},{"id":6693,"inV":153,"properties":{"weight":8}},{"id":6694,"inV":5,"properties":{"weight":2}},{"id":6695,"inV":18,"properties":{"weight":1}},{"id":6696,"inV":154,"properties":{"weight":1}},{"id":6697,"inV":110,"properties":{"weight":2}},{"id":6698,"inV":15,"properties":{"weight":1}},{"id":6699,"inV":96,"properties":{"weight":5}},{"id":6700,"inV":13,"properties":{"weight":4}},{"id":6701,"inV":25,"properties":{"weight":7}},{"id":6702,"inV":181,"properties":{"weight":3}},{"id":6703,"inV":85,"properties":{"weight":1}},{"id":6704,"inV":148,"properties":{"weight":2}},{"id":6705,"inV":21,"properties":{"weight":2}},{"id":6706,"inV":29,"properties":{"weight":2}},{"id":6707,"inV":67,"properties":{"weight":1}},{"id":6708,"inV":57,"properties":{"weight":1}},{"id":6709,"inV":164,"properties":{"weight":2}},{"id":6710,"inV":120,"properties":{"weight":1}},{"id":6711,"inV":238,"properties":{"weight":1}},{"id":6712,"inV":74,"properties":{"weight":1}},{"id":6713,"inV":41,"properties":{"weight":1}}],"sungBy":[{"id":7108,"inV":340}],"writtenBy":[{"id":7107,"inV":339}]},"properties":{"name":[{"id":420,"value":"COMES A TIME"}],"songType":[{"id":422,"value":"original"}],"performances":[{"id":421,"value":66}]}}
-{"id":142,"label":"song","inE":{"followedBy":[{"id":5428,"outV":143,"properties":{"weight":1}},{"id":5647,"outV":22,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":230,"inV":143,"properties":{"weight":1}},{"id":231,"inV":107,"properties":{"weight":1}}]},"properties":{"name":[{"id":423,"value":"CHILDREN OF THE EIGHTIES"}],"songType":[{"id":425,"value":""}],"performances":[{"id":424,"value":0}]}}
-{"id":143,"label":"song","inE":{"followedBy":[{"id":3345,"outV":301,"properties":{"weight":1}},{"id":230,"outV":142,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5427,"inV":300,"properties":{"weight":1}},{"id":5428,"inV":142,"properties":{"weight":1}}],"sungBy":[{"id":7752,"inV":469}],"writtenBy":[{"id":7751,"inV":469}]},"properties":{"name":[{"id":426,"value":"LUCIFERS EYES"}],"songType":[{"id":428,"value":"cover"}],"performances":[{"id":427,"value":2}]}}
-{"id":144,"label":"song","inE":{"followedBy":[{"id":593,"outV":120,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":232,"inV":120,"properties":{"weight":4}}],"sungBy":[{"id":7722,"inV":340}],"writtenBy":[{"id":7721,"inV":629}]},"properties":{"name":[{"id":429,"value":"LA BAMBA"}],"songType":[{"id":431,"value":"cover"}],"performances":[{"id":430,"value":4}]}}
-{"id":145,"label":"song","inE":{"followedBy":[{"id":6326,"outV":21,"properties":{"weight":2}},{"id":3063,"outV":153,"properties":{"weight":4}},{"id":3258,"outV":146,"properties":{"weight":2}},{"id":3724,"outV":3,"properties":{"weight":1}},{"id":5868,"outV":96,"properties":{"weight":1}},{"id":527,"outV":120,"properties":{"weight":1}},{"id":6287,"outV":49,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":240,"inV":69,"properties":{"weight":1}},{"id":241,"inV":147,"properties":{"weight":1}},{"id":242,"inV":148,"properties":{"weight":1}},{"id":243,"inV":149,"properties":{"weight":1}},{"id":233,"inV":146,"properties":{"weight":3}},{"id":234,"inV":120,"properties":{"weight":1}},{"id":235,"inV":74,"properties":{"weight":1}},{"id":236,"inV":4,"properties":{"weight":1}},{"id":237,"inV":114,"properties":{"weight":1}},{"id":238,"inV":21,"properties":{"weight":1}},{"id":239,"inV":96,"properties":{"weight":1}}],"sungBy":[{"id":7096,"inV":342}],"writtenBy":[{"id":7095,"inV":342}]},"properties":{"name":[{"id":432,"value":"CAUTION"}],"songType":[{"id":434,"value":"original"}],"performances":[{"id":433,"value":56}]}}
-{"id":146,"label":"song","inE":{"followedBy":[{"id":233,"outV":145,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":3258,"inV":145,"properties":{"weight":2}},{"id":3259,"inV":114,"properties":{"weight":1}}],"sungBy":[{"id":8024,"inV":356}],"writtenBy":[{"id":8023,"inV":527}]},"properties":{"name":[{"id":435,"value":"WHO DO YOU LOVE"}],"songType":[{"id":437,"value":"cover"}],"performances":[{"id":436,"value":3}]}}
-{"id":147,"label":"song","inE":{"followedBy":[{"id":241,"outV":145,"properties":{"weight":1}},{"id":4314,"outV":110,"properties":{"weight":1}},{"id":5884,"outV":96,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6897,"inV":110,"properties":{"weight":1}},{"id":6898,"inV":148,"properties":{"weight":1}},{"id":6899,"inV":5,"properties":{"weight":1}}]},"properties":{"name":[{"id":438,"value":"MOJO"}],"songType":[{"id":440,"value":""}],"performances":[{"id":439,"value":0}]}}
-{"id":148,"label":"song","inE":{"followedBy":[{"id":5632,"outV":22,"properties":{"weight":4}},{"id":6402,"outV":134,"properties":{"weight":18}},{"id":5445,"outV":231,"properties":{"weight":11}},{"id":1863,"outV":94,"properties":{"weight":2}},{"id":2248,"outV":29,"properties":{"weight":1}},{"id":6601,"outV":127,"properties":{"weight":1}},{"id":4685,"outV":33,"properties":{"weight":2}},{"id":1553,"outV":18,"properties":{"weight":1}},{"id":5138,"outV":125,"properties":{"weight":1}},{"id":3732,"outV":3,"properties":{"weight":1}},{"id":2774,"outV":15,"properties":{"weight":1}},{"id":6550,"outV":172,"properties":{"weight":1}},{"id":2716,"outV":13,"properties":{"weight":1}},{"id":2013,"outV":149,"properties":{"weight":10}},{"id":1182,"outV":26,"properties":{"weight":1}},{"id":1822,"outV":41,"properties":{"weight":1}},{"id":2847,"outV":101,"properties":{"weight":1}},{"id":2338,"outV":278,"properties":{"weight":3}},{"id":5860,"outV":96,"properties":{"weight":219}},{"id":1382,"outV":130,"properties":{"weight":4}},{"id":935,"outV":91,"properties":{"weight":1}},{"id":360,"outV":74,"properties":{"weight":1}},{"id":1769,"outV":28,"properties":{"weight":1}},{"id":4714,"outV":186,"properties":{"weight":55}},{"id":4587,"outV":85,"properties":{"weight":7}},{"id":4336,"outV":62,"properties":{"weight":3}},{"id":5040,"outV":209,"properties":{"weight":1}},{"id":6704,"outV":141,"properties":{"weight":2}},{"id":242,"outV":145,"properties":{"weight":1}},{"id":6322,"outV":21,"properties":{"weight":48}},{"id":6898,"outV":147,"properties":{"weight":1}},{"id":7027,"outV":89,"properties":{"weight":1}},{"id":948,"outV":67,"properties":{"weight":1}},{"id":3061,"outV":153,"properties":{"weight":1}},{"id":6264,"outV":49,"properties":{"weight":22}},{"id":6203,"outV":319,"properties":{"weight":4}},{"id":6652,"outV":12,"properties":{"weight":1}},{"id":1406,"outV":83,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":1927,"inV":49,"properties":{"weight":2}},{"id":1928,"inV":23,"properties":{"weight":1}},{"id":1929,"inV":127,"properties":{"weight":24}},{"id":1930,"inV":130,"properties":{"weight":143}},{"id":1931,"inV":206,"properties":{"weight":7}},{"id":1932,"inV":160,"properties":{"weight":1}},{"id":1933,"inV":94,"properties":{"weight":84}},{"id":1934,"inV":57,"properties":{"weight":1}},{"id":1935,"inV":153,"properties":{"weight":5}},{"id":1936,"inV":89,"properties":{"weight":4}},{"id":1937,"inV":96,"properties":{"weight":28}},{"id":1938,"inV":12,"properties":{"weight":1}},{"id":1939,"inV":252,"properties":{"weight":1}},{"id":1940,"inV":141,"properties":{"weight":9}},{"id":1941,"inV":3,"properties":{"weight":4}},{"id":1942,"inV":114,"properties":{"weight":1}},{"id":1943,"inV":18,"properties":{"weight":1}},{"id":1944,"inV":22,"properties":{"weight":4}},{"id":1945,"inV":15,"properties":{"weight":2}},{"id":1946,"inV":27,"properties":{"weight":1}},{"id":1947,"inV":14,"properties":{"weight":1}},{"id":1948,"inV":125,"properties":{"weight":35}},{"id":1949,"inV":21,"properties":{"weight":6}},{"id":1950,"inV":16,"properties":{"weight":1}},{"id":1951,"inV":83,"properties":{"weight":14}},{"id":1952,"inV":149,"properties":{"weight":2}},{"id":1953,"inV":5,"properties":{"weight":10}},{"id":1954,"inV":209,"properties":{"weight":1}},{"id":1955,"inV":276,"properties":{"weight":1}},{"id":1956,"inV":219,"properties":{"weight":1}},{"id":1957,"inV":103,"properties":{"weight":1}},{"id":1958,"inV":69,"properties":{"weight":1}},{"id":1959,"inV":120,"properties":{"weight":1}},{"id":1960,"inV":134,"properties":{"weight":6}},{"id":1961,"inV":277,"properties":{"weight":1}},{"id":1962,"inV":129,"properties":{"weight":4}},{"id":1963,"inV":29,"properties":{"weight":3}},{"id":1964,"inV":70,"properties":{"weight":4}},{"id":1965,"inV":278,"properties":{"weight":1}},{"id":1966,"inV":25,"properties":{"weight":1}},{"id":1967,"inV":92,"properties":{"weight":4}},{"id":1968,"inV":132,"properties":{"weight":1}},{"id":1969,"inV":135,"properties":{"weight":1}},{"id":1970,"inV":213,"properties":{"weight":1}},{"id":1971,"inV":28,"properties":{"weight":1}},{"id":1972,"inV":137,"properties":{"weight":1}},{"id":1973,"inV":138,"properties":{"weight":5}},{"id":1974,"inV":140,"properties":{"weight":2}},{"id":1975,"inV":217,"properties":{"weight":1}},{"id":1976,"inV":179,"properties":{"weight":1}},{"id":1977,"inV":66,"properties":{"weight":1}}],"sungBy":[{"id":7284,"inV":405}],"writtenBy":[{"id":7283,"inV":351}]},"properties":{"name":[{"id":441,"value":"THE OTHER ONE"}],"songType":[{"id":443,"value":"original"}],"performances":[{"id":442,"value":583}]}}
-{"id":149,"label":"song","inE":{"followedBy":[{"id":1952,"outV":148,"properties":{"weight":2}},{"id":2850,"outV":101,"properties":{"weight":1}},{"id":7026,"outV":89,"properties":{"weight":1}},{"id":243,"outV":145,"properties":{"weight":1}},{"id":5044,"outV":209,"properties":{"weight":1}},{"id":6340,"outV":21,"properties":{"weight":2}},{"id":6438,"outV":338,"properties":{"weight":1}},{"id":6167,"outV":36,"properties":{"weight":1}},{"id":4729,"outV":186,"properties":{"weight":6}},{"id":5898,"outV":96,"properties":{"weight":23}},{"id":6411,"outV":134,"properties":{"weight":1}},{"id":1374,"outV":130,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2016,"inV":21,"properties":{"weight":8}},{"id":2017,"inV":96,"properties":{"weight":2}},{"id":2018,"inV":3,"properties":{"weight":1}},{"id":2019,"inV":29,"properties":{"weight":1}},{"id":2020,"inV":70,"properties":{"weight":3}},{"id":2021,"inV":5,"properties":{"weight":1}},{"id":2022,"inV":201,"properties":{"weight":1}},{"id":2006,"inV":89,"properties":{"weight":1}},{"id":2007,"inV":187,"properties":{"weight":1}},{"id":2008,"inV":209,"properties":{"weight":1}},{"id":2009,"inV":74,"properties":{"weight":2}},{"id":2010,"inV":130,"properties":{"weight":3}},{"id":2011,"inV":83,"properties":{"weight":1}},{"id":2012,"inV":25,"properties":{"weight":1}},{"id":2013,"inV":148,"properties":{"weight":10}},{"id":2014,"inV":13,"properties":{"weight":1}},{"id":2015,"inV":134,"properties":{"weight":3}}],"sungBy":[{"id":7330,"inV":384}],"writtenBy":[{"id":7329,"inV":342}]},"properties":{"name":[{"id":444,"value":"SPANISH JAM"}],"songType":[{"id":446,"value":"original"}],"performances":[{"id":445,"value":41}]}}
-{"id":150,"label":"song","inE":{"followedBy":[{"id":1508,"outV":164,"properties":{"weight":21}},{"id":6628,"outV":127,"properties":{"weight":2}},{"id":965,"outV":67,"properties":{"weight":1}},{"id":3749,"outV":3,"properties":{"weight":8}},{"id":6919,"outV":133,"properties":{"weight":1}},{"id":5512,"outV":131,"properties":{"weight":1}},{"id":4330,"outV":110,"properties":{"weight":1}},{"id":6123,"outV":72,"properties":{"weight":1}},{"id":6507,"outV":187,"properties":{"weight":1}},{"id":591,"outV":120,"properties":{"weight":2}},{"id":5360,"outV":132,"properties":{"weight":3}},{"id":5617,"outV":42,"properties":{"weight":1}},{"id":3122,"outV":153,"properties":{"weight":11}},{"id":5522,"outV":43,"properties":{"weight":1}},{"id":307,"outV":5,"properties":{"weight":1}},{"id":6259,"outV":117,"properties":{"weight":4}},{"id":2326,"outV":25,"properties":{"weight":1}},{"id":5334,"outV":165,"properties":{"weight":2}},{"id":3031,"outV":14,"properties":{"weight":1}},{"id":4827,"outV":114,"properties":{"weight":3}},{"id":5819,"outV":76,"properties":{"weight":2}},{"id":2877,"outV":101,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":256,"inV":62,"properties":{"weight":5}},{"id":257,"inV":120,"properties":{"weight":1}},{"id":258,"inV":50,"properties":{"weight":4}},{"id":259,"inV":103,"properties":{"weight":1}},{"id":260,"inV":90,"properties":{"weight":4}},{"id":261,"inV":82,"properties":{"weight":1}},{"id":262,"inV":38,"properties":{"weight":1}},{"id":263,"inV":88,"properties":{"weight":1}},{"id":264,"inV":156,"properties":{"weight":1}},{"id":265,"inV":31,"properties":{"weight":1}},{"id":266,"inV":157,"properties":{"weight":1}},{"id":267,"inV":84,"properties":{"weight":1}},{"id":268,"inV":26,"properties":{"weight":2}},{"id":269,"inV":83,"properties":{"weight":1}},{"id":270,"inV":79,"properties":{"weight":1}},{"id":271,"inV":158,"properties":{"weight":1}},{"id":272,"inV":19,"properties":{"weight":1}},{"id":244,"inV":13,"properties":{"weight":3}},{"id":245,"inV":76,"properties":{"weight":1}},{"id":246,"inV":49,"properties":{"weight":2}},{"id":247,"inV":151,"properties":{"weight":5}},{"id":248,"inV":152,"properties":{"weight":3}},{"id":249,"inV":153,"properties":{"weight":2}},{"id":250,"inV":78,"properties":{"weight":3}},{"id":251,"inV":154,"properties":{"weight":1}},{"id":252,"inV":70,"properties":{"weight":1}},{"id":253,"inV":64,"properties":{"weight":14}},{"id":254,"inV":87,"properties":{"weight":6}},{"id":255,"inV":155,"properties":{"weight":1}}],"sungBy":[{"id":7066,"inV":340}],"writtenBy":[{"id":7065,"inV":339}]},"properties":{"name":[{"id":447,"value":"BIRDSONG"}],"songType":[{"id":449,"value":"original"}],"performances":[{"id":448,"value":296}]}}
-{"id":151,"label":"song","inE":{"followedBy":[{"id":2497,"outV":90,"properties":{"weight":1}},{"id":5697,"outV":156,"properties":{"weight":1}},{"id":6018,"outV":204,"properties":{"weight":1}},{"id":5827,"outV":76,"properties":{"weight":1}},{"id":3303,"outV":160,"properties":{"weight":1}},{"id":3752,"outV":3,"properties":{"weight":1}},{"id":5001,"outV":30,"properties":{"weight":1}},{"id":2890,"outV":101,"properties":{"weight":1}},{"id":1515,"outV":164,"properties":{"weight":1}},{"id":6219,"outV":117,"properties":{"weight":1}},{"id":2382,"outV":87,"properties":{"weight":1}},{"id":2958,"outV":78,"properties":{"weight":1}},{"id":4942,"outV":86,"properties":{"weight":1}},{"id":6003,"outV":50,"properties":{"weight":1}},{"id":3828,"outV":88,"properties":{"weight":1}},{"id":247,"outV":150,"properties":{"weight":5}},{"id":666,"outV":23,"properties":{"weight":1}},{"id":6042,"outV":115,"properties":{"weight":1}},{"id":1212,"outV":26,"properties":{"weight":2}},{"id":2046,"outV":92,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2148,"inV":32,"properties":{"weight":3}},{"id":2149,"inV":57,"properties":{"weight":1}},{"id":2150,"inV":50,"properties":{"weight":3}},{"id":2151,"inV":152,"properties":{"weight":1}},{"id":2152,"inV":68,"properties":{"weight":1}},{"id":2153,"inV":73,"properties":{"weight":1}},{"id":2154,"inV":71,"properties":{"weight":1}},{"id":2155,"inV":188,"properties":{"weight":1}},{"id":2156,"inV":155,"properties":{"weight":1}},{"id":2157,"inV":27,"properties":{"weight":1}},{"id":2158,"inV":232,"properties":{"weight":1}},{"id":2159,"inV":14,"properties":{"weight":1}},{"id":2160,"inV":39,"properties":{"weight":1}},{"id":2161,"inV":82,"properties":{"weight":1}},{"id":2162,"inV":21,"properties":{"weight":1}},{"id":2163,"inV":76,"properties":{"weight":1}},{"id":2164,"inV":62,"properties":{"weight":1}},{"id":2165,"inV":13,"properties":{"weight":1}},{"id":2166,"inV":60,"properties":{"weight":1}},{"id":2167,"inV":96,"properties":{"weight":1}},{"id":2168,"inV":85,"properties":{"weight":1}}],"sungBy":[{"id":7618,"inV":352}],"writtenBy":[{"id":7617,"inV":570}]},"properties":{"name":[{"id":450,"value":"HEY POCKY WAY"}],"songType":[{"id":452,"value":"cover"}],"performances":[{"id":451,"value":25}]}}
-{"id":152,"label":"song","inE":{"followedBy":[{"id":1248,"outV":27,"properties":{"weight":1}},{"id":3328,"outV":268,"properties":{"weight":1}},{"id":4160,"outV":54,"properties":{"weight":1}},{"id":6720,"outV":53,"properties":{"weight":2}},{"id":2820,"outV":15,"properties":{"weight":1}},{"id":2470,"outV":68,"properties":{"weight":1}},{"id":2151,"outV":151,"properties":{"weight":1}},{"id":3626,"outV":24,"properties":{"weight":2}},{"id":4010,"outV":320,"properties":{"weight":1}},{"id":4460,"outV":272,"properties":{"weight":1}},{"id":622,"outV":23,"properties":{"weight":1}},{"id":1551,"outV":18,"properties":{"weight":1}},{"id":2384,"outV":87,"properties":{"weight":1}},{"id":1650,"outV":213,"properties":{"weight":1}},{"id":4882,"outV":100,"properties":{"weight":1}},{"id":6453,"outV":187,"properties":{"weight":2}},{"id":248,"outV":150,"properties":{"weight":3}},{"id":4280,"outV":10,"properties":{"weight":1}},{"id":2073,"outV":188,"properties":{"weight":1}},{"id":3290,"outV":160,"properties":{"weight":1}},{"id":3805,"outV":88,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1984,"inV":89,"properties":{"weight":1}},{"id":1985,"inV":13,"properties":{"weight":1}},{"id":1986,"inV":18,"properties":{"weight":1}},{"id":1987,"inV":10,"properties":{"weight":2}},{"id":1988,"inV":50,"properties":{"weight":2}},{"id":1989,"inV":11,"properties":{"weight":2}},{"id":1990,"inV":23,"properties":{"weight":2}},{"id":1991,"inV":74,"properties":{"weight":1}},{"id":1992,"inV":27,"properties":{"weight":1}},{"id":1993,"inV":12,"properties":{"weight":2}},{"id":1994,"inV":32,"properties":{"weight":1}},{"id":1995,"inV":62,"properties":{"weight":2}},{"id":1996,"inV":38,"properties":{"weight":1}},{"id":1997,"inV":26,"properties":{"weight":1}},{"id":1998,"inV":97,"properties":{"weight":1}},{"id":1999,"inV":68,"properties":{"weight":1}},{"id":2000,"inV":30,"properties":{"weight":1}},{"id":2001,"inV":77,"properties":{"weight":1}},{"id":2002,"inV":114,"properties":{"weight":1}},{"id":2003,"inV":100,"properties":{"weight":1}}],"sungBy":[{"id":7464,"inV":474}],"writtenBy":[{"id":7463,"inV":473}]},"properties":{"name":[{"id":453,"value":"BIG BOSS MAN"}],"songType":[{"id":455,"value":"cover"}],"performances":[{"id":454,"value":71}]}}
-{"id":153,"label":"song","inE":{"followedBy":[{"id":896,"outV":140,"properties":{"weight":5}},{"id":2048,"outV":92,"properties":{"weight":11}},{"id":4228,"outV":52,"properties":{"weight":1}},{"id":5380,"outV":69,"properties":{"weight":3}},{"id":774,"outV":122,"properties":{"weight":3}},{"id":6406,"outV":134,"properties":{"weight":7}},{"id":6151,"outV":36,"properties":{"weight":1}},{"id":6541,"outV":55,"properties":{"weight":1}},{"id":1935,"outV":148,"properties":{"weight":5}},{"id":2831,"outV":101,"properties":{"weight":5}},{"id":4624,"outV":154,"properties":{"weight":4}},{"id":3222,"outV":63,"properties":{"weight":1}},{"id":6934,"outV":84,"properties":{"weight":1}},{"id":281,"outV":5,"properties":{"weight":5}},{"id":5147,"outV":125,"properties":{"weight":69}},{"id":924,"outV":91,"properties":{"weight":3}},{"id":1696,"outV":124,"properties":{"weight":1}},{"id":4000,"outV":66,"properties":{"weight":1}},{"id":4256,"outV":10,"properties":{"weight":1}},{"id":3363,"outV":184,"properties":{"weight":1}},{"id":6693,"outV":141,"properties":{"weight":8}},{"id":1190,"outV":26,"properties":{"weight":2}},{"id":552,"outV":120,"properties":{"weight":1}},{"id":5033,"outV":47,"properties":{"weight":1}},{"id":2987,"outV":14,"properties":{"weight":1}},{"id":2224,"outV":226,"properties":{"weight":1}},{"id":4147,"outV":218,"properties":{"weight":2}},{"id":820,"outV":171,"properties":{"weight":1}},{"id":5941,"outV":50,"properties":{"weight":2}},{"id":6197,"outV":232,"properties":{"weight":2}},{"id":1080,"outV":243,"properties":{"weight":1}},{"id":6458,"outV":187,"properties":{"weight":2}},{"id":699,"outV":206,"properties":{"weight":10}},{"id":1851,"outV":94,"properties":{"weight":80}},{"id":5691,"outV":159,"properties":{"weight":1}},{"id":6331,"outV":21,"properties":{"weight":5}},{"id":3901,"outV":51,"properties":{"weight":1}},{"id":4797,"outV":114,"properties":{"weight":2}},{"id":6717,"outV":53,"properties":{"weight":1}},{"id":3264,"outV":160,"properties":{"weight":2}},{"id":6595,"outV":127,"properties":{"weight":30}},{"id":4297,"outV":135,"properties":{"weight":1}},{"id":5065,"outV":128,"properties":{"weight":1}},{"id":1098,"outV":59,"properties":{"weight":2}},{"id":2506,"outV":57,"properties":{"weight":4}},{"id":2635,"outV":137,"properties":{"weight":1}},{"id":2252,"outV":29,"properties":{"weight":1}},{"id":1357,"outV":130,"properties":{"weight":81}},{"id":1614,"outV":210,"properties":{"weight":1}},{"id":719,"outV":80,"properties":{"weight":1}},{"id":4176,"outV":54,"properties":{"weight":1}},{"id":1746,"outV":82,"properties":{"weight":1}},{"id":4309,"outV":110,"properties":{"weight":1}},{"id":1241,"outV":27,"properties":{"weight":6}},{"id":6114,"outV":72,"properties":{"weight":6}},{"id":5220,"outV":99,"properties":{"weight":1}},{"id":5732,"outV":129,"properties":{"weight":13}},{"id":7012,"outV":89,"properties":{"weight":7}},{"id":5349,"outV":165,"properties":{"weight":1}},{"id":4454,"outV":163,"properties":{"weight":1}},{"id":5862,"outV":96,"properties":{"weight":4}},{"id":3943,"outV":138,"properties":{"weight":5}},{"id":2922,"outV":78,"properties":{"weight":1}},{"id":5098,"outV":4,"properties":{"weight":3}},{"id":4332,"outV":62,"properties":{"weight":3}},{"id":1007,"outV":176,"properties":{"weight":1}},{"id":1649,"outV":213,"properties":{"weight":1}},{"id":2289,"outV":25,"properties":{"weight":21}},{"id":3700,"outV":3,"properties":{"weight":7}},{"id":3318,"outV":252,"properties":{"weight":1}},{"id":5368,"outV":132,"properties":{"weight":3}},{"id":249,"outV":150,"properties":{"weight":2}},{"id":6269,"outV":49,"properties":{"weight":3}},{"id":383,"outV":74,"properties":{"weight":1}},{"id":1407,"outV":83,"properties":{"weight":9}},{"id":2687,"outV":13,"properties":{"weight":12}},{"id":6399,"outV":136,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3072,"inV":12,"properties":{"weight":4}},{"id":3073,"inV":26,"properties":{"weight":18}},{"id":3074,"inV":157,"properties":{"weight":2}},{"id":3075,"inV":263,"properties":{"weight":1}},{"id":3076,"inV":53,"properties":{"weight":1}},{"id":3077,"inV":9,"properties":{"weight":2}},{"id":3078,"inV":25,"properties":{"weight":2}},{"id":3079,"inV":24,"properties":{"weight":2}},{"id":3080,"inV":82,"properties":{"weight":13}},{"id":3081,"inV":215,"properties":{"weight":3}},{"id":3082,"inV":42,"properties":{"weight":2}},{"id":3083,"inV":59,"properties":{"weight":6}},{"id":3084,"inV":133,"properties":{"weight":1}},{"id":3085,"inV":94,"properties":{"weight":2}},{"id":3086,"inV":32,"properties":{"weight":4}},{"id":3087,"inV":50,"properties":{"weight":18}},{"id":3088,"inV":21,"properties":{"weight":1}},{"id":3089,"inV":96,"properties":{"weight":1}},{"id":3090,"inV":289,"properties":{"weight":2}},{"id":3091,"inV":154,"properties":{"weight":8}},{"id":3092,"inV":84,"properties":{"weight":5}},{"id":3093,"inV":78,"properties":{"weight":4}},{"id":3094,"inV":109,"properties":{"weight":1}},{"id":3095,"inV":214,"properties":{"weight":1}},{"id":3096,"inV":91,"properties":{"weight":1}},{"id":3097,"inV":19,"properties":{"weight":3}},{"id":3098,"inV":65,"properties":{"weight":15}},{"id":3099,"inV":72,"properties":{"weight":14}},{"id":3100,"inV":111,"properties":{"weight":1}},{"id":3101,"inV":80,"properties":{"weight":1}},{"id":3102,"inV":62,"properties":{"weight":5}},{"id":3103,"inV":125,"properties":{"weight":2}},{"id":3104,"inV":99,"properties":{"weight":1}},{"id":3105,"inV":124,"properties":{"weight":30}},{"id":3106,"inV":162,"properties":{"weight":12}},{"id":3107,"inV":38,"properties":{"weight":9}},{"id":3108,"inV":13,"properties":{"weight":1}},{"id":3109,"inV":87,"properties":{"weight":17}},{"id":3110,"inV":210,"properties":{"weight":12}},{"id":3111,"inV":212,"properties":{"weight":1}},{"id":3112,"inV":89,"properties":{"weight":1}},{"id":3113,"inV":303,"properties":{"weight":1}},{"id":3114,"inV":64,"properties":{"weight":7}},{"id":3115,"inV":227,"properties":{"weight":2}},{"id":3116,"inV":110,"properties":{"weight":1}},{"id":3117,"inV":61,"properties":{"weight":1}},{"id":3118,"inV":46,"properties":{"weight":5}},{"id":3119,"inV":213,"properties":{"weight":8}},{"id":3120,"inV":155,"properties":{"weight":1}},{"id":3121,"inV":204,"properties":{"weight":11}},{"id":3122,"inV":150,"properties":{"weight":11}},{"id":3123,"inV":264,"properties":{"weight":1}},{"id":3124,"inV":81,"properties":{"weight":2}},{"id":3125,"inV":69,"properties":{"weight":1}},{"id":3126,"inV":86,"properties":{"weight":12}},{"id":3127,"inV":201,"properties":{"weight":1}},{"id":3128,"inV":90,"properties":{"weight":2}},{"id":3129,"inV":185,"properties":{"weight":1}},{"id":3130,"inV":140,"properties":{"weight":1}},{"id":3131,"inV":216,"properties":{"weight":4}},{"id":3132,"inV":193,"properties":{"weight":1}},{"id":3133,"inV":217,"properties":{"weight":1}},{"id":3134,"inV":236,"properties":{"weight":1}},{"id":3135,"inV":31,"properties":{"weight":1}},{"id":3136,"inV":79,"properties":{"weight":1}},{"id":3137,"inV":292,"properties":{"weight":1}},{"id":3048,"inV":3,"properties":{"weight":13}},{"id":3049,"inV":74,"properties":{"weight":14}},{"id":3050,"inV":4,"properties":{"weight":13}},{"id":3051,"inV":122,"properties":{"weight":31}},{"id":3052,"inV":49,"properties":{"weight":3}},{"id":3053,"inV":48,"properties":{"weight":1}},{"id":3054,"inV":114,"properties":{"weight":40}},{"id":3055,"inV":5,"properties":{"weight":9}},{"id":3056,"inV":160,"properties":{"weight":24}},{"id":3057,"inV":27,"properties":{"weight":3}},{"id":3058,"inV":206,"properties":{"weight":6}},{"id":3059,"inV":1,"properties":{"weight":1}},{"id":3060,"inV":56,"properties":{"weight":1}},{"id":3061,"inV":148,"properties":{"weight":1}},{"id":3062,"inV":120,"properties":{"weight":3}},{"id":3063,"inV":145,"properties":{"weight":4}},{"id":3064,"inV":18,"properties":{"weight":2}},{"id":3065,"inV":141,"properties":{"weight":2}},{"id":3066,"inV":164,"properties":{"weight":2}},{"id":3067,"inV":235,"properties":{"weight":1}},{"id":3068,"inV":104,"properties":{"weight":1}},{"id":3069,"inV":127,"properties":{"weight":3}},{"id":3070,"inV":57,"properties":{"weight":2}},{"id":3071,"inV":83,"properties":{"weight":5}}],"sungBy":[{"id":7344,"inV":351}],"writtenBy":[{"id":7343,"inV":367}]},"properties":{"name":[{"id":456,"value":"SUGAR MAGNOLIA"}],"songType":[{"id":458,"value":"original"}],"performances":[{"id":457,"value":594}]}}
-{"id":154,"label":"song","inE":{"followedBy":[{"id":2562,"outV":57,"properties":{"weight":1}},{"id":5890,"outV":96,"properties":{"weight":1}},{"id":5124,"outV":222,"properties":{"weight":3}},{"id":5444,"outV":288,"properties":{"weight":8}},{"id":1672,"outV":124,"properties":{"weight":2}},{"id":5770,"outV":76,"properties":{"weight":2}},{"id":3659,"outV":24,"properties":{"weight":1}},{"id":1868,"outV":94,"properties":{"weight":1}},{"id":6156,"outV":36,"properties":{"weight":2}},{"id":6860,"outV":64,"properties":{"weight":1}},{"id":3091,"outV":153,"properties":{"weight":8}},{"id":6356,"outV":21,"properties":{"weight":1}},{"id":405,"outV":38,"properties":{"weight":34}},{"id":3286,"outV":160,"properties":{"weight":3}},{"id":5978,"outV":50,"properties":{"weight":9}},{"id":3867,"outV":60,"properties":{"weight":1}},{"id":6944,"outV":84,"properties":{"weight":3}},{"id":2722,"outV":13,"properties":{"weight":3}},{"id":4322,"outV":110,"properties":{"weight":4}},{"id":1383,"outV":130,"properties":{"weight":4}},{"id":808,"outV":122,"properties":{"weight":1}},{"id":6696,"outV":141,"properties":{"weight":1}},{"id":3370,"outV":184,"properties":{"weight":1}},{"id":2862,"outV":101,"properties":{"weight":3}},{"id":4270,"outV":10,"properties":{"weight":1}},{"id":1906,"outV":103,"properties":{"weight":2}},{"id":563,"outV":120,"properties":{"weight":3}},{"id":2229,"outV":215,"properties":{"weight":97}},{"id":2296,"outV":25,"properties":{"weight":3}},{"id":4601,"outV":85,"properties":{"weight":3}},{"id":2490,"outV":90,"properties":{"weight":3}},{"id":251,"outV":150,"properties":{"weight":1}},{"id":4796,"outV":114,"properties":{"weight":8}},{"id":5564,"outV":162,"properties":{"weight":1}},{"id":2239,"outV":29,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4620,"inV":159,"properties":{"weight":1}},{"id":4621,"inV":103,"properties":{"weight":5}},{"id":4622,"inV":15,"properties":{"weight":1}},{"id":4623,"inV":110,"properties":{"weight":6}},{"id":4624,"inV":153,"properties":{"weight":4}},{"id":4625,"inV":114,"properties":{"weight":2}},{"id":4626,"inV":101,"properties":{"weight":2}},{"id":4627,"inV":25,"properties":{"weight":5}},{"id":4628,"inV":98,"properties":{"weight":1}},{"id":4629,"inV":76,"properties":{"weight":11}},{"id":4630,"inV":13,"properties":{"weight":8}},{"id":4631,"inV":14,"properties":{"weight":6}},{"id":4632,"inV":50,"properties":{"weight":2}},{"id":4633,"inV":26,"properties":{"weight":1}},{"id":4634,"inV":32,"properties":{"weight":26}},{"id":4635,"inV":68,"properties":{"weight":2}},{"id":4636,"inV":129,"properties":{"weight":1}},{"id":4637,"inV":85,"properties":{"weight":19}},{"id":4638,"inV":112,"properties":{"weight":11}},{"id":4639,"inV":125,"properties":{"weight":1}},{"id":4640,"inV":12,"properties":{"weight":10}},{"id":4641,"inV":49,"properties":{"weight":4}},{"id":4642,"inV":18,"properties":{"weight":3}},{"id":4643,"inV":96,"properties":{"weight":9}},{"id":4644,"inV":38,"properties":{"weight":4}},{"id":4645,"inV":181,"properties":{"weight":8}},{"id":4646,"inV":91,"properties":{"weight":2}},{"id":4647,"inV":10,"properties":{"weight":1}},{"id":4648,"inV":69,"properties":{"weight":1}},{"id":4649,"inV":58,"properties":{"weight":1}},{"id":4650,"inV":21,"properties":{"weight":2}},{"id":4651,"inV":83,"properties":{"weight":1}},{"id":4652,"inV":106,"properties":{"weight":1}},{"id":4653,"inV":70,"properties":{"weight":1}},{"id":4654,"inV":27,"properties":{"weight":1}},{"id":4655,"inV":88,"properties":{"weight":16}},{"id":4656,"inV":30,"properties":{"weight":13}},{"id":4657,"inV":31,"properties":{"weight":7}},{"id":4658,"inV":117,"properties":{"weight":2}},{"id":4659,"inV":46,"properties":{"weight":2}},{"id":4660,"inV":116,"properties":{"weight":1}},{"id":4661,"inV":81,"properties":{"weight":1}},{"id":4662,"inV":34,"properties":{"weight":1}},{"id":4663,"inV":36,"properties":{"weight":2}},{"id":4664,"inV":188,"properties":{"weight":1}},{"id":4665,"inV":3,"properties":{"weight":1}},{"id":4666,"inV":239,"properties":{"weight":1}},{"id":4667,"inV":40,"properties":{"weight":5}},{"id":4668,"inV":33,"properties":{"weight":1}},{"id":4669,"inV":174,"properties":{"weight":1}},{"id":4670,"inV":41,"properties":{"weight":1}},{"id":4671,"inV":37,"properties":{"weight":1}}],"sungBy":[{"id":7170,"inV":375}],"writtenBy":[{"id":7169,"inV":339}]},"properties":{"name":[{"id":459,"value":"FRANKLINS TOWER"}],"songType":[{"id":461,"value":"original"}],"performances":[{"id":460,"value":221}]}}
-{"id":155,"label":"song","inE":{"followedBy":[{"id":4067,"outV":109,"properties":{"weight":1}},{"id":6115,"outV":72,"properties":{"weight":2}},{"id":5797,"outV":76,"properties":{"weight":1}},{"id":3015,"outV":14,"properties":{"weight":1}},{"id":2156,"outV":151,"properties":{"weight":1}},{"id":3660,"outV":24,"properties":{"weight":1}},{"id":814,"outV":171,"properties":{"weight":1}},{"id":592,"outV":120,"properties":{"weight":1}},{"id":3120,"outV":153,"properties":{"weight":1}},{"id":2869,"outV":101,"properties":{"weight":1}},{"id":1113,"outV":59,"properties":{"weight":1}},{"id":4186,"outV":54,"properties":{"weight":1}},{"id":732,"outV":80,"properties":{"weight":1}},{"id":1276,"outV":27,"properties":{"weight":1}},{"id":3292,"outV":160,"properties":{"weight":1}},{"id":255,"outV":150,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3330,"inV":13,"properties":{"weight":2}},{"id":3331,"inV":12,"properties":{"weight":2}},{"id":3332,"inV":100,"properties":{"weight":1}},{"id":3333,"inV":18,"properties":{"weight":1}},{"id":3334,"inV":215,"properties":{"weight":1}},{"id":3335,"inV":10,"properties":{"weight":1}},{"id":3336,"inV":51,"properties":{"weight":1}},{"id":3337,"inV":109,"properties":{"weight":1}},{"id":3338,"inV":24,"properties":{"weight":1}},{"id":3339,"inV":38,"properties":{"weight":1}},{"id":3340,"inV":114,"properties":{"weight":1}},{"id":3341,"inV":64,"properties":{"weight":1}},{"id":3342,"inV":50,"properties":{"weight":2}},{"id":3343,"inV":30,"properties":{"weight":1}}]},"properties":{"name":[{"id":462,"value":"FUNICULI FUNICULA"}],"songType":[{"id":464,"value":""}],"performances":[{"id":463,"value":0}]}}
-{"id":156,"label":"song","inE":{"followedBy":[{"id":264,"outV":150,"properties":{"weight":1}},{"id":1213,"outV":26,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5697,"inV":151,"properties":{"weight":1}},{"id":5698,"inV":38,"properties":{"weight":1}}],"sungBy":[{"id":7494,"inV":340}],"writtenBy":[{"id":7493,"inV":493}]},"properties":{"name":[{"id":465,"value":"CALIFORNIA EARTHQUAKE"}],"songType":[{"id":467,"value":"cover"}],"performances":[{"id":466,"value":2}]}}
-{"id":157,"label":"song","inE":{"followedBy":[{"id":3537,"outV":201,"properties":{"weight":1}},{"id":3074,"outV":153,"properties":{"weight":2}},{"id":6630,"outV":127,"properties":{"weight":1}},{"id":791,"outV":122,"properties":{"weight":3}},{"id":266,"outV":150,"properties":{"weight":1}},{"id":2746,"outV":13,"properties":{"weight":1}},{"id":4780,"outV":114,"properties":{"weight":1}},{"id":3309,"outV":160,"properties":{"weight":1}},{"id":3758,"outV":3,"properties":{"weight":5}},{"id":367,"outV":74,"properties":{"weight":2}},{"id":1519,"outV":164,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":684,"inV":53,"properties":{"weight":1}},{"id":685,"inV":127,"properties":{"weight":1}},{"id":686,"inV":26,"properties":{"weight":3}},{"id":687,"inV":10,"properties":{"weight":1}},{"id":688,"inV":24,"properties":{"weight":1}},{"id":689,"inV":50,"properties":{"weight":1}},{"id":690,"inV":84,"properties":{"weight":1}},{"id":691,"inV":81,"properties":{"weight":1}},{"id":692,"inV":38,"properties":{"weight":1}},{"id":693,"inV":87,"properties":{"weight":1}},{"id":694,"inV":90,"properties":{"weight":3}},{"id":695,"inV":78,"properties":{"weight":1}},{"id":696,"inV":23,"properties":{"weight":1}},{"id":697,"inV":116,"properties":{"weight":1}},{"id":698,"inV":64,"properties":{"weight":1}}]},"properties":{"name":[{"id":468,"value":"WE BID YOU GOODNIGHT"}],"songType":[{"id":470,"value":""}],"performances":[{"id":469,"value":0}]}}
-{"id":158,"label":"song","inE":{"followedBy":[{"id":3200,"outV":104,"properties":{"weight":1}},{"id":4736,"outV":186,"properties":{"weight":8}},{"id":1922,"outV":103,"properties":{"weight":1}},{"id":4866,"outV":35,"properties":{"weight":1}},{"id":6822,"outV":39,"properties":{"weight":1}},{"id":4935,"outV":100,"properties":{"weight":1}},{"id":4553,"outV":105,"properties":{"weight":1}},{"id":4043,"outV":173,"properties":{"weight":2}},{"id":908,"outV":174,"properties":{"weight":1}},{"id":4492,"outV":202,"properties":{"weight":2}},{"id":6061,"outV":115,"properties":{"weight":2}},{"id":4142,"outV":48,"properties":{"weight":4}},{"id":271,"outV":150,"properties":{"weight":1}},{"id":2895,"outV":101,"properties":{"weight":1}},{"id":4847,"outV":119,"properties":{"weight":1}},{"id":1488,"outV":81,"properties":{"weight":1}},{"id":4560,"outV":254,"properties":{"weight":3}},{"id":3252,"outV":63,"properties":{"weight":1}},{"id":4216,"outV":54,"properties":{"weight":6}},{"id":2653,"outV":137,"properties":{"weight":2}},{"id":1310,"outV":27,"properties":{"weight":1}},{"id":3615,"outV":56,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":2624,"inV":37,"properties":{"weight":1}},{"id":2625,"inV":65,"properties":{"weight":1}},{"id":2626,"inV":94,"properties":{"weight":2}},{"id":2627,"inV":92,"properties":{"weight":2}},{"id":2628,"inV":127,"properties":{"weight":1}},{"id":2629,"inV":140,"properties":{"weight":1}},{"id":2608,"inV":259,"properties":{"weight":1}},{"id":2609,"inV":57,"properties":{"weight":7}},{"id":2610,"inV":72,"properties":{"weight":10}},{"id":2611,"inV":76,"properties":{"weight":1}},{"id":2612,"inV":103,"properties":{"weight":1}},{"id":2613,"inV":4,"properties":{"weight":1}},{"id":2614,"inV":137,"properties":{"weight":2}},{"id":2615,"inV":138,"properties":{"weight":2}},{"id":2616,"inV":173,"properties":{"weight":3}},{"id":2617,"inV":13,"properties":{"weight":1}},{"id":2618,"inV":58,"properties":{"weight":1}},{"id":2619,"inV":87,"properties":{"weight":1}},{"id":2620,"inV":83,"properties":{"weight":1}},{"id":2621,"inV":19,"properties":{"weight":2}},{"id":2622,"inV":74,"properties":{"weight":1}},{"id":2623,"inV":81,"properties":{"weight":1}}],"sungBy":[{"id":7142,"inV":368}],"writtenBy":[{"id":7141,"inV":367}]},"properties":{"name":[{"id":471,"value":"EASY ANSWERS"}],"songType":[{"id":473,"value":"original"}],"performances":[{"id":472,"value":44}]}}
-{"id":159,"label":"song","inE":{"followedBy":[{"id":4787,"outV":114,"properties":{"weight":1}},{"id":282,"outV":5,"properties":{"weight":1}},{"id":5899,"outV":96,"properties":{"weight":2}},{"id":4620,"outV":154,"properties":{"weight":1}},{"id":349,"outV":178,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":5688,"inV":178,"properties":{"weight":1}},{"id":5689,"inV":60,"properties":{"weight":1}},{"id":5690,"inV":96,"properties":{"weight":1}},{"id":5691,"inV":153,"properties":{"weight":1}},{"id":5692,"inV":215,"properties":{"weight":1}},{"id":5693,"inV":134,"properties":{"weight":1}},{"id":5694,"inV":29,"properties":{"weight":1}}],"sungBy":[{"id":7076,"inV":340}],"writtenBy":[{"id":7075,"inV":339}]},"properties":{"name":[{"id":474,"value":"BLUES FOR ALLAH"}],"songType":[{"id":476,"value":"original"}],"performances":[{"id":475,"value":3}]}}
-{"id":160,"label":"song","inE":{"followedBy":[{"id":6529,"outV":211,"properties":{"weight":1}},{"id":4803,"outV":114,"properties":{"weight":8}},{"id":6662,"outV":12,"properties":{"weight":1}},{"id":2376,"outV":87,"properties":{"weight":5}},{"id":6090,"outV":72,"properties":{"weight":1}},{"id":2251,"outV":29,"properties":{"weight":1}},{"id":1932,"outV":148,"properties":{"weight":1}},{"id":3727,"outV":3,"properties":{"weight":37}},{"id":2770,"outV":15,"properties":{"weight":5}},{"id":5842,"outV":61,"properties":{"weight":3}},{"id":1497,"outV":164,"properties":{"weight":19}},{"id":286,"outV":5,"properties":{"weight":2}},{"id":1569,"outV":18,"properties":{"weight":2}},{"id":4258,"outV":10,"properties":{"weight":1}},{"id":613,"outV":23,"properties":{"weight":3}},{"id":6632,"outV":127,"properties":{"weight":2}},{"id":7018,"outV":89,"properties":{"weight":1}},{"id":1390,"outV":130,"properties":{"weight":1}},{"id":3056,"outV":153,"properties":{"weight":24}},{"id":5298,"outV":321,"properties":{"weight":2}},{"id":6386,"outV":65,"properties":{"weight":1}},{"id":3635,"outV":24,"properties":{"weight":1}},{"id":5556,"outV":162,"properties":{"weight":8}},{"id":1143,"outV":26,"properties":{"weight":3}},{"id":2680,"outV":13,"properties":{"weight":3}},{"id":5625,"outV":22,"properties":{"weight":1}},{"id":1082,"outV":243,"properties":{"weight":1}},{"id":2299,"outV":25,"properties":{"weight":10}},{"id":6908,"outV":133,"properties":{"weight":2}},{"id":573,"outV":120,"properties":{"weight":18}}]},"outE":{"followedBy":[{"id":3262,"inV":114,"properties":{"weight":1}},{"id":3263,"inV":21,"properties":{"weight":4}},{"id":3264,"inV":153,"properties":{"weight":2}},{"id":3265,"inV":25,"properties":{"weight":2}},{"id":3266,"inV":4,"properties":{"weight":10}},{"id":3267,"inV":122,"properties":{"weight":1}},{"id":3268,"inV":26,"properties":{"weight":3}},{"id":3269,"inV":10,"properties":{"weight":2}},{"id":3270,"inV":18,"properties":{"weight":1}},{"id":3271,"inV":12,"properties":{"weight":1}},{"id":3272,"inV":50,"properties":{"weight":18}},{"id":3273,"inV":16,"properties":{"weight":2}},{"id":3274,"inV":22,"properties":{"weight":1}},{"id":3275,"inV":19,"properties":{"weight":2}},{"id":3276,"inV":3,"properties":{"weight":1}},{"id":3277,"inV":13,"properties":{"weight":3}},{"id":3278,"inV":59,"properties":{"weight":2}},{"id":3279,"inV":111,"properties":{"weight":2}},{"id":3280,"inV":80,"properties":{"weight":3}},{"id":3281,"inV":198,"properties":{"weight":1}},{"id":3282,"inV":20,"properties":{"weight":1}},{"id":3283,"inV":180,"properties":{"weight":1}},{"id":3284,"inV":65,"properties":{"weight":15}},{"id":3285,"inV":32,"properties":{"weight":7}},{"id":3286,"inV":154,"properties":{"weight":3}},{"id":3287,"inV":38,"properties":{"weight":14}},{"id":3288,"inV":84,"properties":{"weight":10}},{"id":3289,"inV":123,"properties":{"weight":1}},{"id":3290,"inV":152,"properties":{"weight":1}},{"id":3291,"inV":76,"properties":{"weight":1}},{"id":3292,"inV":155,"properties":{"weight":1}},{"id":3293,"inV":87,"properties":{"weight":8}},{"id":3294,"inV":57,"properties":{"weight":1}},{"id":3295,"inV":214,"properties":{"weight":1}},{"id":3296,"inV":64,"properties":{"weight":8}},{"id":3297,"inV":110,"properties":{"weight":2}},{"id":3298,"inV":62,"properties":{"weight":4}},{"id":3299,"inV":103,"properties":{"weight":1}},{"id":3300,"inV":78,"properties":{"weight":8}},{"id":3301,"inV":27,"properties":{"weight":1}},{"id":3302,"inV":61,"properties":{"weight":2}},{"id":3303,"inV":151,"properties":{"weight":1}},{"id":3304,"inV":90,"properties":{"weight":6}},{"id":3305,"inV":81,"properties":{"weight":1}},{"id":3306,"inV":133,"properties":{"weight":1}},{"id":3307,"inV":215,"properties":{"weight":2}},{"id":3308,"inV":31,"properties":{"weight":1}},{"id":3309,"inV":157,"properties":{"weight":1}},{"id":3310,"inV":93,"properties":{"weight":2}}],"sungBy":[{"id":7082,"inV":340}],"writtenBy":[{"id":7081,"inV":339}]},"properties":{"name":[{"id":477,"value":"BROKEDOWN PALACE"}],"songType":[{"id":479,"value":"original"}],"performances":[{"id":478,"value":215}]}}
-{"id":161,"label":"song","inE":{"followedBy":[{"id":4452,"outV":163,"properties":{"weight":1}},{"id":297,"outV":5,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1314,"inV":255,"properties":{"weight":1}},{"id":1315,"inV":61,"properties":{"weight":1}}],"sungBy":[{"id":7604,"inV":356}],"writtenBy":[{"id":7603,"inV":562}]},"properties":{"name":[{"id":480,"value":"HARD TO HANDLE"}],"songType":[{"id":482,"value":"cover"}],"performances":[{"id":481,"value":105}]}}
-{"id":162,"label":"song","inE":{"followedBy":[{"id":576,"outV":120,"properties":{"weight":7}},{"id":5152,"outV":125,"properties":{"weight":1}},{"id":1874,"outV":94,"properties":{"weight":1}},{"id":3106,"outV":153,"properties":{"weight":12}},{"id":6615,"outV":127,"properties":{"weight":3}},{"id":809,"outV":122,"properties":{"weight":1}},{"id":5913,"outV":96,"properties":{"weight":1}},{"id":298,"outV":5,"properties":{"weight":1}},{"id":6907,"outV":133,"properties":{"weight":2}},{"id":4814,"outV":114,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":5568,"inV":88,"properties":{"weight":1}},{"id":5555,"inV":50,"properties":{"weight":2}},{"id":5556,"inV":160,"properties":{"weight":8}},{"id":5557,"inV":32,"properties":{"weight":2}},{"id":5558,"inV":38,"properties":{"weight":1}},{"id":5559,"inV":65,"properties":{"weight":1}},{"id":5560,"inV":78,"properties":{"weight":4}},{"id":5561,"inV":124,"properties":{"weight":4}},{"id":5562,"inV":4,"properties":{"weight":2}},{"id":5563,"inV":180,"properties":{"weight":1}},{"id":5564,"inV":154,"properties":{"weight":1}},{"id":5565,"inV":84,"properties":{"weight":2}},{"id":5566,"inV":103,"properties":{"weight":1}},{"id":5567,"inV":67,"properties":{"weight":1}}]},"properties":{"name":[{"id":483,"value":"SATISFACTION"}],"songType":[{"id":485,"value":""}],"performances":[{"id":484,"value":0}]}}
-{"id":163,"label":"song","inE":{"followedBy":[{"id":4918,"outV":100,"properties":{"weight":1}},{"id":2973,"outV":255,"properties":{"weight":1}},{"id":302,"outV":5,"properties":{"weight":1}},{"id":5758,"outV":129,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4452,"inV":161,"properties":{"weight":1}},{"id":4453,"inV":50,"properties":{"weight":1}},{"id":4454,"inV":153,"properties":{"weight":1}},{"id":4455,"inV":96,"properties":{"weight":1}}],"sungBy":[{"id":7444,"inV":461}],"writtenBy":[{"id":7443,"inV":460}]},"properties":{"name":[{"id":486,"value":"BABY WHAT YOU WANT ME TO DO"}],"songType":[{"id":488,"value":"cover"}],"performances":[{"id":487,"value":5}]}}
-{"id":164,"label":"song","inE":{"followedBy":[{"id":4740,"outV":186,"properties":{"weight":1}},{"id":5764,"outV":129,"properties":{"weight":1}},{"id":4295,"outV":135,"properties":{"weight":1}},{"id":2633,"outV":137,"properties":{"weight":1}},{"id":2250,"outV":29,"properties":{"weight":46}},{"id":779,"outV":122,"properties":{"weight":1}},{"id":524,"outV":120,"properties":{"weight":1}},{"id":1872,"outV":94,"properties":{"weight":24}},{"id":2322,"outV":25,"properties":{"weight":8}},{"id":2389,"outV":87,"properties":{"weight":1}},{"id":3735,"outV":3,"properties":{"weight":4}},{"id":6622,"outV":127,"properties":{"weight":8}},{"id":5536,"outV":333,"properties":{"weight":1}},{"id":4001,"outV":66,"properties":{"weight":1}},{"id":5155,"outV":125,"properties":{"weight":20}},{"id":3947,"outV":138,"properties":{"weight":3}},{"id":5356,"outV":165,"properties":{"weight":1}},{"id":1453,"outV":81,"properties":{"weight":1}},{"id":1070,"outV":227,"properties":{"weight":1}},{"id":1391,"outV":130,"properties":{"weight":18}},{"id":305,"outV":5,"properties":{"weight":6}},{"id":5361,"outV":132,"properties":{"weight":5}},{"id":6709,"outV":141,"properties":{"weight":2}},{"id":2039,"outV":92,"properties":{"weight":11}},{"id":6585,"outV":116,"properties":{"weight":1}},{"id":3066,"outV":153,"properties":{"weight":2}},{"id":894,"outV":140,"properties":{"weight":3}},{"id":6910,"outV":133,"properties":{"weight":1}},{"id":2751,"outV":13,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1490,"inV":23,"properties":{"weight":2}},{"id":1491,"inV":5,"properties":{"weight":3}},{"id":1492,"inV":114,"properties":{"weight":3}},{"id":1493,"inV":255,"properties":{"weight":1}},{"id":1494,"inV":4,"properties":{"weight":3}},{"id":1495,"inV":64,"properties":{"weight":9}},{"id":1496,"inV":211,"properties":{"weight":2}},{"id":1497,"inV":160,"properties":{"weight":19}},{"id":1498,"inV":67,"properties":{"weight":2}},{"id":1499,"inV":3,"properties":{"weight":2}},{"id":1500,"inV":124,"properties":{"weight":15}},{"id":1501,"inV":38,"properties":{"weight":4}},{"id":1502,"inV":50,"properties":{"weight":6}},{"id":1503,"inV":87,"properties":{"weight":1}},{"id":1504,"inV":212,"properties":{"weight":1}},{"id":1505,"inV":46,"properties":{"weight":8}},{"id":1506,"inV":213,"properties":{"weight":8}},{"id":1507,"inV":115,"properties":{"weight":1}},{"id":1508,"inV":150,"properties":{"weight":21}},{"id":1509,"inV":131,"properties":{"weight":1}},{"id":1510,"inV":204,"properties":{"weight":18}},{"id":1511,"inV":116,"properties":{"weight":1}},{"id":1512,"inV":243,"properties":{"weight":1}},{"id":1513,"inV":68,"properties":{"weight":1}},{"id":1514,"inV":103,"properties":{"weight":1}},{"id":1515,"inV":151,"properties":{"weight":1}},{"id":1516,"inV":140,"properties":{"weight":1}},{"id":1517,"inV":90,"properties":{"weight":1}},{"id":1518,"inV":13,"properties":{"weight":1}},{"id":1519,"inV":157,"properties":{"weight":1}},{"id":1520,"inV":86,"properties":{"weight":7}},{"id":1521,"inV":201,"properties":{"weight":2}},{"id":1522,"inV":78,"properties":{"weight":1}},{"id":1523,"inV":42,"properties":{"weight":3}},{"id":1524,"inV":93,"properties":{"weight":2}},{"id":1525,"inV":215,"properties":{"weight":2}},{"id":1526,"inV":227,"properties":{"weight":3}},{"id":1527,"inV":185,"properties":{"weight":1}},{"id":1528,"inV":236,"properties":{"weight":2}},{"id":1529,"inV":216,"properties":{"weight":5}},{"id":1530,"inV":84,"properties":{"weight":3}},{"id":1531,"inV":94,"properties":{"weight":1}},{"id":1532,"inV":9,"properties":{"weight":2}},{"id":1533,"inV":259,"properties":{"weight":1}},{"id":1534,"inV":65,"properties":{"weight":1}}],"sungBy":[{"id":7978,"inV":476}],"writtenBy":[{"id":7977,"inV":771}]},"properties":{"name":[{"id":489,"value":"TURN ON YOUR LOVE LIGHT"}],"songType":[{"id":491,"value":"cover"}],"performances":[{"id":490,"value":341}]}}
-{"id":165,"label":"song","inE":{"followedBy":[{"id":5760,"outV":129,"properties":{"weight":1}},{"id":6432,"outV":134,"properties":{"weight":34}},{"id":5922,"outV":96,"properties":{"weight":11}},{"id":963,"outV":67,"properties":{"weight":15}},{"id":5448,"outV":231,"properties":{"weight":7}},{"id":6440,"outV":284,"properties":{"weight":1}},{"id":4713,"outV":186,"properties":{"weight":31}},{"id":2380,"outV":87,"properties":{"weight":2}},{"id":1393,"outV":130,"properties":{"weight":1}},{"id":2642,"outV":137,"properties":{"weight":1}},{"id":5362,"outV":132,"properties":{"weight":2}},{"id":595,"outV":120,"properties":{"weight":1}},{"id":308,"outV":5,"properties":{"weight":7}},{"id":2325,"outV":25,"properties":{"weight":1}},{"id":4374,"outV":62,"properties":{"weight":3}},{"id":6263,"outV":310,"properties":{"weight":3}},{"id":6620,"outV":127,"properties":{"weight":2}},{"id":7039,"outV":89,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5333,"inV":72,"properties":{"weight":1}},{"id":5334,"inV":150,"properties":{"weight":2}},{"id":5335,"inV":124,"properties":{"weight":1}},{"id":5336,"inV":134,"properties":{"weight":1}},{"id":5337,"inV":125,"properties":{"weight":23}},{"id":5338,"inV":87,"properties":{"weight":4}},{"id":5339,"inV":64,"properties":{"weight":2}},{"id":5340,"inV":94,"properties":{"weight":28}},{"id":5341,"inV":62,"properties":{"weight":1}},{"id":5342,"inV":204,"properties":{"weight":2}},{"id":5343,"inV":5,"properties":{"weight":2}},{"id":5344,"inV":82,"properties":{"weight":1}},{"id":5345,"inV":130,"properties":{"weight":3}},{"id":5346,"inV":268,"properties":{"weight":1}},{"id":5347,"inV":127,"properties":{"weight":21}},{"id":5348,"inV":3,"properties":{"weight":1}},{"id":5349,"inV":153,"properties":{"weight":1}},{"id":5350,"inV":232,"properties":{"weight":2}},{"id":5351,"inV":92,"properties":{"weight":10}},{"id":5352,"inV":132,"properties":{"weight":1}},{"id":5353,"inV":136,"properties":{"weight":1}},{"id":5354,"inV":129,"properties":{"weight":4}},{"id":5355,"inV":137,"properties":{"weight":1}},{"id":5356,"inV":164,"properties":{"weight":1}},{"id":5357,"inV":138,"properties":{"weight":6}},{"id":5358,"inV":140,"properties":{"weight":3}}],"sungBy":[{"id":7428,"inV":351}],"writtenBy":[{"id":7427,"inV":447}]},"properties":{"name":[{"id":492,"value":"ALL ALONG THE WATCHTOWER"}],"songType":[{"id":494,"value":"cover"}],"performances":[{"id":493,"value":123}]}}
-{"id":166,"label":"song","inE":{"followedBy":[{"id":4033,"outV":173,"properties":{"weight":2}},{"id":1765,"outV":28,"properties":{"weight":1}},{"id":311,"outV":5,"properties":{"weight":1}},{"id":4984,"outV":236,"properties":{"weight":1}},{"id":2314,"outV":25,"properties":{"weight":1}},{"id":3949,"outV":138,"properties":{"weight":2}},{"id":4494,"outV":202,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5552,"inV":62,"properties":{"weight":1}},{"id":5553,"inV":76,"properties":{"weight":1}},{"id":5554,"inV":81,"properties":{"weight":1}},{"id":5546,"inV":114,"properties":{"weight":1}},{"id":5547,"inV":262,"properties":{"weight":1}},{"id":5548,"inV":9,"properties":{"weight":1}},{"id":5549,"inV":93,"properties":{"weight":1}},{"id":5550,"inV":216,"properties":{"weight":1}},{"id":5551,"inV":236,"properties":{"weight":1}}],"sungBy":[{"id":7704,"inV":351}],"writtenBy":[{"id":7703,"inV":458}]},"properties":{"name":[{"id":495,"value":"JOHNNY B GOODE"}],"songType":[{"id":497,"value":"cover"}],"performances":[{"id":496,"value":284}]}}
-{"id":167,"label":"song","inE":{"followedBy":[{"id":2466,"outV":68,"properties":{"weight":1}},{"id":2085,"outV":188,"properties":{"weight":1}},{"id":3781,"outV":168,"properties":{"weight":1}},{"id":2889,"outV":101,"properties":{"weight":1}},{"id":1130,"outV":59,"properties":{"weight":2}},{"id":1327,"outV":31,"properties":{"weight":1}},{"id":4944,"outV":86,"properties":{"weight":1}},{"id":850,"outV":171,"properties":{"weight":2}},{"id":6130,"outV":72,"properties":{"weight":1}},{"id":6514,"outV":187,"properties":{"weight":1}},{"id":6808,"outV":39,"properties":{"weight":1}},{"id":1049,"outV":73,"properties":{"weight":1}},{"id":3929,"outV":51,"properties":{"weight":3}},{"id":6873,"outV":64,"properties":{"weight":1}},{"id":316,"outV":34,"properties":{"weight":1}},{"id":3485,"outV":58,"properties":{"weight":2}},{"id":4607,"outV":85,"properties":{"weight":1}},{"id":4927,"outV":100,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5666,"inV":30,"properties":{"weight":1}},{"id":5667,"inV":69,"properties":{"weight":1}},{"id":5668,"inV":81,"properties":{"weight":1}},{"id":5669,"inV":34,"properties":{"weight":1}},{"id":5670,"inV":68,"properties":{"weight":1}},{"id":5671,"inV":54,"properties":{"weight":1}},{"id":5672,"inV":117,"properties":{"weight":2}},{"id":5673,"inV":76,"properties":{"weight":1}},{"id":5674,"inV":89,"properties":{"weight":1}},{"id":5675,"inV":215,"properties":{"weight":1}},{"id":5676,"inV":26,"properties":{"weight":1}},{"id":5677,"inV":77,"properties":{"weight":1}},{"id":5678,"inV":85,"properties":{"weight":1}},{"id":5679,"inV":188,"properties":{"weight":1}},{"id":5680,"inV":21,"properties":{"weight":1}},{"id":5681,"inV":46,"properties":{"weight":1}},{"id":5682,"inV":13,"properties":{"weight":1}},{"id":5683,"inV":82,"properties":{"weight":1}},{"id":5684,"inV":168,"properties":{"weight":1}},{"id":5685,"inV":91,"properties":{"weight":1}},{"id":5686,"inV":49,"properties":{"weight":1}},{"id":5687,"inV":112,"properties":{"weight":1}}],"sungBy":[{"id":7074,"inV":352}],"writtenBy":[{"id":7073,"inV":350}]},"properties":{"name":[{"id":498,"value":"BLOW AWAY"}],"songType":[{"id":500,"value":"original"}],"performances":[{"id":499,"value":23}]}}
-{"id":168,"label":"song","inE":{"followedBy":[{"id":321,"outV":34,"properties":{"weight":2}},{"id":5825,"outV":76,"properties":{"weight":1}},{"id":6245,"outV":117,"properties":{"weight":1}},{"id":2822,"outV":15,"properties":{"weight":1}},{"id":1607,"outV":18,"properties":{"weight":1}},{"id":3688,"outV":24,"properties":{"weight":1}},{"id":5005,"outV":30,"properties":{"weight":2}},{"id":5684,"outV":167,"properties":{"weight":1}},{"id":2745,"outV":13,"properties":{"weight":2}},{"id":442,"outV":38,"properties":{"weight":2}},{"id":3994,"outV":106,"properties":{"weight":1}},{"id":3419,"outV":77,"properties":{"weight":1}},{"id":6588,"outV":116,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":3778,"inV":96,"properties":{"weight":2}},{"id":3779,"inV":117,"properties":{"weight":1}},{"id":3780,"inV":77,"properties":{"weight":1}},{"id":3781,"inV":167,"properties":{"weight":1}},{"id":3782,"inV":88,"properties":{"weight":1}},{"id":3783,"inV":188,"properties":{"weight":2}},{"id":3784,"inV":169,"properties":{"weight":2}},{"id":3785,"inV":34,"properties":{"weight":4}},{"id":3786,"inV":114,"properties":{"weight":1}},{"id":3787,"inV":79,"properties":{"weight":1}},{"id":3788,"inV":12,"properties":{"weight":1}},{"id":3789,"inV":21,"properties":{"weight":1}}],"sungBy":[{"id":7086,"inV":340}],"writtenBy":[{"id":7085,"inV":339}]},"properties":{"name":[{"id":501,"value":"BUILT TO LAST"}],"songType":[{"id":503,"value":"original"}],"performances":[{"id":502,"value":18}]}}
-{"id":169,"label":"song","inE":{"followedBy":[{"id":2082,"outV":188,"properties":{"weight":2}},{"id":325,"outV":34,"properties":{"weight":1}},{"id":5607,"outV":42,"properties":{"weight":1}},{"id":3784,"outV":168,"properties":{"weight":2}},{"id":4137,"outV":48,"properties":{"weight":1}},{"id":5291,"outV":32,"properties":{"weight":1}},{"id":1135,"outV":59,"properties":{"weight":2}},{"id":1328,"outV":31,"properties":{"weight":2}},{"id":4209,"outV":54,"properties":{"weight":1}},{"id":1299,"outV":27,"properties":{"weight":1}},{"id":2964,"outV":78,"properties":{"weight":1}},{"id":6516,"outV":187,"properties":{"weight":1}},{"id":3605,"outV":56,"properties":{"weight":1}},{"id":6005,"outV":50,"properties":{"weight":1}},{"id":1051,"outV":73,"properties":{"weight":1}},{"id":5118,"outV":4,"properties":{"weight":2}},{"id":3039,"outV":14,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5664,"inV":85,"properties":{"weight":1}},{"id":5665,"inV":12,"properties":{"weight":1}},{"id":5650,"inV":104,"properties":{"weight":1}},{"id":5651,"inV":60,"properties":{"weight":1}},{"id":5652,"inV":77,"properties":{"weight":3}},{"id":5653,"inV":117,"properties":{"weight":2}},{"id":5654,"inV":58,"properties":{"weight":2}},{"id":5655,"inV":71,"properties":{"weight":1}},{"id":5656,"inV":74,"properties":{"weight":1}},{"id":5657,"inV":188,"properties":{"weight":1}},{"id":5658,"inV":100,"properties":{"weight":1}},{"id":5659,"inV":79,"properties":{"weight":2}},{"id":5660,"inV":75,"properties":{"weight":1}},{"id":5661,"inV":54,"properties":{"weight":2}},{"id":5662,"inV":105,"properties":{"weight":1}},{"id":5663,"inV":27,"properties":{"weight":1}}]},"properties":{"name":[{"id":504,"value":"WE CAN RUN BUT WE CANT HIDE"}],"songType":[{"id":506,"value":""}],"performances":[{"id":505,"value":0}]}}
-{"id":170,"label":"song","inE":{"followedBy":[{"id":578,"outV":120,"properties":{"weight":1}},{"id":2691,"outV":13,"properties":{"weight":1}},{"id":645,"outV":23,"properties":{"weight":2}},{"id":838,"outV":171,"properties":{"weight":1}},{"id":3399,"outV":77,"properties":{"weight":4}},{"id":332,"outV":34,"properties":{"weight":1}},{"id":5004,"outV":30,"properties":{"weight":2}},{"id":2446,"outV":68,"properties":{"weight":3}},{"id":5198,"outV":99,"properties":{"weight":1}},{"id":5717,"outV":20,"properties":{"weight":2}},{"id":6997,"outV":197,"properties":{"weight":3}},{"id":407,"outV":38,"properties":{"weight":1}},{"id":2072,"outV":188,"properties":{"weight":2}},{"id":6680,"outV":12,"properties":{"weight":2}},{"id":3675,"outV":24,"properties":{"weight":3}},{"id":4700,"outV":111,"properties":{"weight":2}},{"id":1117,"outV":59,"properties":{"weight":1}},{"id":6494,"outV":187,"properties":{"weight":1}},{"id":993,"outV":11,"properties":{"weight":2}},{"id":6053,"outV":115,"properties":{"weight":1}},{"id":2790,"outV":15,"properties":{"weight":3}},{"id":5606,"outV":42,"properties":{"weight":1}},{"id":6246,"outV":117,"properties":{"weight":1}},{"id":1575,"outV":18,"properties":{"weight":5}},{"id":5807,"outV":76,"properties":{"weight":6}},{"id":6000,"outV":50,"properties":{"weight":1}},{"id":1713,"outV":82,"properties":{"weight":1}},{"id":5048,"outV":209,"properties":{"weight":2}},{"id":5178,"outV":71,"properties":{"weight":1}},{"id":3451,"outV":58,"properties":{"weight":1}},{"id":4413,"outV":198,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":5312,"inV":101,"properties":{"weight":7}},{"id":5313,"inV":32,"properties":{"weight":3}},{"id":5314,"inV":198,"properties":{"weight":1}},{"id":5315,"inV":85,"properties":{"weight":1}},{"id":5316,"inV":91,"properties":{"weight":2}},{"id":5317,"inV":121,"properties":{"weight":1}},{"id":5318,"inV":181,"properties":{"weight":2}},{"id":5319,"inV":88,"properties":{"weight":1}},{"id":5320,"inV":72,"properties":{"weight":1}},{"id":5321,"inV":46,"properties":{"weight":1}},{"id":5322,"inV":269,"properties":{"weight":1}},{"id":5323,"inV":103,"properties":{"weight":2}},{"id":5324,"inV":117,"properties":{"weight":2}},{"id":5325,"inV":42,"properties":{"weight":1}},{"id":5326,"inV":26,"properties":{"weight":1}},{"id":5299,"inV":18,"properties":{"weight":3}},{"id":5300,"inV":20,"properties":{"weight":1}},{"id":5301,"inV":15,"properties":{"weight":1}},{"id":5302,"inV":112,"properties":{"weight":1}},{"id":5303,"inV":16,"properties":{"weight":2}},{"id":5304,"inV":12,"properties":{"weight":2}},{"id":5305,"inV":21,"properties":{"weight":1}},{"id":5306,"inV":13,"properties":{"weight":4}},{"id":5307,"inV":209,"properties":{"weight":6}},{"id":5308,"inV":222,"properties":{"weight":1}},{"id":5309,"inV":68,"properties":{"weight":5}},{"id":5310,"inV":197,"properties":{"weight":3}},{"id":5311,"inV":111,"properties":{"weight":3}}],"sungBy":[{"id":7372,"inV":340}],"writtenBy":[{"id":7371,"inV":339}]},"properties":{"name":[{"id":507,"value":"TO LAY ME DOWN"}],"songType":[{"id":509,"value":"original"}],"performances":[{"id":508,"value":63}]}}
-{"id":171,"label":"song","inE":{"followedBy":[{"id":5888,"outV":96,"properties":{"weight":2}},{"id":6144,"outV":289,"properties":{"weight":1}},{"id":6865,"outV":64,"properties":{"weight":3}},{"id":4821,"outV":114,"properties":{"weight":1}},{"id":1736,"outV":82,"properties":{"weight":239}},{"id":1449,"outV":83,"properties":{"weight":1}},{"id":2233,"outV":215,"properties":{"weight":1}},{"id":2956,"outV":78,"properties":{"weight":1}},{"id":5484,"outV":79,"properties":{"weight":1}},{"id":333,"outV":34,"properties":{"weight":1}},{"id":2367,"outV":87,"properties":{"weight":2}},{"id":5215,"outV":99,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":832,"inV":101,"properties":{"weight":1}},{"id":833,"inV":227,"properties":{"weight":1}},{"id":834,"inV":96,"properties":{"weight":20}},{"id":835,"inV":3,"properties":{"weight":1}},{"id":836,"inV":38,"properties":{"weight":1}},{"id":837,"inV":27,"properties":{"weight":1}},{"id":838,"inV":170,"properties":{"weight":1}},{"id":839,"inV":98,"properties":{"weight":1}},{"id":840,"inV":116,"properties":{"weight":2}},{"id":841,"inV":74,"properties":{"weight":1}},{"id":842,"inV":49,"properties":{"weight":2}},{"id":843,"inV":106,"properties":{"weight":1}},{"id":844,"inV":82,"properties":{"weight":1}},{"id":845,"inV":14,"properties":{"weight":11}},{"id":846,"inV":30,"properties":{"weight":2}},{"id":847,"inV":5,"properties":{"weight":1}},{"id":848,"inV":69,"properties":{"weight":1}},{"id":849,"inV":36,"properties":{"weight":2}},{"id":850,"inV":167,"properties":{"weight":2}},{"id":851,"inV":228,"properties":{"weight":1}},{"id":852,"inV":28,"properties":{"weight":4}},{"id":853,"inV":137,"properties":{"weight":1}},{"id":854,"inV":34,"properties":{"weight":2}},{"id":855,"inV":41,"properties":{"weight":3}},{"id":856,"inV":172,"properties":{"weight":2}},{"id":857,"inV":229,"properties":{"weight":5}},{"id":858,"inV":35,"properties":{"weight":5}},{"id":859,"inV":46,"properties":{"weight":1}},{"id":860,"inV":37,"properties":{"weight":1}},{"id":813,"inV":85,"properties":{"weight":68}},{"id":814,"inV":155,"properties":{"weight":1}},{"id":815,"inV":120,"properties":{"weight":7}},{"id":816,"inV":21,"properties":{"weight":11}},{"id":817,"inV":76,"properties":{"weight":38}},{"id":818,"inV":91,"properties":{"weight":2}},{"id":819,"inV":70,"properties":{"weight":1}},{"id":820,"inV":153,"properties":{"weight":1}},{"id":821,"inV":26,"properties":{"weight":1}},{"id":822,"inV":208,"properties":{"weight":2}},{"id":823,"inV":13,"properties":{"weight":24}},{"id":824,"inV":12,"properties":{"weight":1}},{"id":825,"inV":196,"properties":{"weight":1}},{"id":826,"inV":110,"properties":{"weight":4}},{"id":827,"inV":18,"properties":{"weight":1}},{"id":828,"inV":62,"properties":{"weight":1}},{"id":829,"inV":109,"properties":{"weight":1}},{"id":830,"inV":181,"properties":{"weight":10}},{"id":831,"inV":189,"properties":{"weight":1}}],"sungBy":[{"id":7164,"inV":347}],"writtenBy":[{"id":7163,"inV":339}]},"properties":{"name":[{"id":510,"value":"FIRE ON THE MOUNTAIN"}],"songType":[{"id":512,"value":"original"}],"performances":[{"id":511,"value":253}]}}
-{"id":172,"label":"song","inE":{"followedBy":[{"id":3043,"outV":14,"properties":{"weight":1}},{"id":3876,"outV":60,"properties":{"weight":2}},{"id":4388,"outV":62,"properties":{"weight":3}},{"id":3206,"outV":229,"properties":{"weight":2}},{"id":1767,"outV":28,"properties":{"weight":2}},{"id":4489,"outV":202,"properties":{"weight":1}},{"id":4618,"outV":85,"properties":{"weight":1}},{"id":5482,"outV":79,"properties":{"weight":1}},{"id":5420,"outV":69,"properties":{"weight":1}},{"id":397,"outV":74,"properties":{"weight":1}},{"id":335,"outV":34,"properties":{"weight":1}},{"id":4727,"outV":186,"properties":{"weight":2}},{"id":856,"outV":171,"properties":{"weight":2}},{"id":5436,"outV":217,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6560,"inV":68,"properties":{"weight":1}},{"id":6561,"inV":13,"properties":{"weight":1}},{"id":6549,"inV":72,"properties":{"weight":1}},{"id":6550,"inV":148,"properties":{"weight":1}},{"id":6551,"inV":96,"properties":{"weight":5}},{"id":6552,"inV":130,"properties":{"weight":1}},{"id":6553,"inV":60,"properties":{"weight":2}},{"id":6554,"inV":49,"properties":{"weight":1}},{"id":6555,"inV":21,"properties":{"weight":2}},{"id":6556,"inV":85,"properties":{"weight":1}},{"id":6557,"inV":62,"properties":{"weight":1}},{"id":6558,"inV":91,"properties":{"weight":3}},{"id":6559,"inV":36,"properties":{"weight":1}}],"sungBy":[{"id":7394,"inV":354}],"writtenBy":[{"id":7393,"inV":339}]},"properties":{"name":[{"id":513,"value":"WAVE TO THE WIND"}],"songType":[{"id":515,"value":"original"}],"performances":[{"id":514,"value":21}]}}
-{"id":173,"label":"song","inE":{"followedBy":[{"id":900,"outV":174,"properties":{"weight":1}},{"id":1350,"outV":31,"properties":{"weight":4}},{"id":5833,"outV":76,"properties":{"weight":2}},{"id":5514,"outV":131,"properties":{"weight":1}},{"id":1612,"outV":18,"properties":{"weight":1}},{"id":4561,"outV":254,"properties":{"weight":1}},{"id":4689,"outV":33,"properties":{"weight":2}},{"id":343,"outV":34,"properties":{"weight":1}},{"id":4505,"outV":202,"properties":{"weight":1}},{"id":5022,"outV":30,"properties":{"weight":2}},{"id":6878,"outV":64,"properties":{"weight":1}},{"id":5728,"outV":20,"properties":{"weight":1}},{"id":1313,"outV":27,"properties":{"weight":1}},{"id":995,"outV":11,"properties":{"weight":1}},{"id":676,"outV":23,"properties":{"weight":3}},{"id":3428,"outV":77,"properties":{"weight":1}},{"id":1829,"outV":41,"properties":{"weight":1}},{"id":3045,"outV":14,"properties":{"weight":1}},{"id":6373,"outV":21,"properties":{"weight":1}},{"id":1766,"outV":28,"properties":{"weight":1}},{"id":6055,"outV":115,"properties":{"weight":2}},{"id":1065,"outV":73,"properties":{"weight":1}},{"id":4457,"outV":272,"properties":{"weight":1}},{"id":6185,"outV":36,"properties":{"weight":2}},{"id":3692,"outV":24,"properties":{"weight":1}},{"id":4143,"outV":48,"properties":{"weight":1}},{"id":5295,"outV":32,"properties":{"weight":6}},{"id":4401,"outV":40,"properties":{"weight":4}},{"id":5490,"outV":79,"properties":{"weight":2}},{"id":5619,"outV":42,"properties":{"weight":1}},{"id":6260,"outV":117,"properties":{"weight":1}},{"id":2101,"outV":188,"properties":{"weight":6}},{"id":2616,"outV":158,"properties":{"weight":3}},{"id":3835,"outV":88,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":4032,"inV":24,"properties":{"weight":2}},{"id":4033,"inV":166,"properties":{"weight":2}},{"id":4034,"inV":115,"properties":{"weight":3}},{"id":4035,"inV":188,"properties":{"weight":3}},{"id":4036,"inV":101,"properties":{"weight":3}},{"id":4037,"inV":14,"properties":{"weight":1}},{"id":4038,"inV":12,"properties":{"weight":1}},{"id":4039,"inV":77,"properties":{"weight":1}},{"id":4040,"inV":254,"properties":{"weight":1}},{"id":4041,"inV":26,"properties":{"weight":1}},{"id":4042,"inV":85,"properties":{"weight":1}},{"id":4043,"inV":158,"properties":{"weight":2}},{"id":4044,"inV":18,"properties":{"weight":4}},{"id":4045,"inV":202,"properties":{"weight":1}},{"id":4046,"inV":174,"properties":{"weight":1}},{"id":4047,"inV":112,"properties":{"weight":1}},{"id":4048,"inV":175,"properties":{"weight":1}},{"id":4049,"inV":37,"properties":{"weight":1}},{"id":4050,"inV":31,"properties":{"weight":1}},{"id":4051,"inV":68,"properties":{"weight":2}},{"id":4052,"inV":15,"properties":{"weight":1}},{"id":4053,"inV":11,"properties":{"weight":1}},{"id":4054,"inV":298,"properties":{"weight":1}},{"id":4055,"inV":119,"properties":{"weight":2}},{"id":4056,"inV":58,"properties":{"weight":1}},{"id":4057,"inV":72,"properties":{"weight":2}},{"id":4024,"inV":103,"properties":{"weight":1}},{"id":4025,"inV":117,"properties":{"weight":5}},{"id":4026,"inV":43,"properties":{"weight":7}},{"id":4027,"inV":13,"properties":{"weight":3}},{"id":4028,"inV":41,"properties":{"weight":4}},{"id":4029,"inV":71,"properties":{"weight":1}},{"id":4030,"inV":21,"properties":{"weight":2}},{"id":4031,"inV":79,"properties":{"weight":1}}]},"properties":{"name":[{"id":516,"value":"LAZY RIVER"}],"songType":[{"id":518,"value":""}],"performances":[{"id":517,"value":0}]}}
-{"id":174,"label":"song","inE":{"followedBy":[{"id":5297,"outV":32,"properties":{"weight":1}},{"id":2483,"outV":68,"properties":{"weight":1}},{"id":3251,"outV":63,"properties":{"weight":2}},{"id":4501,"outV":202,"properties":{"weight":1}},{"id":344,"outV":34,"properties":{"weight":1}},{"id":1610,"outV":18,"properties":{"weight":4}},{"id":5834,"outV":76,"properties":{"weight":1}},{"id":3213,"outV":229,"properties":{"weight":1}},{"id":3613,"outV":56,"properties":{"weight":1}},{"id":4669,"outV":154,"properties":{"weight":1}},{"id":4046,"outV":173,"properties":{"weight":1}},{"id":4750,"outV":37,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":900,"inV":173,"properties":{"weight":1}},{"id":901,"inV":58,"properties":{"weight":5}},{"id":902,"inV":60,"properties":{"weight":2}},{"id":903,"inV":117,"properties":{"weight":1}},{"id":904,"inV":54,"properties":{"weight":1}},{"id":905,"inV":35,"properties":{"weight":2}},{"id":906,"inV":27,"properties":{"weight":1}},{"id":907,"inV":21,"properties":{"weight":1}},{"id":908,"inV":158,"properties":{"weight":1}},{"id":909,"inV":175,"properties":{"weight":1}}],"sungBy":[{"id":7200,"inV":354}],"writtenBy":[{"id":7199,"inV":383}]},"properties":{"name":[{"id":519,"value":"IF THE SHOE FITS"}],"songType":[{"id":521,"value":"original"}],"performances":[{"id":520,"value":17}]}}
-{"id":175,"label":"song","inE":{"followedBy":[{"id":3042,"outV":14,"properties":{"weight":1}},{"id":3426,"outV":77,"properties":{"weight":1}},{"id":675,"outV":23,"properties":{"weight":1}},{"id":4931,"outV":100,"properties":{"weight":1}},{"id":6371,"outV":21,"properties":{"weight":7}},{"id":6180,"outV":36,"properties":{"weight":3}},{"id":1608,"outV":18,"properties":{"weight":1}},{"id":2472,"outV":68,"properties":{"weight":2}},{"id":3497,"outV":58,"properties":{"weight":1}},{"id":1226,"outV":26,"properties":{"weight":1}},{"id":4684,"outV":33,"properties":{"weight":1}},{"id":909,"outV":174,"properties":{"weight":1}},{"id":6254,"outV":117,"properties":{"weight":1}},{"id":4048,"outV":173,"properties":{"weight":1}},{"id":5489,"outV":79,"properties":{"weight":1}},{"id":4854,"outV":35,"properties":{"weight":3}},{"id":345,"outV":34,"properties":{"weight":1}},{"id":3389,"outV":177,"properties":{"weight":1}},{"id":5181,"outV":71,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6978,"inV":19,"properties":{"weight":2}},{"id":6979,"inV":96,"properties":{"weight":7}},{"id":6980,"inV":62,"properties":{"weight":1}},{"id":6981,"inV":21,"properties":{"weight":5}},{"id":6982,"inV":103,"properties":{"weight":1}},{"id":6983,"inV":74,"properties":{"weight":1}},{"id":6984,"inV":13,"properties":{"weight":1}},{"id":6985,"inV":12,"properties":{"weight":1}},{"id":6986,"inV":26,"properties":{"weight":2}},{"id":6987,"inV":113,"properties":{"weight":1}},{"id":6988,"inV":139,"properties":{"weight":3}},{"id":6989,"inV":319,"properties":{"weight":1}},{"id":6990,"inV":34,"properties":{"weight":1}},{"id":6991,"inV":35,"properties":{"weight":1}},{"id":6992,"inV":85,"properties":{"weight":1}},{"id":6993,"inV":14,"properties":{"weight":1}}],"sungBy":[{"id":7272,"inV":340}],"writtenBy":[{"id":7271,"inV":339}]},"properties":{"name":[{"id":522,"value":"NEW SPEEDWAY BOOGIE"}],"songType":[{"id":524,"value":"original"}],"performances":[{"id":523,"value":55}]}}
-{"id":176,"label":"song","inE":{"followedBy":[{"id":2658,"outV":137,"properties":{"weight":1}},{"id":2486,"outV":68,"properties":{"weight":1}},{"id":4744,"outV":186,"properties":{"weight":1}},{"id":1225,"outV":26,"properties":{"weight":1}},{"id":346,"outV":34,"properties":{"weight":1}},{"id":1450,"outV":83,"properties":{"weight":1}},{"id":6138,"outV":72,"properties":{"weight":2}},{"id":4763,"outV":37,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1001,"inV":35,"properties":{"weight":1}},{"id":1002,"inV":82,"properties":{"weight":1}},{"id":1003,"inV":215,"properties":{"weight":1}},{"id":1004,"inV":41,"properties":{"weight":1}},{"id":1005,"inV":83,"properties":{"weight":2}},{"id":1006,"inV":37,"properties":{"weight":2}},{"id":1007,"inV":153,"properties":{"weight":1}}],"sungBy":[{"id":7382,"inV":354}],"writtenBy":[{"id":7381,"inV":401}]},"properties":{"name":[{"id":525,"value":"UNBROKEN CHAIN"}],"songType":[{"id":527,"value":"original"}],"performances":[{"id":526,"value":10}]}}
-{"id":177,"label":"song","inE":{"followedBy":[{"id":1489,"outV":81,"properties":{"weight":1}},{"id":1224,"outV":26,"properties":{"weight":1}},{"id":347,"outV":34,"properties":{"weight":1}},{"id":6139,"outV":72,"properties":{"weight":1}},{"id":6523,"outV":187,"properties":{"weight":1}},{"id":3215,"outV":229,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3386,"inV":13,"properties":{"weight":2}},{"id":3387,"inV":60,"properties":{"weight":1}},{"id":3388,"inV":41,"properties":{"weight":1}},{"id":3389,"inV":175,"properties":{"weight":1}},{"id":3390,"inV":36,"properties":{"weight":1}}],"sungBy":[{"id":7690,"inV":415}],"writtenBy":[{"id":7689,"inV":592}]},"properties":{"name":[{"id":528,"value":"ITS ALL TOO MUCH"}],"songType":[{"id":530,"value":"cover"}],"performances":[{"id":529,"value":6}]}}
-{"id":178,"label":"song","inE":{"followedBy":[{"id":5688,"outV":159,"properties":{"weight":1}},{"id":2713,"outV":13,"properties":{"weight":1}},{"id":5869,"outV":96,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":352,"inV":179,"properties":{"weight":1}},{"id":348,"inV":96,"properties":{"weight":1}},{"id":349,"inV":159,"properties":{"weight":2}},{"id":350,"inV":25,"properties":{"weight":1}},{"id":351,"inV":3,"properties":{"weight":1}}]},"properties":{"name":[{"id":531,"value":"STRONGER THAN DIRT"}],"songType":[{"id":533,"value":""}],"performances":[{"id":532,"value":0}]}}
-{"id":179,"label":"song","inE":{"followedBy":[{"id":352,"outV":178,"properties":{"weight":1}},{"id":4307,"outV":110,"properties":{"weight":3}},{"id":5783,"outV":76,"properties":{"weight":1}},{"id":1976,"outV":148,"properties":{"weight":1}},{"id":2857,"outV":101,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2400,"inV":82,"properties":{"weight":1}},{"id":2401,"inV":130,"properties":{"weight":1}},{"id":2395,"inV":215,"properties":{"weight":1}},{"id":2396,"inV":25,"properties":{"weight":1}},{"id":2397,"inV":3,"properties":{"weight":1}},{"id":2398,"inV":101,"properties":{"weight":1}},{"id":2399,"inV":76,"properties":{"weight":1}}]},"properties":{"name":[{"id":534,"value":"COSMIC CHARLIE"}],"songType":[{"id":536,"value":""}],"performances":[{"id":535,"value":0}]}}
-{"id":180,"label":"song","inE":{"followedBy":[{"id":1600,"outV":18,"properties":{"weight":2}},{"id":803,"outV":122,"properties":{"weight":1}},{"id":581,"outV":120,"properties":{"weight":1}},{"id":741,"outV":80,"properties":{"weight":1}},{"id":2437,"outV":68,"properties":{"weight":3}},{"id":5990,"outV":50,"properties":{"weight":1}},{"id":4810,"outV":114,"properties":{"weight":1}},{"id":3283,"outV":160,"properties":{"weight":1}},{"id":6837,"outV":64,"properties":{"weight":1}},{"id":5718,"outV":20,"properties":{"weight":1}},{"id":4089,"outV":109,"properties":{"weight":1}},{"id":379,"outV":74,"properties":{"weight":1}},{"id":2811,"outV":15,"properties":{"weight":2}},{"id":5563,"outV":162,"properties":{"weight":1}},{"id":3804,"outV":88,"properties":{"weight":1}},{"id":5054,"outV":209,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2025,"inV":197,"properties":{"weight":2}},{"id":2026,"inV":222,"properties":{"weight":1}},{"id":2027,"inV":20,"properties":{"weight":3}},{"id":2028,"inV":198,"properties":{"weight":2}},{"id":2029,"inV":18,"properties":{"weight":1}},{"id":2030,"inV":14,"properties":{"weight":2}},{"id":2031,"inV":12,"properties":{"weight":1}},{"id":2032,"inV":104,"properties":{"weight":1}},{"id":2033,"inV":70,"properties":{"weight":1}},{"id":2034,"inV":68,"properties":{"weight":3}},{"id":2035,"inV":10,"properties":{"weight":1}},{"id":2036,"inV":88,"properties":{"weight":1}},{"id":2037,"inV":97,"properties":{"weight":1}}],"sungBy":[{"id":7528,"inV":340}],"writtenBy":[{"id":7527,"inV":446}]},"properties":{"name":[{"id":537,"value":"DEEP ELEM BLUES"}],"songType":[{"id":539,"value":"cover"}],"performances":[{"id":538,"value":45}]}}
-{"id":181,"label":"song","inE":{"followedBy":[{"id":384,"outV":74,"properties":{"weight":1}},{"id":1281,"outV":27,"properties":{"weight":4}},{"id":6211,"outV":319,"properties":{"weight":1}},{"id":5892,"outV":96,"properties":{"weight":8}},{"id":3462,"outV":58,"properties":{"weight":1}},{"id":5318,"outV":170,"properties":{"weight":2}},{"id":3911,"outV":51,"properties":{"weight":1}},{"id":2443,"outV":68,"properties":{"weight":1}},{"id":3851,"outV":60,"properties":{"weight":2}},{"id":4429,"outV":299,"properties":{"weight":2}},{"id":6478,"outV":187,"properties":{"weight":9}},{"id":6095,"outV":72,"properties":{"weight":5}},{"id":1424,"outV":83,"properties":{"weight":2}},{"id":6744,"outV":53,"properties":{"weight":1}},{"id":5401,"outV":69,"properties":{"weight":8}},{"id":861,"outV":189,"properties":{"weight":2}},{"id":4125,"outV":48,"properties":{"weight":1}},{"id":1118,"outV":59,"properties":{"weight":3}},{"id":3230,"outV":63,"properties":{"weight":4}},{"id":927,"outV":91,"properties":{"weight":3}},{"id":4195,"outV":54,"properties":{"weight":2}},{"id":4645,"outV":154,"properties":{"weight":8}},{"id":742,"outV":80,"properties":{"weight":1}},{"id":5095,"outV":4,"properties":{"weight":2}},{"id":6952,"outV":84,"properties":{"weight":7}},{"id":6570,"outV":116,"properties":{"weight":3}},{"id":2349,"outV":87,"properties":{"weight":1}},{"id":4525,"outV":105,"properties":{"weight":1}},{"id":4909,"outV":100,"properties":{"weight":4}},{"id":6702,"outV":141,"properties":{"weight":3}},{"id":3183,"outV":104,"properties":{"weight":1}},{"id":1010,"outV":73,"properties":{"weight":26}},{"id":2933,"outV":78,"properties":{"weight":3}},{"id":3960,"outV":106,"properties":{"weight":3}},{"id":505,"outV":98,"properties":{"weight":4}},{"id":4345,"outV":62,"properties":{"weight":4}},{"id":2554,"outV":57,"properties":{"weight":1}},{"id":830,"outV":171,"properties":{"weight":10}}]},"outE":{"followedBy":[{"id":6562,"inV":36,"properties":{"weight":140}},{"id":6563,"inV":72,"properties":{"weight":1}},{"id":6564,"inV":57,"properties":{"weight":2}},{"id":6565,"inV":73,"properties":{"weight":1}},{"id":6566,"inV":96,"properties":{"weight":1}}],"sungBy":[{"id":7238,"inV":351}],"writtenBy":[{"id":7237,"inV":350}]},"properties":{"name":[{"id":540,"value":"LOST SAILOR"}],"songType":[{"id":542,"value":"original"}],"performances":[{"id":541,"value":145}]}}
-{"id":182,"label":"song","inE":{"followedBy":[{"id":388,"outV":74,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":607,"inV":96,"properties":{"weight":1}}],"sungBy":[{"id":7278,"inV":352}],"writtenBy":[{"id":7277,"inV":352}]},"properties":{"name":[{"id":543,"value":"ONLY A FOOL"}],"songType":[{"id":545,"value":"original"}],"performances":[{"id":544,"value":1}]}}
-{"id":183,"label":"song","inE":{"followedBy":[{"id":2737,"outV":13,"properties":{"weight":3}},{"id":930,"outV":91,"properties":{"weight":4}},{"id":389,"outV":74,"properties":{"weight":1}},{"id":1430,"outV":83,"properties":{"weight":1}},{"id":5910,"outV":96,"properties":{"weight":1}},{"id":6295,"outV":49,"properties":{"weight":2}},{"id":1322,"outV":31,"properties":{"weight":1}},{"id":5754,"outV":129,"properties":{"weight":1}},{"id":1740,"outV":82,"properties":{"weight":1}},{"id":6173,"outV":36,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1238,"inV":74,"properties":{"weight":1}},{"id":1239,"inV":96,"properties":{"weight":14}},{"id":1240,"inV":21,"properties":{"weight":1}}],"sungBy":[{"id":7132,"inV":352}],"writtenBy":[{"id":7131,"inV":352}]},"properties":{"name":[{"id":546,"value":"DONT NEED LOVE"}],"songType":[{"id":548,"value":"original"}],"performances":[{"id":547,"value":16}]}}
-{"id":184,"label":"song","inE":{"followedBy":[{"id":1284,"outV":27,"properties":{"weight":1}},{"id":5412,"outV":69,"properties":{"weight":1}},{"id":6756,"outV":53,"properties":{"weight":1}},{"id":390,"outV":74,"properties":{"weight":1}},{"id":4614,"outV":85,"properties":{"weight":1}},{"id":6762,"outV":121,"properties":{"weight":111}},{"id":5164,"outV":71,"properties":{"weight":1}},{"id":3182,"outV":104,"properties":{"weight":1}},{"id":3477,"outV":58,"properties":{"weight":1}},{"id":3861,"outV":60,"properties":{"weight":1}},{"id":3512,"outV":223,"properties":{"weight":2}},{"id":4568,"outV":254,"properties":{"weight":1}},{"id":2714,"outV":13,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3346,"inV":59,"properties":{"weight":4}},{"id":3347,"inV":51,"properties":{"weight":2}},{"id":3348,"inV":100,"properties":{"weight":7}},{"id":3349,"inV":63,"properties":{"weight":5}},{"id":3350,"inV":54,"properties":{"weight":2}},{"id":3351,"inV":104,"properties":{"weight":3}},{"id":3352,"inV":48,"properties":{"weight":3}},{"id":3353,"inV":103,"properties":{"weight":2}},{"id":3354,"inV":294,"properties":{"weight":1}},{"id":3355,"inV":57,"properties":{"weight":21}},{"id":3356,"inV":101,"properties":{"weight":4}},{"id":3357,"inV":99,"properties":{"weight":11}},{"id":3358,"inV":60,"properties":{"weight":1}},{"id":3359,"inV":13,"properties":{"weight":3}},{"id":3360,"inV":110,"properties":{"weight":1}},{"id":3361,"inV":98,"properties":{"weight":3}},{"id":3362,"inV":82,"properties":{"weight":6}},{"id":3363,"inV":153,"properties":{"weight":1}},{"id":3364,"inV":69,"properties":{"weight":1}},{"id":3365,"inV":109,"properties":{"weight":1}},{"id":3366,"inV":27,"properties":{"weight":2}},{"id":3367,"inV":4,"properties":{"weight":6}},{"id":3368,"inV":91,"properties":{"weight":1}},{"id":3369,"inV":76,"properties":{"weight":4}},{"id":3370,"inV":154,"properties":{"weight":1}},{"id":3371,"inV":123,"properties":{"weight":1}},{"id":3372,"inV":84,"properties":{"weight":3}},{"id":3373,"inV":120,"properties":{"weight":1}},{"id":3374,"inV":70,"properties":{"weight":1}},{"id":3375,"inV":73,"properties":{"weight":5}},{"id":3376,"inV":56,"properties":{"weight":2}},{"id":3377,"inV":106,"properties":{"weight":4}},{"id":3378,"inV":85,"properties":{"weight":1}},{"id":3379,"inV":72,"properties":{"weight":3}},{"id":3380,"inV":58,"properties":{"weight":2}},{"id":3381,"inV":96,"properties":{"weight":1}},{"id":3382,"inV":97,"properties":{"weight":1}},{"id":3383,"inV":26,"properties":{"weight":1}},{"id":3384,"inV":74,"properties":{"weight":1}},{"id":3385,"inV":105,"properties":{"weight":1}}],"sungBy":[{"id":7352,"inV":351}],"writtenBy":[{"id":7351,"inV":350}]},"properties":{"name":[{"id":549,"value":"SUPPLICATION"}],"songType":[{"id":551,"value":"original"}],"performances":[{"id":550,"value":113}]}}
-{"id":185,"label":"song","inE":{"followedBy":[{"id":400,"outV":74,"properties":{"weight":1}},{"id":3765,"outV":3,"properties":{"weight":2}},{"id":4838,"outV":114,"properties":{"weight":2}},{"id":1527,"outV":164,"properties":{"weight":1}},{"id":3129,"outV":153,"properties":{"weight":1}},{"id":2333,"outV":25,"properties":{"weight":1}},{"id":6637,"outV":127,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":4023,"inV":275,"properties":{"weight":12}}],"sungBy":[{"id":7442,"inV":415}],"writtenBy":[{"id":7441,"inV":459}]},"properties":{"name":[{"id":552,"value":"BABA ORILEY"}],"songType":[{"id":554,"value":"cover"}],"performances":[{"id":553,"value":12}]}}
-{"id":186,"label":"song","inE":{"followedBy":[{"id":401,"outV":74,"properties":{"weight":1}},{"id":3138,"outV":304,"properties":{"weight":1}},{"id":5928,"outV":96,"properties":{"weight":324}},{"id":1833,"outV":41,"properties":{"weight":2}},{"id":1978,"outV":279,"properties":{"weight":1}},{"id":940,"outV":91,"properties":{"weight":2}},{"id":6303,"outV":49,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":4736,"inV":158,"properties":{"weight":8}},{"id":4737,"inV":130,"properties":{"weight":3}},{"id":4738,"inV":35,"properties":{"weight":3}},{"id":4739,"inV":92,"properties":{"weight":1}},{"id":4740,"inV":164,"properties":{"weight":1}},{"id":4741,"inV":258,"properties":{"weight":2}},{"id":4742,"inV":74,"properties":{"weight":1}},{"id":4743,"inV":66,"properties":{"weight":3}},{"id":4744,"inV":176,"properties":{"weight":1}},{"id":4712,"inV":134,"properties":{"weight":45}},{"id":4713,"inV":165,"properties":{"weight":31}},{"id":4714,"inV":148,"properties":{"weight":55}},{"id":4715,"inV":89,"properties":{"weight":6}},{"id":4716,"inV":70,"properties":{"weight":58}},{"id":4717,"inV":201,"properties":{"weight":58}},{"id":4718,"inV":5,"properties":{"weight":6}},{"id":4719,"inV":129,"properties":{"weight":6}},{"id":4720,"inV":46,"properties":{"weight":4}},{"id":4721,"inV":13,"properties":{"weight":4}},{"id":4722,"inV":94,"properties":{"weight":3}},{"id":4723,"inV":141,"properties":{"weight":1}},{"id":4724,"inV":127,"properties":{"weight":1}},{"id":4725,"inV":81,"properties":{"weight":1}},{"id":4726,"inV":139,"properties":{"weight":1}},{"id":4727,"inV":172,"properties":{"weight":2}},{"id":4728,"inV":29,"properties":{"weight":1}},{"id":4729,"inV":149,"properties":{"weight":6}},{"id":4730,"inV":140,"properties":{"weight":3}},{"id":4731,"inV":33,"properties":{"weight":1}},{"id":4732,"inV":122,"properties":{"weight":1}},{"id":4733,"inV":138,"properties":{"weight":8}},{"id":4734,"inV":41,"properties":{"weight":4}},{"id":4735,"inV":28,"properties":{"weight":4}}]},"properties":{"name":[{"id":555,"value":"SPACE"}],"songType":[{"id":557,"value":""}],"performances":[{"id":556,"value":0}]}}
-{"id":187,"label":"song","inE":{"followedBy":[{"id":3139,"outV":19,"properties":{"weight":402}},{"id":437,"outV":38,"properties":{"weight":1}},{"id":2007,"outV":149,"properties":{"weight":1}},{"id":3868,"outV":60,"properties":{"weight":1}},{"id":2750,"outV":13,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6441,"inV":120,"properties":{"weight":1}},{"id":6442,"inV":11,"properties":{"weight":7}},{"id":6443,"inV":13,"properties":{"weight":47}},{"id":6444,"inV":10,"properties":{"weight":9}},{"id":6445,"inV":47,"properties":{"weight":1}},{"id":6446,"inV":24,"properties":{"weight":5}},{"id":6447,"inV":46,"properties":{"weight":5}},{"id":6448,"inV":3,"properties":{"weight":3}},{"id":6449,"inV":25,"properties":{"weight":16}},{"id":6450,"inV":21,"properties":{"weight":8}},{"id":6451,"inV":22,"properties":{"weight":2}},{"id":6452,"inV":50,"properties":{"weight":10}},{"id":6453,"inV":152,"properties":{"weight":2}},{"id":6454,"inV":252,"properties":{"weight":1}},{"id":6455,"inV":12,"properties":{"weight":12}},{"id":6456,"inV":18,"properties":{"weight":8}},{"id":6457,"inV":234,"properties":{"weight":1}},{"id":6458,"inV":153,"properties":{"weight":2}},{"id":6459,"inV":104,"properties":{"weight":1}},{"id":6460,"inV":15,"properties":{"weight":10}},{"id":6461,"inV":23,"properties":{"weight":2}},{"id":6462,"inV":26,"properties":{"weight":4}},{"id":6463,"inV":14,"properties":{"weight":26}},{"id":6464,"inV":55,"properties":{"weight":1}},{"id":6465,"inV":49,"properties":{"weight":9}},{"id":6466,"inV":94,"properties":{"weight":1}},{"id":6467,"inV":16,"properties":{"weight":1}},{"id":6468,"inV":56,"properties":{"weight":1}},{"id":6469,"inV":129,"properties":{"weight":1}},{"id":6470,"inV":76,"properties":{"weight":32}},{"id":6471,"inV":68,"properties":{"weight":2}},{"id":6472,"inV":112,"properties":{"weight":1}},{"id":6473,"inV":42,"properties":{"weight":2}},{"id":6474,"inV":84,"properties":{"weight":5}},{"id":6475,"inV":83,"properties":{"weight":1}},{"id":6476,"inV":208,"properties":{"weight":2}},{"id":6477,"inV":32,"properties":{"weight":3}},{"id":6478,"inV":181,"properties":{"weight":9}},{"id":6479,"inV":189,"properties":{"weight":1}},{"id":6480,"inV":101,"properties":{"weight":1}},{"id":6481,"inV":38,"properties":{"weight":9}},{"id":6482,"inV":96,"properties":{"weight":7}},{"id":6483,"inV":82,"properties":{"weight":6}},{"id":6484,"inV":85,"properties":{"weight":34}},{"id":6485,"inV":91,"properties":{"weight":5}},{"id":6486,"inV":106,"properties":{"weight":3}},{"id":6487,"inV":69,"properties":{"weight":16}},{"id":6488,"inV":63,"properties":{"weight":1}},{"id":6489,"inV":73,"properties":{"weight":1}},{"id":6490,"inV":4,"properties":{"weight":1}},{"id":6491,"inV":65,"properties":{"weight":1}},{"id":6492,"inV":78,"properties":{"weight":1}},{"id":6493,"inV":87,"properties":{"weight":4}},{"id":6494,"inV":170,"properties":{"weight":1}},{"id":6495,"inV":116,"properties":{"weight":1}},{"id":6496,"inV":210,"properties":{"weight":1}},{"id":6497,"inV":59,"properties":{"weight":1}},{"id":6498,"inV":70,"properties":{"weight":2}},{"id":6499,"inV":74,"properties":{"weight":1}},{"id":6500,"inV":97,"properties":{"weight":1}},{"id":6501,"inV":215,"properties":{"weight":1}},{"id":6502,"inV":39,"properties":{"weight":2}},{"id":6503,"inV":64,"properties":{"weight":1}},{"id":6504,"inV":36,"properties":{"weight":8}},{"id":6505,"inV":67,"properties":{"weight":1}},{"id":6506,"inV":62,"properties":{"weight":1}},{"id":6507,"inV":150,"properties":{"weight":1}},{"id":6508,"inV":60,"properties":{"weight":3}},{"id":6509,"inV":257,"properties":{"weight":1}},{"id":6510,"inV":114,"properties":{"weight":1}},{"id":6511,"inV":115,"properties":{"weight":1}},{"id":6512,"inV":92,"properties":{"weight":2}},{"id":6513,"inV":90,"properties":{"weight":1}},{"id":6514,"inV":167,"properties":{"weight":1}},{"id":6515,"inV":118,"properties":{"weight":1}},{"id":6516,"inV":169,"properties":{"weight":1}},{"id":6517,"inV":31,"properties":{"weight":1}},{"id":6518,"inV":28,"properties":{"weight":8}},{"id":6519,"inV":229,"properties":{"weight":5}},{"id":6520,"inV":34,"properties":{"weight":2}},{"id":6521,"inV":35,"properties":{"weight":5}},{"id":6522,"inV":37,"properties":{"weight":4}},{"id":6523,"inV":177,"properties":{"weight":1}}],"sungBy":[{"id":7646,"inV":453}],"writtenBy":[{"id":7645,"inV":446}]},"properties":{"name":[{"id":558,"value":"I KNOW YOU RIDER"}],"songType":[{"id":560,"value":"cover"}],"performances":[{"id":559,"value":550}]}}
-{"id":188,"label":"song","inE":{"followedBy":[{"id":4544,"outV":105,"properties":{"weight":10}},{"id":2754,"outV":297,"properties":{"weight":1}},{"id":515,"outV":98,"properties":{"weight":4}},{"id":4035,"outV":173,"properties":{"weight":3}},{"id":3398,"outV":77,"properties":{"weight":1}},{"id":2823,"outV":15,"properties":{"weight":1}},{"id":3783,"outV":168,"properties":{"weight":2}},{"id":2632,"outV":137,"properties":{"weight":1}},{"id":4491,"outV":202,"properties":{"weight":2}},{"id":6923,"outV":270,"properties":{"weight":1}},{"id":4943,"outV":86,"properties":{"weight":1}},{"id":1300,"outV":27,"properties":{"weight":4}},{"id":3604,"outV":56,"properties":{"weight":3}},{"id":5012,"outV":30,"properties":{"weight":4}},{"id":3925,"outV":51,"properties":{"weight":3}},{"id":2136,"outV":17,"properties":{"weight":2}},{"id":3993,"outV":106,"properties":{"weight":3}},{"id":5657,"outV":169,"properties":{"weight":1}},{"id":2970,"outV":78,"properties":{"weight":1}},{"id":2907,"outV":118,"properties":{"weight":3}},{"id":670,"outV":23,"properties":{"weight":2}},{"id":1055,"outV":73,"properties":{"weight":6}},{"id":4132,"outV":48,"properties":{"weight":9}},{"id":3686,"outV":24,"properties":{"weight":2}},{"id":2218,"outV":75,"properties":{"weight":4}},{"id":2155,"outV":151,"properties":{"weight":1}},{"id":5292,"outV":32,"properties":{"weight":2}},{"id":1325,"outV":31,"properties":{"weight":6}},{"id":3501,"outV":192,"properties":{"weight":3}},{"id":3246,"outV":63,"properties":{"weight":1}},{"id":4207,"outV":54,"properties":{"weight":4}},{"id":5679,"outV":167,"properties":{"weight":1}},{"id":4400,"outV":40,"properties":{"weight":2}},{"id":753,"outV":80,"properties":{"weight":7}},{"id":883,"outV":189,"properties":{"weight":2}},{"id":3187,"outV":104,"properties":{"weight":9}},{"id":3827,"outV":88,"properties":{"weight":4}},{"id":1398,"outV":190,"properties":{"weight":4}},{"id":6390,"outV":65,"properties":{"weight":1}},{"id":4407,"outV":271,"properties":{"weight":2}},{"id":4664,"outV":154,"properties":{"weight":1}},{"id":443,"outV":38,"properties":{"weight":1}},{"id":5501,"outV":131,"properties":{"weight":1}},{"id":4926,"outV":100,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":2064,"inV":284,"properties":{"weight":1}},{"id":2065,"inV":271,"properties":{"weight":2}},{"id":2066,"inV":269,"properties":{"weight":1}},{"id":2067,"inV":77,"properties":{"weight":1}},{"id":2068,"inV":54,"properties":{"weight":14}},{"id":2069,"inV":51,"properties":{"weight":5}},{"id":2070,"inV":105,"properties":{"weight":3}},{"id":2071,"inV":58,"properties":{"weight":15}},{"id":2072,"inV":170,"properties":{"weight":2}},{"id":2073,"inV":152,"properties":{"weight":1}},{"id":2074,"inV":56,"properties":{"weight":9}},{"id":2075,"inV":53,"properties":{"weight":1}},{"id":2076,"inV":72,"properties":{"weight":3}},{"id":2077,"inV":75,"properties":{"weight":2}},{"id":2078,"inV":80,"properties":{"weight":2}},{"id":2079,"inV":73,"properties":{"weight":4}},{"id":2080,"inV":27,"properties":{"weight":12}},{"id":2081,"inV":118,"properties":{"weight":3}},{"id":2082,"inV":169,"properties":{"weight":2}},{"id":2083,"inV":100,"properties":{"weight":4}},{"id":2084,"inV":48,"properties":{"weight":3}},{"id":2085,"inV":167,"properties":{"weight":1}},{"id":2086,"inV":19,"properties":{"weight":1}},{"id":2087,"inV":78,"properties":{"weight":1}},{"id":2088,"inV":68,"properties":{"weight":2}},{"id":2089,"inV":62,"properties":{"weight":2}},{"id":2090,"inV":57,"properties":{"weight":4}},{"id":2091,"inV":202,"properties":{"weight":8}},{"id":2092,"inV":201,"properties":{"weight":1}},{"id":2093,"inV":189,"properties":{"weight":1}},{"id":2094,"inV":63,"properties":{"weight":2}},{"id":2095,"inV":285,"properties":{"weight":1}},{"id":2096,"inV":124,"properties":{"weight":1}},{"id":2097,"inV":103,"properties":{"weight":1}},{"id":2098,"inV":137,"properties":{"weight":2}},{"id":2099,"inV":98,"properties":{"weight":2}},{"id":2100,"inV":254,"properties":{"weight":2}},{"id":2101,"inV":173,"properties":{"weight":6}},{"id":2102,"inV":190,"properties":{"weight":1}}]},"properties":{"name":[{"id":561,"value":"QUEEN JANE"}],"songType":[{"id":563,"value":""}],"performances":[{"id":562,"value":0}]}}
-{"id":189,"label":"song","inE":{"followedBy":[{"id":2435,"outV":68,"properties":{"weight":1}},{"id":6087,"outV":72,"properties":{"weight":1}},{"id":6479,"outV":187,"properties":{"weight":1}},{"id":3025,"outV":14,"properties":{"weight":3}},{"id":5265,"outV":32,"properties":{"weight":4}},{"id":6737,"outV":53,"properties":{"weight":1}},{"id":4119,"outV":48,"properties":{"weight":2}},{"id":5591,"outV":42,"properties":{"weight":2}},{"id":5016,"outV":30,"properties":{"weight":1}},{"id":3228,"outV":63,"properties":{"weight":1}},{"id":733,"outV":80,"properties":{"weight":1}},{"id":3166,"outV":104,"properties":{"weight":1}},{"id":4194,"outV":54,"properties":{"weight":2}},{"id":4908,"outV":100,"properties":{"weight":1}},{"id":2093,"outV":188,"properties":{"weight":1}},{"id":5805,"outV":76,"properties":{"weight":1}},{"id":4526,"outV":105,"properties":{"weight":1}},{"id":1138,"outV":59,"properties":{"weight":2}},{"id":1011,"outV":73,"properties":{"weight":9}},{"id":2931,"outV":78,"properties":{"weight":1}},{"id":3831,"outV":88,"properties":{"weight":1}},{"id":4091,"outV":109,"properties":{"weight":1}},{"id":444,"outV":38,"properties":{"weight":2}},{"id":1596,"outV":18,"properties":{"weight":2}},{"id":3580,"outV":56,"properties":{"weight":1}},{"id":831,"outV":171,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":864,"inV":14,"properties":{"weight":2}},{"id":865,"inV":73,"properties":{"weight":9}},{"id":866,"inV":18,"properties":{"weight":1}},{"id":867,"inV":100,"properties":{"weight":3}},{"id":868,"inV":83,"properties":{"weight":1}},{"id":869,"inV":50,"properties":{"weight":1}},{"id":870,"inV":101,"properties":{"weight":2}},{"id":871,"inV":42,"properties":{"weight":1}},{"id":872,"inV":91,"properties":{"weight":1}},{"id":873,"inV":109,"properties":{"weight":1}},{"id":874,"inV":27,"properties":{"weight":1}},{"id":875,"inV":53,"properties":{"weight":2}},{"id":876,"inV":103,"properties":{"weight":1}},{"id":877,"inV":38,"properties":{"weight":1}},{"id":878,"inV":84,"properties":{"weight":1}},{"id":879,"inV":30,"properties":{"weight":1}},{"id":880,"inV":10,"properties":{"weight":1}},{"id":881,"inV":63,"properties":{"weight":1}},{"id":882,"inV":117,"properties":{"weight":2}},{"id":883,"inV":188,"properties":{"weight":2}},{"id":884,"inV":71,"properties":{"weight":1}},{"id":861,"inV":181,"properties":{"weight":2}},{"id":862,"inV":32,"properties":{"weight":6}},{"id":863,"inV":26,"properties":{"weight":1}}],"sungBy":[{"id":7144,"inV":352}],"writtenBy":[{"id":7143,"inV":350}]},"properties":{"name":[{"id":564,"value":"EASY TO LOVE YOU"}],"songType":[{"id":566,"value":"original"}],"performances":[{"id":565,"value":45}]}}
-{"id":190,"label":"song","inE":{"followedBy":[{"id":450,"outV":38,"properties":{"weight":1}},{"id":6882,"outV":64,"properties":{"weight":1}},{"id":4581,"outV":254,"properties":{"weight":1}},{"id":2102,"outV":188,"properties":{"weight":1}},{"id":2502,"outV":90,"properties":{"weight":1}},{"id":4406,"outV":40,"properties":{"weight":1}},{"id":680,"outV":23,"properties":{"weight":3}},{"id":6009,"outV":50,"properties":{"weight":2}},{"id":2827,"outV":15,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1396,"inV":11,"properties":{"weight":1}},{"id":1397,"inV":43,"properties":{"weight":2}},{"id":1398,"inV":188,"properties":{"weight":4}},{"id":1399,"inV":117,"properties":{"weight":1}},{"id":1400,"inV":51,"properties":{"weight":1}},{"id":1401,"inV":18,"properties":{"weight":2}},{"id":1402,"inV":88,"properties":{"weight":1}}]},"properties":{"name":[{"id":567,"value":"WEST LA FADEAWAY"}],"songType":[{"id":569,"value":""}],"performances":[{"id":568,"value":0}]}}
-{"id":191,"label":"song","inE":{"followedBy":[{"id":4688,"outV":33,"properties":{"weight":1}},{"id":451,"outV":38,"properties":{"weight":1}},{"id":678,"outV":23,"properties":{"weight":1}},{"id":5019,"outV":30,"properties":{"weight":1}},{"id":6879,"outV":64,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4018,"inV":71,"properties":{"weight":1}},{"id":4019,"inV":31,"properties":{"weight":1}},{"id":4020,"inV":11,"properties":{"weight":1}},{"id":4021,"inV":40,"properties":{"weight":1}},{"id":4022,"inV":88,"properties":{"weight":1}}]},"properties":{"name":[{"id":570,"value":"JACK A ROE"}],"songType":[{"id":572,"value":""}],"performances":[{"id":571,"value":0}]}}
-{"id":192,"label":"song","inE":{"followedBy":[{"id":452,"outV":38,"properties":{"weight":1}},{"id":1348,"outV":31,"properties":{"weight":2}},{"id":679,"outV":23,"properties":{"weight":1}},{"id":5483,"outV":79,"properties":{"weight":1}},{"id":4399,"outV":40,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":3504,"inV":43,"properties":{"weight":1}},{"id":3505,"inV":254,"properties":{"weight":1}},{"id":3506,"inV":31,"properties":{"weight":1}},{"id":3501,"inV":188,"properties":{"weight":3}},{"id":3502,"inV":40,"properties":{"weight":2}},{"id":3503,"inV":115,"properties":{"weight":1}}]},"properties":{"name":[{"id":573,"value":"PEGGY O"}],"songType":[{"id":575,"value":""}],"performances":[{"id":574,"value":0}]}}
-{"id":193,"label":"song","inE":{"followedBy":[{"id":1077,"outV":227,"properties":{"weight":1}},{"id":3769,"outV":3,"properties":{"weight":1}},{"id":3132,"outV":153,"properties":{"weight":1}},{"id":605,"outV":120,"properties":{"weight":1}},{"id":6638,"outV":127,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":464,"inV":84,"properties":{"weight":1}},{"id":465,"inV":78,"properties":{"weight":1}},{"id":466,"inV":87,"properties":{"weight":1}},{"id":463,"inV":64,"properties":{"weight":2}}],"sungBy":[{"id":7380,"inV":340}],"writtenBy":[{"id":7379,"inV":339}]},"properties":{"name":[{"id":576,"value":"US BLUES"}],"songType":[{"id":578,"value":"original"}],"performances":[{"id":577,"value":323}]}}
-{"id":194,"label":"song","inE":{"followedBy":[{"id":5841,"outV":326,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":467,"inV":21,"properties":{"weight":1}}],"sungBy":[{"id":7850,"inV":462}],"writtenBy":[{"id":7849,"inV":462}]},"properties":{"name":[{"id":579,"value":"PROUD MARY"}],"songType":[{"id":581,"value":"cover"}],"performances":[{"id":580,"value":1}]}}
-{"id":195,"label":"song","inE":{"followedBy":[{"id":1413,"outV":83,"properties":{"weight":1}},{"id":3895,"outV":51,"properties":{"weight":1}},{"id":794,"outV":122,"properties":{"weight":1}},{"id":2701,"outV":13,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":468,"inV":16,"properties":{"weight":3}},{"id":469,"inV":25,"properties":{"weight":1}},{"id":470,"inV":21,"properties":{"weight":1}}],"sungBy":[{"id":7224,"inV":391}],"writtenBy":[{"id":7223,"inV":339}]},"properties":{"name":[{"id":582,"value":"LET ME SING YOUR BLUES AWAY"}],"songType":[{"id":584,"value":"original"}],"performances":[{"id":583,"value":6}]}}
-{"id":196,"label":"song","inE":{"followedBy":[{"id":4071,"outV":109,"properties":{"weight":2}},{"id":2600,"outV":112,"properties":{"weight":1}},{"id":1579,"outV":18,"properties":{"weight":1}},{"id":496,"outV":98,"properties":{"weight":2}},{"id":2800,"outV":15,"properties":{"weight":3}},{"id":5584,"outV":42,"properties":{"weight":1}},{"id":4113,"outV":48,"properties":{"weight":2}},{"id":3158,"outV":104,"properties":{"weight":2}},{"id":4598,"outV":85,"properties":{"weight":1}},{"id":5974,"outV":50,"properties":{"weight":1}},{"id":825,"outV":171,"properties":{"weight":1}},{"id":4187,"outV":54,"properties":{"weight":1}},{"id":5788,"outV":76,"properties":{"weight":5}},{"id":2430,"outV":68,"properties":{"weight":3}},{"id":543,"outV":120,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":1792,"inV":91,"properties":{"weight":6}},{"id":1793,"inV":80,"properties":{"weight":1}},{"id":1794,"inV":100,"properties":{"weight":2}},{"id":1795,"inV":109,"properties":{"weight":2}},{"id":1796,"inV":27,"properties":{"weight":1}},{"id":1797,"inV":82,"properties":{"weight":3}},{"id":1798,"inV":32,"properties":{"weight":1}},{"id":1799,"inV":13,"properties":{"weight":2}},{"id":1800,"inV":76,"properties":{"weight":1}},{"id":1801,"inV":85,"properties":{"weight":1}},{"id":1802,"inV":103,"properties":{"weight":1}},{"id":1803,"inV":110,"properties":{"weight":1}},{"id":1804,"inV":42,"properties":{"weight":1}},{"id":1805,"inV":59,"properties":{"weight":1}},{"id":1806,"inV":84,"properties":{"weight":1}},{"id":1791,"inV":57,"properties":{"weight":4}}],"sungBy":[{"id":7350,"inV":377}],"writtenBy":[{"id":7349,"inV":377}]},"properties":{"name":[{"id":585,"value":"SUNRISE"}],"songType":[{"id":587,"value":"original"}],"performances":[{"id":586,"value":30}]}}
-{"id":197,"label":"song","inE":{"followedBy":[{"id":737,"outV":80,"properties":{"weight":2}},{"id":806,"outV":122,"properties":{"weight":1}},{"id":4422,"outV":198,"properties":{"weight":1}},{"id":2025,"outV":180,"properties":{"weight":2}},{"id":2442,"outV":68,"properties":{"weight":1}},{"id":5747,"outV":129,"properties":{"weight":1}},{"id":1812,"outV":273,"properties":{"weight":4}},{"id":501,"outV":98,"properties":{"weight":3}},{"id":6198,"outV":220,"properties":{"weight":1}},{"id":4378,"outV":62,"properties":{"weight":1}},{"id":5722,"outV":20,"properties":{"weight":1}},{"id":763,"outV":224,"properties":{"weight":2}},{"id":5310,"outV":170,"properties":{"weight":3}},{"id":4703,"outV":111,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6994,"inV":198,"properties":{"weight":1}},{"id":6995,"inV":129,"properties":{"weight":2}},{"id":6996,"inV":273,"properties":{"weight":4}},{"id":6997,"inV":170,"properties":{"weight":3}},{"id":6998,"inV":199,"properties":{"weight":2}},{"id":6999,"inV":58,"properties":{"weight":4}},{"id":7000,"inV":98,"properties":{"weight":3}},{"id":7001,"inV":224,"properties":{"weight":1}},{"id":7002,"inV":68,"properties":{"weight":1}},{"id":7003,"inV":104,"properties":{"weight":1}},{"id":7004,"inV":50,"properties":{"weight":1}},{"id":7005,"inV":65,"properties":{"weight":1}}],"sungBy":[{"id":7784,"inV":351}],"writtenBy":[{"id":7783,"inV":471}]},"properties":{"name":[{"id":588,"value":"MONKEY AND THE ENGINEER"}],"songType":[{"id":590,"value":"cover"}],"performances":[{"id":589,"value":32}]}}
-{"id":198,"label":"song","inE":{"followedBy":[{"id":3281,"outV":160,"properties":{"weight":1}},{"id":5314,"outV":170,"properties":{"weight":1}},{"id":6994,"outV":197,"properties":{"weight":1}},{"id":4341,"outV":62,"properties":{"weight":2}},{"id":503,"outV":98,"properties":{"weight":2}},{"id":1815,"outV":273,"properties":{"weight":3}},{"id":4697,"outV":111,"properties":{"weight":1}},{"id":762,"outV":224,"properties":{"weight":1}},{"id":2028,"outV":180,"properties":{"weight":2}},{"id":3452,"outV":58,"properties":{"weight":1}},{"id":734,"outV":80,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":4416,"inV":62,"properties":{"weight":1}},{"id":4417,"inV":68,"properties":{"weight":1}},{"id":4418,"inV":209,"properties":{"weight":1}},{"id":4419,"inV":273,"properties":{"weight":2}},{"id":4420,"inV":58,"properties":{"weight":1}},{"id":4421,"inV":199,"properties":{"weight":1}},{"id":4422,"inV":197,"properties":{"weight":1}},{"id":4413,"inV":170,"properties":{"weight":2}},{"id":4414,"inV":224,"properties":{"weight":6}},{"id":4415,"inV":98,"properties":{"weight":2}}],"sungBy":[{"id":7516,"inV":351}],"writtenBy":[{"id":7515,"inV":446}]},"properties":{"name":[{"id":591,"value":"DARK HOLLOW"}],"songType":[{"id":593,"value":"cover"}],"performances":[{"id":592,"value":29}]}}
-{"id":199,"label":"song","inE":{"followedBy":[{"id":1601,"outV":18,"properties":{"weight":1}},{"id":4421,"outV":198,"properties":{"weight":1}},{"id":5046,"outV":209,"properties":{"weight":3}},{"id":5750,"outV":129,"properties":{"weight":1}},{"id":6998,"outV":197,"properties":{"weight":2}},{"id":5720,"outV":20,"properties":{"weight":1}},{"id":2873,"outV":101,"properties":{"weight":1}},{"id":506,"outV":98,"properties":{"weight":1}},{"id":4701,"outV":111,"properties":{"weight":2}},{"id":3454,"outV":58,"properties":{"weight":1}},{"id":2447,"outV":68,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1808,"inV":50,"properties":{"weight":1}},{"id":1809,"inV":20,"properties":{"weight":1}},{"id":1810,"inV":111,"properties":{"weight":2}},{"id":1811,"inV":64,"properties":{"weight":1}},{"id":1807,"inV":222,"properties":{"weight":10}}],"sungBy":[{"id":7812,"inV":340}],"writtenBy":[{"id":7811,"inV":673}]},"properties":{"name":[{"id":594,"value":"OH BABE IT AINT NO LIE"}],"songType":[{"id":596,"value":"cover"}],"performances":[{"id":595,"value":13}]}}
-{"id":200,"label":"song","inE":{"followedBy":[{"id":512,"outV":98,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2975,"inV":106,"properties":{"weight":1}}]},"properties":{"name":[{"id":597,"value":"FRERE JACQUES"}],"songType":[{"id":599,"value":""}],"performances":[{"id":598,"value":0}]}}
-{"id":201,"label":"song","inE":{"followedBy":[{"id":1521,"outV":164,"properties":{"weight":2}},{"id":3763,"outV":3,"properties":{"weight":1}},{"id":516,"outV":98,"properties":{"weight":1}},{"id":2022,"outV":149,"properties":{"weight":1}},{"id":3127,"outV":153,"properties":{"weight":1}},{"id":5929,"outV":96,"properties":{"weight":1}},{"id":2092,"outV":188,"properties":{"weight":1}},{"id":6300,"outV":49,"properties":{"weight":1}},{"id":4717,"outV":186,"properties":{"weight":58}},{"id":7037,"outV":89,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":3531,"inV":68,"properties":{"weight":1}},{"id":3532,"inV":84,"properties":{"weight":1}},{"id":3533,"inV":79,"properties":{"weight":1}},{"id":3534,"inV":96,"properties":{"weight":1}},{"id":3535,"inV":4,"properties":{"weight":1}},{"id":3536,"inV":215,"properties":{"weight":1}},{"id":3537,"inV":157,"properties":{"weight":1}},{"id":3538,"inV":136,"properties":{"weight":1}},{"id":3539,"inV":94,"properties":{"weight":15}},{"id":3540,"inV":125,"properties":{"weight":11}},{"id":3541,"inV":127,"properties":{"weight":7}},{"id":3542,"inV":9,"properties":{"weight":1}},{"id":3543,"inV":129,"properties":{"weight":3}},{"id":3544,"inV":130,"properties":{"weight":4}},{"id":3545,"inV":92,"properties":{"weight":6}},{"id":3546,"inV":138,"properties":{"weight":6}},{"id":3547,"inV":140,"properties":{"weight":4}},{"id":3548,"inV":139,"properties":{"weight":2}},{"id":3549,"inV":134,"properties":{"weight":1}},{"id":3550,"inV":66,"properties":{"weight":1}}]},"properties":{"name":[{"id":600,"value":"THIS COULD BE THE LAST TIME"}],"songType":[{"id":602,"value":""}],"performances":[{"id":601,"value":0}]}}
-{"id":202,"label":"song","inE":{"followedBy":[{"id":5506,"outV":131,"properties":{"weight":3}},{"id":518,"outV":98,"properties":{"weight":1}},{"id":2697,"outV":13,"properties":{"weight":3}},{"id":6665,"outV":12,"properties":{"weight":2}},{"id":5962,"outV":50,"properties":{"weight":3}},{"id":4555,"outV":105,"properties":{"weight":1}},{"id":1165,"outV":26,"properties":{"weight":1}},{"id":4045,"outV":173,"properties":{"weight":1}},{"id":5646,"outV":22,"properties":{"weight":1}},{"id":4562,"outV":254,"properties":{"weight":4}},{"id":5014,"outV":30,"properties":{"weight":2}},{"id":5526,"outV":43,"properties":{"weight":2}},{"id":1305,"outV":27,"properties":{"weight":1}},{"id":1566,"outV":18,"properties":{"weight":6}},{"id":3614,"outV":56,"properties":{"weight":1}},{"id":2783,"outV":15,"properties":{"weight":6}},{"id":3423,"outV":77,"properties":{"weight":1}},{"id":997,"outV":11,"properties":{"weight":3}},{"id":4261,"outV":10,"properties":{"weight":4}},{"id":4390,"outV":40,"properties":{"weight":6}},{"id":2280,"outV":25,"properties":{"weight":3}},{"id":6248,"outV":117,"properties":{"weight":6}},{"id":1066,"outV":73,"properties":{"weight":1}},{"id":2474,"outV":68,"properties":{"weight":2}},{"id":2091,"outV":188,"properties":{"weight":8}},{"id":4781,"outV":114,"properties":{"weight":1}},{"id":6063,"outV":115,"properties":{"weight":1}},{"id":2995,"outV":14,"properties":{"weight":3}},{"id":3829,"outV":88,"properties":{"weight":6}},{"id":3893,"outV":51,"properties":{"weight":1}},{"id":631,"outV":23,"properties":{"weight":1}},{"id":1335,"outV":31,"properties":{"weight":5}},{"id":5179,"outV":71,"properties":{"weight":2}},{"id":3647,"outV":24,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":4480,"inV":77,"properties":{"weight":4}},{"id":4481,"inV":34,"properties":{"weight":1}},{"id":4482,"inV":114,"properties":{"weight":1}},{"id":4483,"inV":118,"properties":{"weight":1}},{"id":4484,"inV":42,"properties":{"weight":2}},{"id":4485,"inV":79,"properties":{"weight":4}},{"id":4486,"inV":117,"properties":{"weight":4}},{"id":4487,"inV":64,"properties":{"weight":1}},{"id":4488,"inV":103,"properties":{"weight":4}},{"id":4489,"inV":172,"properties":{"weight":1}},{"id":4490,"inV":71,"properties":{"weight":1}},{"id":4491,"inV":188,"properties":{"weight":2}},{"id":4492,"inV":158,"properties":{"weight":2}},{"id":4493,"inV":43,"properties":{"weight":2}},{"id":4494,"inV":166,"properties":{"weight":1}},{"id":4495,"inV":62,"properties":{"weight":1}},{"id":4496,"inV":11,"properties":{"weight":1}},{"id":4497,"inV":101,"properties":{"weight":3}},{"id":4498,"inV":88,"properties":{"weight":1}},{"id":4499,"inV":254,"properties":{"weight":4}},{"id":4500,"inV":26,"properties":{"weight":2}},{"id":4501,"inV":174,"properties":{"weight":1}},{"id":4502,"inV":61,"properties":{"weight":1}},{"id":4503,"inV":66,"properties":{"weight":1}},{"id":4504,"inV":72,"properties":{"weight":1}},{"id":4505,"inV":173,"properties":{"weight":1}},{"id":4506,"inV":119,"properties":{"weight":1}},{"id":4462,"inV":21,"properties":{"weight":2}},{"id":4463,"inV":10,"properties":{"weight":4}},{"id":4464,"inV":16,"properties":{"weight":1}},{"id":4465,"inV":22,"properties":{"weight":2}},{"id":4466,"inV":24,"properties":{"weight":5}},{"id":4467,"inV":15,"properties":{"weight":6}},{"id":4468,"inV":12,"properties":{"weight":4}},{"id":4469,"inV":23,"properties":{"weight":1}},{"id":4470,"inV":19,"properties":{"weight":2}},{"id":4471,"inV":51,"properties":{"weight":1}},{"id":4472,"inV":55,"properties":{"weight":1}},{"id":4473,"inV":50,"properties":{"weight":1}},{"id":4474,"inV":14,"properties":{"weight":1}},{"id":4475,"inV":82,"properties":{"weight":1}},{"id":4476,"inV":18,"properties":{"weight":3}},{"id":4477,"inV":290,"properties":{"weight":1}},{"id":4478,"inV":56,"properties":{"weight":1}},{"id":4479,"inV":68,"properties":{"weight":10}}],"sungBy":[{"id":7234,"inV":340}],"writtenBy":[{"id":7233,"inV":339}]},"properties":{"name":[{"id":603,"value":"LOOSE LUCY"}],"songType":[{"id":605,"value":"original"}],"performances":[{"id":604,"value":98}]}}
-{"id":203,"label":"song","inE":{"followedBy":[{"id":4369,"outV":62,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":519,"inV":204,"properties":{"weight":1}},{"id":520,"inV":96,"properties":{"weight":1}}]},"properties":{"name":[{"id":606,"value":"BANANA BOAT SONG"}],"songType":[{"id":608,"value":""}],"performances":[{"id":607,"value":0}]}}
-{"id":204,"label":"song","inE":{"followedBy":[{"id":3392,"outV":309,"properties":{"weight":1}},{"id":5920,"outV":96,"properties":{"weight":1}},{"id":3121,"outV":153,"properties":{"weight":11}},{"id":594,"outV":120,"properties":{"weight":7}},{"id":3747,"outV":3,"properties":{"weight":14}},{"id":1510,"outV":164,"properties":{"weight":18}},{"id":519,"outV":203,"properties":{"weight":1}},{"id":2327,"outV":25,"properties":{"weight":9}},{"id":4375,"outV":62,"properties":{"weight":1}},{"id":2379,"outV":87,"properties":{"weight":3}},{"id":4829,"outV":114,"properties":{"weight":6}},{"id":5342,"outV":165,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":6016,"inV":38,"properties":{"weight":6}},{"id":6017,"inV":120,"properties":{"weight":1}},{"id":6018,"inV":151,"properties":{"weight":1}},{"id":6019,"inV":42,"properties":{"weight":1}},{"id":6020,"inV":88,"properties":{"weight":3}},{"id":6021,"inV":78,"properties":{"weight":3}},{"id":6022,"inV":50,"properties":{"weight":8}},{"id":6023,"inV":64,"properties":{"weight":7}},{"id":6024,"inV":46,"properties":{"weight":1}},{"id":6025,"inV":81,"properties":{"weight":2}},{"id":6026,"inV":90,"properties":{"weight":8}},{"id":6027,"inV":30,"properties":{"weight":2}},{"id":6028,"inV":332,"properties":{"weight":1}},{"id":6029,"inV":215,"properties":{"weight":4}},{"id":6030,"inV":4,"properties":{"weight":2}},{"id":6031,"inV":23,"properties":{"weight":1}},{"id":6012,"inV":84,"properties":{"weight":6}},{"id":6013,"inV":114,"properties":{"weight":1}},{"id":6014,"inV":87,"properties":{"weight":10}},{"id":6015,"inV":62,"properties":{"weight":6}}],"sungBy":[{"id":7720,"inV":340}],"writtenBy":[{"id":7719,"inV":447}]},"properties":{"name":[{"id":609,"value":"KNOCKING ON HEAVENS DOOR"}],"songType":[{"id":611,"value":"cover"}],"performances":[{"id":610,"value":76}]}}
-{"id":205,"label":"song","inE":{"followedBy":[{"id":2511,"outV":57,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":521,"inV":11,"properties":{"weight":1}}],"sungBy":[{"id":7256,"inV":356}],"writtenBy":[{"id":7255,"inV":339}]},"properties":{"name":[{"id":612,"value":"MISTER CHARLIE"}],"songType":[{"id":614,"value":"original"}],"performances":[{"id":613,"value":48}]}}
-{"id":206,"label":"song","inE":{"followedBy":[{"id":1249,"outV":27,"properties":{"weight":2}},{"id":1154,"outV":26,"properties":{"weight":1}},{"id":3058,"outV":153,"properties":{"weight":6}},{"id":6660,"outV":12,"properties":{"weight":1}},{"id":534,"outV":120,"properties":{"weight":1}},{"id":1560,"outV":18,"properties":{"weight":1}},{"id":1931,"outV":148,"properties":{"weight":7}},{"id":2702,"outV":13,"properties":{"weight":1}},{"id":5951,"outV":50,"properties":{"weight":1}},{"id":7023,"outV":89,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":704,"inV":122,"properties":{"weight":1}},{"id":705,"inV":24,"properties":{"weight":1}},{"id":706,"inV":3,"properties":{"weight":2}},{"id":707,"inV":27,"properties":{"weight":1}},{"id":708,"inV":22,"properties":{"weight":1}},{"id":699,"inV":153,"properties":{"weight":10}},{"id":700,"inV":5,"properties":{"weight":1}},{"id":701,"inV":74,"properties":{"weight":1}},{"id":702,"inV":114,"properties":{"weight":2}},{"id":703,"inV":12,"properties":{"weight":2}}],"sungBy":[{"id":7912,"inV":340}],"writtenBy":[{"id":7911,"inV":650}]},"properties":{"name":[{"id":615,"value":"SING ME BACK HOME"}],"songType":[{"id":617,"value":"cover"}],"performances":[{"id":616,"value":39}]}}
-{"id":207,"label":"song","inE":{"followedBy":[{"id":4163,"outV":54,"properties":{"weight":2}},{"id":2660,"outV":13,"properties":{"weight":3}},{"id":6725,"outV":53,"properties":{"weight":1}},{"id":3558,"outV":56,"properties":{"weight":2}},{"id":535,"outV":120,"properties":{"weight":1}},{"id":5944,"outV":50,"properties":{"weight":1}},{"id":617,"outV":23,"properties":{"weight":1}},{"id":985,"outV":11,"properties":{"weight":4}},{"id":4559,"outV":305,"properties":{"weight":1}},{"id":6271,"outV":49,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":4960,"inV":54,"properties":{"weight":1}},{"id":4961,"inV":22,"properties":{"weight":1}},{"id":4962,"inV":19,"properties":{"weight":1}},{"id":4963,"inV":89,"properties":{"weight":2}},{"id":4964,"inV":39,"properties":{"weight":1}},{"id":4965,"inV":56,"properties":{"weight":1}},{"id":4966,"inV":50,"properties":{"weight":1}},{"id":4967,"inV":18,"properties":{"weight":1}},{"id":4968,"inV":27,"properties":{"weight":1}},{"id":4958,"inV":100,"properties":{"weight":3}},{"id":4959,"inV":13,"properties":{"weight":6}}],"sungBy":[{"id":7804,"inV":356}],"writtenBy":[{"id":7803,"inV":670}]},"properties":{"name":[{"id":618,"value":"NEXT TIME YOU SEE ME"}],"songType":[{"id":620,"value":"cover"}],"performances":[{"id":619,"value":72}]}}
-{"id":208,"label":"song","inE":{"followedBy":[{"id":5799,"outV":76,"properties":{"weight":3}},{"id":4523,"outV":105,"properties":{"weight":2}},{"id":4907,"outV":100,"properties":{"weight":1}},{"id":5579,"outV":42,"properties":{"weight":1}},{"id":556,"outV":120,"properties":{"weight":6}},{"id":6476,"outV":187,"properties":{"weight":2}},{"id":5262,"outV":32,"properties":{"weight":2}},{"id":3664,"outV":24,"properties":{"weight":1}},{"id":1588,"outV":18,"properties":{"weight":1}},{"id":4117,"outV":48,"properties":{"weight":1}},{"id":822,"outV":171,"properties":{"weight":2}},{"id":6936,"outV":84,"properties":{"weight":3}},{"id":1274,"outV":27,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2176,"inV":103,"properties":{"weight":2}},{"id":2177,"inV":56,"properties":{"weight":1}},{"id":2178,"inV":100,"properties":{"weight":2}},{"id":2179,"inV":49,"properties":{"weight":2}},{"id":2180,"inV":85,"properties":{"weight":5}},{"id":2181,"inV":91,"properties":{"weight":4}},{"id":2182,"inV":133,"properties":{"weight":1}},{"id":2183,"inV":50,"properties":{"weight":1}},{"id":2184,"inV":27,"properties":{"weight":1}},{"id":2185,"inV":53,"properties":{"weight":1}},{"id":2186,"inV":32,"properties":{"weight":1}},{"id":2174,"inV":69,"properties":{"weight":3}},{"id":2175,"inV":70,"properties":{"weight":2}}],"sungBy":[{"id":7174,"inV":377}],"writtenBy":[{"id":7173,"inV":377}]},"properties":{"name":[{"id":621,"value":"FROM THE HEART OF ME"}],"songType":[{"id":623,"value":"original"}],"performances":[{"id":622,"value":26}]}}
-{"id":209,"label":"song","inE":{"followedBy":[{"id":2849,"outV":101,"properties":{"weight":1}},{"id":1954,"outV":148,"properties":{"weight":1}},{"id":4418,"outV":198,"properties":{"weight":1}},{"id":5746,"outV":129,"properties":{"weight":2}},{"id":1813,"outV":273,"properties":{"weight":3}},{"id":3445,"outV":58,"properties":{"weight":3}},{"id":5909,"outV":96,"properties":{"weight":1}},{"id":2008,"outV":149,"properties":{"weight":1}},{"id":6345,"outV":21,"properties":{"weight":3}},{"id":5307,"outV":170,"properties":{"weight":6}},{"id":765,"outV":224,"properties":{"weight":1}},{"id":575,"outV":120,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5056,"inV":127,"properties":{"weight":1}},{"id":5040,"inV":148,"properties":{"weight":1}},{"id":5041,"inV":51,"properties":{"weight":1}},{"id":5042,"inV":3,"properties":{"weight":1}},{"id":5043,"inV":26,"properties":{"weight":1}},{"id":5044,"inV":149,"properties":{"weight":1}},{"id":5045,"inV":58,"properties":{"weight":3}},{"id":5046,"inV":199,"properties":{"weight":3}},{"id":5047,"inV":20,"properties":{"weight":1}},{"id":5048,"inV":170,"properties":{"weight":2}},{"id":5049,"inV":80,"properties":{"weight":1}},{"id":5050,"inV":224,"properties":{"weight":1}},{"id":5051,"inV":129,"properties":{"weight":3}},{"id":5052,"inV":222,"properties":{"weight":1}},{"id":5053,"inV":219,"properties":{"weight":1}},{"id":5054,"inV":180,"properties":{"weight":1}},{"id":5055,"inV":130,"properties":{"weight":1}}],"sungBy":[{"id":7184,"inV":351}],"writtenBy":[{"id":7183,"inV":380}]},"properties":{"name":[{"id":624,"value":"HEAVEN HELP THE FOOL"}],"songType":[{"id":626,"value":"original"}],"performances":[{"id":625,"value":17}]}}
-{"id":210,"label":"song","inE":{"followedBy":[{"id":6496,"outV":187,"properties":{"weight":1}},{"id":2242,"outV":29,"properties":{"weight":1}},{"id":582,"outV":120,"properties":{"weight":11}},{"id":3110,"outV":153,"properties":{"weight":12}},{"id":5991,"outV":50,"properties":{"weight":2}},{"id":6823,"outV":64,"properties":{"weight":4}},{"id":4815,"outV":114,"properties":{"weight":7}},{"id":1072,"outV":227,"properties":{"weight":1}},{"id":2320,"outV":25,"properties":{"weight":4}},{"id":2738,"outV":13,"properties":{"weight":1}},{"id":3027,"outV":14,"properties":{"weight":3}},{"id":660,"outV":23,"properties":{"weight":1}},{"id":2870,"outV":101,"properties":{"weight":4}},{"id":3739,"outV":3,"properties":{"weight":3}},{"id":2364,"outV":87,"properties":{"weight":1}},{"id":2559,"outV":57,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1632,"inV":67,"properties":{"weight":1}},{"id":1633,"inV":61,"properties":{"weight":1}},{"id":1634,"inV":5,"properties":{"weight":1}},{"id":1635,"inV":100,"properties":{"weight":1}},{"id":1613,"inV":4,"properties":{"weight":2}},{"id":1614,"inV":153,"properties":{"weight":1}},{"id":1615,"inV":106,"properties":{"weight":1}},{"id":1616,"inV":76,"properties":{"weight":2}},{"id":1617,"inV":84,"properties":{"weight":2}},{"id":1618,"inV":82,"properties":{"weight":4}},{"id":1619,"inV":31,"properties":{"weight":2}},{"id":1620,"inV":19,"properties":{"weight":4}},{"id":1621,"inV":103,"properties":{"weight":1}},{"id":1622,"inV":13,"properties":{"weight":1}},{"id":1623,"inV":50,"properties":{"weight":6}},{"id":1624,"inV":38,"properties":{"weight":5}},{"id":1625,"inV":78,"properties":{"weight":2}},{"id":1626,"inV":62,"properties":{"weight":7}},{"id":1627,"inV":65,"properties":{"weight":4}},{"id":1628,"inV":32,"properties":{"weight":3}},{"id":1629,"inV":110,"properties":{"weight":2}},{"id":1630,"inV":87,"properties":{"weight":3}},{"id":1631,"inV":64,"properties":{"weight":1}}]},"properties":{"name":[{"id":627,"value":"DAY JOB"}],"songType":[{"id":629,"value":""}],"performances":[{"id":628,"value":0}]}}
-{"id":211,"label":"song","inE":{"followedBy":[{"id":3733,"outV":3,"properties":{"weight":3}},{"id":1496,"outV":164,"properties":{"weight":2}},{"id":585,"outV":120,"properties":{"weight":2}},{"id":5211,"outV":99,"properties":{"weight":2}},{"id":4812,"outV":114,"properties":{"weight":1}},{"id":2318,"outV":25,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6528,"inV":85,"properties":{"weight":1}},{"id":6529,"inV":160,"properties":{"weight":1}},{"id":6530,"inV":90,"properties":{"weight":1}},{"id":6524,"inV":65,"properties":{"weight":2}},{"id":6525,"inV":50,"properties":{"weight":3}},{"id":6526,"inV":38,"properties":{"weight":1}},{"id":6527,"inV":64,"properties":{"weight":2}}],"sungBy":[{"id":7862,"inV":340}],"writtenBy":[{"id":7861,"inV":480}]},"properties":{"name":[{"id":630,"value":"REVOLUTION"}],"songType":[{"id":632,"value":"cover"}],"performances":[{"id":631,"value":11}]}}
-{"id":212,"label":"song","inE":{"followedBy":[{"id":1504,"outV":164,"properties":{"weight":1}},{"id":2741,"outV":13,"properties":{"weight":1}},{"id":2949,"outV":78,"properties":{"weight":1}},{"id":3111,"outV":153,"properties":{"weight":1}},{"id":587,"outV":120,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4423,"inV":114,"properties":{"weight":1}},{"id":4424,"inV":112,"properties":{"weight":1}},{"id":4425,"inV":4,"properties":{"weight":1}},{"id":4426,"inV":80,"properties":{"weight":1}},{"id":4427,"inV":50,"properties":{"weight":1}}],"sungBy":[{"id":7518,"inV":507}],"writtenBy":[{"id":7517,"inV":480}]},"properties":{"name":[{"id":633,"value":"DAY TRIPPER"}],"songType":[{"id":635,"value":"cover"}],"performances":[{"id":634,"value":5}]}}
-{"id":213,"label":"song","inE":{"followedBy":[{"id":3744,"outV":3,"properties":{"weight":13}},{"id":6624,"outV":127,"properties":{"weight":2}},{"id":1506,"outV":164,"properties":{"weight":8}},{"id":2564,"outV":57,"properties":{"weight":1}},{"id":6118,"outV":72,"properties":{"weight":1}},{"id":6920,"outV":133,"properties":{"weight":1}},{"id":590,"outV":120,"properties":{"weight":6}},{"id":3119,"outV":153,"properties":{"weight":8}},{"id":2385,"outV":87,"properties":{"weight":1}},{"id":1970,"outV":148,"properties":{"weight":1}},{"id":2324,"outV":25,"properties":{"weight":7}},{"id":3476,"outV":58,"properties":{"weight":1}},{"id":4822,"outV":114,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":1637,"inV":76,"properties":{"weight":2}},{"id":1638,"inV":110,"properties":{"weight":1}},{"id":1639,"inV":87,"properties":{"weight":6}},{"id":1640,"inV":261,"properties":{"weight":1}},{"id":1641,"inV":62,"properties":{"weight":5}},{"id":1642,"inV":18,"properties":{"weight":1}},{"id":1643,"inV":67,"properties":{"weight":1}},{"id":1644,"inV":65,"properties":{"weight":3}},{"id":1645,"inV":50,"properties":{"weight":8}},{"id":1646,"inV":38,"properties":{"weight":2}},{"id":1647,"inV":23,"properties":{"weight":2}},{"id":1648,"inV":64,"properties":{"weight":7}},{"id":1649,"inV":153,"properties":{"weight":1}},{"id":1650,"inV":152,"properties":{"weight":1}},{"id":1651,"inV":90,"properties":{"weight":1}},{"id":1652,"inV":4,"properties":{"weight":3}},{"id":1653,"inV":26,"properties":{"weight":1}},{"id":1654,"inV":78,"properties":{"weight":2}},{"id":1655,"inV":46,"properties":{"weight":1}},{"id":1656,"inV":215,"properties":{"weight":2}},{"id":1657,"inV":79,"properties":{"weight":1}}]},"properties":{"name":[{"id":636,"value":"QUINN THE ESKIMO"}],"songType":[{"id":638,"value":""}],"performances":[{"id":637,"value":0}]}}
-{"id":214,"label":"song","inE":{"followedBy":[{"id":2308,"outV":25,"properties":{"weight":6}},{"id":3764,"outV":3,"properties":{"weight":1}},{"id":599,"outV":120,"properties":{"weight":1}},{"id":3095,"outV":153,"properties":{"weight":1}},{"id":2728,"outV":13,"properties":{"weight":1}},{"id":3295,"outV":160,"properties":{"weight":1}},{"id":4799,"outV":114,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5232,"inV":4,"properties":{"weight":2}},{"id":5233,"inV":50,"properties":{"weight":1}},{"id":5234,"inV":59,"properties":{"weight":2}},{"id":5235,"inV":103,"properties":{"weight":1}},{"id":5236,"inV":64,"properties":{"weight":2}},{"id":5231,"inV":26,"properties":{"weight":4}}],"sungBy":[{"id":8014,"inV":340}],"writtenBy":[{"id":8013,"inV":790}]},"properties":{"name":[{"id":639,"value":"WEREWOLVES OF LONDON"}],"songType":[{"id":641,"value":"cover"}],"performances":[{"id":640,"value":12}]}}
-{"id":215,"label":"song","inE":{"followedBy":[{"id":4352,"outV":62,"properties":{"weight":2}},{"id":3714,"outV":3,"properties":{"weight":4}},{"id":4867,"outV":35,"properties":{"weight":1}},{"id":5765,"outV":76,"properties":{"weight":8}},{"id":1734,"outV":82,"properties":{"weight":1}},{"id":3334,"outV":155,"properties":{"weight":1}},{"id":3081,"outV":153,"properties":{"weight":3}},{"id":4939,"outV":86,"properties":{"weight":5}},{"id":6029,"outV":204,"properties":{"weight":4}},{"id":1231,"outV":248,"properties":{"weight":1}},{"id":3536,"outV":201,"properties":{"weight":1}},{"id":657,"outV":23,"properties":{"weight":1}},{"id":6610,"outV":127,"properties":{"weight":2}},{"id":5205,"outV":99,"properties":{"weight":6}},{"id":2390,"outV":87,"properties":{"weight":1}},{"id":5528,"outV":43,"properties":{"weight":2}},{"id":1177,"outV":26,"properties":{"weight":4}},{"id":602,"outV":120,"properties":{"weight":1}},{"id":2395,"outV":179,"properties":{"weight":1}},{"id":6683,"outV":12,"properties":{"weight":1}},{"id":3421,"outV":77,"properties":{"weight":1}},{"id":4318,"outV":110,"properties":{"weight":1}},{"id":5726,"outV":20,"properties":{"weight":1}},{"id":1889,"outV":103,"properties":{"weight":7}},{"id":6117,"outV":72,"properties":{"weight":4}},{"id":6501,"outV":187,"properties":{"weight":1}},{"id":3495,"outV":58,"properties":{"weight":1}},{"id":3687,"outV":24,"properties":{"weight":1}},{"id":6887,"outV":93,"properties":{"weight":1}},{"id":1003,"outV":176,"properties":{"weight":1}},{"id":3307,"outV":160,"properties":{"weight":2}},{"id":5675,"outV":167,"properties":{"weight":1}},{"id":6251,"outV":117,"properties":{"weight":1}},{"id":1710,"outV":124,"properties":{"weight":1}},{"id":5230,"outV":216,"properties":{"weight":4}},{"id":1842,"outV":275,"properties":{"weight":1}},{"id":1525,"outV":164,"properties":{"weight":2}},{"id":2294,"outV":25,"properties":{"weight":3}},{"id":1656,"outV":213,"properties":{"weight":2}},{"id":2872,"outV":101,"properties":{"weight":6}},{"id":4795,"outV":114,"properties":{"weight":3}},{"id":5692,"outV":159,"properties":{"weight":1}},{"id":3005,"outV":14,"properties":{"weight":1}},{"id":2558,"outV":57,"properties":{"weight":11}},{"id":5246,"outV":32,"properties":{"weight":1}},{"id":6591,"outV":116,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2229,"inV":154,"properties":{"weight":97}},{"id":2230,"inV":103,"properties":{"weight":1}},{"id":2231,"inV":96,"properties":{"weight":2}},{"id":2232,"inV":3,"properties":{"weight":1}},{"id":2233,"inV":171,"properties":{"weight":1}},{"id":2234,"inV":288,"properties":{"weight":8}}],"sungBy":[{"id":7188,"inV":340}],"writtenBy":[{"id":7187,"inV":339}]},"properties":{"name":[{"id":642,"value":"HELP ON THE WAY"}],"songType":[{"id":644,"value":"original"}],"performances":[{"id":643,"value":110}]}}
-{"id":216,"label":"song","inE":{"followedBy":[{"id":2577,"outV":57,"properties":{"weight":1}},{"id":3766,"outV":3,"properties":{"weight":1}},{"id":4840,"outV":114,"properties":{"weight":4}},{"id":1529,"outV":164,"properties":{"weight":5}},{"id":603,"outV":120,"properties":{"weight":3}},{"id":2331,"outV":25,"properties":{"weight":2}},{"id":3131,"outV":153,"properties":{"weight":4}},{"id":5550,"outV":166,"properties":{"weight":1}},{"id":6639,"outV":127,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5222,"inV":38,"properties":{"weight":3}},{"id":5223,"inV":50,"properties":{"weight":7}},{"id":5224,"inV":87,"properties":{"weight":1}},{"id":5225,"inV":259,"properties":{"weight":3}},{"id":5226,"inV":9,"properties":{"weight":1}},{"id":5227,"inV":28,"properties":{"weight":1}},{"id":5228,"inV":79,"properties":{"weight":1}},{"id":5229,"inV":64,"properties":{"weight":1}},{"id":5230,"inV":215,"properties":{"weight":4}}],"sungBy":[{"id":7636,"inV":340}],"writtenBy":[{"id":7635,"inV":583}]},"properties":{"name":[{"id":645,"value":"I FOUGHT THE LAW"}],"songType":[{"id":647,"value":"cover"}],"performances":[{"id":646,"value":36}]}}
-{"id":217,"label":"song","inE":{"followedBy":[{"id":2484,"outV":68,"properties":{"weight":1}},{"id":6134,"outV":72,"properties":{"weight":1}},{"id":1975,"outV":148,"properties":{"weight":1}},{"id":3767,"outV":3,"properties":{"weight":2}},{"id":1784,"outV":259,"properties":{"weight":1}},{"id":4841,"outV":114,"properties":{"weight":1}},{"id":604,"outV":120,"properties":{"weight":2}},{"id":3133,"outV":153,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5431,"inV":229,"properties":{"weight":1}},{"id":5432,"inV":64,"properties":{"weight":2}},{"id":5433,"inV":87,"properties":{"weight":2}},{"id":5434,"inV":4,"properties":{"weight":1}},{"id":5435,"inV":259,"properties":{"weight":1}},{"id":5436,"inV":172,"properties":{"weight":1}},{"id":5437,"inV":38,"properties":{"weight":1}},{"id":5438,"inV":37,"properties":{"weight":1}}]},"properties":{"name":[{"id":648,"value":"LUCY IN THE SKY"}],"songType":[{"id":650,"value":""}],"performances":[{"id":649,"value":0}]}}
-{"id":218,"label":"song","inE":{"followedBy":[{"id":1091,"outV":59,"properties":{"weight":1}},{"id":6726,"outV":53,"properties":{"weight":2}},{"id":4250,"outV":10,"properties":{"weight":1}},{"id":715,"outV":80,"properties":{"weight":1}},{"id":620,"outV":23,"properties":{"weight":1}},{"id":6653,"outV":12,"properties":{"weight":2}},{"id":1247,"outV":27,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4146,"inV":24,"properties":{"weight":1}},{"id":4147,"inV":153,"properties":{"weight":2}},{"id":4148,"inV":122,"properties":{"weight":2}},{"id":4149,"inV":27,"properties":{"weight":1}},{"id":4150,"inV":18,"properties":{"weight":1}},{"id":4151,"inV":13,"properties":{"weight":2}}]},"properties":{"name":[{"id":651,"value":"TWO SOULS IN COMMUNION"}],"songType":[{"id":653,"value":""}],"performances":[{"id":652,"value":0}]}}
-{"id":219,"label":"song","inE":{"followedBy":[{"id":1956,"outV":148,"properties":{"weight":1}},{"id":5053,"outV":209,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":682,"inV":5,"properties":{"weight":1}},{"id":683,"inV":220,"properties":{"weight":1}}],"sungBy":[{"id":7310,"inV":351}],"writtenBy":[{"id":7309,"inV":384}]},"properties":{"name":[{"id":654,"value":"SAGE AND SPIRIT"}],"songType":[{"id":656,"value":"original"}],"performances":[{"id":655,"value":2}]}}
-{"id":220,"label":"song","inE":{"followedBy":[{"id":683,"outV":219,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6198,"inV":197,"properties":{"weight":1}}],"sungBy":[{"id":7738,"inV":340}],"writtenBy":[{"id":7737,"inV":446}]},"properties":{"name":[{"id":657,"value":"LITTLE SADIE"}],"songType":[{"id":659,"value":"cover"}],"performances":[{"id":658,"value":6}]}}
-{"id":221,"label":"song","inE":{"followedBy":[{"id":1297,"outV":27,"properties":{"weight":1}},{"id":6809,"outV":39,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":709,"inV":53,"properties":{"weight":1}},{"id":710,"inV":117,"properties":{"weight":1}}],"sungBy":[{"id":7176,"inV":352}],"writtenBy":[{"id":7175,"inV":350}]},"properties":{"name":[{"id":660,"value":"GENTLEMEN START YOUR ENGINES"}],"songType":[{"id":662,"value":"original"}],"performances":[{"id":661,"value":2}]}}
-{"id":222,"label":"song","inE":{"followedBy":[{"id":736,"outV":80,"properties":{"weight":1}},{"id":3444,"outV":58,"properties":{"weight":10}},{"id":5748,"outV":129,"properties":{"weight":3}},{"id":1594,"outV":18,"properties":{"weight":1}},{"id":2026,"outV":180,"properties":{"weight":1}},{"id":5723,"outV":20,"properties":{"weight":1}},{"id":5052,"outV":209,"properties":{"weight":1}},{"id":5308,"outV":170,"properties":{"weight":1}},{"id":1807,"outV":199,"properties":{"weight":10}},{"id":4831,"outV":114,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5124,"inV":154,"properties":{"weight":3}},{"id":5125,"inV":38,"properties":{"weight":5}},{"id":5126,"inV":59,"properties":{"weight":1}},{"id":5127,"inV":65,"properties":{"weight":10}},{"id":5128,"inV":50,"properties":{"weight":5}},{"id":5129,"inV":4,"properties":{"weight":1}},{"id":5130,"inV":19,"properties":{"weight":1}},{"id":5131,"inV":78,"properties":{"weight":1}},{"id":5132,"inV":13,"properties":{"weight":1}},{"id":5133,"inV":96,"properties":{"weight":1}},{"id":5134,"inV":62,"properties":{"weight":1}}],"sungBy":[{"id":7304,"inV":340}],"writtenBy":[{"id":7303,"inV":339}]},"properties":{"name":[{"id":663,"value":"RIPPLE"}],"songType":[{"id":665,"value":"original"}],"performances":[{"id":664,"value":39}]}}
-{"id":223,"label":"song","inE":{"followedBy":[{"id":2370,"outV":87,"properties":{"weight":1}},{"id":3682,"outV":24,"properties":{"weight":1}},{"id":2212,"outV":75,"properties":{"weight":3}},{"id":1127,"outV":59,"properties":{"weight":2}},{"id":5288,"outV":32,"properties":{"weight":2}},{"id":748,"outV":80,"properties":{"weight":1}},{"id":1293,"outV":27,"properties":{"weight":2}},{"id":4205,"outV":54,"properties":{"weight":1}},{"id":3598,"outV":56,"properties":{"weight":2}},{"id":6862,"outV":64,"properties":{"weight":1}},{"id":3472,"outV":58,"properties":{"weight":2}},{"id":3824,"outV":88,"properties":{"weight":2}},{"id":1041,"outV":73,"properties":{"weight":1}},{"id":6801,"outV":39,"properties":{"weight":2}},{"id":3186,"outV":104,"properties":{"weight":1}},{"id":4370,"outV":62,"properties":{"weight":1}},{"id":1203,"outV":26,"properties":{"weight":1}},{"id":3924,"outV":51,"properties":{"weight":1}},{"id":4919,"outV":100,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":3520,"inV":71,"properties":{"weight":3}},{"id":3521,"inV":46,"properties":{"weight":1}},{"id":3522,"inV":36,"properties":{"weight":1}},{"id":3523,"inV":97,"properties":{"weight":1}},{"id":3524,"inV":27,"properties":{"weight":1}},{"id":3525,"inV":75,"properties":{"weight":1}},{"id":3526,"inV":314,"properties":{"weight":1}},{"id":3527,"inV":12,"properties":{"weight":1}},{"id":3528,"inV":117,"properties":{"weight":1}},{"id":3529,"inV":63,"properties":{"weight":1}},{"id":3530,"inV":104,"properties":{"weight":1}},{"id":3507,"inV":245,"properties":{"weight":1}},{"id":3508,"inV":108,"properties":{"weight":2}},{"id":3509,"inV":99,"properties":{"weight":1}},{"id":3510,"inV":53,"properties":{"weight":1}},{"id":3511,"inV":19,"properties":{"weight":1}},{"id":3512,"inV":184,"properties":{"weight":2}},{"id":3513,"inV":88,"properties":{"weight":2}},{"id":3514,"inV":54,"properties":{"weight":1}},{"id":3515,"inV":98,"properties":{"weight":1}},{"id":3516,"inV":313,"properties":{"weight":1}},{"id":3517,"inV":38,"properties":{"weight":1}},{"id":3518,"inV":68,"properties":{"weight":1}},{"id":3519,"inV":112,"properties":{"weight":1}}],"sungBy":[{"id":7374,"inV":352}],"writtenBy":[{"id":7373,"inV":352}]},"properties":{"name":[{"id":666,"value":"TONS OF STEEL"}],"songType":[{"id":668,"value":"original"}],"performances":[{"id":667,"value":29}]}}
-{"id":224,"label":"song","inE":{"followedBy":[{"id":7001,"outV":197,"properties":{"weight":1}},{"id":5050,"outV":209,"properties":{"weight":1}},{"id":4414,"outV":198,"properties":{"weight":6}}]},"outE":{"followedBy":[{"id":760,"inV":68,"properties":{"weight":2}},{"id":761,"inV":111,"properties":{"weight":1}},{"id":762,"inV":198,"properties":{"weight":1}},{"id":763,"inV":197,"properties":{"weight":2}},{"id":764,"inV":58,"properties":{"weight":1}},{"id":765,"inV":209,"properties":{"weight":1}}]},"properties":{"name":[{"id":669,"value":"ROSALIE MCFALL"}],"songType":[{"id":671,"value":""}],"performances":[{"id":670,"value":0}]}}
-{"id":225,"label":"song","inE":{"followedBy":[{"id":1555,"outV":18,"properties":{"weight":1}},{"id":4435,"outV":113,"properties":{"weight":1}},{"id":2678,"outV":13,"properties":{"weight":1}},{"id":780,"outV":122,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4006,"inV":59,"properties":{"weight":1}},{"id":4007,"inV":12,"properties":{"weight":1}},{"id":4008,"inV":226,"properties":{"weight":1}},{"id":4009,"inV":5,"properties":{"weight":1}}]},"properties":{"name":[{"id":672,"value":"TOP OF THE WORLD"}],"songType":[{"id":674,"value":""}],"performances":[{"id":673,"value":0}]}}
-{"id":226,"label":"song","inE":{"followedBy":[{"id":1254,"outV":27,"properties":{"weight":2}},{"id":4008,"outV":225,"properties":{"weight":1}},{"id":782,"outV":122,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2224,"inV":153,"properties":{"weight":1}},{"id":2225,"inV":3,"properties":{"weight":1}},{"id":2223,"inV":24,"properties":{"weight":2}}]},"properties":{"name":[{"id":675,"value":"ROCKIN PNEUMONIA"}],"songType":[{"id":677,"value":""}],"performances":[{"id":676,"value":0}]}}
-{"id":227,"label":"song","inE":{"followedBy":[{"id":6288,"outV":49,"properties":{"weight":1}},{"id":833,"outV":171,"properties":{"weight":1}},{"id":1394,"outV":130,"properties":{"weight":1}},{"id":1526,"outV":164,"properties":{"weight":3}},{"id":5063,"outV":128,"properties":{"weight":1}},{"id":4842,"outV":114,"properties":{"weight":1}},{"id":6794,"outV":39,"properties":{"weight":1}},{"id":3115,"outV":153,"properties":{"weight":2}},{"id":6635,"outV":127,"properties":{"weight":3}},{"id":5806,"outV":76,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1072,"inV":210,"properties":{"weight":1}},{"id":1073,"inV":110,"properties":{"weight":1}},{"id":1074,"inV":90,"properties":{"weight":1}},{"id":1075,"inV":87,"properties":{"weight":2}},{"id":1076,"inV":64,"properties":{"weight":3}},{"id":1077,"inV":193,"properties":{"weight":1}},{"id":1078,"inV":50,"properties":{"weight":1}},{"id":1079,"inV":78,"properties":{"weight":1}},{"id":1068,"inV":96,"properties":{"weight":1}},{"id":1069,"inV":241,"properties":{"weight":1}},{"id":1070,"inV":164,"properties":{"weight":1}},{"id":1071,"inV":242,"properties":{"weight":1}}],"sungBy":[{"id":7580,"inV":351}],"writtenBy":[{"id":7579,"inV":549}]},"properties":{"name":[{"id":678,"value":"GLORIA"}],"songType":[{"id":680,"value":"cover"}],"performances":[{"id":679,"value":15}]}}
-{"id":228,"label":"song","inE":{"followedBy":[{"id":851,"outV":171,"properties":{"weight":1}},{"id":1131,"outV":59,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2146,"inV":32,"properties":{"weight":1}},{"id":2147,"inV":96,"properties":{"weight":1}}],"sungBy":[{"id":7938,"inV":340}],"writtenBy":[{"id":7937,"inV":749}]},"properties":{"name":[{"id":681,"value":"STIR IT UP"}],"songType":[{"id":683,"value":"cover"}],"performances":[{"id":682,"value":1}]}}
-{"id":229,"label":"song","inE":{"followedBy":[{"id":1444,"outV":83,"properties":{"weight":2}},{"id":1221,"outV":26,"properties":{"weight":1}},{"id":4757,"outV":37,"properties":{"weight":2}},{"id":1926,"outV":103,"properties":{"weight":1}},{"id":5431,"outV":217,"properties":{"weight":1}},{"id":6215,"outV":319,"properties":{"weight":1}},{"id":6519,"outV":187,"properties":{"weight":5}},{"id":857,"outV":171,"properties":{"weight":5}},{"id":1481,"outV":81,"properties":{"weight":2}},{"id":4863,"outV":35,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3203,"inV":83,"properties":{"weight":2}},{"id":3204,"inV":28,"properties":{"weight":2}},{"id":3205,"inV":74,"properties":{"weight":1}},{"id":3206,"inV":172,"properties":{"weight":2}},{"id":3207,"inV":91,"properties":{"weight":1}},{"id":3208,"inV":69,"properties":{"weight":4}},{"id":3209,"inV":37,"properties":{"weight":1}},{"id":3210,"inV":60,"properties":{"weight":2}},{"id":3211,"inV":96,"properties":{"weight":2}},{"id":3212,"inV":137,"properties":{"weight":1}},{"id":3213,"inV":174,"properties":{"weight":1}},{"id":3214,"inV":35,"properties":{"weight":1}},{"id":3215,"inV":177,"properties":{"weight":1}}]},"properties":{"name":[{"id":684,"value":"WOMEN ARE SMARTER"}],"songType":[{"id":686,"value":""}],"performances":[{"id":685,"value":0}]}}
-{"id":230,"label":"song","inE":{"followedBy":[{"id":919,"outV":91,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3324,"inV":96,"properties":{"weight":1}}]},"properties":{"name":[{"id":687,"value":"THE ALHAMBRA"}],"songType":[{"id":689,"value":""}],"performances":[{"id":688,"value":0}]}}
-{"id":231,"label":"song","inE":{"followedBy":[{"id":4608,"outV":85,"properties":{"weight":1}},{"id":1745,"outV":82,"properties":{"weight":1}},{"id":5923,"outV":96,"properties":{"weight":30}},{"id":936,"outV":91,"properties":{"weight":1}},{"id":1432,"outV":83,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5445,"inV":148,"properties":{"weight":11}},{"id":5446,"inV":5,"properties":{"weight":5}},{"id":5447,"inV":96,"properties":{"weight":4}},{"id":5448,"inV":165,"properties":{"weight":7}},{"id":5449,"inV":70,"properties":{"weight":3}},{"id":5450,"inV":49,"properties":{"weight":1}},{"id":5451,"inV":134,"properties":{"weight":2}},{"id":5452,"inV":130,"properties":{"weight":1}}],"sungBy":[{"id":7198,"inV":352}],"writtenBy":[{"id":7197,"inV":350}]},"properties":{"name":[{"id":690,"value":"I WILL TAKE YOU HOME"}],"songType":[{"id":692,"value":"original"}],"performances":[{"id":691,"value":34}]}}
-{"id":232,"label":"song","inE":{"followedBy":[{"id":5350,"outV":165,"properties":{"weight":2}},{"id":967,"outV":67,"properties":{"weight":1}},{"id":4999,"outV":30,"properties":{"weight":1}},{"id":2158,"outV":151,"properties":{"weight":1}},{"id":5823,"outV":76,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":6193,"inV":77,"properties":{"weight":1}},{"id":6194,"inV":49,"properties":{"weight":1}},{"id":6195,"inV":21,"properties":{"weight":2}},{"id":6196,"inV":29,"properties":{"weight":1}},{"id":6197,"inV":153,"properties":{"weight":2}}],"sungBy":[{"id":7062,"inV":340}],"writtenBy":[{"id":7061,"inV":339}]},"properties":{"name":[{"id":693,"value":"BELIEVE IT OR NOT"}],"songType":[{"id":695,"value":"original"}],"performances":[{"id":694,"value":7}]}}
-{"id":233,"label":"song","inE":{"followedBy":[{"id":5907,"outV":96,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":971,"inV":62,"properties":{"weight":1}}],"sungBy":[{"id":7476,"inV":481}],"writtenBy":[{"id":7475,"inV":481}]},"properties":{"name":[{"id":696,"value":"BLACK QUEEN"}],"songType":[{"id":698,"value":"cover"}],"performances":[{"id":697,"value":2}]}}
-{"id":234,"label":"song","inE":{"followedBy":[{"id":4161,"outV":54,"properties":{"weight":2}},{"id":6274,"outV":49,"properties":{"weight":2}},{"id":1094,"outV":59,"properties":{"weight":2}},{"id":2918,"outV":78,"properties":{"weight":1}},{"id":6727,"outV":53,"properties":{"weight":1}},{"id":3560,"outV":56,"properties":{"weight":1}},{"id":5933,"outV":50,"properties":{"weight":3}},{"id":2514,"outV":57,"properties":{"weight":1}},{"id":4883,"outV":100,"properties":{"weight":1}},{"id":2676,"outV":13,"properties":{"weight":1}},{"id":983,"outV":11,"properties":{"weight":7}},{"id":6457,"outV":187,"properties":{"weight":1}},{"id":5630,"outV":22,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1776,"inV":19,"properties":{"weight":7}},{"id":1777,"inV":56,"properties":{"weight":3}},{"id":1778,"inV":59,"properties":{"weight":1}},{"id":1779,"inV":12,"properties":{"weight":1}},{"id":1780,"inV":13,"properties":{"weight":2}},{"id":1781,"inV":24,"properties":{"weight":1}},{"id":1782,"inV":53,"properties":{"weight":1}},{"id":1783,"inV":27,"properties":{"weight":1}},{"id":1773,"inV":237,"properties":{"weight":1}},{"id":1774,"inV":100,"properties":{"weight":2}},{"id":1775,"inV":11,"properties":{"weight":4}}],"sungBy":[{"id":7104,"inV":356}],"writtenBy":[{"id":7103,"inV":356}]},"properties":{"name":[{"id":699,"value":"CHINATOWN SHUFFLE"}],"songType":[{"id":701,"value":"original"}],"performances":[{"id":700,"value":28}]}}
-{"id":235,"label":"song","inE":{"followedBy":[{"id":2679,"outV":13,"properties":{"weight":2}},{"id":984,"outV":11,"properties":{"weight":2}},{"id":3320,"outV":252,"properties":{"weight":1}},{"id":4249,"outV":10,"properties":{"weight":1}},{"id":3067,"outV":153,"properties":{"weight":1}},{"id":3627,"outV":24,"properties":{"weight":1}},{"id":6654,"outV":12,"properties":{"weight":2}},{"id":1535,"outV":18,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2192,"inV":13,"properties":{"weight":1}},{"id":2193,"inV":252,"properties":{"weight":1}},{"id":2194,"inV":3,"properties":{"weight":1}},{"id":2195,"inV":15,"properties":{"weight":1}},{"id":2187,"inV":53,"properties":{"weight":1}},{"id":2188,"inV":50,"properties":{"weight":3}},{"id":2189,"inV":18,"properties":{"weight":1}},{"id":2190,"inV":11,"properties":{"weight":1}},{"id":2191,"inV":120,"properties":{"weight":1}}],"sungBy":[{"id":8046,"inV":340}],"writtenBy":[{"id":8045,"inV":807}]},"properties":{"name":[{"id":702,"value":"YOU WIN AGAIN"}],"songType":[{"id":704,"value":"cover"}],"performances":[{"id":703,"value":25}]}}
-{"id":236,"label":"song","inE":{"followedBy":[{"id":5520,"outV":43,"properties":{"weight":6}},{"id":2259,"outV":29,"properties":{"weight":1}},{"id":996,"outV":11,"properties":{"weight":1}},{"id":6261,"outV":117,"properties":{"weight":1}},{"id":1222,"outV":26,"properties":{"weight":1}},{"id":4839,"outV":114,"properties":{"weight":2}},{"id":1528,"outV":164,"properties":{"weight":2}},{"id":3768,"outV":3,"properties":{"weight":5}},{"id":2332,"outV":25,"properties":{"weight":4}},{"id":3134,"outV":153,"properties":{"weight":1}},{"id":5551,"outV":166,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4969,"inV":9,"properties":{"weight":3}},{"id":4970,"inV":4,"properties":{"weight":1}},{"id":4971,"inV":41,"properties":{"weight":1}},{"id":4972,"inV":78,"properties":{"weight":3}},{"id":4973,"inV":79,"properties":{"weight":2}},{"id":4974,"inV":38,"properties":{"weight":1}},{"id":4975,"inV":76,"properties":{"weight":1}},{"id":4976,"inV":19,"properties":{"weight":3}},{"id":4977,"inV":62,"properties":{"weight":1}},{"id":4978,"inV":87,"properties":{"weight":3}},{"id":4979,"inV":82,"properties":{"weight":1}},{"id":4980,"inV":84,"properties":{"weight":1}},{"id":4981,"inV":90,"properties":{"weight":1}},{"id":4982,"inV":64,"properties":{"weight":1}},{"id":4983,"inV":50,"properties":{"weight":1}},{"id":4984,"inV":166,"properties":{"weight":1}}],"sungBy":[{"id":7228,"inV":340}],"writtenBy":[{"id":7227,"inV":339}]},"properties":{"name":[{"id":705,"value":"LIBERTY"}],"songType":[{"id":707,"value":"original"}],"performances":[{"id":706,"value":56}]}}
-{"id":237,"label":"song","inE":{"followedBy":[{"id":1773,"outV":234,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1008,"inV":54,"properties":{"weight":1}}]},"properties":{"name":[{"id":708,"value":"YOUR LOVE AT HOME"}],"songType":[{"id":710,"value":""}],"performances":[{"id":709,"value":0}]}}
-{"id":238,"label":"song","inE":{"followedBy":[{"id":1044,"outV":73,"properties":{"weight":1}},{"id":2565,"outV":57,"properties":{"weight":1}},{"id":5413,"outV":69,"properties":{"weight":1}},{"id":6711,"outV":141,"properties":{"weight":1}},{"id":5915,"outV":96,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":5328,"inV":134,"properties":{"weight":1}},{"id":5329,"inV":48,"properties":{"weight":1}},{"id":5330,"inV":5,"properties":{"weight":1}},{"id":5331,"inV":51,"properties":{"weight":1}},{"id":5332,"inV":96,"properties":{"weight":1}},{"id":5327,"inV":62,"properties":{"weight":1}}],"sungBy":[{"id":8034,"inV":351}],"writtenBy":[{"id":8033,"inV":799}]},"properties":{"name":[{"id":711,"value":"WILLIE AND THE HAND JIVE"}],"songType":[{"id":713,"value":"cover"}],"performances":[{"id":712,"value":6}]}}
-{"id":239,"label":"song","inE":{"followedBy":[{"id":1056,"outV":73,"properties":{"weight":1}},{"id":4666,"outV":154,"properties":{"weight":1}},{"id":6876,"outV":64,"properties":{"weight":1}},{"id":3197,"outV":104,"properties":{"weight":1}},{"id":6973,"outV":84,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":5440,"inV":12,"properties":{"weight":2}},{"id":5441,"inV":10,"properties":{"weight":1}},{"id":5442,"inV":63,"properties":{"weight":1}},{"id":5443,"inV":27,"properties":{"weight":1}},{"id":5439,"inV":18,"properties":{"weight":1}}]},"properties":{"name":[{"id":714,"value":"IT TAKES A TRAIN TO CRY"}],"songType":[{"id":716,"value":""}],"performances":[{"id":715,"value":0}]}}
-{"id":240,"label":"song","inE":{"followedBy":[{"id":3774,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1067,"inV":104,"properties":{"weight":1}}],"sungBy":[{"id":7316,"inV":351}],"writtenBy":[{"id":7315,"inV":350}]},"properties":{"name":[{"id":717,"value":"SALT LAKE CITY"}],"songType":[{"id":719,"value":"original"}],"performances":[{"id":718,"value":1}]}}
-{"id":241,"label":"song","inE":{"followedBy":[{"id":1069,"outV":227,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4747,"inV":123,"properties":{"weight":1}}]},"properties":{"name":[{"id":720,"value":"LINDA LOU"}],"songType":[{"id":722,"value":""}],"performances":[{"id":721,"value":0}]}}
-{"id":242,"label":"song","inE":{"followedBy":[{"id":6849,"outV":64,"properties":{"weight":1}},{"id":4819,"outV":114,"properties":{"weight":1}},{"id":1428,"outV":83,"properties":{"weight":1}},{"id":1685,"outV":124,"properties":{"weight":1}},{"id":5157,"outV":125,"properties":{"weight":1}},{"id":5916,"outV":96,"properties":{"weight":1}},{"id":1071,"outV":227,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6531,"inV":96,"properties":{"weight":2}},{"id":6532,"inV":19,"properties":{"weight":1}},{"id":6533,"inV":25,"properties":{"weight":1}},{"id":6534,"inV":4,"properties":{"weight":1}},{"id":6535,"inV":58,"properties":{"weight":1}},{"id":6536,"inV":94,"properties":{"weight":1}}],"sungBy":[{"id":8028,"inV":354}],"writtenBy":[{"id":8027,"inV":480}]},"properties":{"name":[{"id":723,"value":"WHY DONT WE DO IT IN THE ROAD"}],"songType":[{"id":725,"value":"cover"}],"performances":[{"id":724,"value":7}]}}
-{"id":243,"label":"song","inE":{"followedBy":[{"id":2567,"outV":57,"properties":{"weight":1}},{"id":1512,"outV":164,"properties":{"weight":1}},{"id":5999,"outV":50,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1080,"inV":153,"properties":{"weight":1}},{"id":1081,"inV":31,"properties":{"weight":1}},{"id":1082,"inV":160,"properties":{"weight":1}}]},"properties":{"name":[{"id":726,"value":"HAPPY BIRTHDAY"}],"songType":[{"id":728,"value":""}],"performances":[{"id":727,"value":0}]}}
-{"id":244,"label":"song","inE":{"followedBy":[{"id":1124,"outV":59,"properties":{"weight":1}},{"id":2133,"outV":17,"properties":{"weight":1}},{"id":4955,"outV":307,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4507,"inV":97,"properties":{"weight":1}},{"id":4508,"inV":54,"properties":{"weight":1}},{"id":4509,"inV":117,"properties":{"weight":1}}],"sungBy":[{"id":7710,"inV":351}],"writtenBy":[{"id":7709,"inV":598}]},"properties":{"name":[{"id":729,"value":"KANSAS CITY"}],"songType":[{"id":731,"value":"cover"}],"performances":[{"id":730,"value":1}]}}
-{"id":245,"label":"song","inE":{"followedBy":[{"id":3507,"outV":223,"properties":{"weight":1}},{"id":5539,"outV":126,"properties":{"weight":1}},{"id":1125,"outV":59,"properties":{"weight":1}},{"id":2951,"outV":78,"properties":{"weight":2}},{"id":1291,"outV":27,"properties":{"weight":2}},{"id":3180,"outV":104,"properties":{"weight":1}},{"id":6799,"outV":39,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6925,"inV":98,"properties":{"weight":1}},{"id":6926,"inV":126,"properties":{"weight":7}},{"id":6927,"inV":108,"properties":{"weight":1}}],"sungBy":[{"id":7542,"inV":351}],"writtenBy":[{"id":7541,"inV":520}]},"properties":{"name":[{"id":732,"value":"DOWN IN THE BOTTOM"}],"songType":[{"id":734,"value":"cover"}],"performances":[{"id":733,"value":9}]}}
-{"id":246,"label":"song","inE":{"followedBy":[{"id":2730,"outV":13,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1141,"inV":134,"properties":{"weight":1}}]},"properties":{"name":[{"id":735,"value":"HULLY GULLY"}],"songType":[{"id":737,"value":""}],"performances":[{"id":736,"value":0}]}}
-{"id":247,"label":"song","inE":{"followedBy":[{"id":1214,"outV":26,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3997,"inV":67,"properties":{"weight":1}}],"sungBy":[{"id":7628,"inV":340}],"writtenBy":[{"id":7627,"inV":577}]},"properties":{"name":[{"id":738,"value":"HOW LONG BLUES"}],"songType":[{"id":740,"value":"cover"}],"performances":[{"id":739,"value":4}]}}
-{"id":248,"label":"song","inE":{"followedBy":[{"id":3489,"outV":58,"properties":{"weight":3}},{"id":4212,"outV":54,"properties":{"weight":1}},{"id":2891,"outV":101,"properties":{"weight":1}},{"id":3420,"outV":77,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1232,"inV":14,"properties":{"weight":1}},{"id":1233,"inV":83,"properties":{"weight":1}},{"id":1234,"inV":76,"properties":{"weight":1}},{"id":1229,"inV":34,"properties":{"weight":1}},{"id":1230,"inV":79,"properties":{"weight":1}},{"id":1231,"inV":215,"properties":{"weight":1}}]},"properties":{"name":[{"id":741,"value":"VALLEY ROAD"}],"songType":[{"id":743,"value":""}],"performances":[{"id":742,"value":0}]}}
-{"id":249,"label":"song","inE":{"followedBy":[{"id":3954,"outV":266,"properties":{"weight":1}},{"id":2979,"outV":265,"properties":{"weight":1}},{"id":4461,"outV":311,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1235,"inV":250,"properties":{"weight":1}},{"id":1236,"inV":124,"properties":{"weight":1}},{"id":1237,"inV":251,"properties":{"weight":1}}],"sungBy":[{"id":7700,"inV":447}],"writtenBy":[{"id":7699,"inV":447}]},"properties":{"name":[{"id":744,"value":"JOHN BROWN"}],"songType":[{"id":746,"value":"cover"}],"performances":[{"id":745,"value":3}]}}
-{"id":250,"label":"song","inE":{"followedBy":[{"id":1235,"outV":249,"properties":{"weight":1}},{"id":5496,"outV":131,"properties":{"weight":1}},{"id":3260,"outV":287,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2226,"inV":269,"properties":{"weight":1}},{"id":2227,"inV":265,"properties":{"weight":1}},{"id":2228,"inV":287,"properties":{"weight":1}}],"sungBy":[{"id":7910,"inV":447}],"writtenBy":[{"id":7909,"inV":447}]},"properties":{"name":[{"id":747,"value":"SIMPLE TWIST OF FATE"}],"songType":[{"id":749,"value":"cover"}],"performances":[{"id":748,"value":3}]}}
-{"id":251,"label":"song","inE":{"followedBy":[{"id":3953,"outV":266,"properties":{"weight":1}},{"id":1237,"outV":249,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2004,"inV":124,"properties":{"weight":1}},{"id":2005,"inV":269,"properties":{"weight":1}}],"sungBy":[{"id":7652,"inV":447}],"writtenBy":[{"id":7651,"inV":447}]},"properties":{"name":[{"id":750,"value":"I WANT YOU"}],"songType":[{"id":752,"value":"cover"}],"performances":[{"id":751,"value":2}]}}
-{"id":252,"label":"song","inE":{"followedBy":[{"id":6272,"outV":49,"properties":{"weight":2}},{"id":2193,"outV":235,"properties":{"weight":1}},{"id":1554,"outV":18,"properties":{"weight":1}},{"id":1939,"outV":148,"properties":{"weight":1}},{"id":6659,"outV":12,"properties":{"weight":1}},{"id":1252,"outV":27,"properties":{"weight":1}},{"id":6325,"outV":21,"properties":{"weight":2}},{"id":4774,"outV":114,"properties":{"weight":1}},{"id":6454,"outV":187,"properties":{"weight":1}},{"id":4251,"outV":10,"properties":{"weight":1}},{"id":2510,"outV":57,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3311,"inV":39,"properties":{"weight":1}},{"id":3312,"inV":3,"properties":{"weight":1}},{"id":3313,"inV":100,"properties":{"weight":1}},{"id":3314,"inV":27,"properties":{"weight":1}},{"id":3315,"inV":18,"properties":{"weight":1}},{"id":3316,"inV":89,"properties":{"weight":1}},{"id":3317,"inV":10,"properties":{"weight":1}},{"id":3318,"inV":153,"properties":{"weight":1}},{"id":3319,"inV":54,"properties":{"weight":1}},{"id":3320,"inV":235,"properties":{"weight":1}},{"id":3321,"inV":80,"properties":{"weight":1}},{"id":3322,"inV":21,"properties":{"weight":1}},{"id":3323,"inV":49,"properties":{"weight":1}}]},"properties":{"name":[{"id":753,"value":"HURTS ME TOO"}],"songType":[{"id":755,"value":""}],"performances":[{"id":754,"value":0}]}}
-{"id":253,"label":"song","inE":{"followedBy":[{"id":5289,"outV":32,"properties":{"weight":1}},{"id":1295,"outV":27,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1982,"inV":117,"properties":{"weight":1}},{"id":1983,"inV":68,"properties":{"weight":1}}]},"properties":{"name":[{"id":756,"value":"ADDAMS FAMILY"}],"songType":[{"id":758,"value":""}],"performances":[{"id":757,"value":0}]}}
-{"id":254,"label":"song","inE":{"followedBy":[{"id":3937,"outV":51,"properties":{"weight":2}},{"id":3427,"outV":77,"properties":{"weight":1}},{"id":4932,"outV":100,"properties":{"weight":2}},{"id":5831,"outV":76,"properties":{"weight":1}},{"id":1768,"outV":28,"properties":{"weight":1}},{"id":4040,"outV":173,"properties":{"weight":1}},{"id":1353,"outV":31,"properties":{"weight":1}},{"id":1609,"outV":18,"properties":{"weight":1}},{"id":5513,"outV":131,"properties":{"weight":2}},{"id":4554,"outV":105,"properties":{"weight":1}},{"id":3693,"outV":24,"properties":{"weight":2}},{"id":5296,"outV":32,"properties":{"weight":1}},{"id":3505,"outV":192,"properties":{"weight":1}},{"id":4499,"outV":202,"properties":{"weight":4}},{"id":2100,"outV":188,"properties":{"weight":2}},{"id":5620,"outV":42,"properties":{"weight":1}},{"id":4405,"outV":40,"properties":{"weight":1}},{"id":4217,"outV":54,"properties":{"weight":2}},{"id":1307,"outV":27,"properties":{"weight":3}},{"id":3612,"outV":56,"properties":{"weight":1}},{"id":5020,"outV":30,"properties":{"weight":2}},{"id":3837,"outV":88,"properties":{"weight":2}}]},"outE":{"followedBy":[{"id":4576,"inV":112,"properties":{"weight":1}},{"id":4577,"inV":15,"properties":{"weight":1}},{"id":4578,"inV":137,"properties":{"weight":2}},{"id":4579,"inV":103,"properties":{"weight":1}},{"id":4580,"inV":43,"properties":{"weight":1}},{"id":4581,"inV":190,"properties":{"weight":1}},{"id":4582,"inV":39,"properties":{"weight":1}},{"id":4583,"inV":26,"properties":{"weight":1}},{"id":4560,"inV":158,"properties":{"weight":3}},{"id":4561,"inV":173,"properties":{"weight":1}},{"id":4562,"inV":202,"properties":{"weight":4}},{"id":4563,"inV":28,"properties":{"weight":1}},{"id":4564,"inV":36,"properties":{"weight":1}},{"id":4565,"inV":51,"properties":{"weight":1}},{"id":4566,"inV":85,"properties":{"weight":1}},{"id":4567,"inV":58,"properties":{"weight":1}},{"id":4568,"inV":184,"properties":{"weight":1}},{"id":4569,"inV":27,"properties":{"weight":2}},{"id":4570,"inV":54,"properties":{"weight":4}},{"id":4571,"inV":57,"properties":{"weight":1}},{"id":4572,"inV":117,"properties":{"weight":1}},{"id":4573,"inV":73,"properties":{"weight":1}},{"id":4574,"inV":100,"properties":{"weight":1}},{"id":4575,"inV":105,"properties":{"weight":2}}],"sungBy":[{"id":7488,"inV":354}],"writtenBy":[{"id":7487,"inV":490}]},"properties":{"name":[{"id":759,"value":"BROKEN ARROW"}],"songType":[{"id":761,"value":"cover"}],"performances":[{"id":760,"value":35}]}}
-{"id":255,"label":"song","inE":{"followedBy":[{"id":1314,"outV":161,"properties":{"weight":1}},{"id":1493,"outV":164,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2972,"inV":78,"properties":{"weight":1}},{"id":2973,"inV":163,"properties":{"weight":1}}],"sungBy":[{"id":7952,"inV":757}],"writtenBy":[{"id":7951,"inV":757}]},"properties":{"name":[{"id":762,"value":"TELL MAMA"}],"songType":[{"id":764,"value":"cover"}],"performances":[{"id":763,"value":1}]}}
-{"id":256,"label":"song","inE":{"followedBy":[{"id":1336,"outV":31,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6644,"inV":325,"properties":{"weight":1}}],"sungBy":[{"id":7482,"inV":462}],"writtenBy":[{"id":7481,"inV":462}]},"properties":{"name":[{"id":765,"value":"BORN ON THE BAYOU"}],"songType":[{"id":767,"value":"cover"}],"performances":[{"id":766,"value":1}]}}
-{"id":257,"label":"song","inE":{"followedBy":[{"id":4133,"outV":48,"properties":{"weight":1}},{"id":4376,"outV":62,"properties":{"weight":1}},{"id":1466,"outV":81,"properties":{"weight":1}},{"id":6509,"outV":187,"properties":{"weight":1}},{"id":6238,"outV":117,"properties":{"weight":1}},{"id":2463,"outV":68,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5057,"inV":39,"properties":{"weight":1}},{"id":5058,"inV":85,"properties":{"weight":1}},{"id":5059,"inV":76,"properties":{"weight":1}},{"id":5060,"inV":21,"properties":{"weight":1}},{"id":5061,"inV":103,"properties":{"weight":1}},{"id":5062,"inV":69,"properties":{"weight":1}}],"sungBy":[{"id":7748,"inV":381}],"writtenBy":[{"id":7747,"inV":646}]},"properties":{"name":[{"id":768,"value":"LOUIE LOUIE"}],"songType":[{"id":770,"value":"cover"}],"performances":[{"id":769,"value":8}]}}
-{"id":258,"label":"song","inE":{"followedBy":[{"id":4868,"outV":35,"properties":{"weight":1}},{"id":4741,"outV":186,"properties":{"weight":2}},{"id":6187,"outV":36,"properties":{"weight":1}},{"id":1487,"outV":81,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5840,"inV":85,"properties":{"weight":1}},{"id":5836,"inV":70,"properties":{"weight":1}},{"id":5837,"inV":13,"properties":{"weight":1}},{"id":5838,"inV":14,"properties":{"weight":1}},{"id":5839,"inV":140,"properties":{"weight":1}}],"sungBy":[{"id":7650,"inV":340}],"writtenBy":[{"id":7649,"inV":592}]},"properties":{"name":[{"id":771,"value":"I WANT TO TELL YOU"}],"songType":[{"id":773,"value":"cover"}],"performances":[{"id":772,"value":7}]}}
-{"id":259,"label":"song","inE":{"followedBy":[{"id":2608,"outV":158,"properties":{"weight":1}},{"id":3777,"outV":3,"properties":{"weight":1}},{"id":1843,"outV":275,"properties":{"weight":1}},{"id":5225,"outV":216,"properties":{"weight":3}},{"id":6890,"outV":93,"properties":{"weight":1}},{"id":5435,"outV":217,"properties":{"weight":1}},{"id":1533,"outV":164,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1784,"inV":217,"properties":{"weight":1}},{"id":1785,"inV":42,"properties":{"weight":1}},{"id":1786,"inV":30,"properties":{"weight":1}},{"id":1787,"inV":88,"properties":{"weight":3}},{"id":1788,"inV":32,"properties":{"weight":1}},{"id":1789,"inV":31,"properties":{"weight":1}},{"id":1790,"inV":272,"properties":{"weight":1}}],"sungBy":[{"id":7254,"inV":340}],"writtenBy":[{"id":7253,"inV":339}]},"properties":{"name":[{"id":774,"value":"MISSISSIPPI HALF-STEP"}],"songType":[{"id":776,"value":"original"}],"performances":[{"id":775,"value":234}]}}
-{"id":260,"label":"song","inE":{"followedBy":[{"id":3396,"outV":77,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1636,"inV":124,"properties":{"weight":1}}],"sungBy":[{"id":7608,"inV":447}],"writtenBy":[{"id":7607,"inV":447}]},"properties":{"name":[{"id":777,"value":"HEART OF MINE"}],"songType":[{"id":779,"value":"cover"}],"performances":[{"id":778,"value":1}]}}
-{"id":261,"label":"song","inE":{"followedBy":[{"id":1640,"outV":213,"properties":{"weight":1}},{"id":3743,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3840,"inV":97,"properties":{"weight":1}},{"id":3839,"inV":108,"properties":{"weight":1}}]},"properties":{"name":[{"id":780,"value":"ROADRUNNER"}],"songType":[{"id":782,"value":""}],"performances":[{"id":781,"value":0}]}}
-{"id":262,"label":"song","inE":{"followedBy":[{"id":5547,"outV":166,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1658,"inV":62,"properties":{"weight":1}}]},"properties":{"name":[{"id":783,"value":"MARDI GRAS PARADE"}],"songType":[{"id":785,"value":""}],"performances":[{"id":784,"value":0}]}}
-{"id":263,"label":"song","inE":{"followedBy":[{"id":6192,"outV":313,"properties":{"weight":1}},{"id":3075,"outV":153,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1659,"inV":26,"properties":{"weight":1}},{"id":1660,"inV":103,"properties":{"weight":1}}]},"properties":{"name":[{"id":786,"value":"THATS ALRIGHT MAMA"}],"songType":[{"id":788,"value":""}],"performances":[{"id":787,"value":0}]}}
-{"id":264,"label":"song","inE":{"followedBy":[{"id":3952,"outV":266,"properties":{"weight":1}},{"id":3123,"outV":153,"properties":{"weight":1}},{"id":2253,"outV":29,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1661,"inV":265,"properties":{"weight":1}},{"id":1662,"inV":131,"properties":{"weight":1}},{"id":1663,"inV":266,"properties":{"weight":1}}],"sungBy":[{"id":7764,"inV":447}],"writtenBy":[{"id":7763,"inV":447}]},"properties":{"name":[{"id":789,"value":"MAN OF PEACE"}],"songType":[{"id":791,"value":"cover"}],"performances":[{"id":790,"value":3}]}}
-{"id":265,"label":"song","inE":{"followedBy":[{"id":2227,"outV":250,"properties":{"weight":1}},{"id":1661,"outV":264,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2979,"inV":249,"properties":{"weight":1}},{"id":2980,"inV":77,"properties":{"weight":1}}]},"properties":{"name":[{"id":792,"value":"FRANKIE LEE AND JUDAS PRIEST"}],"songType":[{"id":794,"value":""}],"performances":[{"id":793,"value":0}]}}
-{"id":266,"label":"song","inE":{"followedBy":[{"id":5495,"outV":131,"properties":{"weight":1}},{"id":1663,"outV":264,"properties":{"weight":1}},{"id":5695,"outV":330,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3952,"inV":264,"properties":{"weight":1}},{"id":3953,"inV":251,"properties":{"weight":1}},{"id":3954,"inV":249,"properties":{"weight":1}}],"sungBy":[{"id":7656,"inV":447}],"writtenBy":[{"id":7655,"inV":447}]},"properties":{"name":[{"id":795,"value":"ILL BE YOUR BABY TONIGHT"}],"songType":[{"id":797,"value":"cover"}],"performances":[{"id":796,"value":3}]}}
-{"id":267,"label":"song","inE":{"followedBy":[{"id":5284,"outV":32,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1664,"inV":4,"properties":{"weight":1}}],"sungBy":[{"id":7302,"inV":412}],"writtenBy":[{"id":7301,"inV":401}]},"properties":{"name":[{"id":798,"value":"REVOLUTIONARY HAMSTRUNG BLUES"}],"songType":[{"id":800,"value":"original"}],"performances":[{"id":799,"value":1}]}}
-{"id":268,"label":"song","inE":{"followedBy":[{"id":5346,"outV":165,"properties":{"weight":1}},{"id":1683,"outV":124,"properties":{"weight":1}},{"id":5845,"outV":61,"properties":{"weight":2}},{"id":2363,"outV":87,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3328,"inV":152,"properties":{"weight":1}},{"id":3329,"inV":307,"properties":{"weight":1}},{"id":3325,"inV":4,"properties":{"weight":1}},{"id":3326,"inV":57,"properties":{"weight":1}},{"id":3327,"inV":64,"properties":{"weight":1}}]},"properties":{"name":[{"id":801,"value":"WALKIN THE DOG"}],"songType":[{"id":803,"value":""}],"performances":[{"id":802,"value":0}]}}
-{"id":269,"label":"song","inE":{"followedBy":[{"id":2066,"outV":188,"properties":{"weight":1}},{"id":2226,"outV":250,"properties":{"weight":1}},{"id":2005,"outV":251,"properties":{"weight":1}},{"id":3397,"outV":77,"properties":{"weight":2}},{"id":1690,"outV":124,"properties":{"weight":1}},{"id":5322,"outV":170,"properties":{"weight":1}},{"id":4543,"outV":105,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":7040,"inV":77,"properties":{"weight":2}},{"id":7041,"inV":297,"properties":{"weight":1}},{"id":7042,"inV":330,"properties":{"weight":1}},{"id":7043,"inV":331,"properties":{"weight":1}},{"id":7044,"inV":270,"properties":{"weight":1}},{"id":7045,"inV":39,"properties":{"weight":1}},{"id":7046,"inV":75,"properties":{"weight":1}}],"sungBy":[{"id":7452,"inV":351}],"writtenBy":[{"id":7451,"inV":447}]},"properties":{"name":[{"id":804,"value":"BALLAD OF A THIN MAN"}],"songType":[{"id":806,"value":"cover"}],"performances":[{"id":805,"value":8}]}}
-{"id":270,"label":"song","inE":{"followedBy":[{"id":7044,"outV":269,"properties":{"weight":1}},{"id":1691,"outV":124,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6923,"inV":188,"properties":{"weight":1}},{"id":6924,"inV":284,"properties":{"weight":1}}]},"properties":{"name":[{"id":807,"value":"RAINY DAY WOMAN"}],"songType":[{"id":809,"value":""}],"performances":[{"id":808,"value":0}]}}
-{"id":271,"label":"song","inE":{"followedBy":[{"id":2065,"outV":188,"properties":{"weight":2}},{"id":3394,"outV":77,"properties":{"weight":1}},{"id":1693,"outV":124,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4407,"inV":188,"properties":{"weight":2}},{"id":4408,"inV":310,"properties":{"weight":1}},{"id":4409,"inV":309,"properties":{"weight":1}}],"sungBy":[{"id":7502,"inV":447}],"writtenBy":[{"id":7501,"inV":447}]},"properties":{"name":[{"id":810,"value":"CHIMES OF FREEDOM"}],"songType":[{"id":812,"value":"cover"}],"performances":[{"id":811,"value":4}]}}
-{"id":272,"label":"song","inE":{"followedBy":[{"id":3616,"outV":56,"properties":{"weight":1}},{"id":4144,"outV":48,"properties":{"weight":1}},{"id":6883,"outV":64,"properties":{"weight":1}},{"id":1790,"outV":259,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4457,"inV":173,"properties":{"weight":1}},{"id":4458,"inV":51,"properties":{"weight":1}},{"id":4459,"inV":48,"properties":{"weight":1}},{"id":4460,"inV":152,"properties":{"weight":1}}],"sungBy":[{"id":7944,"inV":351}],"writtenBy":[{"id":7943,"inV":753}]},"properties":{"name":[{"id":813,"value":"TAKE ME TO THE RIVER"}],"songType":[{"id":815,"value":"cover"}],"performances":[{"id":814,"value":4}]}}
-{"id":273,"label":"song","inE":{"followedBy":[{"id":4419,"outV":198,"properties":{"weight":2}},{"id":6996,"outV":197,"properties":{"weight":4}},{"id":2438,"outV":68,"properties":{"weight":3}},{"id":5719,"outV":20,"properties":{"weight":2}},{"id":3450,"outV":58,"properties":{"weight":1}},{"id":4698,"outV":111,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":1812,"inV":197,"properties":{"weight":4}},{"id":1813,"inV":209,"properties":{"weight":3}},{"id":1814,"inV":18,"properties":{"weight":1}},{"id":1815,"inV":198,"properties":{"weight":3}},{"id":1816,"inV":111,"properties":{"weight":1}},{"id":1817,"inV":68,"properties":{"weight":2}},{"id":1818,"inV":20,"properties":{"weight":1}}]},"properties":{"name":[{"id":816,"value":"BEEN ALL AROUND THIS WORLD"}],"songType":[{"id":818,"value":""}],"performances":[{"id":817,"value":0}]}}
-{"id":274,"label":"song","inE":{"followedBy":[{"id":1835,"outV":41,"properties":{"weight":4}}]},"outE":{"followedBy":[{"id":5729,"inV":96,"properties":{"weight":3}},{"id":5730,"inV":123,"properties":{"weight":1}}]},"properties":{"name":[{"id":819,"value":"MATILDA"}],"songType":[{"id":821,"value":""}],"performances":[{"id":820,"value":0}]}}
-{"id":275,"label":"song","inE":{"followedBy":[{"id":4023,"outV":185,"properties":{"weight":12}}]},"outE":{"followedBy":[{"id":1840,"inV":4,"properties":{"weight":1}},{"id":1841,"inV":64,"properties":{"weight":2}},{"id":1842,"inV":215,"properties":{"weight":1}},{"id":1843,"inV":259,"properties":{"weight":1}},{"id":1844,"inV":96,"properties":{"weight":1}},{"id":1837,"inV":38,"properties":{"weight":2}},{"id":1838,"inV":50,"properties":{"weight":3}},{"id":1839,"inV":30,"properties":{"weight":1}}],"sungBy":[{"id":7974,"inV":415}],"writtenBy":[{"id":7973,"inV":480}]},"properties":{"name":[{"id":822,"value":"TOMORROW NEVER KNOWS"}],"songType":[{"id":824,"value":"cover"}],"performances":[{"id":823,"value":12}]}}
-{"id":276,"label":"song","inE":{"followedBy":[{"id":1955,"outV":148,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5037,"inV":94,"properties":{"weight":1}}]},"properties":{"name":[{"id":825,"value":"ITS A SIN"}],"songType":[{"id":827,"value":""}],"performances":[{"id":826,"value":0}]}}
-{"id":277,"label":"song","inE":{"followedBy":[{"id":1961,"outV":148,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4937,"inV":3,"properties":{"weight":1}}]},"properties":{"name":[{"id":828,"value":"CLOSE ENCOUNTERS"}],"songType":[{"id":830,"value":""}],"performances":[{"id":829,"value":0}]}}
-{"id":278,"label":"song","inE":{"followedBy":[{"id":5816,"outV":76,"properties":{"weight":1}},{"id":6121,"outV":72,"properties":{"weight":1}},{"id":6299,"outV":49,"properties":{"weight":1}},{"id":4444,"outV":113,"properties":{"weight":1}},{"id":6428,"outV":134,"properties":{"weight":1}},{"id":1965,"outV":148,"properties":{"weight":1}},{"id":2270,"outV":25,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2337,"inV":96,"properties":{"weight":3}},{"id":2338,"inV":148,"properties":{"weight":3}},{"id":2339,"inV":130,"properties":{"weight":1}}],"sungBy":[{"id":7118,"inV":340}],"writtenBy":[{"id":7117,"inV":340}]},"properties":{"name":[{"id":831,"value":"CRYPTICAL ENVELOPMENT"}],"songType":[{"id":833,"value":"original"}],"performances":[{"id":832,"value":132}]}}
-{"id":279,"label":"song","inE":{"followedBy":[{"id":5930,"outV":96,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1978,"inV":186,"properties":{"weight":1}}]},"properties":{"name":[{"id":834,"value":"CHANTING BY THE GYOTO MONKS"}],"songType":[{"id":836,"value":""}],"performances":[{"id":835,"value":0}]}}
-{"id":280,"label":"song","inE":{"followedBy":[{"id":3869,"outV":60,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1979,"inV":95,"properties":{"weight":1}}]},"properties":{"name":[{"id":837,"value":"EVERY TIME YOU GO"}],"songType":[{"id":839,"value":""}],"performances":[{"id":838,"value":0}]}}
-{"id":281,"label":"song","inE":{"followedBy":[{"id":5900,"outV":96,"properties":{"weight":1}},{"id":6348,"outV":21,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":1980,"inV":96,"properties":{"weight":1}},{"id":1981,"inV":21,"properties":{"weight":1}}],"sungBy":[{"id":7148,"inV":354}],"writtenBy":[{"id":7147,"inV":339}]},"properties":{"name":[{"id":840,"value":"THE ELEVEN"}],"songType":[{"id":842,"value":"original"}],"performances":[{"id":841,"value":93}]}}
-{"id":282,"label":"song","inE":{"followedBy":[{"id":6306,"outV":123,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2023,"inV":6,"properties":{"weight":1}}]},"properties":{"name":[{"id":843,"value":"TAKE IT OFF"}],"songType":[{"id":845,"value":""}],"performances":[{"id":844,"value":0}]}}
-{"id":283,"label":"song","inE":{"followedBy":[{"id":4922,"outV":100,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2024,"inV":105,"properties":{"weight":1}}],"sungBy":[{"id":7560,"inV":351}],"writtenBy":[{"id":7559,"inV":534}]},"properties":{"name":[{"id":846,"value":"FEVER"}],"songType":[{"id":848,"value":"cover"}],"performances":[{"id":847,"value":1}]}}
-{"id":284,"label":"song","inE":{"followedBy":[{"id":2064,"outV":188,"properties":{"weight":1}},{"id":6924,"outV":270,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6439,"inV":310,"properties":{"weight":1}},{"id":6440,"inV":165,"properties":{"weight":1}}],"sungBy":[{"id":7598,"inV":447}],"writtenBy":[{"id":7597,"inV":447}]},"properties":{"name":[{"id":849,"value":"GOTTA SERVE SOMEBODY"}],"songType":[{"id":851,"value":"cover"}],"performances":[{"id":850,"value":2}]}}
-{"id":285,"label":"song","inE":{"followedBy":[{"id":5472,"outV":79,"properties":{"weight":1}},{"id":3932,"outV":51,"properties":{"weight":1}},{"id":2095,"outV":188,"properties":{"weight":1}},{"id":6255,"outV":117,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3254,"inV":101,"properties":{"weight":2}},{"id":3255,"inV":82,"properties":{"weight":1}},{"id":3256,"inV":26,"properties":{"weight":1}}]},"properties":{"name":[{"id":852,"value":"RUBIN AND CHERISE"}],"songType":[{"id":854,"value":""}],"performances":[{"id":853,"value":0}]}}
-{"id":286,"label":"song","inE":{"followedBy":[{"id":5411,"outV":69,"properties":{"weight":1}},{"id":5813,"outV":76,"properties":{"weight":1}},{"id":6376,"outV":21,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2144,"inV":91,"properties":{"weight":1}},{"id":2145,"inV":139,"properties":{"weight":1}},{"id":2143,"inV":70,"properties":{"weight":1}}]},"properties":{"name":[{"id":855,"value":"I JUST WANNA MAKE LOVE TO YOU"}],"songType":[{"id":857,"value":""}],"performances":[{"id":856,"value":0}]}}
-{"id":287,"label":"song","inE":{"followedBy":[{"id":2228,"outV":250,"properties":{"weight":1}},{"id":5494,"outV":131,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3260,"inV":250,"properties":{"weight":1}},{"id":3261,"inV":124,"properties":{"weight":1}}],"sungBy":[{"id":8008,"inV":447}],"writtenBy":[{"id":8007,"inV":447}]},"properties":{"name":[{"id":858,"value":"WATCHING THE RIVER FLOW"}],"songType":[{"id":860,"value":"cover"}],"performances":[{"id":859,"value":2}]}}
-{"id":288,"label":"song","inE":{"followedBy":[{"id":2234,"outV":215,"properties":{"weight":8}}]},"outE":{"followedBy":[{"id":5444,"inV":154,"properties":{"weight":8}}],"sungBy":[{"id":7326,"inV":342}],"writtenBy":[{"id":7325,"inV":384}]},"properties":{"name":[{"id":861,"value":"SLIPKNOT"}],"songType":[{"id":863,"value":"original"}],"performances":[{"id":862,"value":112}]}}
-{"id":289,"label":"song","inE":{"followedBy":[{"id":6928,"outV":84,"properties":{"weight":2}},{"id":5889,"outV":96,"properties":{"weight":3}},{"id":3090,"outV":153,"properties":{"weight":2}},{"id":2310,"outV":25,"properties":{"weight":1}},{"id":2542,"outV":57,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6144,"inV":171,"properties":{"weight":1}},{"id":6145,"inV":125,"properties":{"weight":1}},{"id":6140,"inV":26,"properties":{"weight":2}},{"id":6141,"inV":57,"properties":{"weight":1}},{"id":6142,"inV":96,"properties":{"weight":1}},{"id":6143,"inV":3,"properties":{"weight":3}}]},"properties":{"name":[{"id":864,"value":"OLLIN ARRAGEED"}],"songType":[{"id":866,"value":""}],"performances":[{"id":865,"value":0}]}}
-{"id":290,"label":"song","inE":{"followedBy":[{"id":5381,"outV":69,"properties":{"weight":1}},{"id":3899,"outV":51,"properties":{"weight":1}},{"id":4477,"outV":202,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2336,"inV":69,"properties":{"weight":1}},{"id":2335,"inV":19,"properties":{"weight":2}}],"sungBy":[{"id":7258,"inV":351}],"writtenBy":[{"id":7257,"inV":350}]},"properties":{"name":[{"id":867,"value":"MONEY MONEY"}],"songType":[{"id":869,"value":"original"}],"performances":[{"id":868,"value":3}]}}
-{"id":291,"label":"song","inE":{"followedBy":[{"id":2501,"outV":90,"properties":{"weight":1}},{"id":2393,"outV":87,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5038,"inV":105,"properties":{"weight":1}},{"id":5039,"inV":104,"properties":{"weight":1}}]},"properties":{"name":[{"id":870,"value":"KING BEE"}],"songType":[{"id":872,"value":""}],"performances":[{"id":871,"value":0}]}}
-{"id":292,"label":"song","inE":{"followedBy":[{"id":3137,"outV":153,"properties":{"weight":1}},{"id":4145,"outV":48,"properties":{"weight":1}},{"id":4386,"outV":62,"properties":{"weight":1}},{"id":5123,"outV":4,"properties":{"weight":1}},{"id":6374,"outV":21,"properties":{"weight":1}},{"id":3480,"outV":58,"properties":{"weight":1}},{"id":2394,"outV":87,"properties":{"weight":1}},{"id":3775,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4016,"inV":27,"properties":{"weight":2}},{"id":4017,"inV":56,"properties":{"weight":1}},{"id":4011,"inV":61,"properties":{"weight":1}},{"id":4012,"inV":28,"properties":{"weight":1}},{"id":4013,"inV":113,"properties":{"weight":1}},{"id":4014,"inV":104,"properties":{"weight":1}},{"id":4015,"inV":18,"properties":{"weight":1}}],"sungBy":[{"id":7590,"inV":476}],"writtenBy":[{"id":7589,"inV":554}]},"properties":{"name":[{"id":873,"value":"GOOD MORNING LITTLE SCHOOL GIRL"}],"songType":[{"id":875,"value":"cover"}],"performances":[{"id":874,"value":62}]}}
-{"id":293,"label":"song","inE":{"followedBy":[{"id":2406,"outV":6,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3253,"inV":305,"properties":{"weight":1}}]},"properties":{"name":[{"id":876,"value":"HOW SWEET IT IS"}],"songType":[{"id":878,"value":""}],"performances":[{"id":877,"value":0}]}}
-{"id":294,"label":"song","inE":{"followedBy":[{"id":2416,"outV":68,"properties":{"weight":1}},{"id":2592,"outV":112,"properties":{"weight":1}},{"id":2793,"outV":15,"properties":{"weight":2}},{"id":3354,"outV":184,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4745,"inV":14,"properties":{"weight":4}},{"id":4746,"inV":26,"properties":{"weight":1}}],"sungBy":[{"id":7252,"inV":340}],"writtenBy":[{"id":7251,"inV":339}]},"properties":{"name":[{"id":879,"value":"MISSION IN THE RAIN"}],"songType":[{"id":881,"value":"original"}],"performances":[{"id":880,"value":5}]}}
-{"id":295,"label":"song","inE":{"followedBy":[{"id":4431,"outV":308,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2607,"inV":7,"properties":{"weight":1}}]},"properties":{"name":[{"id":882,"value":"YOU WONT FIND ME"}],"songType":[{"id":884,"value":""}],"performances":[{"id":883,"value":0}]}}
-{"id":296,"label":"song","inE":{"followedBy":[{"id":2694,"outV":13,"properties":{"weight":1}},{"id":7020,"outV":89,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":6067,"inV":127,"properties":{"weight":1}},{"id":6068,"inV":89,"properties":{"weight":1}},{"id":6069,"inV":83,"properties":{"weight":1}},{"id":6070,"inV":49,"properties":{"weight":1}}],"sungBy":[{"id":7250,"inV":342}],"writtenBy":[{"id":7249,"inV":342}]},"properties":{"name":[{"id":885,"value":"MIND LEFT BODY JAM"}],"songType":[{"id":887,"value":"original"}],"performances":[{"id":886,"value":4}]}}
-{"id":297,"label":"song","inE":{"followedBy":[{"id":7041,"outV":269,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2754,"inV":188,"properties":{"weight":1}}],"sungBy":[{"id":8030,"inV":447}],"writtenBy":[{"id":8029,"inV":447}]},"properties":{"name":[{"id":888,"value":"WICKED MESSENGER"}],"songType":[{"id":890,"value":"cover"}],"performances":[{"id":889,"value":1}]}}
-{"id":298,"label":"song","inE":{"followedBy":[{"id":4054,"outV":173,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2829,"inV":108,"properties":{"weight":1}}],"sungBy":[{"id":7714,"inV":351}],"writtenBy":[{"id":7713,"inV":446}]},"properties":{"name":[{"id":891,"value":"KC MOAN"}],"songType":[{"id":893,"value":"cover"}],"performances":[{"id":892,"value":2}]}}
-{"id":299,"label":"song","inE":{"followedBy":[{"id":3681,"outV":24,"properties":{"weight":1}},{"id":4820,"outV":114,"properties":{"weight":1}},{"id":6852,"outV":64,"properties":{"weight":1}},{"id":2878,"outV":101,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4428,"inV":105,"properties":{"weight":1}},{"id":4429,"inV":181,"properties":{"weight":2}},{"id":4430,"inV":53,"properties":{"weight":1}}],"sungBy":[{"id":7716,"inV":628}],"writtenBy":[{"id":7715,"inV":627}]},"properties":{"name":[{"id":894,"value":"KEEP ON GROWING"}],"songType":[{"id":896,"value":"cover"}],"performances":[{"id":895,"value":4}]}}
-{"id":300,"label":"song","inE":{"followedBy":[{"id":5427,"outV":143,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":2974,"inV":301,"properties":{"weight":1}}],"sungBy":[{"id":8006,"inV":469}],"writtenBy":[{"id":8005,"inV":469}]},"properties":{"name":[{"id":897,"value":"WARRIORS OF THE SUN"}],"songType":[{"id":899,"value":"cover"}],"performances":[{"id":898,"value":1}]}}
-{"id":301,"label":"song","inE":{"followedBy":[{"id":5649,"outV":22,"properties":{"weight":1}},{"id":2974,"outV":300,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3344,"inV":308,"properties":{"weight":1}},{"id":3345,"inV":143,"properties":{"weight":1}}],"sungBy":[{"id":7490,"inV":469}],"writtenBy":[{"id":7489,"inV":491}]},"properties":{"name":[{"id":900,"value":"BYE BYE LOVE"}],"songType":[{"id":902,"value":"cover"}],"performances":[{"id":901,"value":2}]}}
-{"id":302,"label":"song","inE":{"followedBy":[{"id":2976,"outV":8,"properties":{"weight":1}},{"id":5648,"outV":22,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4433,"inV":328,"properties":{"weight":1}},{"id":4434,"inV":308,"properties":{"weight":1}}]},"properties":{"name":[{"id":903,"value":"LADY DI"}],"songType":[{"id":905,"value":""}],"performances":[{"id":904,"value":0}]}}
-{"id":303,"label":"song","inE":{"followedBy":[{"id":3113,"outV":153,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5028,"inV":80,"properties":{"weight":1}}],"sungBy":[{"id":7466,"inV":476}],"writtenBy":[{"id":7465,"inV":475}]},"properties":{"name":[{"id":906,"value":"BIG BOY PETE"}],"songType":[{"id":908,"value":"cover"}],"performances":[{"id":907,"value":7}]}}
-{"id":304,"label":"song","inE":{"followedBy":[{"id":5931,"outV":96,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3138,"inV":186,"properties":{"weight":1}}]},"properties":{"name":[{"id":909,"value":"SILENT WAY JAM"}],"songType":[{"id":911,"value":""}],"performances":[{"id":910,"value":0}]}}
-{"id":305,"label":"song","inE":{"followedBy":[{"id":3253,"outV":293,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4559,"inV":207,"properties":{"weight":1}}]},"properties":{"name":[{"id":912,"value":"ARE YOU LONELY FOR ME"}],"songType":[{"id":914,"value":""}],"performances":[{"id":913,"value":0}]}}
-{"id":306,"label":"song","inE":{"followedBy":[{"id":5277,"outV":32,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3257,"inV":58,"properties":{"weight":1}}],"sungBy":[{"id":7758,"inV":354}],"writtenBy":[{"id":7757,"inV":649}]},"properties":{"name":[{"id":915,"value":"MACK THE KNIFE"}],"songType":[{"id":917,"value":"cover"}],"performances":[{"id":916,"value":1}]}}
-{"id":307,"label":"song","inE":{"followedBy":[{"id":3329,"outV":268,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4955,"inV":244,"properties":{"weight":1}}]},"properties":{"name":[{"id":918,"value":"TORE UP OVER YOU"}],"songType":[{"id":920,"value":""}],"performances":[{"id":919,"value":0}]}}
-{"id":308,"label":"song","inE":{"followedBy":[{"id":3344,"outV":301,"properties":{"weight":1}},{"id":4434,"outV":302,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4432,"inV":38,"properties":{"weight":1}},{"id":4431,"inV":295,"properties":{"weight":1}}]},"properties":{"name":[{"id":921,"value":"BARBRY ALLEN"}],"songType":[{"id":923,"value":""}],"performances":[{"id":922,"value":0}]}}
-{"id":309,"label":"song","inE":{"followedBy":[{"id":3750,"outV":3,"properties":{"weight":1}},{"id":4409,"outV":271,"properties":{"weight":1}},{"id":4956,"outV":331,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3392,"inV":204,"properties":{"weight":1}},{"id":3393,"inV":310,"properties":{"weight":1}},{"id":3391,"inV":77,"properties":{"weight":1}}]},"properties":{"name":[{"id":924,"value":"SLOW TRAIN COMIN"}],"songType":[{"id":926,"value":""}],"performances":[{"id":925,"value":0}]}}
-{"id":310,"label":"song","inE":{"followedBy":[{"id":3393,"outV":309,"properties":{"weight":1}},{"id":6439,"outV":284,"properties":{"weight":1}},{"id":4408,"outV":271,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6263,"inV":165,"properties":{"weight":3}}],"sungBy":[{"id":7698,"inV":447}],"writtenBy":[{"id":7697,"inV":447}]},"properties":{"name":[{"id":927,"value":"JOEY"}],"songType":[{"id":929,"value":"cover"}],"performances":[{"id":928,"value":3}]}}
-{"id":311,"label":"song","inE":{"followedBy":[{"id":3395,"outV":77,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4461,"inV":249,"properties":{"weight":1}}],"sungBy":[{"id":7970,"inV":447}],"writtenBy":[{"id":7969,"inV":447}]},"properties":{"name":[{"id":930,"value":"TOMORROW IS A LONG TIME"}],"songType":[{"id":932,"value":"cover"}],"performances":[{"id":931,"value":1}]}}
-{"id":312,"label":"song","inE":{"followedBy":[{"id":6965,"outV":84,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3430,"inV":30,"properties":{"weight":1}}],"sungBy":[{"id":7576,"inV":351}],"writtenBy":[{"id":7575,"inV":480}]},"properties":{"name":[{"id":933,"value":"GET BACK"}],"songType":[{"id":935,"value":"cover"}],"performances":[{"id":934,"value":1}]}}
-{"id":313,"label":"song","inE":{"followedBy":[{"id":3516,"outV":223,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6192,"inV":263,"properties":{"weight":1}}],"sungBy":[{"id":7792,"inV":340}],"writtenBy":[{"id":7791,"inV":644}]},"properties":{"name":[{"id":936,"value":"MY BABY LEFT ME"}],"songType":[{"id":938,"value":"cover"}],"performances":[{"id":937,"value":1}]}}
-{"id":314,"label":"song","inE":{"followedBy":[{"id":3526,"outV":223,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5932,"inV":27,"properties":{"weight":1}}]},"properties":{"name":[{"id":939,"value":"STEP BACK"}],"songType":[{"id":941,"value":""}],"performances":[{"id":940,"value":0}]}}
-{"id":315,"label":"song","inE":{"followedBy":[{"id":3561,"outV":56,"properties":{"weight":1}},{"id":3742,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5429,"inV":18,"properties":{"weight":1}},{"id":5430,"inV":32,"properties":{"weight":1}}],"sungBy":[{"id":7568,"inV":351}],"writtenBy":[{"id":7567,"inV":540}]},"properties":{"name":[{"id":942,"value":"THE FROZEN LOGGER"}],"songType":[{"id":944,"value":"cover"}],"performances":[{"id":943,"value":6}]}}
-{"id":316,"label":"song","inE":{"followedBy":[{"id":3643,"outV":24,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5569,"inV":80,"properties":{"weight":1}}]},"properties":{"name":[{"id":945,"value":"SUGAR SHACK"}],"songType":[{"id":947,"value":""}],"performances":[{"id":946,"value":0}]}}
-{"id":317,"label":"song","inE":{"followedBy":[{"id":3702,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4225,"inV":114,"properties":{"weight":1}}],"sungBy":[{"id":7906,"inV":574}],"writtenBy":[{"id":7905,"inV":730}]},"properties":{"name":[{"id":948,"value":"SIDEWALKS OF NEW YORK"}],"songType":[{"id":950,"value":"cover"}],"performances":[{"id":949,"value":1}]}}
-{"id":318,"label":"song","inE":{"followedBy":[{"id":3708,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6437,"inV":27,"properties":{"weight":1}}]},"properties":{"name":[{"id":951,"value":"MOUNTAIN JAM"}],"songType":[{"id":953,"value":""}],"performances":[{"id":952,"value":0}]}}
-{"id":319,"label":"song","inE":{"followedBy":[{"id":6321,"outV":21,"properties":{"weight":24}},{"id":3725,"outV":3,"properties":{"weight":3}},{"id":6989,"outV":175,"properties":{"weight":1}},{"id":5902,"outV":96,"properties":{"weight":4}},{"id":6302,"outV":49,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6208,"inV":3,"properties":{"weight":4}},{"id":6209,"inV":125,"properties":{"weight":4}},{"id":6210,"inV":94,"properties":{"weight":2}},{"id":6211,"inV":181,"properties":{"weight":1}},{"id":6212,"inV":127,"properties":{"weight":1}},{"id":6213,"inV":33,"properties":{"weight":1}},{"id":6214,"inV":139,"properties":{"weight":1}},{"id":6215,"inV":229,"properties":{"weight":1}},{"id":6199,"inV":96,"properties":{"weight":1}},{"id":6200,"inV":130,"properties":{"weight":2}},{"id":6201,"inV":5,"properties":{"weight":2}},{"id":6202,"inV":21,"properties":{"weight":3}},{"id":6203,"inV":148,"properties":{"weight":4}},{"id":6204,"inV":83,"properties":{"weight":3}},{"id":6205,"inV":18,"properties":{"weight":1}},{"id":6206,"inV":13,"properties":{"weight":1}},{"id":6207,"inV":62,"properties":{"weight":1}}],"sungBy":[{"id":7806,"inV":340}],"writtenBy":[{"id":7805,"inV":446}]},"properties":{"name":[{"id":954,"value":"NOBODYS FAULT BUT MINE"}],"songType":[{"id":956,"value":"cover"}],"performances":[{"id":955,"value":16}]}}
-{"id":320,"label":"song","inE":{"followedBy":[{"id":3737,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4010,"inV":152,"properties":{"weight":1}}],"sungBy":[{"id":7802,"inV":351}],"writtenBy":[{"id":7801,"inV":669}]},"properties":{"name":[{"id":957,"value":"NEW ORLEANS"}],"songType":[{"id":959,"value":"cover"}],"performances":[{"id":958,"value":5}]}}
-{"id":321,"label":"song","inE":{"followedBy":[{"id":6627,"outV":127,"properties":{"weight":1}},{"id":3753,"outV":3,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5298,"inV":160,"properties":{"weight":2}}],"sungBy":[{"id":7474,"inV":351}],"writtenBy":[{"id":7473,"inV":480}]},"properties":{"name":[{"id":960,"value":"BLACKBIRD"}],"songType":[{"id":962,"value":"cover"}],"performances":[{"id":961,"value":2}]}}
-{"id":322,"label":"song","inE":{"followedBy":[{"id":3821,"outV":88,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":3955,"inV":124,"properties":{"weight":1}}]},"properties":{"name":[{"id":963,"value":"DONT THINK TWICE ITS ALRIGHT"}],"songType":[{"id":965,"value":""}],"performances":[{"id":964,"value":0}]}}
-{"id":323,"label":"song","inE":{"followedBy":[{"id":5908,"outV":96,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4005,"inV":134,"properties":{"weight":1}}],"sungBy":[{"id":7750,"inV":481}],"writtenBy":[{"id":7749,"inV":481}]},"properties":{"name":[{"id":966,"value":"LOVE THE ONE YOURE WITH"}],"songType":[{"id":968,"value":"cover"}],"performances":[{"id":967,"value":1}]}}
-{"id":324,"label":"song","inE":{"followedBy":[{"id":5971,"outV":50,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4223,"inV":39,"properties":{"weight":1}}],"sungBy":[{"id":7732,"inV":340}],"writtenBy":[{"id":7731,"inV":458}]},"properties":{"name":[{"id":969,"value":"LET IT ROCK"}],"songType":[{"id":971,"value":"cover"}],"performances":[{"id":970,"value":1}]}}
-{"id":325,"label":"song","inE":{"followedBy":[{"id":6644,"outV":256,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4224,"inV":326,"properties":{"weight":1}}],"sungBy":[{"id":7602,"inV":462}],"writtenBy":[{"id":7601,"inV":462}]},"properties":{"name":[{"id":972,"value":"GREEN RIVER"}],"songType":[{"id":974,"value":"cover"}],"performances":[{"id":973,"value":1}]}}
-{"id":326,"label":"song","inE":{"followedBy":[{"id":4224,"outV":325,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5841,"inV":194,"properties":{"weight":1}}],"sungBy":[{"id":7446,"inV":462}],"writtenBy":[{"id":7445,"inV":462}]},"properties":{"name":[{"id":975,"value":"BAD MOON RISING"}],"songType":[{"id":977,"value":"cover"}],"performances":[{"id":976,"value":1}]}}
-{"id":327,"label":"song","inE":{"followedBy":[{"id":5883,"outV":96,"properties":{"weight":3}}]},"outE":{"followedBy":[{"id":4410,"inV":25,"properties":{"weight":1}},{"id":4411,"inV":13,"properties":{"weight":1}},{"id":4412,"inV":62,"properties":{"weight":1}}],"sungBy":[{"id":7202,"inV":340}],"writtenBy":[{"id":7201,"inV":339}]},"properties":{"name":[{"id":978,"value":"IF I HAD THE WORLD TO GIVE"}],"songType":[{"id":980,"value":"original"}],"performances":[{"id":979,"value":3}]}}
-{"id":328,"label":"song","inE":{"followedBy":[{"id":4433,"outV":302,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5516,"inV":32,"properties":{"weight":1}}]},"properties":{"name":[{"id":981,"value":"THE BOXER"}],"songType":[{"id":983,"value":""}],"performances":[{"id":982,"value":0}]}}
-{"id":329,"label":"song","inE":{"followedBy":[{"id":6377,"outV":21,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4456,"inV":139,"properties":{"weight":1}}]},"properties":{"name":[{"id":984,"value":"ROLLIN AND TUMBLIN"}],"songType":[{"id":986,"value":""}],"performances":[{"id":985,"value":0}]}}
-{"id":330,"label":"song","inE":{"followedBy":[{"id":7042,"outV":269,"properties":{"weight":1}},{"id":4826,"outV":114,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5696,"inV":87,"properties":{"weight":1}},{"id":5695,"inV":266,"properties":{"weight":1}}],"sungBy":[{"id":7946,"inV":447}],"writtenBy":[{"id":7945,"inV":447}]},"properties":{"name":[{"id":987,"value":"TANGLED UP IN BLUE"}],"songType":[{"id":989,"value":"cover"}],"performances":[{"id":988,"value":2}]}}
-{"id":331,"label":"song","inE":{"followedBy":[{"id":7043,"outV":269,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4956,"inV":309,"properties":{"weight":1}}],"sungBy":[{"id":7902,"inV":447}],"writtenBy":[{"id":7901,"inV":447}]},"properties":{"name":[{"id":990,"value":"SHELTER FROM THE STORM"}],"songType":[{"id":992,"value":"cover"}],"performances":[{"id":991,"value":1}]}}
-{"id":332,"label":"song","inE":{"followedBy":[{"id":6028,"outV":204,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":4957,"inV":87,"properties":{"weight":1}}],"sungBy":[{"id":7622,"inV":574}],"writtenBy":[{"id":7621,"inV":573}]},"properties":{"name":[{"id":993,"value":"HIDEAWAY"}],"songType":[{"id":995,"value":"cover"}],"performances":[{"id":994,"value":1}]}}
-{"id":333,"label":"song","inE":{"followedBy":[{"id":4985,"outV":30,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5536,"inV":164,"properties":{"weight":1}}]},"properties":{"name":[{"id":996,"value":"A MIND TO GIVE UP LIVIN"}],"songType":[{"id":998,"value":""}],"performances":[{"id":997,"value":0}]}}
-{"id":334,"label":"song","inE":{"followedBy":[{"id":6216,"outV":337,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5135,"inV":60,"properties":{"weight":1}}],"sungBy":[{"id":7798,"inV":501}],"writtenBy":[{"id":7797,"inV":501}]},"properties":{"name":[{"id":999,"value":"NEIGHBORHOOD GIRLS"}],"songType":[{"id":1001,"value":"cover"}],"performances":[{"id":1000,"value":1}]}}
-{"id":335,"label":"song","inE":{"followedBy":[{"id":6921,"outV":133,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":5421,"inV":87,"properties":{"weight":1}}],"sungBy":[{"id":7566,"inV":539}],"writtenBy":[{"id":7565,"inV":447}]},"properties":{"name":[{"id":1002,"value":"FOREVER YOUNG"}],"songType":[{"id":1004,"value":"cover"}],"performances":[{"id":1003,"value":1}]}}
-{"id":336,"label":"song","inE":{"followedBy":[{"id":5843,"outV":61,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6217,"inV":78,"properties":{"weight":1}}],"sungBy":[{"id":7594,"inV":340}],"writtenBy":[{"id":7593,"inV":557}]},"properties":{"name":[{"id":1005,"value":"GOODNIGHT IRENE"}],"songType":[{"id":1007,"value":"cover"}],"performances":[{"id":1006,"value":1}]}}
-{"id":337,"label":"song","inE":{"followedBy":[{"id":6128,"outV":72,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6216,"inV":334,"properties":{"weight":1}}],"sungBy":[{"id":7504,"inV":501}],"writtenBy":[{"id":7503,"inV":500}]},"properties":{"name":[{"id":1008,"value":"CHINESE BONES"}],"songType":[{"id":1010,"value":"cover"}],"performances":[{"id":1009,"value":1}]}}
-{"id":338,"label":"song","inE":{"followedBy":[{"id":6347,"outV":21,"properties":{"weight":1}}]},"outE":{"followedBy":[{"id":6438,"inV":149,"properties":{"weight":1}}]},"properties":{"name":[{"id":1011,"value":"OTHER ONE JAM"}],"songType":[{"id":1013,"value":""}],"performances":[{"id":1012,"value":0}]}}
-{"id":339,"label":"artist","inE":{"sungBy":[{"id":7408,"outV":436},{"id":7204,"outV":98},{"id":7146,"outV":369}],"writtenBy":[{"id":7169,"outV":154},{"id":7297,"outV":410},{"id":7171,"outV":104},{"id":7299,"outV":411},{"id":7047,"outV":65},{"id":7303,"outV":222},{"id":7305,"outV":413},{"id":7179,"outV":379},{"id":7307,"outV":51},{"id":7053,"outV":73},{"id":7181,"outV":49},{"id":7055,"outV":346},{"id":7057,"outV":140},{"id":7313,"outV":414},{"id":7187,"outV":215},{"id":7061,"outV":232},{"id":7189,"outV":9},{"id":7317,"outV":37},{"id":7063,"outV":4},{"id":7191,"outV":63},{"id":7319,"outV":82},{"id":7065,"outV":150},{"id":7193,"outV":382},{"id":7321,"outV":84},{"id":7067,"outV":349},{"id":7323,"outV":69},{"id":7069,"outV":125},{"id":7327,"outV":137},{"id":7201,"outV":327},{"id":7075,"outV":159},{"id":7203,"outV":98},{"id":7331,"outV":105},{"id":7079,"outV":46},{"id":7207,"outV":50},{"id":7081,"outV":160},{"id":7337,"outV":92},{"id":7083,"outV":100},{"id":7339,"outV":94},{"id":7085,"outV":168},{"id":7213,"outV":386},{"id":7089,"outV":48},{"id":7217,"outV":389},{"id":7345,"outV":59},{"id":7091,"outV":122},{"id":7221,"outV":390},{"id":7223,"outV":195},{"id":7099,"outV":19},{"id":7227,"outV":236},{"id":7355,"outV":420},{"id":7101,"outV":129},{"id":7359,"outV":91},{"id":7105,"outV":357},{"id":7233,"outV":202},{"id":7107,"outV":141},{"id":7235,"outV":56},{"id":7363,"outV":17},{"id":7109,"outV":358},{"id":7111,"outV":360},{"id":7239,"outV":393},{"id":7113,"outV":60},{"id":7369,"outV":425},{"id":7371,"outV":170},{"id":7245,"outV":99},{"id":7119,"outV":39},{"id":7375,"outV":87},{"id":7121,"outV":89},{"id":7377,"outV":21},{"id":7123,"outV":363},{"id":7251,"outV":294},{"id":7379,"outV":193},{"id":7125,"outV":57},{"id":7253,"outV":259},{"id":7127,"outV":80},{"id":7255,"outV":205},{"id":7383,"outV":74},{"id":7129,"outV":364},{"id":7261,"outV":398},{"id":7135,"outV":108},{"id":7391,"outV":52},{"id":7393,"outV":172},{"id":7395,"outV":35},{"id":7271,"outV":175},{"id":7145,"outV":369},{"id":7147,"outV":281},{"id":7403,"outV":435},{"id":7405,"outV":130},{"id":7407,"outV":436},{"id":7409,"outV":437},{"id":7411,"outV":134},{"id":7157,"outV":83},{"id":7413,"outV":75},{"id":7163,"outV":171},{"id":7291,"outV":13},{"id":7165,"outV":81},{"id":7167,"outV":374},{"id":7295,"outV":27}]},"properties":{"name":[{"id":1014,"value":"Hunter"}]}}
-{"id":340,"label":"artist","inE":{"sungBy":[{"id":7936,"outV":747},{"id":7426,"outV":445},{"id":7682,"outV":612},{"id":7938,"outV":228},{"id":7940,"outV":750},{"id":7942,"outV":752},{"id":7688,"outV":616},{"id":7182,"outV":49},{"id":7950,"outV":756},{"id":7696,"outV":620},{"id":7954,"outV":139},{"id":7188,"outV":215},{"id":7956,"outV":759},{"id":7190,"outV":9},{"id":7958,"outV":761},{"id":7192,"outV":63},{"id":7448,"outV":463},{"id":7964,"outV":766},{"id":7968,"outV":768},{"id":7202,"outV":327},{"id":7462,"outV":472},{"id":7720,"outV":204},{"id":7976,"outV":770},{"id":7722,"outV":144},{"id":7214,"outV":386},{"id":7470,"outV":53},{"id":7218,"outV":389},{"id":7732,"outV":324},{"id":7222,"outV":390},{"id":7480,"outV":485},{"id":7992,"outV":66},{"id":7738,"outV":220},{"id":7228,"outV":236},{"id":7234,"outV":202},{"id":7236,"outV":56},{"id":7494,"outV":156},{"id":7754,"outV":647},{"id":7246,"outV":99},{"id":8014,"outV":214},{"id":7506,"outV":78},{"id":7252,"outV":294},{"id":7254,"outV":259},{"id":8022,"outV":794},{"id":7514,"outV":506},{"id":7772,"outV":656},{"id":7262,"outV":398},{"id":7524,"outV":135},{"id":7780,"outV":661},{"id":7526,"outV":512},{"id":7272,"outV":175},{"id":7528,"outV":180},{"id":8040,"outV":802},{"id":7786,"outV":127},{"id":7790,"outV":664},{"id":8046,"outV":235},{"id":7536,"outV":72},{"id":7792,"outV":313},{"id":7796,"outV":667},{"id":7544,"outV":365},{"id":7546,"outV":521},{"id":7806,"outV":319},{"id":7296,"outV":27},{"id":7300,"outV":411},{"id":7812,"outV":199},{"id":7048,"outV":65},{"id":7304,"outV":222},{"id":7306,"outV":413},{"id":7308,"outV":51},{"id":7054,"outV":73},{"id":7824,"outV":680},{"id":7058,"outV":140},{"id":7572,"outV":543},{"id":7828,"outV":684},{"id":7062,"outV":232},{"id":7830,"outV":685},{"id":7064,"outV":4},{"id":7320,"outV":82},{"id":7066,"outV":150},{"id":7322,"outV":84},{"id":7068,"outV":349},{"id":7324,"outV":69},{"id":7070,"outV":125},{"id":7582,"outV":5},{"id":7838,"outV":692},{"id":7328,"outV":137},{"id":7076,"outV":159},{"id":7332,"outV":105},{"id":7082,"outV":160},{"id":7338,"outV":92},{"id":7594,"outV":336},{"id":7084,"outV":100},{"id":7340,"outV":94},{"id":7086,"outV":168},{"id":7090,"outV":48},{"id":7346,"outV":59},{"id":7092,"outV":122},{"id":7606,"outV":563},{"id":7862,"outV":211},{"id":7866,"outV":705},{"id":7100,"outV":19},{"id":7356,"outV":420},{"id":7612,"outV":1},{"id":7102,"outV":129},{"id":7360,"outV":91},{"id":7616,"outV":568},{"id":7874,"outV":711},{"id":7108,"outV":141},{"id":7364,"outV":17},{"id":7620,"outV":571},{"id":7876,"outV":713},{"id":7878,"outV":715},{"id":7112,"outV":360},{"id":7114,"outV":60},{"id":7370,"outV":425},{"id":7626,"outV":576},{"id":7116,"outV":361},{"id":7372,"outV":170},{"id":7628,"outV":247},{"id":7118,"outV":278},{"id":7630,"outV":578},{"id":7376,"outV":87},{"id":7122,"outV":89},{"id":7124,"outV":363},{"id":7380,"outV":193},{"id":7636,"outV":216},{"id":7126,"outV":57},{"id":7128,"outV":80},{"id":7384,"outV":74},{"id":7130,"outV":364},{"id":7644,"outV":589},{"id":7136,"outV":108},{"id":7392,"outV":52},{"id":7648,"outV":590},{"id":7650,"outV":258},{"id":7654,"outV":593},{"id":7912,"outV":206},{"id":7914,"outV":733},{"id":7404,"outV":435},{"id":7406,"outV":130},{"id":7410,"outV":437},{"id":7668,"outV":603},{"id":7158,"outV":83},{"id":7414,"outV":75},{"id":7674,"outV":62},{"id":7676,"outV":607},{"id":7166,"outV":81}],"writtenBy":[{"id":7115,"outV":361},{"id":7117,"outV":278},{"id":7087,"outV":355},{"id":7279,"outV":403}]},"properties":{"name":[{"id":1015,"value":"Garcia"}]}}
-{"id":341,"label":"song","outE":{"sungBy":[{"id":7050,"inV":342}],"writtenBy":[{"id":7049,"inV":342}]},"properties":{"name":[{"id":1016,"value":"ALICE D MILLIONAIRE"}],"songType":[{"id":1018,"value":"original"}],"performances":[{"id":1017,"value":3}]}}
-{"id":342,"label":"artist","inE":{"sungBy":[{"id":7138,"outV":96},{"id":7206,"outV":123},{"id":7336,"outV":417},{"id":7050,"outV":341},{"id":7178,"outV":378},{"id":7212,"outV":385},{"id":7088,"outV":355},{"id":7280,"outV":403},{"id":7250,"outV":296},{"id":7060,"outV":348},{"id":7286,"outV":406},{"id":7096,"outV":145},{"id":7416,"outV":438},{"id":7418,"outV":439},{"id":7260,"outV":397},{"id":7134,"outV":365},{"id":7326,"outV":288}],"writtenBy":[{"id":7137,"outV":96},{"id":7329,"outV":149},{"id":7335,"outV":417},{"id":7049,"outV":341},{"id":7177,"outV":378},{"id":7211,"outV":385},{"id":7249,"outV":296},{"id":7059,"outV":348},{"id":7285,"outV":406},{"id":7095,"outV":145},{"id":7415,"outV":438},{"id":7417,"outV":439},{"id":7259,"outV":397},{"id":7133,"outV":365}]},"properties":{"name":[{"id":1019,"value":"Grateful_Dead"}]}}
-{"id":343,"label":"song","outE":{"sungBy":[{"id":7052,"inV":345}],"writtenBy":[{"id":7051,"inV":344}]},"properties":{"name":[{"id":1020,"value":"ALLIGATOR"}],"songType":[{"id":1022,"value":"original"}],"performances":[{"id":1021,"value":63}]}}
-{"id":344,"label":"artist","inE":{"writtenBy":[{"id":7051,"outV":343}]},"properties":{"name":[{"id":1023,"value":"Hunter_Pigpen"}]}}
-{"id":345,"label":"artist","inE":{"sungBy":[{"id":7052,"outV":343}]},"properties":{"name":[{"id":1024,"value":"Lesh_Pigpen"}]}}
-{"id":346,"label":"song","outE":{"sungBy":[{"id":7056,"inV":347}],"writtenBy":[{"id":7055,"inV":339}]},"properties":{"name":[{"id":1025,"value":"AT A SIDING"}],"songType":[{"id":1027,"value":"original"}],"performances":[{"id":1026,"value":0}]}}
-{"id":347,"label":"artist","inE":{"sungBy":[{"id":7056,"outV":346},{"id":7164,"outV":171}]},"properties":{"name":[{"id":1028,"value":"Hart"}]}}
-{"id":348,"label":"song","outE":{"sungBy":[{"id":7060,"inV":342}],"writtenBy":[{"id":7059,"inV":342}]},"properties":{"name":[{"id":1029,"value":"BARBED WIRE WHIPPING PARTY"}],"songType":[{"id":1031,"value":"original"}],"performances":[{"id":1030,"value":0}]}}
-{"id":349,"label":"song","outE":{"sungBy":[{"id":7068,"inV":340}],"writtenBy":[{"id":7067,"inV":339}]},"properties":{"name":[{"id":1032,"value":"BLACK MUDDY RIVER"}],"songType":[{"id":1034,"value":"original"}],"performances":[{"id":1033,"value":66}]}}
-{"id":350,"label":"artist","inE":{"writtenBy":[{"id":7237,"outV":181},{"id":7365,"outV":424},{"id":7175,"outV":221},{"id":7367,"outV":29},{"id":7243,"outV":24},{"id":7311,"outV":36},{"id":7185,"outV":64},{"id":7315,"outV":240},{"id":7257,"outV":290},{"id":7195,"outV":70},{"id":7197,"outV":231},{"id":7389,"outV":429},{"id":7071,"outV":11},{"id":7263,"outV":103},{"id":7073,"outV":167},{"id":7265,"outV":97},{"id":7139,"outV":366},{"id":7397,"outV":431},{"id":7143,"outV":189},{"id":7209,"outV":118},{"id":7153,"outV":85},{"id":7219,"outV":121},{"id":7093,"outV":68},{"id":7351,"outV":184},{"id":7161,"outV":38},{"id":7225,"outV":101},{"id":7289,"outV":79},{"id":7231,"outV":14}]},"properties":{"name":[{"id":1035,"value":"Barlow"}]}}
-{"id":351,"label":"artist","inE":{"sungBy":[{"id":7168,"outV":374},{"id":7424,"outV":443},{"id":7428,"outV":165},{"id":7430,"outV":448},{"id":7944,"outV":272},{"id":7184,"outV":209},{"id":7440,"outV":25},{"id":7704,"outV":166},{"id":7194,"outV":382},{"id":7196,"outV":70},{"id":7452,"outV":269},{"id":7710,"outV":244},{"id":7714,"outV":298},{"id":7460,"outV":10},{"id":7208,"outV":50},{"id":7472,"outV":15},{"id":7474,"outV":321},{"id":7730,"outV":634},{"id":7220,"outV":121},{"id":7734,"outV":636},{"id":7226,"outV":101},{"id":7994,"outV":780},{"id":7996,"outV":782},{"id":7230,"outV":392},{"id":7742,"outV":639},{"id":7232,"outV":14},{"id":8002,"outV":786},{"id":7492,"outV":492},{"id":8004,"outV":31},{"id":7238,"outV":181},{"id":7496,"outV":494},{"id":7244,"outV":24},{"id":7762,"outV":112},{"id":8020,"outV":117},{"id":7512,"outV":504},{"id":7258,"outV":290},{"id":7516,"outV":198},{"id":7774,"outV":22},{"id":7264,"outV":103},{"id":7776,"outV":12},{"id":7266,"outV":97},{"id":7778,"outV":660},{"id":8034,"outV":238},{"id":8036,"outV":800},{"id":7782,"outV":6},{"id":7784,"outV":197},{"id":7530,"outV":71},{"id":7276,"outV":114},{"id":8048,"outV":808},{"id":7542,"outV":245},{"id":7800,"outV":32},{"id":7802,"outV":320},{"id":7808,"outV":3},{"id":7554,"outV":18},{"id":7814,"outV":8},{"id":7560,"outV":283},{"id":7818,"outV":676},{"id":7820,"outV":678},{"id":7310,"outV":219},{"id":7312,"outV":36},{"id":7568,"outV":315},{"id":7570,"outV":541},{"id":7316,"outV":240},{"id":7574,"outV":545},{"id":7576,"outV":312},{"id":7580,"outV":227},{"id":7072,"outV":11},{"id":7078,"outV":353},{"id":7848,"outV":26},{"id":7596,"outV":558},{"id":7852,"outV":698},{"id":7854,"outV":20},{"id":7344,"outV":153},{"id":7600,"outV":560},{"id":7856,"outV":700},{"id":7348,"outV":133},{"id":7094,"outV":68},{"id":7352,"outV":184},{"id":7870,"outV":709},{"id":7366,"outV":424},{"id":7368,"outV":29},{"id":7884,"outV":76},{"id":7886,"outV":719},{"id":7632,"outV":580},{"id":7888,"outV":720},{"id":7634,"outV":582},{"id":7894,"outV":723},{"id":7388,"outV":34},{"id":7390,"outV":429},{"id":7140,"outV":366},{"id":7908,"outV":731},{"id":7400,"outV":432},{"id":7402,"outV":433},{"id":7154,"outV":85},{"id":7922,"outV":738},{"id":7670,"outV":604},{"id":7672,"outV":606},{"id":7928,"outV":33},{"id":7162,"outV":38}],"writtenBy":[{"id":7283,"outV":148},{"id":7077,"outV":353},{"id":7275,"outV":114},{"id":7229,"outV":392}]},"properties":{"name":[{"id":1036,"value":"Weir"}]}}
-{"id":352,"label":"artist","inE":{"sungBy":[{"id":7074,"outV":167},{"id":7522,"outV":509},{"id":7586,"outV":44},{"id":7618,"outV":151},{"id":7268,"outV":399},{"id":7398,"outV":431},{"id":7144,"outV":189},{"id":7176,"outV":221},{"id":7210,"outV":118},{"id":7242,"outV":395},{"id":7532,"outV":513},{"id":7278,"outV":182},{"id":7374,"outV":223},{"id":7160,"outV":106},{"id":7640,"outV":586},{"id":7736,"outV":638},{"id":7132,"outV":183},{"id":7198,"outV":231}],"writtenBy":[{"id":7267,"outV":399},{"id":7159,"outV":106},{"id":7241,"outV":395},{"id":7131,"outV":183},{"id":7277,"outV":182},{"id":7373,"outV":223}]},"properties":{"name":[{"id":1037,"value":"Mydland"}]}}
-{"id":353,"label":"song","outE":{"sungBy":[{"id":7078,"inV":351}],"writtenBy":[{"id":7077,"inV":351}]},"properties":{"name":[{"id":1038,"value":"BORN CROSS EYED"}],"songType":[{"id":1040,"value":"original"}],"performances":[{"id":1039,"value":13}]}}
-{"id":354,"label":"artist","inE":{"sungBy":[{"id":7200,"outV":174},{"id":7488,"outV":254},{"id":7106,"outV":357},{"id":7298,"outV":410},{"id":7394,"outV":172},{"id":7270,"outV":400},{"id":7080,"outV":46},{"id":7274,"outV":402},{"id":7148,"outV":281},{"id":7758,"outV":306},{"id":7152,"outV":371},{"id":7382,"outV":176},{"id":7288,"outV":109},{"id":7098,"outV":119},{"id":7578,"outV":547},{"id":7548,"outV":522},{"id":7708,"outV":625},{"id":8028,"outV":242},{"id":7294,"outV":409}],"writtenBy":[{"id":7097,"outV":119},{"id":7273,"outV":402},{"id":7151,"outV":371}]},"properties":{"name":[{"id":1041,"value":"Lesh"}]}}
-{"id":355,"label":"song","outE":{"sungBy":[{"id":7088,"inV":342}],"writtenBy":[{"id":7087,"inV":340}]},"properties":{"name":[{"id":1042,"value":"CANT COME DOWN"}],"songType":[{"id":1044,"value":"original"}],"performances":[{"id":1043,"value":1}]}}
-{"id":356,"label":"artist","inE":{"sungBy":[{"id":7104,"outV":234},{"id":7680,"outV":610},{"id":7872,"outV":710},{"id":7556,"outV":529},{"id":7684,"outV":613},{"id":7432,"outV":450},{"id":7880,"outV":717},{"id":7882,"outV":40},{"id":7564,"outV":538},{"id":7508,"outV":502},{"id":7892,"outV":722},{"id":7256,"outV":205},{"id":7768,"outV":653},{"id":7832,"outV":687},{"id":7960,"outV":762},{"id":8024,"outV":146},{"id":7836,"outV":690},{"id":7900,"outV":727},{"id":7712,"outV":626},{"id":7904,"outV":728},{"id":7658,"outV":595},{"id":7468,"outV":477},{"id":7660,"outV":597},{"id":8044,"outV":805},{"id":7150,"outV":370},{"id":7342,"outV":418},{"id":7662,"outV":599},{"id":7984,"outV":776},{"id":7282,"outV":404},{"id":7538,"outV":517},{"id":7604,"outV":161},{"id":7354,"outV":419},{"id":7420,"outV":440},{"id":7804,"outV":207},{"id":7422,"outV":441},{"id":7486,"outV":489}],"writtenBy":[{"id":7281,"outV":404},{"id":7353,"outV":419},{"id":7419,"outV":440},{"id":7149,"outV":370},{"id":7341,"outV":418},{"id":7103,"outV":234}]},"properties":{"name":[{"id":1045,"value":"Pigpen"}]}}
-{"id":357,"label":"song","outE":{"sungBy":[{"id":7106,"inV":354}],"writtenBy":[{"id":7105,"inV":339}]},"properties":{"name":[{"id":1046,"value":"CLEMENTINE"}],"songType":[{"id":1048,"value":"original"}],"performances":[{"id":1047,"value":3}]}}
-{"id":358,"label":"song","outE":{"sungBy":[{"id":7110,"inV":359}],"writtenBy":[{"id":7109,"inV":339}]},"properties":{"name":[{"id":1049,"value":"CORRINA"}],"songType":[{"id":1051,"value":"original"}],"performances":[{"id":1050,"value":77}]}}
-{"id":359,"label":"artist","inE":{"sungBy":[{"id":7110,"outV":358},{"id":7180,"outV":379},{"id":7292,"outV":13}]},"properties":{"name":[{"id":1052,"value":"Weir_Hart"}]}}
-{"id":360,"label":"song","outE":{"sungBy":[{"id":7112,"inV":340}],"writtenBy":[{"id":7111,"inV":339}]},"properties":{"name":[{"id":1053,"value":"COSMIC CHARLEY"}],"songType":[{"id":1055,"value":"original"}],"performances":[{"id":1054,"value":41}]}}
-{"id":361,"label":"song","outE":{"sungBy":[{"id":7116,"inV":340}],"writtenBy":[{"id":7115,"inV":340}]},"properties":{"name":[{"id":1056,"value":"CREAM PUFF WAR"}],"songType":[{"id":1058,"value":"original"}],"performances":[{"id":1057,"value":7}]}}
-{"id":362,"label":"artist","inE":{"sungBy":[{"id":7120,"outV":39},{"id":7248,"outV":396},{"id":7314,"outV":414}],"writtenBy":[{"id":7247,"outV":396}]},"properties":{"name":[{"id":1059,"value":"Garcia_Lesh"}]}}
-{"id":363,"label":"song","outE":{"sungBy":[{"id":7124,"inV":340}],"writtenBy":[{"id":7123,"inV":339}]},"properties":{"name":[{"id":1060,"value":"DAYS BETWEEN"}],"songType":[{"id":1062,"value":"original"}],"performances":[{"id":1061,"value":41}]}}
-{"id":364,"label":"song","outE":{"sungBy":[{"id":7130,"inV":340}],"writtenBy":[{"id":7129,"inV":339}]},"properties":{"name":[{"id":1063,"value":"DOING THAT RAG"}],"songType":[{"id":1065,"value":"original"}],"performances":[{"id":1064,"value":37}]}}
-{"id":365,"label":"song","outE":{"sungBy":[{"id":7544,"inV":340},{"id":7134,"inV":342}],"writtenBy":[{"id":7543,"inV":451},{"id":7133,"inV":342}]},"properties":{"name":[{"id":1066,"value":"DOWN SO LONG"}],"songType":[{"id":1068,"value":"cover"}],"performances":[{"id":1067,"value":2}]}}
-{"id":366,"label":"song","outE":{"sungBy":[{"id":7140,"inV":351}],"writtenBy":[{"id":7139,"inV":350}]},"properties":{"name":[{"id":1069,"value":"THE DWARF"}],"songType":[{"id":1071,"value":"original"}],"performances":[{"id":1070,"value":0}]}}
-{"id":367,"label":"artist","inE":{"writtenBy":[{"id":7347,"outV":133},{"id":7141,"outV":158},{"id":7343,"outV":153}]},"properties":{"name":[{"id":1072,"value":"Hunter_Weir"}]}}
-{"id":368,"label":"artist","inE":{"sungBy":[{"id":7142,"outV":158}]},"properties":{"name":[{"id":1073,"value":"Weir_Hart_Welnick"}]}}
-{"id":369,"label":"song","outE":{"sungBy":[{"id":7146,"inV":339}],"writtenBy":[{"id":7145,"inV":339}]},"properties":{"name":[{"id":1074,"value":"EASY WIND"}],"songType":[{"id":1076,"value":"original"}],"performances":[{"id":1075,"value":44}]}}
-{"id":370,"label":"song","outE":{"sungBy":[{"id":7150,"inV":356}],"writtenBy":[{"id":7149,"inV":356}]},"properties":{"name":[{"id":1077,"value":"EMPTY PAGES"}],"songType":[{"id":1079,"value":"original"}],"performances":[{"id":1078,"value":2}]}}
-{"id":371,"label":"song","outE":{"sungBy":[{"id":7152,"inV":354}],"writtenBy":[{"id":7151,"inV":354}]},"properties":{"name":[{"id":1080,"value":"EQUINOX"}],"songType":[{"id":1082,"value":"original"}],"performances":[{"id":1081,"value":0}]}}
-{"id":372,"label":"artist","inE":{"writtenBy":[{"id":7155,"outV":43}]},"properties":{"name":[{"id":1083,"value":"Dixon"}]}}
-{"id":373,"label":"artist","inE":{"sungBy":[{"id":7156,"outV":43}]},"properties":{"name":[{"id":1084,"value":"Weir_Wasserman"}]}}
-{"id":374,"label":"song","outE":{"sungBy":[{"id":7168,"inV":351}],"writtenBy":[{"id":7167,"inV":339}]},"properties":{"name":[{"id":1085,"value":"FRANCE"}],"songType":[{"id":1087,"value":"original"}],"performances":[{"id":1086,"value":0}]}}
-{"id":375,"label":"artist","inE":{"sungBy":[{"id":7170,"outV":154},{"id":7412,"outV":134}]},"properties":{"name":[{"id":1088,"value":"Garcia_Kreutzmann"}]}}
-{"id":376,"label":"artist","inE":{"sungBy":[{"id":7172,"outV":104}]},"properties":{"name":[{"id":1089,"value":"Garcia_Dawson"}]}}
-{"id":377,"label":"artist","inE":{"sungBy":[{"id":7174,"outV":208},{"id":7350,"outV":196}],"writtenBy":[{"id":7173,"outV":208},{"id":7349,"outV":196}]},"properties":{"name":[{"id":1090,"value":"Donna_Godchaux"}]}}
-{"id":378,"label":"song","outE":{"sungBy":[{"id":7178,"inV":342}],"writtenBy":[{"id":7177,"inV":342}]},"properties":{"name":[{"id":1091,"value":"THE GOLDEN ROAD (TO UNLIMITED DEVOTION)"}],"songType":[{"id":1093,"value":"original"}],"performances":[{"id":1092,"value":3}]}}
-{"id":379,"label":"song","outE":{"sungBy":[{"id":7180,"inV":359}],"writtenBy":[{"id":7179,"inV":339}]},"properties":{"name":[{"id":1094,"value":"GREATEST STORY EVER TOLD"}],"songType":[{"id":1096,"value":"original"}],"performances":[{"id":1095,"value":280}]}}
-{"id":380,"label":"artist","inE":{"writtenBy":[{"id":7183,"outV":209}]},"properties":{"name":[{"id":1097,"value":"Barlow_instrumental"}]}}
-{"id":381,"label":"artist","inE":{"sungBy":[{"id":7186,"outV":64},{"id":7748,"outV":257},{"id":7766,"outV":651}]},"properties":{"name":[{"id":1098,"value":"Weir_Mydland"}]}}
-{"id":382,"label":"song","outE":{"sungBy":[{"id":7194,"inV":351}],"writtenBy":[{"id":7193,"inV":339}]},"properties":{"name":[{"id":1099,"value":"HOLLYWOOD CANTATA"}],"songType":[{"id":1101,"value":"original"}],"performances":[{"id":1100,"value":0}]}}
-{"id":383,"label":"artist","inE":{"writtenBy":[{"id":7199,"outV":174}]},"properties":{"name":[{"id":1102,"value":"Charles"}]}}
-{"id":384,"label":"artist","inE":{"sungBy":[{"id":7330,"outV":149}],"writtenBy":[{"id":7361,"outV":423},{"id":7205,"outV":123},{"id":7399,"outV":432},{"id":7309,"outV":219},{"id":7325,"outV":288},{"id":7357,"outV":421},{"id":7215,"outV":387}]},"properties":{"name":[{"id":1103,"value":"instrumental"}]}}
-{"id":385,"label":"song","outE":{"sungBy":[{"id":7718,"inV":453},{"id":7212,"inV":342}],"writtenBy":[{"id":7717,"inV":446},{"id":7211,"inV":342}]},"properties":{"name":[{"id":1104,"value":"KEEP ROLLING BY"}],"songType":[{"id":1106,"value":"cover"}],"performances":[{"id":1105,"value":1}]}}
-{"id":386,"label":"song","outE":{"sungBy":[{"id":7214,"inV":340}],"writtenBy":[{"id":7213,"inV":339}]},"properties":{"name":[{"id":1107,"value":"KEEP YOUR DAY JOB"}],"songType":[{"id":1109,"value":"original"}],"performances":[{"id":1108,"value":57}]}}
-{"id":387,"label":"song","outE":{"sungBy":[{"id":7216,"inV":388}],"writtenBy":[{"id":7215,"inV":384}]},"properties":{"name":[{"id":1110,"value":"KING SOLOMONS MARBLES"}],"songType":[{"id":1112,"value":"original"}],"performances":[{"id":1111,"value":5}]}}
-{"id":388,"label":"artist","inE":{"sungBy":[{"id":7216,"outV":387}]},"properties":{"name":[{"id":1113,"value":"Lesh_Hart_Kreutzmann"}]}}
-{"id":389,"label":"song","outE":{"sungBy":[{"id":7218,"inV":340}],"writtenBy":[{"id":7217,"inV":339}]},"properties":{"name":[{"id":1114,"value":"LADY WITH A FAN"}],"songType":[{"id":1116,"value":"original"}],"performances":[{"id":1115,"value":302}]}}
-{"id":390,"label":"song","outE":{"sungBy":[{"id":7222,"inV":340}],"writtenBy":[{"id":7221,"inV":339}]},"properties":{"name":[{"id":1117,"value":"LAZY RIVER ROAD"}],"songType":[{"id":1119,"value":"original"}],"performances":[{"id":1118,"value":65}]}}
-{"id":391,"label":"artist","inE":{"sungBy":[{"id":7224,"outV":195}]},"properties":{"name":[{"id":1120,"value":"Keith_Godchaux"}]}}
-{"id":392,"label":"song","outE":{"sungBy":[{"id":7230,"inV":351}],"writtenBy":[{"id":7229,"inV":351}]},"properties":{"name":[{"id":1121,"value":"LITTLE STAR"}],"songType":[{"id":1123,"value":"original"}],"performances":[{"id":1122,"value":3}]}}
-{"id":393,"label":"song","outE":{"sungBy":[{"id":7240,"inV":394}],"writtenBy":[{"id":7239,"inV":339}]},"properties":{"name":[{"id":1124,"value":"MASONS CHILDREN"}],"songType":[{"id":1126,"value":"original"}],"performances":[{"id":1125,"value":18}]}}
-{"id":394,"label":"artist","inE":{"sungBy":[{"id":7240,"outV":393}]},"properties":{"name":[{"id":1127,"value":"Garcia_Weir_Lesh"}]}}
-{"id":395,"label":"song","outE":{"sungBy":[{"id":7242,"inV":352}],"writtenBy":[{"id":7241,"inV":352}]},"properties":{"name":[{"id":1128,"value":"MAYBE YOU KNOW"}],"songType":[{"id":1130,"value":"original"}],"performances":[{"id":1129,"value":6}]}}
-{"id":396,"label":"song","outE":{"sungBy":[{"id":7248,"inV":362}],"writtenBy":[{"id":7247,"inV":362}]},"properties":{"name":[{"id":1131,"value":"MINDBENDER"}],"songType":[{"id":1133,"value":"original"}],"performances":[{"id":1132,"value":2}]}}
-{"id":397,"label":"song","outE":{"sungBy":[{"id":7260,"inV":342}],"writtenBy":[{"id":7259,"inV":342}]},"properties":{"name":[{"id":1134,"value":"THE MONSTER"}],"songType":[{"id":1136,"value":"original"}],"performances":[{"id":1135,"value":1}]}}
-{"id":398,"label":"song","outE":{"sungBy":[{"id":7262,"inV":340}],"writtenBy":[{"id":7261,"inV":339}]},"properties":{"name":[{"id":1137,"value":"MOUNTAINS OF THE MOON"}],"songType":[{"id":1139,"value":"original"}],"performances":[{"id":1138,"value":12}]}}
-{"id":399,"label":"song","outE":{"sungBy":[{"id":7268,"inV":352}],"writtenBy":[{"id":7267,"inV":352}]},"properties":{"name":[{"id":1140,"value":"NEVER TRUST A WOMAN"}],"songType":[{"id":1142,"value":"original"}],"performances":[{"id":1141,"value":42}]}}
-{"id":400,"label":"song","outE":{"sungBy":[{"id":7270,"inV":354}],"writtenBy":[{"id":7269,"inV":401}]},"properties":{"name":[{"id":1143,"value":"NEW POTATO CABOOSE"}],"songType":[{"id":1145,"value":"original"}],"performances":[{"id":1144,"value":26}]}}
-{"id":401,"label":"artist","inE":{"writtenBy":[{"id":7269,"outV":400},{"id":7301,"outV":267},{"id":7381,"outV":176},{"id":7293,"outV":409}]},"properties":{"name":[{"id":1146,"value":"Petersen"}]}}
-{"id":402,"label":"song","outE":{"sungBy":[{"id":7274,"inV":354}],"writtenBy":[{"id":7273,"inV":354}]},"properties":{"name":[{"id":1147,"value":"NO LEFT TURN UNSTONED (CARDBOARD COWBOY)"}],"songType":[{"id":1149,"value":"original"}],"performances":[{"id":1148,"value":2}]}}
-{"id":403,"label":"song","outE":{"sungBy":[{"id":7280,"inV":342}],"writtenBy":[{"id":7279,"inV":340}]},"properties":{"name":[{"id":1150,"value":"THE ONLY TIME IS NOW"}],"songType":[{"id":1152,"value":"original"}],"performances":[{"id":1151,"value":1}]}}
-{"id":404,"label":"song","outE":{"sungBy":[{"id":7282,"inV":356}],"writtenBy":[{"id":7281,"inV":356}]},"properties":{"name":[{"id":1153,"value":"OPERATOR"}],"songType":[{"id":1155,"value":"original"}],"performances":[{"id":1154,"value":4}]}}
-{"id":405,"label":"artist","inE":{"sungBy":[{"id":7284,"outV":148}]},"properties":{"name":[{"id":1156,"value":"Weir_Kreutzmann"}]}}
-{"id":406,"label":"song","outE":{"sungBy":[{"id":7286,"inV":342}],"writtenBy":[{"id":7285,"inV":342}]},"properties":{"name":[{"id":1157,"value":"OTIS ON A SHAKEDOWN CRUISE"}],"songType":[{"id":1159,"value":"original"}],"performances":[{"id":1158,"value":1}]}}
-{"id":407,"label":"artist","inE":{"writtenBy":[{"id":7287,"outV":109}]},"properties":{"name":[{"id":1160,"value":"Monk"}]}}
-{"id":408,"label":"artist","inE":{"sungBy":[{"id":7290,"outV":79}]},"properties":{"name":[{"id":1161,"value":"Weir_Bralove"}]}}
-{"id":409,"label":"song","outE":{"sungBy":[{"id":7294,"inV":354}],"writtenBy":[{"id":7293,"inV":401}]},"properties":{"name":[{"id":1162,"value":"PRIDE OF CUCAMONGA"}],"songType":[{"id":1164,"value":"original"}],"performances":[{"id":1163,"value":0}]}}
-{"id":410,"label":"song","outE":{"sungBy":[{"id":7298,"inV":354}],"writtenBy":[{"id":7297,"inV":339}]},"properties":{"name":[{"id":1165,"value":"RED"}],"songType":[{"id":1167,"value":"original"}],"performances":[{"id":1166,"value":0}]}}
-{"id":411,"label":"song","outE":{"sungBy":[{"id":7300,"inV":340}],"writtenBy":[{"id":7299,"inV":339}]},"properties":{"name":[{"id":1168,"value":"REUBEN AND CERISE"}],"songType":[{"id":1170,"value":"original"}],"performances":[{"id":1169,"value":4}]}}
-{"id":412,"label":"artist","inE":{"sungBy":[{"id":7302,"outV":267}]},"properties":{"name":[{"id":1171,"value":"Mydland_Lesh"}]}}
-{"id":413,"label":"song","outE":{"sungBy":[{"id":7306,"inV":340}],"writtenBy":[{"id":7305,"inV":339}]},"properties":{"name":[{"id":1172,"value":"ROSEMARY"}],"songType":[{"id":1174,"value":"original"}],"performances":[{"id":1173,"value":1}]}}
-{"id":414,"label":"song","outE":{"sungBy":[{"id":7314,"inV":362}],"writtenBy":[{"id":7313,"inV":339}]},"properties":{"name":[{"id":1175,"value":"SAINT STEPHEN"}],"songType":[{"id":1177,"value":"original"}],"performances":[{"id":1176,"value":165}]}}
-{"id":415,"label":"artist","inE":{"sungBy":[{"id":7442,"outV":185},{"id":7826,"outV":682},{"id":7842,"outV":695},{"id":8018,"outV":792},{"id":7318,"outV":37},{"id":7974,"outV":275},{"id":7690,"outV":177},{"id":7834,"outV":689},{"id":8010,"outV":788},{"id":7934,"outV":746}]},"properties":{"name":[{"id":1178,"value":"Welnick"}]}}
-{"id":416,"label":"artist","inE":{"sungBy":[{"id":7988,"outV":778},{"id":7334,"outV":136},{"id":7386,"outV":427},{"id":7930,"outV":136}],"writtenBy":[{"id":7333,"outV":136},{"id":7385,"outV":427}]},"properties":{"name":[{"id":1179,"value":"Hornsby"}]}}
-{"id":417,"label":"song","outE":{"sungBy":[{"id":7336,"inV":342}],"writtenBy":[{"id":7335,"inV":342}]},"properties":{"name":[{"id":1180,"value":"STANDING ON THE CORNER"}],"songType":[{"id":1182,"value":"original"}],"performances":[{"id":1181,"value":3}]}}
-{"id":418,"label":"song","outE":{"sungBy":[{"id":7342,"inV":356}],"writtenBy":[{"id":7341,"inV":356}]},"properties":{"name":[{"id":1183,"value":"THE STRANGER (TWO SOULS IN COMMUNION)"}],"songType":[{"id":1185,"value":"original"}],"performances":[{"id":1184,"value":12}]}}
-{"id":419,"label":"song","outE":{"sungBy":[{"id":7354,"inV":356}],"writtenBy":[{"id":7353,"inV":356}]},"properties":{"name":[{"id":1186,"value":"TASTEBUD"}],"songType":[{"id":1188,"value":"original"}],"performances":[{"id":1187,"value":1}]}}
-{"id":420,"label":"song","outE":{"sungBy":[{"id":7356,"inV":340}],"writtenBy":[{"id":7355,"inV":339}]},"properties":{"name":[{"id":1189,"value":"TENNESSEE JED"}],"songType":[{"id":1191,"value":"original"}],"performances":[{"id":1190,"value":433}]}}
-{"id":421,"label":"song","outE":{"sungBy":[{"id":7358,"inV":422}],"writtenBy":[{"id":7357,"inV":384}]},"properties":{"name":[{"id":1192,"value":"TERRAPIN FLYER"}],"songType":[{"id":1194,"value":"original"}],"performances":[{"id":1193,"value":1}]}}
-{"id":422,"label":"artist","inE":{"sungBy":[{"id":7362,"outV":423},{"id":7358,"outV":421}]},"properties":{"name":[{"id":1195,"value":"Hart_Kreutzmann"}]}}
-{"id":423,"label":"song","outE":{"sungBy":[{"id":7362,"inV":422}],"writtenBy":[{"id":7361,"inV":384}]},"properties":{"name":[{"id":1196,"value":"TERRAPIN TRANSIT"}],"songType":[{"id":1198,"value":"original"}],"performances":[{"id":1197,"value":1}]}}
-{"id":424,"label":"song","outE":{"sungBy":[{"id":7366,"inV":351}],"writtenBy":[{"id":7365,"inV":350}]},"properties":{"name":[{"id":1199,"value":"THIS TIME FOREVER"}],"songType":[{"id":1201,"value":"original"}],"performances":[{"id":1200,"value":1}]}}
-{"id":425,"label":"song","outE":{"sungBy":[{"id":7370,"inV":340}],"writtenBy":[{"id":7369,"inV":339}]},"properties":{"name":[{"id":1202,"value":"TILL THE MORNING COMES"}],"songType":[{"id":1204,"value":"original"}],"performances":[{"id":1203,"value":5}]}}
-{"id":426,"label":"artist","inE":{"sungBy":[{"id":7378,"outV":21}]},"properties":{"name":[{"id":1205,"value":"Garcia_Lesh_Weir"}]}}
-{"id":427,"label":"song","outE":{"sungBy":[{"id":7386,"inV":416}],"writtenBy":[{"id":7385,"inV":416}]},"properties":{"name":[{"id":1206,"value":"THE VALLEY ROAD"}],"songType":[{"id":1208,"value":"original"}],"performances":[{"id":1207,"value":6}]}}
-{"id":428,"label":"artist","inE":{"writtenBy":[{"id":7387,"outV":34}]},"properties":{"name":[{"id":1209,"value":"Graham"}]}}
-{"id":429,"label":"song","outE":{"sungBy":[{"id":7390,"inV":351}],"writtenBy":[{"id":7389,"inV":350}]},"properties":{"name":[{"id":1210,"value":"WALK IN THE SUNSHINE"}],"songType":[{"id":1212,"value":"original"}],"performances":[{"id":1211,"value":0}]}}
-{"id":430,"label":"artist","inE":{"sungBy":[{"id":7396,"outV":35}]},"properties":{"name":[{"id":1213,"value":"Welnick_Bralove"}]}}
-{"id":431,"label":"song","outE":{"sungBy":[{"id":7398,"inV":352}],"writtenBy":[{"id":7397,"inV":350}]},"properties":{"name":[{"id":1214,"value":"WE CAN RUN"}],"songType":[{"id":1216,"value":"original"}],"performances":[{"id":1215,"value":22}]}}
-{"id":432,"label":"song","outE":{"sungBy":[{"id":7400,"inV":351}],"writtenBy":[{"id":7399,"inV":384}]},"properties":{"name":[{"id":1217,"value":"WEATHER REPORT SUITE PRELUDE"}],"songType":[{"id":1219,"value":"original"}],"performances":[{"id":1218,"value":52}]}}
-{"id":433,"label":"song","outE":{"sungBy":[{"id":7402,"inV":351}],"writtenBy":[{"id":7401,"inV":434}]},"properties":{"name":[{"id":1220,"value":"WEATHER REPORT SUITE PART 1"}],"songType":[{"id":1222,"value":"original"}],"performances":[{"id":1221,"value":47}]}}
-{"id":434,"label":"artist","inE":{"writtenBy":[{"id":7401,"outV":433}]},"properties":{"name":[{"id":1223,"value":"Weir_Andersen"}]}}
-{"id":435,"label":"song","outE":{"sungBy":[{"id":7404,"inV":340}],"writtenBy":[{"id":7403,"inV":339}]},"properties":{"name":[{"id":1224,"value":"WEST L.A. FADEAWAY"}],"songType":[{"id":1226,"value":"original"}],"performances":[{"id":1225,"value":140}]}}
-{"id":436,"label":"song","outE":{"sungBy":[{"id":7408,"inV":339}],"writtenBy":[{"id":7407,"inV":339}]},"properties":{"name":[{"id":1227,"value":"WHATLL YOU RAISE"}],"songType":[{"id":1229,"value":"original"}],"performances":[{"id":1228,"value":0}]}}
-{"id":437,"label":"song","outE":{"sungBy":[{"id":7410,"inV":340}],"writtenBy":[{"id":7409,"inV":339}]},"properties":{"name":[{"id":1230,"value":"WHATS BECOME OF THE BABY"}],"songType":[{"id":1232,"value":"original"}],"performances":[{"id":1231,"value":0}]}}
-{"id":438,"label":"song","outE":{"sungBy":[{"id":7416,"inV":342}],"writtenBy":[{"id":7415,"inV":342}]},"properties":{"name":[{"id":1233,"value":"YOU CANT CATCH ME"}],"songType":[{"id":1235,"value":"original"}],"performances":[{"id":1234,"value":1}]}}
-{"id":439,"label":"song","outE":{"sungBy":[{"id":7418,"inV":342}],"writtenBy":[{"id":7417,"inV":342}]},"properties":{"name":[{"id":1236,"value":"YOU DONT HAVE TO ASK"}],"songType":[{"id":1238,"value":"original"}],"performances":[{"id":1237,"value":5}]}}
-{"id":440,"label":"song","outE":{"sungBy":[{"id":7420,"inV":356}],"writtenBy":[{"id":7419,"inV":356}]},"properties":{"name":[{"id":1239,"value":"YOU SEE A BROKEN HEART"}],"songType":[{"id":1241,"value":"original"}],"performances":[{"id":1240,"value":1}]}}
-{"id":441,"label":"song","outE":{"sungBy":[{"id":7422,"inV":356}],"writtenBy":[{"id":7421,"inV":442}]},"properties":{"name":[{"id":1242,"value":"AINT IT CRAZY (THE RUB)"}],"songType":[{"id":1244,"value":"cover"}],"performances":[{"id":1243,"value":12}]}}
-{"id":442,"label":"artist","inE":{"writtenBy":[{"id":7507,"outV":502},{"id":7899,"outV":727},{"id":7421,"outV":441},{"id":7485,"outV":489},{"id":7711,"outV":626}]},"properties":{"name":[{"id":1245,"value":"Lightning_Hopkins"}]}}
-{"id":443,"label":"song","outE":{"sungBy":[{"id":7424,"inV":351}],"writtenBy":[{"id":7423,"inV":444}]},"properties":{"name":[{"id":1246,"value":"AINT THAT PECULIAR"}],"songType":[{"id":1248,"value":"cover"}],"performances":[{"id":1247,"value":1}]}}
-{"id":444,"label":"artist","inE":{"writtenBy":[{"id":7423,"outV":443}]},"properties":{"name":[{"id":1249,"value":"Robinson_et_al"}]}}
-{"id":445,"label":"song","outE":{"sungBy":[{"id":7426,"inV":340}],"writtenBy":[{"id":7425,"inV":446}]},"properties":{"name":[{"id":1250,"value":"ALABAMA BOUND"}],"songType":[{"id":1252,"value":"cover"}],"performances":[{"id":1251,"value":1}]}}
-{"id":446,"label":"artist","inE":{"writtenBy":[{"id":7425,"outV":445},{"id":7491,"outV":492},{"id":7941,"outV":752},{"id":7433,"outV":452},{"id":7883,"outV":76},{"id":7821,"outV":111},{"id":7949,"outV":756},{"id":7695,"outV":620},{"id":7505,"outV":78},{"id":7637,"outV":584},{"id":8021,"outV":794},{"id":7447,"outV":463},{"id":7513,"outV":506},{"id":7705,"outV":624},{"id":7515,"outV":198},{"id":7581,"outV":5},{"id":7645,"outV":187},{"id":7837,"outV":692},{"id":7455,"outV":468},{"id":7967,"outV":768},{"id":8031,"outV":797},{"id":7457,"outV":470},{"id":7713,"outV":298},{"id":8035,"outV":800},{"id":7461,"outV":472},{"id":7525,"outV":512},{"id":7717,"outV":385},{"id":7845,"outV":697},{"id":7527,"outV":180},{"id":7535,"outV":72},{"id":7983,"outV":776},{"id":7985,"outV":777},{"id":7667,"outV":603},{"id":7545,"outV":521},{"id":7673,"outV":62},{"id":7737,"outV":220},{"id":7675,"outV":607},{"id":7549,"outV":524},{"id":7805,"outV":319}]},"properties":{"name":[{"id":1253,"value":"Traditional"}]}}
-{"id":447,"label":"artist","inE":{"sungBy":[{"id":7520,"outV":508},{"id":7970,"outV":311},{"id":7652,"outV":251},{"id":7910,"outV":250},{"id":7624,"outV":575},{"id":7656,"outV":266},{"id":8008,"outV":287},{"id":7946,"outV":330},{"id":7788,"outV":663},{"id":7502,"outV":271},{"id":7598,"outV":284},{"id":7918,"outV":736},{"id":7698,"outV":310},{"id":7540,"outV":519},{"id":7700,"outV":249},{"id":7764,"outV":264},{"id":7860,"outV":702},{"id":7608,"outV":260},{"id":7450,"outV":464},{"id":7902,"outV":331},{"id":7966,"outV":767},{"id":8030,"outV":297}],"writtenBy":[{"id":7681,"outV":612},{"id":7427,"outV":165},{"id":7623,"outV":575},{"id":7687,"outV":616},{"id":8007,"outV":287},{"id":7945,"outV":330},{"id":7501,"outV":271},{"id":7565,"outV":335},{"id":7759,"outV":131},{"id":7697,"outV":310},{"id":7699,"outV":249},{"id":7763,"outV":264},{"id":8019,"outV":117},{"id":7449,"outV":464},{"id":7897,"outV":128},{"id":7451,"outV":269},{"id":7707,"outV":625},{"id":7901,"outV":331},{"id":7965,"outV":767},{"id":8029,"outV":297},{"id":7519,"outV":508},{"id":7777,"outV":660},{"id":7969,"outV":311},{"id":7651,"outV":251},{"id":7779,"outV":661},{"id":7909,"outV":250},{"id":7655,"outV":266},{"id":7719,"outV":204},{"id":7975,"outV":770},{"id":7529,"outV":71},{"id":7787,"outV":663},{"id":7851,"outV":698},{"id":7597,"outV":284},{"id":7917,"outV":736},{"id":7539,"outV":519},{"id":7859,"outV":702},{"id":7607,"outV":260},{"id":7991,"outV":66}]},"properties":{"name":[{"id":1254,"value":"Bob_Dylan"}]}}
-{"id":448,"label":"song","outE":{"sungBy":[{"id":7430,"inV":351}],"writtenBy":[{"id":7429,"inV":449}]},"properties":{"name":[{"id":1255,"value":"ALL I HAVE TO DO IS DREAM"}],"songType":[{"id":1257,"value":"cover"}],"performances":[{"id":1256,"value":1}]}}
-{"id":449,"label":"artist","inE":{"writtenBy":[{"id":7429,"outV":448}]},"properties":{"name":[{"id":1258,"value":"Boudleaux_Bryant"}]}}
-{"id":450,"label":"song","outE":{"sungBy":[{"id":7432,"inV":356}],"writtenBy":[{"id":7431,"inV":451}]},"properties":{"name":[{"id":1259,"value":"ALL OF MY LOVE"}],"songType":[{"id":1261,"value":"cover"}],"performances":[{"id":1260,"value":1}]}}
-{"id":451,"label":"artist","inE":{"sungBy":[{"id":7584,"outV":550},{"id":7728,"outV":633},{"id":7510,"outV":503},{"id":7436,"outV":454},{"id":7692,"outV":617},{"id":7998,"outV":784}],"writtenBy":[{"id":7827,"outV":684},{"id":7509,"outV":503},{"id":7925,"outV":742},{"id":7431,"outV":450},{"id":7543,"outV":365},{"id":7735,"outV":638},{"id":7435,"outV":454},{"id":7467,"outV":477},{"id":7563,"outV":538},{"id":7755,"outV":648},{"id":7997,"outV":784},{"id":7727,"outV":633}]},"properties":{"name":[{"id":1262,"value":"Unknown"}]}}
-{"id":452,"label":"song","outE":{"sungBy":[{"id":7434,"inV":453}],"writtenBy":[{"id":7433,"inV":446}]},"properties":{"name":[{"id":1263,"value":"AND WE BID YOU GOODNIGHT"}],"songType":[{"id":1265,"value":"cover"}],"performances":[{"id":1264,"value":61}]}}
-{"id":453,"label":"artist","inE":{"sungBy":[{"id":7760,"outV":131},{"id":7858,"outV":93},{"id":7718,"outV":385},{"id":7990,"outV":779},{"id":7592,"outV":555},{"id":7434,"outV":452},{"id":7706,"outV":624},{"id":8012,"outV":86},{"id":7646,"outV":187}]},"properties":{"name":[{"id":1266,"value":"All"}]}}
-{"id":454,"label":"song","outE":{"sungBy":[{"id":7436,"inV":451}],"writtenBy":[{"id":7435,"inV":451}]},"properties":{"name":[{"id":1267,"value":"ANY WONDER"}],"songType":[{"id":1269,"value":"cover"}],"performances":[{"id":1268,"value":1}]}}
-{"id":455,"label":"song","outE":{"sungBy":[{"id":7438,"inV":457}],"writtenBy":[{"id":7437,"inV":456}]},"properties":{"name":[{"id":1270,"value":"ARE YOU LONELY FOR ME BABY"}],"songType":[{"id":1272,"value":"cover"}],"performances":[{"id":1271,"value":1}]}}
-{"id":456,"label":"artist","inE":{"writtenBy":[{"id":7437,"outV":455}]},"properties":{"name":[{"id":1273,"value":"Freddie_Scott"}]}}
-{"id":457,"label":"artist","inE":{"sungBy":[{"id":7972,"outV":47},{"id":8042,"outV":55},{"id":7868,"outV":707},{"id":7438,"outV":455}]},"properties":{"name":[{"id":1274,"value":"Donna"}]}}
-{"id":458,"label":"artist","inE":{"writtenBy":[{"id":7731,"outV":324},{"id":7703,"outV":166},{"id":7847,"outV":26},{"id":7963,"outV":766},{"id":7439,"outV":25}]},"properties":{"name":[{"id":1275,"value":"Chuck_Berry"}]}}
-{"id":459,"label":"artist","inE":{"writtenBy":[{"id":7441,"outV":185}]},"properties":{"name":[{"id":1276,"value":"Pete_Townshend"}]}}
-{"id":460,"label":"artist","inE":{"writtenBy":[{"id":7443,"outV":163},{"id":7643,"outV":589}]},"properties":{"name":[{"id":1277,"value":"Jimmy_Reed"}]}}
-{"id":461,"label":"artist","inE":{"sungBy":[{"id":7444,"outV":163},{"id":7642,"outV":588},{"id":7614,"outV":132}]},"properties":{"name":[{"id":1278,"value":"Pigpen_Mydland"}]}}
-{"id":462,"label":"artist","inE":{"sungBy":[{"id":7744,"outV":641},{"id":7602,"outV":325},{"id":7446,"outV":326},{"id":7482,"outV":256},{"id":7850,"outV":194}],"writtenBy":[{"id":7601,"outV":325},{"id":7445,"outV":326},{"id":7481,"outV":256},{"id":7849,"outV":194}]},"properties":{"name":[{"id":1279,"value":"John_Fogerty"}]}}
-{"id":463,"label":"song","outE":{"sungBy":[{"id":7448,"inV":340}],"writtenBy":[{"id":7447,"inV":446}]},"properties":{"name":[{"id":1280,"value":"BALLAD OF CASEY JONES"}],"songType":[{"id":1282,"value":"cover"}],"performances":[{"id":1281,"value":2}]}}
-{"id":464,"label":"song","outE":{"sungBy":[{"id":7450,"inV":447}],"writtenBy":[{"id":7449,"inV":447}]},"properties":{"name":[{"id":1283,"value":"BALLAD OF FRANKIE LEE AND JUDAS PRIEST"}],"songType":[{"id":1285,"value":"cover"}],"performances":[{"id":1284,"value":2}]}}
-{"id":465,"label":"song","outE":{"sungBy":[{"id":7454,"inV":467}],"writtenBy":[{"id":7453,"inV":466}]},"properties":{"name":[{"id":1286,"value":"BANANA BOAT SONG (DAY-O)"}],"songType":[{"id":1288,"value":"cover"}],"performances":[{"id":1287,"value":1}]}}
-{"id":466,"label":"artist","inE":{"writtenBy":[{"id":7453,"outV":465}]},"properties":{"name":[{"id":1289,"value":"Darling_Carey_Arkin"}]}}
-{"id":467,"label":"artist","inE":{"sungBy":[{"id":7454,"outV":465},{"id":7534,"outV":515}]},"properties":{"name":[{"id":1290,"value":"Neville_Brothers"}]}}
-{"id":468,"label":"song","outE":{"sungBy":[{"id":7456,"inV":469}],"writtenBy":[{"id":7455,"inV":446}]},"properties":{"name":[{"id":1291,"value":"BANKS OF THE OHIO"}],"songType":[{"id":1293,"value":"cover"}],"performances":[{"id":1292,"value":1}]}}
-{"id":469,"label":"artist","inE":{"sungBy":[{"id":7456,"outV":468},{"id":7458,"outV":470},{"id":7490,"outV":301},{"id":8006,"outV":300},{"id":7752,"outV":143},{"id":7896,"outV":725},{"id":7770,"outV":655},{"id":7484,"outV":487},{"id":7500,"outV":499},{"id":7724,"outV":630}],"writtenBy":[{"id":8005,"outV":300},{"id":7751,"outV":143},{"id":7895,"outV":725},{"id":7769,"outV":655},{"id":7499,"outV":499},{"id":7723,"outV":630}]},"properties":{"name":[{"id":1294,"value":"Joan_Baez"}]}}
-{"id":470,"label":"song","outE":{"sungBy":[{"id":7458,"inV":469}],"writtenBy":[{"id":7457,"inV":446}]},"properties":{"name":[{"id":1295,"value":"BARBARA ALLEN"}],"songType":[{"id":1297,"value":"cover"}],"performances":[{"id":1296,"value":2}]}}
-{"id":471,"label":"artist","inE":{"writtenBy":[{"id":7459,"outV":10},{"id":7783,"outV":197}]},"properties":{"name":[{"id":1298,"value":"Jesse_Fuller"}]}}
-{"id":472,"label":"song","outE":{"sungBy":[{"id":7462,"inV":340}],"writtenBy":[{"id":7461,"inV":446}]},"properties":{"name":[{"id":1299,"value":"BETTY AND DUPREE"}],"songType":[{"id":1301,"value":"cover"}],"performances":[{"id":1300,"value":1}]}}
-{"id":473,"label":"artist","inE":{"writtenBy":[{"id":7463,"outV":152}]},"properties":{"name":[{"id":1302,"value":"Smith_Dixon"}]}}
-{"id":474,"label":"artist","inE":{"sungBy":[{"id":7464,"outV":152}]},"properties":{"name":[{"id":1303,"value":"Pigpen_Garcia"}]}}
-{"id":475,"label":"artist","inE":{"writtenBy":[{"id":7465,"outV":303}]},"properties":{"name":[{"id":1304,"value":"Harris_Terry"}]}}
-{"id":476,"label":"artist","inE":{"sungBy":[{"id":7664,"outV":601},{"id":7920,"outV":113},{"id":8000,"outV":30},{"id":7590,"outV":292},{"id":7686,"outV":42},{"id":7466,"outV":303},{"id":7978,"outV":164},{"id":7678,"outV":608}]},"properties":{"name":[{"id":1305,"value":"Pigpen_Weir"}]}}
-{"id":477,"label":"song","outE":{"sungBy":[{"id":7468,"inV":356}],"writtenBy":[{"id":7467,"inV":451}]},"properties":{"name":[{"id":1306,"value":"BIG BREASA"}],"songType":[{"id":1308,"value":"cover"}],"performances":[{"id":1307,"value":1}]}}
-{"id":478,"label":"artist","inE":{"writtenBy":[{"id":7989,"outV":779},{"id":7799,"outV":32},{"id":7469,"outV":53}]},"properties":{"name":[{"id":1309,"value":"Noah_Lewis"}]}}
-{"id":479,"label":"artist","inE":{"writtenBy":[{"id":7471,"outV":15}]},"properties":{"name":[{"id":1310,"value":"Johnny_Cash"}]}}
-{"id":480,"label":"artist","inE":{"writtenBy":[{"id":7473,"outV":321},{"id":7857,"outV":93},{"id":7861,"outV":211},{"id":7973,"outV":275},{"id":7575,"outV":312},{"id":7671,"outV":606},{"id":7753,"outV":647},{"id":7833,"outV":689},{"id":8027,"outV":242},{"id":7517,"outV":212},{"id":7613,"outV":132},{"id":7583,"outV":550}]},"properties":{"name":[{"id":1311,"value":"Lennon_McCartney"}]}}
-{"id":481,"label":"artist","inE":{"sungBy":[{"id":7476,"outV":233},{"id":7750,"outV":323}],"writtenBy":[{"id":7475,"outV":233},{"id":7749,"outV":323}]},"properties":{"name":[{"id":1312,"value":"Stephen_Stills"}]}}
-{"id":482,"label":"song","outE":{"sungBy":[{"id":7478,"inV":484}],"writtenBy":[{"id":7477,"inV":483}]},"properties":{"name":[{"id":1313,"value":"BLUE MOON"}],"songType":[{"id":1315,"value":"cover"}],"performances":[{"id":1314,"value":1}]}}
-{"id":483,"label":"artist","inE":{"writtenBy":[{"id":7477,"outV":482}]},"properties":{"name":[{"id":1316,"value":"Rodgers_Hart"}]}}
-{"id":484,"label":"artist","inE":{"sungBy":[{"id":7478,"outV":482},{"id":7982,"outV":774}]},"properties":{"name":[{"id":1317,"value":"Joey_Covington"}]}}
-{"id":485,"label":"song","outE":{"sungBy":[{"id":7480,"inV":340}],"writtenBy":[{"id":7479,"inV":486}]},"properties":{"name":[{"id":1318,"value":"BLUE SUEDE SHOES"}],"songType":[{"id":1320,"value":"cover"}],"performances":[{"id":1319,"value":2}]}}
-{"id":486,"label":"artist","inE":{"writtenBy":[{"id":7479,"outV":485}]},"properties":{"name":[{"id":1321,"value":"Carl_Perkins"}]}}
-{"id":487,"label":"song","outE":{"sungBy":[{"id":7484,"inV":469}],"writtenBy":[{"id":7483,"inV":488}]},"properties":{"name":[{"id":1322,"value":"BOXER THE"}],"songType":[{"id":1324,"value":"cover"}],"performances":[{"id":1323,"value":1}]}}
-{"id":488,"label":"artist","inE":{"writtenBy":[{"id":7483,"outV":487}]},"properties":{"name":[{"id":1325,"value":"Paul_Simon"}]}}
-{"id":489,"label":"song","outE":{"sungBy":[{"id":7486,"inV":356}],"writtenBy":[{"id":7485,"inV":442}]},"properties":{"name":[{"id":1326,"value":"BRING ME MY SHOTGUN"}],"songType":[{"id":1328,"value":"cover"}],"performances":[{"id":1327,"value":1}]}}
-{"id":490,"label":"artist","inE":{"writtenBy":[{"id":8011,"outV":86},{"id":7487,"outV":254}]},"properties":{"name":[{"id":1329,"value":"Robbie_Robertson"}]}}
-{"id":491,"label":"artist","inE":{"writtenBy":[{"id":7489,"outV":301}]},"properties":{"name":[{"id":1330,"value":"F_and_B_Bryant"}]}}
-{"id":492,"label":"song","outE":{"sungBy":[{"id":7492,"inV":351}],"writtenBy":[{"id":7491,"inV":446}]},"properties":{"name":[{"id":1331,"value":"C.C.RIDER"}],"songType":[{"id":1333,"value":"cover"}],"performances":[{"id":1332,"value":127}]}}
-{"id":493,"label":"artist","inE":{"writtenBy":[{"id":7493,"outV":156}]},"properties":{"name":[{"id":1334,"value":"Rodney_Crowell"}]}}
-{"id":494,"label":"song","outE":{"sungBy":[{"id":7496,"inV":351}],"writtenBy":[{"id":7495,"inV":495}]},"properties":{"name":[{"id":1335,"value":"CATHYS CLOWN"}],"songType":[{"id":1337,"value":"cover"}],"performances":[{"id":1336,"value":2}]}}
-{"id":495,"label":"artist","inE":{"writtenBy":[{"id":7495,"outV":494}]},"properties":{"name":[{"id":1338,"value":"Don_and_Phil_Everly"}]}}
-{"id":496,"label":"song","outE":{"sungBy":[{"id":7498,"inV":498}],"writtenBy":[{"id":7497,"inV":497}]},"properties":{"name":[{"id":1339,"value":"CHECKING UP"}],"songType":[{"id":1341,"value":"cover"}],"performances":[{"id":1340,"value":1}]}}
-{"id":497,"label":"artist","inE":{"writtenBy":[{"id":7497,"outV":496}]},"properties":{"name":[{"id":1342,"value":"Sonny_Boy_Williamson"}]}}
-{"id":498,"label":"artist","inE":{"sungBy":[{"id":7846,"outV":697},{"id":7498,"outV":496},{"id":7962,"outV":764},{"id":8026,"outV":795}]},"properties":{"name":[{"id":1343,"value":"Elvin_Bishop"}]}}
-{"id":499,"label":"song","outE":{"sungBy":[{"id":7500,"inV":469}],"writtenBy":[{"id":7499,"inV":469}]},"properties":{"name":[{"id":1344,"value":"CHILDREN OF THE 80S"}],"songType":[{"id":1346,"value":"cover"}],"performances":[{"id":1345,"value":2}]}}
-{"id":500,"label":"artist","inE":{"writtenBy":[{"id":7503,"outV":337}]},"properties":{"name":[{"id":1347,"value":"Robyn_Hitchcock"}]}}
-{"id":501,"label":"artist","inE":{"sungBy":[{"id":7504,"outV":337},{"id":7798,"outV":334}],"writtenBy":[{"id":7797,"outV":334}]},"properties":{"name":[{"id":1348,"value":"Suzanne_Vega"}]}}
-{"id":502,"label":"song","outE":{"sungBy":[{"id":7508,"inV":356}],"writtenBy":[{"id":7507,"inV":442}]},"properties":{"name":[{"id":1349,"value":"COME BACK BABY"}],"songType":[{"id":1351,"value":"cover"}],"performances":[{"id":1350,"value":1}]}}
-{"id":503,"label":"song","outE":{"sungBy":[{"id":7510,"inV":451}],"writtenBy":[{"id":7509,"inV":451}]},"properties":{"name":[{"id":1352,"value":"COWBOY SONG"}],"songType":[{"id":1354,"value":"cover"}],"performances":[{"id":1353,"value":1}]}}
-{"id":504,"label":"song","outE":{"sungBy":[{"id":7512,"inV":351}],"writtenBy":[{"id":7511,"inV":505}]},"properties":{"name":[{"id":1355,"value":"DANCING IN THE STREET"}],"songType":[{"id":1357,"value":"cover"}],"performances":[{"id":1356,"value":123}]}}
-{"id":505,"label":"artist","inE":{"writtenBy":[{"id":7511,"outV":504}]},"properties":{"name":[{"id":1358,"value":"Stevenson_et_al"}]}}
-{"id":506,"label":"song","outE":{"sungBy":[{"id":7514,"inV":340}],"writtenBy":[{"id":7513,"inV":446}]},"properties":{"name":[{"id":1359,"value":"DARLING COREY"}],"songType":[{"id":1361,"value":"cover"}],"performances":[{"id":1360,"value":1}]}}
-{"id":507,"label":"artist","inE":{"sungBy":[{"id":7518,"outV":212},{"id":7726,"outV":631},{"id":7822,"outV":111}]},"properties":{"name":[{"id":1362,"value":"Garcia_Weir"}]}}
-{"id":508,"label":"song","outE":{"sungBy":[{"id":7520,"inV":447}],"writtenBy":[{"id":7519,"inV":447}]},"properties":{"name":[{"id":1363,"value":"DEAD MAN DEAD MAN"}],"songType":[{"id":1365,"value":"cover"}],"performances":[{"id":1364,"value":2}]}}
-{"id":509,"label":"song","outE":{"sungBy":[{"id":7522,"inV":352}],"writtenBy":[{"id":7521,"inV":510}]},"properties":{"name":[{"id":1366,"value":"DEAR MR FANTASY"}],"songType":[{"id":1368,"value":"cover"}],"performances":[{"id":1367,"value":58}]}}
-{"id":510,"label":"artist","inE":{"writtenBy":[{"id":7521,"outV":509}]},"properties":{"name":[{"id":1369,"value":"Winwood_et_al"}]}}
-{"id":511,"label":"artist","inE":{"writtenBy":[{"id":7523,"outV":135}]},"properties":{"name":[{"id":1370,"value":"Rev_Gary_Davis"}]}}
-{"id":512,"label":"song","outE":{"sungBy":[{"id":7526,"inV":340}],"writtenBy":[{"id":7525,"inV":446}]},"properties":{"name":[{"id":1371,"value":"DEATH LETTER BLUES"}],"songType":[{"id":1373,"value":"cover"}],"performances":[{"id":1372,"value":1}]}}
-{"id":513,"label":"song","outE":{"sungBy":[{"id":7532,"inV":352}],"writtenBy":[{"id":7531,"inV":514}]},"properties":{"name":[{"id":1374,"value":"DEVIL WITH THE BLUE DRESS ON"}],"songType":[{"id":1376,"value":"cover"}],"performances":[{"id":1375,"value":3}]}}
-{"id":514,"label":"artist","inE":{"writtenBy":[{"id":7531,"outV":513}]},"properties":{"name":[{"id":1377,"value":"Long_Stevenson"}]}}
-{"id":515,"label":"song","outE":{"sungBy":[{"id":7534,"inV":467}],"writtenBy":[{"id":7533,"inV":516}]},"properties":{"name":[{"id":1378,"value":"DO YOU WANNA DANCE?"}],"songType":[{"id":1380,"value":"cover"}],"performances":[{"id":1379,"value":1}]}}
-{"id":516,"label":"artist","inE":{"writtenBy":[{"id":7533,"outV":515}]},"properties":{"name":[{"id":1381,"value":"Bobby_Freeman"}]}}
-{"id":517,"label":"song","outE":{"sungBy":[{"id":7538,"inV":356}],"writtenBy":[{"id":7537,"inV":518}]},"properties":{"name":[{"id":1382,"value":"DONT MESS UP A GOOD THING"}],"songType":[{"id":1384,"value":"cover"}],"performances":[{"id":1383,"value":1}]}}
-{"id":518,"label":"artist","inE":{"writtenBy":[{"id":7537,"outV":517}]},"properties":{"name":[{"id":1385,"value":"Oliver_Sain"}]}}
-{"id":519,"label":"song","outE":{"sungBy":[{"id":7540,"inV":447}],"writtenBy":[{"id":7539,"inV":447}]},"properties":{"name":[{"id":1386,"value":"DONT THINK TWICE ITS ALL RIGHT"}],"songType":[{"id":1388,"value":"cover"}],"performances":[{"id":1387,"value":1}]}}
-{"id":520,"label":"artist","inE":{"writtenBy":[{"id":7633,"outV":582},{"id":8003,"outV":31},{"id":7541,"outV":245},{"id":7927,"outV":33},{"id":7625,"outV":576},{"id":7641,"outV":588},{"id":7881,"outV":40},{"id":7739,"outV":88},{"id":7789,"outV":664}]},"properties":{"name":[{"id":1389,"value":"Willie_Dixon"}]}}
-{"id":521,"label":"song","outE":{"sungBy":[{"id":7546,"inV":340}],"writtenBy":[{"id":7545,"inV":446}]},"properties":{"name":[{"id":1390,"value":"DRINK UP AND GO HOME"}],"songType":[{"id":1392,"value":"cover"}],"performances":[{"id":1391,"value":1}]}}
-{"id":522,"label":"song","outE":{"sungBy":[{"id":7548,"inV":354}],"writtenBy":[{"id":7547,"inV":523}]},"properties":{"name":[{"id":1393,"value":"EARLY MORNING RAIN"}],"songType":[{"id":1395,"value":"cover"}],"performances":[{"id":1394,"value":2}]}}
-{"id":523,"label":"artist","inE":{"writtenBy":[{"id":7547,"outV":522}]},"properties":{"name":[{"id":1396,"value":"Gordon_Lightfoot"}]}}
-{"id":524,"label":"song","outE":{"sungBy":[{"id":7550,"inV":525}],"writtenBy":[{"id":7549,"inV":446}]},"properties":{"name":[{"id":1397,"value":"EASY RIDER"}],"songType":[{"id":1399,"value":"cover"}],"performances":[{"id":1398,"value":1}]}}
-{"id":525,"label":"artist","inE":{"sungBy":[{"id":7666,"outV":2},{"id":7550,"outV":524}],"writtenBy":[{"id":7665,"outV":2}]},"properties":{"name":[{"id":1400,"value":"Spencer_Davis"}]}}
-{"id":526,"label":"song","outE":{"sungBy":[{"id":7552,"inV":527},{"id":7890,"inV":527}],"writtenBy":[{"id":7889,"inV":527},{"id":7551,"inV":527}]},"properties":{"name":[{"id":1401,"value":"SAY BOSS MAN (EIGHTEEN CHILDREN)"}],"songType":[{"id":1403,"value":"cover"}],"performances":[{"id":1402,"value":1}]}}
-{"id":527,"label":"artist","inE":{"sungBy":[{"id":7552,"outV":526},{"id":7890,"outV":526},{"id":7844,"outV":696},{"id":8038,"outV":801},{"id":7916,"outV":735},{"id":7948,"outV":754},{"id":7694,"outV":619}],"writtenBy":[{"id":7889,"outV":526},{"id":7843,"outV":696},{"id":7781,"outV":6},{"id":8037,"outV":801},{"id":8023,"outV":146},{"id":7611,"outV":1},{"id":7915,"outV":735},{"id":7693,"outV":619},{"id":7551,"outV":526}]},"properties":{"name":[{"id":1404,"value":"Bo_Diddley"}]}}
-{"id":528,"label":"artist","inE":{"writtenBy":[{"id":7553,"outV":18}]},"properties":{"name":[{"id":1405,"value":"Marty_Robbins"}]}}
-{"id":529,"label":"song","outE":{"sungBy":[{"id":7556,"inV":356}],"writtenBy":[{"id":7555,"inV":530}]},"properties":{"name":[{"id":1406,"value":"EMPTY HEART"}],"songType":[{"id":1408,"value":"cover"}],"performances":[{"id":1407,"value":1}]}}
-{"id":530,"label":"artist","inE":{"writtenBy":[{"id":7555,"outV":529},{"id":7933,"outV":746}]},"properties":{"name":[{"id":1409,"value":"Jagger_Richard"}]}}
-{"id":531,"label":"song","outE":{"sungBy":[{"id":7558,"inV":533}],"writtenBy":[{"id":7557,"inV":532}]},"properties":{"name":[{"id":1410,"value":"EVERY TIME YOU GO AWAY"}],"songType":[{"id":1412,"value":"cover"}],"performances":[{"id":1411,"value":1}]}}
-{"id":532,"label":"artist","inE":{"writtenBy":[{"id":7557,"outV":531}]},"properties":{"name":[{"id":1413,"value":"Daryl_Hall"}]}}
-{"id":533,"label":"artist","inE":{"sungBy":[{"id":8016,"outV":95},{"id":7558,"outV":531}]},"properties":{"name":[{"id":1414,"value":"Hall_and_Oates"}]}}
-{"id":534,"label":"artist","inE":{"writtenBy":[{"id":7559,"outV":283}]},"properties":{"name":[{"id":1415,"value":"Davenport_Cooley"}]}}
-{"id":535,"label":"song","outE":{"sungBy":[{"id":7562,"inV":537}],"writtenBy":[{"id":7561,"inV":536}]},"properties":{"name":[{"id":1416,"value":"FIRE IN THE CITY"}],"songType":[{"id":1418,"value":"cover"}],"performances":[{"id":1417,"value":1}]}}
-{"id":536,"label":"artist","inE":{"writtenBy":[{"id":7561,"outV":535}]},"properties":{"name":[{"id":1419,"value":"Peter_Krug"}]}}
-{"id":537,"label":"artist","inE":{"sungBy":[{"id":7926,"outV":742},{"id":7562,"outV":535}]},"properties":{"name":[{"id":1420,"value":"Jon_Hendricks"}]}}
-{"id":538,"label":"song","outE":{"sungBy":[{"id":7564,"inV":356}],"writtenBy":[{"id":7563,"inV":451}]},"properties":{"name":[{"id":1421,"value":"THE FLOOD"}],"songType":[{"id":1423,"value":"cover"}],"performances":[{"id":1422,"value":1}]}}
-{"id":539,"label":"artist","inE":{"sungBy":[{"id":7566,"outV":335}]},"properties":{"name":[{"id":1424,"value":"Neil_Young"}]}}
-{"id":540,"label":"artist","inE":{"writtenBy":[{"id":7567,"outV":315}]},"properties":{"name":[{"id":1425,"value":"Stevens"}]}}
-{"id":541,"label":"song","outE":{"sungBy":[{"id":7570,"inV":351}],"writtenBy":[{"id":7569,"inV":542}]},"properties":{"name":[{"id":1426,"value":"GAMES PEOPLE PLAY"}],"songType":[{"id":1428,"value":"cover"}],"performances":[{"id":1427,"value":1}]}}
-{"id":542,"label":"artist","inE":{"writtenBy":[{"id":7569,"outV":541}]},"properties":{"name":[{"id":1429,"value":"Joe_South"}]}}
-{"id":543,"label":"song","outE":{"sungBy":[{"id":7572,"inV":340}],"writtenBy":[{"id":7571,"inV":544}]},"properties":{"name":[{"id":1430,"value":"GANSTER OF LOVE"}],"songType":[{"id":1432,"value":"cover"}],"performances":[{"id":1431,"value":1}]}}
-{"id":544,"label":"artist","inE":{"writtenBy":[{"id":7571,"outV":543}]},"properties":{"name":[{"id":1433,"value":"Johnny_Guitar_Watson"}]}}
-{"id":545,"label":"song","outE":{"sungBy":[{"id":7574,"inV":351}],"writtenBy":[{"id":7573,"inV":546}]},"properties":{"name":[{"id":1434,"value":"GATHERING FLOWERS FOR THE MASTERS BOUQUET"}],"songType":[{"id":1436,"value":"cover"}],"performances":[{"id":1435,"value":1}]}}
-{"id":546,"label":"artist","inE":{"writtenBy":[{"id":7573,"outV":545}]},"properties":{"name":[{"id":1437,"value":"Marvin_Baumgardner"}]}}
-{"id":547,"label":"song","outE":{"sungBy":[{"id":7578,"inV":354}],"writtenBy":[{"id":7577,"inV":548}]},"properties":{"name":[{"id":1438,"value":"GIMME SOME LOVING"}],"songType":[{"id":1440,"value":"cover"}],"performances":[{"id":1439,"value":87}]}}
-{"id":548,"label":"artist","inE":{"writtenBy":[{"id":7577,"outV":547}]},"properties":{"name":[{"id":1441,"value":"Winwood_Davis"}]}}
-{"id":549,"label":"artist","inE":{"writtenBy":[{"id":7579,"outV":227}]},"properties":{"name":[{"id":1442,"value":"Van_Morrison"}]}}
-{"id":550,"label":"song","outE":{"sungBy":[{"id":7584,"inV":451}],"writtenBy":[{"id":7583,"inV":480}]},"properties":{"name":[{"id":1443,"value":"GOOD DAY SUNSHINE"}],"songType":[{"id":1445,"value":"cover"}],"performances":[{"id":1444,"value":1}]}}
-{"id":551,"label":"artist","inE":{"writtenBy":[{"id":7585,"outV":44}]},"properties":{"name":[{"id":1446,"value":"Blackwell_Marascalco"}]}}
-{"id":552,"label":"artist","inE":{"writtenBy":[{"id":7587,"outV":120}]},"properties":{"name":[{"id":1447,"value":"Resnick_Clark"}]}}
-{"id":553,"label":"artist","inE":{"sungBy":[{"id":7588,"outV":120},{"id":7740,"outV":88}]},"properties":{"name":[{"id":1448,"value":"Pigpen_Weir_Mydland"}]}}
-{"id":554,"label":"artist","inE":{"writtenBy":[{"id":7589,"outV":292}]},"properties":{"name":[{"id":1449,"value":"Williamson"}]}}
-{"id":555,"label":"song","outE":{"sungBy":[{"id":7592,"inV":453}],"writtenBy":[{"id":7591,"inV":556}]},"properties":{"name":[{"id":1450,"value":"GOOD TIMES"}],"songType":[{"id":1452,"value":"cover"}],"performances":[{"id":1451,"value":47}]}}
-{"id":556,"label":"artist","inE":{"writtenBy":[{"id":7591,"outV":555}]},"properties":{"name":[{"id":1453,"value":"Sam_Cooke"}]}}
-{"id":557,"label":"artist","inE":{"writtenBy":[{"id":7593,"outV":336},{"id":7871,"outV":710}]},"properties":{"name":[{"id":1454,"value":"Leadbelly"}]}}
-{"id":558,"label":"song","outE":{"sungBy":[{"id":7596,"inV":351}],"writtenBy":[{"id":7595,"inV":559}]},"properties":{"name":[{"id":1455,"value":"GOT MY MOJO WORKING"}],"songType":[{"id":1457,"value":"cover"}],"performances":[{"id":1456,"value":2}]}}
-{"id":559,"label":"artist","inE":{"writtenBy":[{"id":7595,"outV":558}]},"properties":{"name":[{"id":1458,"value":"Preston_Foster"}]}}
-{"id":560,"label":"song","outE":{"sungBy":[{"id":7600,"inV":351}],"writtenBy":[{"id":7599,"inV":561}]},"properties":{"name":[{"id":1459,"value":"GREEN GREEN GRASS OF HOME"}],"songType":[{"id":1461,"value":"cover"}],"performances":[{"id":1460,"value":9}]}}
-{"id":561,"label":"artist","inE":{"writtenBy":[{"id":7599,"outV":560}]},"properties":{"name":[{"id":1462,"value":"Curly_Putnam"}]}}
-{"id":562,"label":"artist","inE":{"writtenBy":[{"id":7603,"outV":161}]},"properties":{"name":[{"id":1463,"value":"Redding"}]}}
-{"id":563,"label":"song","outE":{"sungBy":[{"id":7606,"inV":340}],"writtenBy":[{"id":7605,"inV":564}]},"properties":{"name":[{"id":1464,"value":"HE WAS A FRIEND OF MINE"}],"songType":[{"id":1466,"value":"cover"}],"performances":[{"id":1465,"value":17}]}}
-{"id":564,"label":"artist","inE":{"writtenBy":[{"id":7605,"outV":563}]},"properties":{"name":[{"id":1467,"value":"Mark_Spoelstra"}]}}
-{"id":565,"label":"song","outE":{"sungBy":[{"id":7610,"inV":567}],"writtenBy":[{"id":7609,"inV":566}]},"properties":{"name":[{"id":1468,"value":"HELP ME RHONDA"}],"songType":[{"id":1470,"value":"cover"}],"performances":[{"id":1469,"value":1}]}}
-{"id":566,"label":"artist","inE":{"writtenBy":[{"id":7609,"outV":565}]},"properties":{"name":[{"id":1471,"value":"Brian_Wilson"}]}}
-{"id":567,"label":"artist","inE":{"sungBy":[{"id":7816,"outV":675},{"id":7864,"outV":703},{"id":7610,"outV":565}]},"properties":{"name":[{"id":1472,"value":"Beach_Boys"}]}}
-{"id":568,"label":"song","outE":{"sungBy":[{"id":7616,"inV":340}],"writtenBy":[{"id":7615,"inV":569}]},"properties":{"name":[{"id":1473,"value":"HEY LITTLE ONE"}],"songType":[{"id":1475,"value":"cover"}],"performances":[{"id":1474,"value":3}]}}
-{"id":569,"label":"artist","inE":{"writtenBy":[{"id":7615,"outV":568}]},"properties":{"name":[{"id":1476,"value":"Bernette_Vorzon"}]}}
-{"id":570,"label":"artist","inE":{"writtenBy":[{"id":7617,"outV":151}]},"properties":{"name":[{"id":1477,"value":"Meters_(Traditional)"}]}}
-{"id":571,"label":"song","outE":{"sungBy":[{"id":7620,"inV":340}],"writtenBy":[{"id":7619,"inV":572}]},"properties":{"name":[{"id":1478,"value":"HI-HEEL SNEAKERS"}],"songType":[{"id":1480,"value":"cover"}],"performances":[{"id":1479,"value":5}]}}
-{"id":572,"label":"artist","inE":{"writtenBy":[{"id":7619,"outV":571}]},"properties":{"name":[{"id":1481,"value":"Higgenbotham"}]}}
-{"id":573,"label":"artist","inE":{"writtenBy":[{"id":7621,"outV":332}]},"properties":{"name":[{"id":1482,"value":"Freddie_King"}]}}
-{"id":574,"label":"artist","inE":{"sungBy":[{"id":7906,"outV":317},{"id":7924,"outV":740},{"id":7622,"outV":332},{"id":7756,"outV":648},{"id":7932,"outV":744},{"id":7980,"outV":772}]},"properties":{"name":[{"id":1483,"value":"None"}]}}
-{"id":575,"label":"song","outE":{"sungBy":[{"id":7624,"inV":447}],"writtenBy":[{"id":7623,"inV":447}]},"properties":{"name":[{"id":1484,"value":"HIGHWAY 61 REVISITED"}],"songType":[{"id":1486,"value":"cover"}],"performances":[{"id":1485,"value":3}]}}
-{"id":576,"label":"song","outE":{"sungBy":[{"id":7626,"inV":340}],"writtenBy":[{"id":7625,"inV":520}]},"properties":{"name":[{"id":1487,"value":"HOOCHIE COOCHIE MAN"}],"songType":[{"id":1489,"value":"cover"}],"performances":[{"id":1488,"value":1}]}}
-{"id":577,"label":"artist","inE":{"writtenBy":[{"id":7627,"outV":247}]},"properties":{"name":[{"id":1490,"value":"Leroy_Carr_Frank_Stokes"}]}}
-{"id":578,"label":"song","outE":{"sungBy":[{"id":7630,"inV":340}],"writtenBy":[{"id":7629,"inV":579}]},"properties":{"name":[{"id":1491,"value":"HOW SWEET IT IS (TO BE LOVED BY YOU)"}],"songType":[{"id":1493,"value":"cover"}],"performances":[{"id":1492,"value":1}]}}
-{"id":579,"label":"artist","inE":{"writtenBy":[{"id":7629,"outV":578},{"id":7869,"outV":709}]},"properties":{"name":[{"id":1494,"value":"Holland_et_al"}]}}
-{"id":580,"label":"song","outE":{"sungBy":[{"id":7632,"inV":351}],"writtenBy":[{"id":7631,"inV":581}]},"properties":{"name":[{"id":1495,"value":"(BABY) HULLY GULLY"}],"songType":[{"id":1497,"value":"cover"}],"performances":[{"id":1496,"value":1}]}}
-{"id":581,"label":"artist","inE":{"writtenBy":[{"id":7631,"outV":580}]},"properties":{"name":[{"id":1498,"value":"Smith_Goldsmith"}]}}
-{"id":582,"label":"song","outE":{"sungBy":[{"id":7634,"inV":351}],"writtenBy":[{"id":7633,"inV":520}]},"properties":{"name":[{"id":1499,"value":"I AINT SUPERSTITIOUS"}],"songType":[{"id":1501,"value":"cover"}],"performances":[{"id":1500,"value":8}]}}
-{"id":583,"label":"artist","inE":{"writtenBy":[{"id":7635,"outV":216}]},"properties":{"name":[{"id":1502,"value":"Sonny_Curtis"}]}}
-{"id":584,"label":"song","outE":{"sungBy":[{"id":7638,"inV":585}],"writtenBy":[{"id":7637,"inV":446}]},"properties":{"name":[{"id":1503,"value":"I GOT A MIND TO GIVE UP LIVING"}],"songType":[{"id":1505,"value":"cover"}],"performances":[{"id":1504,"value":1}]}}
-{"id":585,"label":"artist","inE":{"sungBy":[{"id":7638,"outV":584}]},"properties":{"name":[{"id":1506,"value":"Boz_Scaggs"}]}}
-{"id":586,"label":"song","outE":{"sungBy":[{"id":7640,"inV":352}],"writtenBy":[{"id":7639,"inV":587}]},"properties":{"name":[{"id":1507,"value":"I HEARD IT THROUGH THE GRAPEVINE"}],"songType":[{"id":1509,"value":"cover"}],"performances":[{"id":1508,"value":1}]}}
-{"id":587,"label":"artist","inE":{"writtenBy":[{"id":7639,"outV":586}]},"properties":{"name":[{"id":1510,"value":"Strong_Whitfield"}]}}
-{"id":588,"label":"song","outE":{"sungBy":[{"id":7642,"inV":461}],"writtenBy":[{"id":7641,"inV":520}]},"properties":{"name":[{"id":1511,"value":"I JUST WANT TO MAKE LOVE TO YOU"}],"songType":[{"id":1513,"value":"cover"}],"performances":[{"id":1512,"value":4}]}}
-{"id":589,"label":"song","outE":{"sungBy":[{"id":7644,"inV":340}],"writtenBy":[{"id":7643,"inV":460}]},"properties":{"name":[{"id":1514,"value":"I KNOW ITS A SIN"}],"songType":[{"id":1516,"value":"cover"}],"performances":[{"id":1515,"value":11}]}}
-{"id":590,"label":"song","outE":{"sungBy":[{"id":7648,"inV":340}],"writtenBy":[{"id":7647,"inV":591}]},"properties":{"name":[{"id":1517,"value":"I SECOND THAT EMOTION"}],"songType":[{"id":1519,"value":"cover"}],"performances":[{"id":1518,"value":6}]}}
-{"id":591,"label":"artist","inE":{"writtenBy":[{"id":7647,"outV":590}]},"properties":{"name":[{"id":1520,"value":"Robinson_Cleveland"}]}}
-{"id":592,"label":"artist","inE":{"writtenBy":[{"id":7649,"outV":258},{"id":7689,"outV":177}]},"properties":{"name":[{"id":1521,"value":"George_Harrison"}]}}
-{"id":593,"label":"song","outE":{"sungBy":[{"id":7654,"inV":340}],"writtenBy":[{"id":7653,"inV":594}]},"properties":{"name":[{"id":1522,"value":"I WASHED MY HANDS IN MUDDY WATER"}],"songType":[{"id":1524,"value":"cover"}],"performances":[{"id":1523,"value":1}]}}
-{"id":594,"label":"artist","inE":{"writtenBy":[{"id":7653,"outV":593}]},"properties":{"name":[{"id":1525,"value":"J_Babcock"}]}}
-{"id":595,"label":"song","outE":{"sungBy":[{"id":7658,"inV":356}],"writtenBy":[{"id":7657,"inV":596}]},"properties":{"name":[{"id":1526,"value":"ILL GO CRAZY"}],"songType":[{"id":1528,"value":"cover"}],"performances":[{"id":1527,"value":1}]}}
-{"id":596,"label":"artist","inE":{"writtenBy":[{"id":7841,"outV":695},{"id":7657,"outV":595}]},"properties":{"name":[{"id":1529,"value":"James_Brown"}]}}
-{"id":597,"label":"song","outE":{"sungBy":[{"id":7660,"inV":356}],"writtenBy":[{"id":7659,"inV":598}]},"properties":{"name":[{"id":1530,"value":"IM A HOG FOR YOU BABY"}],"songType":[{"id":1532,"value":"cover"}],"performances":[{"id":1531,"value":4}]}}
-{"id":598,"label":"artist","inE":{"writtenBy":[{"id":7659,"outV":597},{"id":7709,"outV":244},{"id":8047,"outV":808}]},"properties":{"name":[{"id":1533,"value":"Leiber_Stoller"}]}}
-{"id":599,"label":"song","outE":{"sungBy":[{"id":7662,"inV":356}],"writtenBy":[{"id":7661,"inV":600}]},"properties":{"name":[{"id":1534,"value":"IM A KING BEE"}],"songType":[{"id":1536,"value":"cover"}],"performances":[{"id":1535,"value":38}]}}
-{"id":600,"label":"artist","inE":{"writtenBy":[{"id":7661,"outV":599}]},"properties":{"name":[{"id":1537,"value":"James_Moore"}]}}
-{"id":601,"label":"song","outE":{"sungBy":[{"id":7664,"inV":476}],"writtenBy":[{"id":7663,"inV":602}]},"properties":{"name":[{"id":1538,"value":"IM A LOVING MAN"}],"songType":[{"id":1540,"value":"cover"}],"performances":[{"id":1539,"value":0}]}}
-{"id":602,"label":"artist","inE":{"writtenBy":[{"id":7663,"outV":601}]},"properties":{"name":[{"id":1541,"value":"Clancy_Carlile"}]}}
-{"id":603,"label":"song","outE":{"sungBy":[{"id":7668,"inV":340}],"writtenBy":[{"id":7667,"inV":446}]},"properties":{"name":[{"id":1542,"value":"IVE BEEN ALL AROUND THIS WORLD"}],"songType":[{"id":1544,"value":"cover"}],"performances":[{"id":1543,"value":18}]}}
-{"id":604,"label":"song","outE":{"sungBy":[{"id":7670,"inV":351}],"writtenBy":[{"id":7669,"inV":605}]},"properties":{"name":[{"id":1545,"value":"IVE GOT A TIGER BY THE TAIL"}],"songType":[{"id":1547,"value":"cover"}],"performances":[{"id":1546,"value":1}]}}
-{"id":605,"label":"artist","inE":{"writtenBy":[{"id":7669,"outV":604}]},"properties":{"name":[{"id":1548,"value":"Owens_Howard"}]}}
-{"id":606,"label":"song","outE":{"sungBy":[{"id":7672,"inV":351}],"writtenBy":[{"id":7671,"inV":480}]},"properties":{"name":[{"id":1549,"value":"IVE JUST SEEN A FACE"}],"songType":[{"id":1551,"value":"cover"}],"performances":[{"id":1550,"value":1}]}}
-{"id":607,"label":"song","outE":{"sungBy":[{"id":7676,"inV":340}],"writtenBy":[{"id":7675,"inV":446}]},"properties":{"name":[{"id":1552,"value":"IN THE PINES"}],"songType":[{"id":1554,"value":"cover"}],"performances":[{"id":1553,"value":1}]}}
-{"id":608,"label":"song","outE":{"sungBy":[{"id":7678,"inV":476}],"writtenBy":[{"id":7677,"inV":609}]},"properties":{"name":[{"id":1555,"value":"IN THE MIDNIGHT HOUR"}],"songType":[{"id":1557,"value":"cover"}],"performances":[{"id":1556,"value":46}]}}
-{"id":609,"label":"artist","inE":{"writtenBy":[{"id":7677,"outV":608}]},"properties":{"name":[{"id":1558,"value":"Pickett_Cropper"}]}}
-{"id":610,"label":"song","outE":{"sungBy":[{"id":7680,"inV":356}],"writtenBy":[{"id":7679,"inV":611}]},"properties":{"name":[{"id":1559,"value":"IT HURTS ME TOO"}],"songType":[{"id":1561,"value":"cover"}],"performances":[{"id":1560,"value":47}]}}
-{"id":611,"label":"artist","inE":{"writtenBy":[{"id":7679,"outV":610}]},"properties":{"name":[{"id":1562,"value":"Tampa_Red"}]}}
-{"id":612,"label":"song","outE":{"sungBy":[{"id":7682,"inV":340}],"writtenBy":[{"id":7681,"inV":447}]},"properties":{"name":[{"id":1563,"value":"IT TAKES ... A TRAIN TO CRY"}],"songType":[{"id":1565,"value":"cover"}],"performances":[{"id":1564,"value":7}]}}
-{"id":613,"label":"song","outE":{"sungBy":[{"id":7684,"inV":356}],"writtenBy":[{"id":7683,"inV":614}]},"properties":{"name":[{"id":1566,"value":"ITS A MANS MANS MANS WORLD"}],"songType":[{"id":1568,"value":"cover"}],"performances":[{"id":1567,"value":11}]}}
-{"id":614,"label":"artist","inE":{"writtenBy":[{"id":7683,"outV":613}]},"properties":{"name":[{"id":1569,"value":"Brown_et_al"}]}}
-{"id":615,"label":"artist","inE":{"writtenBy":[{"id":7685,"outV":42}]},"properties":{"name":[{"id":1570,"value":"B_and_S_Womack"}]}}
-{"id":616,"label":"song","outE":{"sungBy":[{"id":7688,"inV":340}],"writtenBy":[{"id":7687,"inV":447}]},"properties":{"name":[{"id":1571,"value":"ITS ALL OVER NOW BABY BLUE"}],"songType":[{"id":1573,"value":"cover"}],"performances":[{"id":1572,"value":145}]}}
-{"id":617,"label":"song","outE":{"sungBy":[{"id":7692,"inV":451}],"writtenBy":[{"id":7691,"inV":618}]},"properties":{"name":[{"id":1574,"value":"ITS MY OWN FAULT"}],"songType":[{"id":1576,"value":"cover"}],"performances":[{"id":1575,"value":1}]}}
-{"id":618,"label":"artist","inE":{"writtenBy":[{"id":7691,"outV":617}]},"properties":{"name":[{"id":1577,"value":"John_Lee_Hooker"}]}}
-{"id":619,"label":"song","outE":{"sungBy":[{"id":7694,"inV":527}],"writtenBy":[{"id":7693,"inV":527}]},"properties":{"name":[{"id":1578,"value":"IVE SEEN THEM ALL"}],"songType":[{"id":1580,"value":"cover"}],"performances":[{"id":1579,"value":1}]}}
-{"id":620,"label":"song","outE":{"sungBy":[{"id":7696,"inV":340}],"writtenBy":[{"id":7695,"inV":446}]},"properties":{"name":[{"id":1581,"value":"JACK-A-ROE"}],"songType":[{"id":1583,"value":"cover"}],"performances":[{"id":1582,"value":115}]}}
-{"id":621,"label":"song","outE":{"sungBy":[{"id":7702,"inV":623}],"writtenBy":[{"id":7701,"inV":622}]},"properties":{"name":[{"id":1584,"value":"JOHNS OTHER"}],"songType":[{"id":1586,"value":"cover"}],"performances":[{"id":1585,"value":1}]}}
-{"id":622,"label":"artist","inE":{"writtenBy":[{"id":7701,"outV":621}]},"properties":{"name":[{"id":1587,"value":"Papa_John_Creach"}]}}
-{"id":623,"label":"artist","inE":{"sungBy":[{"id":7840,"outV":693},{"id":7810,"outV":672},{"id":7986,"outV":777},{"id":7702,"outV":621}],"writtenBy":[{"id":7809,"outV":672}]},"properties":{"name":[{"id":1588,"value":"Jorma_Kaukonen"}]}}
-{"id":624,"label":"song","outE":{"sungBy":[{"id":7706,"inV":453}],"writtenBy":[{"id":7705,"inV":446}]},"properties":{"name":[{"id":1589,"value":"JORDAN"}],"songType":[{"id":1591,"value":"cover"}],"performances":[{"id":1590,"value":12}]}}
-{"id":625,"label":"song","outE":{"sungBy":[{"id":7708,"inV":354}],"writtenBy":[{"id":7707,"inV":447}]},"properties":{"name":[{"id":1592,"value":"JUST LIKE TOM THUMBS BLUES"}],"songType":[{"id":1594,"value":"cover"}],"performances":[{"id":1593,"value":58}]}}
-{"id":626,"label":"song","outE":{"sungBy":[{"id":7712,"inV":356}],"writtenBy":[{"id":7711,"inV":442}]},"properties":{"name":[{"id":1595,"value":"KATIE MAE"}],"songType":[{"id":1597,"value":"cover"}],"performances":[{"id":1596,"value":11}]}}
-{"id":627,"label":"artist","inE":{"writtenBy":[{"id":7715,"outV":299}]},"properties":{"name":[{"id":1598,"value":"Clapton_Whitlock"}]}}
-{"id":628,"label":"artist","inE":{"sungBy":[{"id":7716,"outV":299}]},"properties":{"name":[{"id":1599,"value":"Lesh_Mydland"}]}}
-{"id":629,"label":"artist","inE":{"writtenBy":[{"id":7721,"outV":144}]},"properties":{"name":[{"id":1600,"value":"Traditional_(arr_Valens)"}]}}
-{"id":630,"label":"song","outE":{"sungBy":[{"id":7724,"inV":469}],"writtenBy":[{"id":7723,"inV":469}]},"properties":{"name":[{"id":1601,"value":"LADY DI AND I"}],"songType":[{"id":1603,"value":"cover"}],"performances":[{"id":1602,"value":2}]}}
-{"id":631,"label":"song","outE":{"sungBy":[{"id":7726,"inV":507}],"writtenBy":[{"id":7725,"inV":632}]},"properties":{"name":[{"id":1604,"value":"THE LAST TIME"}],"songType":[{"id":1606,"value":"cover"}],"performances":[{"id":1605,"value":70}]}}
-{"id":632,"label":"artist","inE":{"writtenBy":[{"id":7725,"outV":631},{"id":7885,"outV":719}]},"properties":{"name":[{"id":1607,"value":"Jagger_Richards"}]}}
-{"id":633,"label":"song","outE":{"sungBy":[{"id":7728,"inV":451}],"writtenBy":[{"id":7727,"inV":451}]},"properties":{"name":[{"id":1608,"value":"LEAVE YOUR LOVE AT HOME"}],"songType":[{"id":1610,"value":"cover"}],"performances":[{"id":1609,"value":1}]}}
-{"id":634,"label":"song","outE":{"sungBy":[{"id":7730,"inV":351}],"writtenBy":[{"id":7729,"inV":635}]},"properties":{"name":[{"id":1611,"value":"LET IT BE ME"}],"songType":[{"id":1613,"value":"cover"}],"performances":[{"id":1612,"value":1}]}}
-{"id":635,"label":"artist","inE":{"writtenBy":[{"id":7729,"outV":634}]},"properties":{"name":[{"id":1614,"value":"Curtis_et_al"}]}}
-{"id":636,"label":"song","outE":{"sungBy":[{"id":7734,"inV":351}],"writtenBy":[{"id":7733,"inV":637}]},"properties":{"name":[{"id":1615,"value":"LET ME IN"}],"songType":[{"id":1617,"value":"cover"}],"performances":[{"id":1616,"value":1}]}}
-{"id":637,"label":"artist","inE":{"writtenBy":[{"id":7733,"outV":636}]},"properties":{"name":[{"id":1618,"value":"Gene_Crysler"}]}}
-{"id":638,"label":"song","outE":{"sungBy":[{"id":7736,"inV":352}],"writtenBy":[{"id":7735,"inV":451}]},"properties":{"name":[{"id":1619,"value":"LITTLE BUNNY FOO FOO"}],"songType":[{"id":1621,"value":"cover"}],"performances":[{"id":1620,"value":1}]}}
-{"id":639,"label":"song","outE":{"sungBy":[{"id":7742,"inV":351}],"writtenBy":[{"id":7741,"inV":640}]},"properties":{"name":[{"id":1622,"value":"LONG BLACK LIMOUSINE"}],"songType":[{"id":1624,"value":"cover"}],"performances":[{"id":1623,"value":6}]}}
-{"id":640,"label":"artist","inE":{"writtenBy":[{"id":7741,"outV":639}]},"properties":{"name":[{"id":1625,"value":"Stovall_George"}]}}
-{"id":641,"label":"song","outE":{"sungBy":[{"id":7744,"inV":462}],"writtenBy":[{"id":7743,"inV":642}]},"properties":{"name":[{"id":1626,"value":"LONG TALL SALLY"}],"songType":[{"id":1628,"value":"cover"}],"performances":[{"id":1627,"value":1}]}}
-{"id":642,"label":"artist","inE":{"writtenBy":[{"id":7743,"outV":641}]},"properties":{"name":[{"id":1629,"value":"Johnson_et_al"}]}}
-{"id":643,"label":"song","outE":{"sungBy":[{"id":7746,"inV":645}],"writtenBy":[{"id":7745,"inV":644}]},"properties":{"name":[{"id":1630,"value":"LOOK ON YONDERS WALL"}],"songType":[{"id":1632,"value":"cover"}],"performances":[{"id":1631,"value":1}]}}
-{"id":644,"label":"artist","inE":{"writtenBy":[{"id":7745,"outV":643},{"id":7957,"outV":761},{"id":7791,"outV":313}]},"properties":{"name":[{"id":1633,"value":"Arthur_Cruddup"}]}}
-{"id":645,"label":"artist","inE":{"sungBy":[{"id":7746,"outV":643}]},"properties":{"name":[{"id":1634,"value":"Pigpen?"}]}}
-{"id":646,"label":"artist","inE":{"writtenBy":[{"id":7747,"outV":257}]},"properties":{"name":[{"id":1635,"value":"Richard_Berry"}]}}
-{"id":647,"label":"song","outE":{"sungBy":[{"id":7754,"inV":340}],"writtenBy":[{"id":7753,"inV":480}]},"properties":{"name":[{"id":1636,"value":"LUCY IN THE SKY WITH DIAMONDS"}],"songType":[{"id":1638,"value":"cover"}],"performances":[{"id":1637,"value":19}]}}
-{"id":648,"label":"song","outE":{"sungBy":[{"id":7756,"inV":574}],"writtenBy":[{"id":7755,"inV":451}]},"properties":{"name":[{"id":1639,"value":"LUCKY MAN"}],"songType":[{"id":1641,"value":"cover"}],"performances":[{"id":1640,"value":0}]}}
-{"id":649,"label":"artist","inE":{"writtenBy":[{"id":7757,"outV":306}]},"properties":{"name":[{"id":1642,"value":"Brecht_Wiell"}]}}
-{"id":650,"label":"artist","inE":{"writtenBy":[{"id":7761,"outV":112},{"id":7815,"outV":675},{"id":7911,"outV":206}]},"properties":{"name":[{"id":1643,"value":"Merle_Haggard"}]}}
-{"id":651,"label":"song","outE":{"sungBy":[{"id":7766,"inV":381}],"writtenBy":[{"id":7765,"inV":652}]},"properties":{"name":[{"id":1644,"value":"MAN SMART (WOMAN SMARTER)"}],"songType":[{"id":1646,"value":"cover"}],"performances":[{"id":1645,"value":199}]}}
-{"id":652,"label":"artist","inE":{"writtenBy":[{"id":7765,"outV":651}]},"properties":{"name":[{"id":1647,"value":"Norman_Span"}]}}
-{"id":653,"label":"song","outE":{"sungBy":[{"id":7768,"inV":356}],"writtenBy":[{"id":7767,"inV":654}]},"properties":{"name":[{"id":1648,"value":"MANNISH BOY (IM A MAN)"}],"songType":[{"id":1650,"value":"cover"}],"performances":[{"id":1649,"value":1}]}}
-{"id":654,"label":"artist","inE":{"writtenBy":[{"id":7767,"outV":653}]},"properties":{"name":[{"id":1651,"value":"Morganfield_McDaniel"}]}}
-{"id":655,"label":"song","outE":{"sungBy":[{"id":7770,"inV":469}],"writtenBy":[{"id":7769,"inV":469}]},"properties":{"name":[{"id":1652,"value":"MARRIOTT USA"}],"songType":[{"id":1654,"value":"cover"}],"performances":[{"id":1653,"value":1}]}}
-{"id":656,"label":"song","outE":{"sungBy":[{"id":7772,"inV":340}],"writtenBy":[{"id":7771,"inV":657}]},"properties":{"name":[{"id":1655,"value":"MATILDA MATILDA"}],"songType":[{"id":1657,"value":"cover"}],"performances":[{"id":1656,"value":6}]}}
-{"id":657,"label":"artist","inE":{"writtenBy":[{"id":7771,"outV":656}]},"properties":{"name":[{"id":1658,"value":"Harry_Belafonte"}]}}
-{"id":658,"label":"artist","inE":{"writtenBy":[{"id":7773,"outV":22}]},"properties":{"name":[{"id":1659,"value":"Kristofferson_Foster"}]}}
-{"id":659,"label":"artist","inE":{"writtenBy":[{"id":7775,"outV":12}]},"properties":{"name":[{"id":1660,"value":"John_Phillips"}]}}
-{"id":660,"label":"song","outE":{"sungBy":[{"id":7778,"inV":351}],"writtenBy":[{"id":7777,"inV":447}]},"properties":{"name":[{"id":1661,"value":"MEMPHIS BLUES"}],"songType":[{"id":1663,"value":"cover"}],"performances":[{"id":1662,"value":76}]}}
-{"id":661,"label":"song","outE":{"sungBy":[{"id":7780,"inV":340}],"writtenBy":[{"id":7779,"inV":447}]},"properties":{"name":[{"id":1664,"value":"THE MIGHTY QUINN (QUINN THE ESKIMO)"}],"songType":[{"id":1666,"value":"cover"}],"performances":[{"id":1665,"value":59}]}}
-{"id":662,"label":"artist","inE":{"writtenBy":[{"id":7785,"outV":127}]},"properties":{"name":[{"id":1667,"value":"Bonnie_Dobson"}]}}
-{"id":663,"label":"song","outE":{"sungBy":[{"id":7788,"inV":447}],"writtenBy":[{"id":7787,"inV":447}]},"properties":{"name":[{"id":1668,"value":"MR TAMBOURINE MAN"}],"songType":[{"id":1670,"value":"cover"}],"performances":[{"id":1669,"value":1}]}}
-{"id":664,"label":"song","outE":{"sungBy":[{"id":7790,"inV":340}],"writtenBy":[{"id":7789,"inV":520}]},"properties":{"name":[{"id":1671,"value":"MY BABE"}],"songType":[{"id":1673,"value":"cover"}],"performances":[{"id":1672,"value":1}]}}
-{"id":665,"label":"song","outE":{"sungBy":[{"id":7794,"inV":666}],"writtenBy":[{"id":7793,"inV":666}]},"properties":{"name":[{"id":1674,"value":"NEAL CASSADY RAP"}],"songType":[{"id":1676,"value":"cover"}],"performances":[{"id":1675,"value":1}]}}
-{"id":666,"label":"artist","inE":{"sungBy":[{"id":7794,"outV":665}],"writtenBy":[{"id":7793,"outV":665}]},"properties":{"name":[{"id":1677,"value":"Neal_Cassady"}]}}
-{"id":667,"label":"song","outE":{"sungBy":[{"id":7796,"inV":340}],"writtenBy":[{"id":7795,"inV":668}]},"properties":{"name":[{"id":1678,"value":"NEIGHBOR NEIGHBOR"}],"songType":[{"id":1680,"value":"cover"}],"performances":[{"id":1679,"value":1}]}}
-{"id":668,"label":"artist","inE":{"writtenBy":[{"id":7795,"outV":667}]},"properties":{"name":[{"id":1681,"value":"Valler_Meaux"}]}}
-{"id":669,"label":"artist","inE":{"writtenBy":[{"id":7801,"outV":320}]},"properties":{"name":[{"id":1682,"value":"Guida_Royster"}]}}
-{"id":670,"label":"artist","inE":{"writtenBy":[{"id":7803,"outV":207}]},"properties":{"name":[{"id":1683,"value":"Forest_Harvey"}]}}
-{"id":671,"label":"artist","inE":{"writtenBy":[{"id":7807,"outV":3}]},"properties":{"name":[{"id":1684,"value":"Hardin_Petty"}]}}
-{"id":672,"label":"song","outE":{"sungBy":[{"id":7810,"inV":623}],"writtenBy":[{"id":7809,"inV":623}]},"properties":{"name":[{"id":1685,"value":"ODE FOR BILLIE DEAN"}],"songType":[{"id":1687,"value":"cover"}],"performances":[{"id":1686,"value":1}]}}
-{"id":673,"label":"artist","inE":{"writtenBy":[{"id":7811,"outV":199}]},"properties":{"name":[{"id":1688,"value":"Elizabeth_Cotten"}]}}
-{"id":674,"label":"artist","inE":{"writtenBy":[{"id":7813,"outV":8}]},"properties":{"name":[{"id":1689,"value":"West_Tilghman_Holly"}]}}
-{"id":675,"label":"song","outE":{"sungBy":[{"id":7816,"inV":567}],"writtenBy":[{"id":7815,"inV":650}]},"properties":{"name":[{"id":1690,"value":"OKIE FROM MUSKOGEE"}],"songType":[{"id":1692,"value":"cover"}],"performances":[{"id":1691,"value":1}]}}
-{"id":676,"label":"song","outE":{"sungBy":[{"id":7818,"inV":351}],"writtenBy":[{"id":7817,"inV":677}]},"properties":{"name":[{"id":1693,"value":"OL SLEWFOOT"}],"songType":[{"id":1695,"value":"cover"}],"performances":[{"id":1694,"value":9}]}}
-{"id":677,"label":"artist","inE":{"writtenBy":[{"id":7817,"outV":676}]},"properties":{"name":[{"id":1696,"value":"Hausey_Manney"}]}}
-{"id":678,"label":"song","outE":{"sungBy":[{"id":7820,"inV":351}],"writtenBy":[{"id":7819,"inV":679}]},"properties":{"name":[{"id":1697,"value":"OLD OLD HOUSE"}],"songType":[{"id":1699,"value":"cover"}],"performances":[{"id":1698,"value":2}]}}
-{"id":679,"label":"artist","inE":{"writtenBy":[{"id":7819,"outV":678}]},"properties":{"name":[{"id":1700,"value":"Jones_Bynum"}]}}
-{"id":680,"label":"song","outE":{"sungBy":[{"id":7824,"inV":340}],"writtenBy":[{"id":7823,"inV":681}]},"properties":{"name":[{"id":1701,"value":"ONE KIND FAVOR"}],"songType":[{"id":1703,"value":"cover"}],"performances":[{"id":1702,"value":4}]}}
-{"id":681,"label":"artist","inE":{"writtenBy":[{"id":7823,"outV":680}]},"properties":{"name":[{"id":1704,"value":"Blind_Lemon_Jefferson"}]}}
-{"id":682,"label":"song","outE":{"sungBy":[{"id":7826,"inV":415}],"writtenBy":[{"id":7825,"inV":683}]},"properties":{"name":[{"id":1705,"value":"ONE WAY OUT"}],"songType":[{"id":1707,"value":"cover"}],"performances":[{"id":1706,"value":1}]}}
-{"id":683,"label":"artist","inE":{"writtenBy":[{"id":7825,"outV":682}]},"properties":{"name":[{"id":1708,"value":"James_Sehorn_Williamson"}]}}
-{"id":684,"label":"song","outE":{"sungBy":[{"id":7828,"inV":340}],"writtenBy":[{"id":7827,"inV":451}]},"properties":{"name":[{"id":1709,"value":"ONE YOU LOVE THE"}],"songType":[{"id":1711,"value":"cover"}],"performances":[{"id":1710,"value":1}]}}
-{"id":685,"label":"song","outE":{"sungBy":[{"id":7830,"inV":340}],"writtenBy":[{"id":7829,"inV":686}]},"properties":{"name":[{"id":1712,"value":"OVERSEAS STOMP (LINDBERGH HOP)"}],"songType":[{"id":1714,"value":"cover"}],"performances":[{"id":1713,"value":3}]}}
-{"id":686,"label":"artist","inE":{"writtenBy":[{"id":7829,"outV":685}]},"properties":{"name":[{"id":1715,"value":"Jones_Shade"}]}}
-{"id":687,"label":"song","outE":{"sungBy":[{"id":7832,"inV":356}],"writtenBy":[{"id":7831,"inV":688}]},"properties":{"name":[{"id":1716,"value":"PAIN IN MY HEART"}],"songType":[{"id":1718,"value":"cover"}],"performances":[{"id":1717,"value":2}]}}
-{"id":688,"label":"artist","inE":{"writtenBy":[{"id":7831,"outV":687}]},"properties":{"name":[{"id":1719,"value":"Naomi_Neville"}]}}
-{"id":689,"label":"song","outE":{"sungBy":[{"id":7834,"inV":415}],"writtenBy":[{"id":7833,"inV":480}]},"properties":{"name":[{"id":1720,"value":"PAPERBACK WRITER"}],"songType":[{"id":1722,"value":"cover"}],"performances":[{"id":1721,"value":1}]}}
-{"id":690,"label":"song","outE":{"sungBy":[{"id":7836,"inV":356}],"writtenBy":[{"id":7835,"inV":691}]},"properties":{"name":[{"id":1723,"value":"PARCHMAN FARM"}],"songType":[{"id":1725,"value":"cover"}],"performances":[{"id":1724,"value":1}]}}
-{"id":691,"label":"artist","inE":{"writtenBy":[{"id":7835,"outV":690}]},"properties":{"name":[{"id":1726,"value":"Mose_Allison"}]}}
-{"id":692,"label":"song","outE":{"sungBy":[{"id":7838,"inV":340}],"writtenBy":[{"id":7837,"inV":446}]},"properties":{"name":[{"id":1727,"value":"PEGGYO"}],"songType":[{"id":1729,"value":"cover"}],"performances":[{"id":1728,"value":265}]}}
-{"id":693,"label":"song","outE":{"sungBy":[{"id":7840,"inV":623}],"writtenBy":[{"id":7839,"inV":694}]},"properties":{"name":[{"id":1730,"value":"PEGGY SUE"}],"songType":[{"id":1732,"value":"cover"}],"performances":[{"id":1731,"value":1}]}}
-{"id":694,"label":"artist","inE":{"writtenBy":[{"id":7839,"outV":693}]},"properties":{"name":[{"id":1733,"value":"Holly_Allison_Petty"}]}}
-{"id":695,"label":"song","outE":{"sungBy":[{"id":7842,"inV":415}],"writtenBy":[{"id":7841,"inV":596}]},"properties":{"name":[{"id":1734,"value":"PLEASE PLEASE PLEASE"}],"songType":[{"id":1736,"value":"cover"}],"performances":[{"id":1735,"value":1}]}}
-{"id":696,"label":"song","outE":{"sungBy":[{"id":7844,"inV":527}],"writtenBy":[{"id":7843,"inV":527}]},"properties":{"name":[{"id":1737,"value":"POLLUTION"}],"songType":[{"id":1739,"value":"cover"}],"performances":[{"id":1738,"value":1}]}}
-{"id":697,"label":"song","outE":{"sungBy":[{"id":7846,"inV":498}],"writtenBy":[{"id":7845,"inV":446}]},"properties":{"name":[{"id":1740,"value":"PRISONER BLUES"}],"songType":[{"id":1742,"value":"cover"}],"performances":[{"id":1741,"value":1}]}}
-{"id":698,"label":"song","outE":{"sungBy":[{"id":7852,"inV":351}],"writtenBy":[{"id":7851,"inV":447}]},"properties":{"name":[{"id":1743,"value":"QUEEN JANE APPROXIMATELY"}],"songType":[{"id":1745,"value":"cover"}],"performances":[{"id":1744,"value":129}]}}
-{"id":699,"label":"artist","inE":{"writtenBy":[{"id":7853,"outV":20}]},"properties":{"name":[{"id":1746,"value":"Don_Rollins"}]}}
-{"id":700,"label":"song","outE":{"sungBy":[{"id":7856,"inV":351}],"writtenBy":[{"id":7855,"inV":701}]},"properties":{"name":[{"id":1747,"value":"RAILROADING ON THE GREAT DIVIDE"}],"songType":[{"id":1749,"value":"cover"}],"performances":[{"id":1748,"value":1}]}}
-{"id":701,"label":"artist","inE":{"writtenBy":[{"id":7855,"outV":700}]},"properties":{"name":[{"id":1750,"value":"Sara_Carter"}]}}
-{"id":702,"label":"song","outE":{"sungBy":[{"id":7860,"inV":447}],"writtenBy":[{"id":7859,"inV":447}]},"properties":{"name":[{"id":1751,"value":"RAINY DAY WOMEN"}],"songType":[{"id":1753,"value":"cover"}],"performances":[{"id":1752,"value":2}]}}
-{"id":703,"label":"song","outE":{"sungBy":[{"id":7864,"inV":567}],"writtenBy":[{"id":7863,"inV":704}]},"properties":{"name":[{"id":1754,"value":"RIOT IN CELL BLOCK"}],"songType":[{"id":1756,"value":"cover"}],"performances":[{"id":1755,"value":1}]}}
-{"id":704,"label":"artist","inE":{"writtenBy":[{"id":7891,"outV":722},{"id":7863,"outV":703}]},"properties":{"name":[{"id":1757,"value":"Lieber_Stoller"}]}}
-{"id":705,"label":"song","outE":{"sungBy":[{"id":7866,"inV":340}],"writtenBy":[{"id":7865,"inV":706}]},"properties":{"name":[{"id":1758,"value":"RIP IT UP"}],"songType":[{"id":1760,"value":"cover"}],"performances":[{"id":1759,"value":1}]}}
-{"id":706,"label":"artist","inE":{"writtenBy":[{"id":7865,"outV":705}]},"properties":{"name":[{"id":1761,"value":"Blackwell_Marascaico"}]}}
-{"id":707,"label":"song","outE":{"sungBy":[{"id":7868,"inV":457}],"writtenBy":[{"id":7867,"inV":708}]},"properties":{"name":[{"id":1762,"value":"RIVER DEEP MOUNTAIN HIGH"}],"songType":[{"id":1764,"value":"cover"}],"performances":[{"id":1763,"value":1}]}}
-{"id":708,"label":"artist","inE":{"writtenBy":[{"id":7867,"outV":707}]},"properties":{"name":[{"id":1765,"value":"Greenwich_Barry_Spector"}]}}
-{"id":709,"label":"song","outE":{"sungBy":[{"id":7870,"inV":351}],"writtenBy":[{"id":7869,"inV":579}]},"properties":{"name":[{"id":1766,"value":"(IM A) ROAD RUNNER"}],"songType":[{"id":1768,"value":"cover"}],"performances":[{"id":1767,"value":2}]}}
-{"id":710,"label":"song","outE":{"sungBy":[{"id":7872,"inV":356}],"writtenBy":[{"id":7871,"inV":557}]},"properties":{"name":[{"id":1769,"value":"ROBERTA"}],"songType":[{"id":1771,"value":"cover"}],"performances":[{"id":1770,"value":2}]}}
-{"id":711,"label":"song","outE":{"sungBy":[{"id":7874,"inV":340}],"writtenBy":[{"id":7873,"inV":712}]},"properties":{"name":[{"id":1772,"value":"ROCKING PNEUMONIA"}],"songType":[{"id":1774,"value":"cover"}],"performances":[{"id":1773,"value":5}]}}
-{"id":712,"label":"artist","inE":{"writtenBy":[{"id":7873,"outV":711}]},"properties":{"name":[{"id":1775,"value":"Vincent_Smith"}]}}
-{"id":713,"label":"song","outE":{"sungBy":[{"id":7876,"inV":340}],"writtenBy":[{"id":7875,"inV":714}]},"properties":{"name":[{"id":1776,"value":"ROLLING AND TUMBLING"}],"songType":[{"id":1778,"value":"cover"}],"performances":[{"id":1777,"value":2}]}}
-{"id":714,"label":"artist","inE":{"writtenBy":[{"id":7875,"outV":713}]},"properties":{"name":[{"id":1779,"value":"Willie_Newbern"}]}}
-{"id":715,"label":"song","outE":{"sungBy":[{"id":7878,"inV":340}],"writtenBy":[{"id":7877,"inV":716}]},"properties":{"name":[{"id":1780,"value":"ROSA LEE MCFALL"}],"songType":[{"id":1782,"value":"cover"}],"performances":[{"id":1781,"value":16}]}}
-{"id":716,"label":"artist","inE":{"writtenBy":[{"id":7877,"outV":715}]},"properties":{"name":[{"id":1783,"value":"Charlie_Monroe"}]}}
-{"id":717,"label":"song","outE":{"sungBy":[{"id":7880,"inV":356}],"writtenBy":[{"id":7879,"inV":718}]},"properties":{"name":[{"id":1784,"value":"RUN RUDOLPH RUN"}],"songType":[{"id":1786,"value":"cover"}],"performances":[{"id":1785,"value":6}]}}
-{"id":718,"label":"artist","inE":{"writtenBy":[{"id":7879,"outV":717}]},"properties":{"name":[{"id":1787,"value":"Brodie_Marks"}]}}
-{"id":719,"label":"song","outE":{"sungBy":[{"id":7886,"inV":351}],"writtenBy":[{"id":7885,"inV":632}]},"properties":{"name":[{"id":1788,"value":"(I CANT GET NO) SATISFACTION"}],"songType":[{"id":1790,"value":"cover"}],"performances":[{"id":1789,"value":31}]}}
-{"id":720,"label":"song","outE":{"sungBy":[{"id":7888,"inV":351}],"writtenBy":[{"id":7887,"inV":721}]},"properties":{"name":[{"id":1791,"value":"SAWMILL"}],"songType":[{"id":1793,"value":"cover"}],"performances":[{"id":1792,"value":3}]}}
-{"id":721,"label":"artist","inE":{"writtenBy":[{"id":7887,"outV":720}]},"properties":{"name":[{"id":1794,"value":"Tillis_Whatley"}]}}
-{"id":722,"label":"song","outE":{"sungBy":[{"id":7892,"inV":356}],"writtenBy":[{"id":7891,"inV":704}]},"properties":{"name":[{"id":1795,"value":"SEARCHING"}],"songType":[{"id":1797,"value":"cover"}],"performances":[{"id":1796,"value":3}]}}
-{"id":723,"label":"song","outE":{"sungBy":[{"id":7894,"inV":351}],"writtenBy":[{"id":7893,"inV":724}]},"properties":{"name":[{"id":1798,"value":"SEASONS OF MY HEART"}],"songType":[{"id":1800,"value":"cover"}],"performances":[{"id":1799,"value":5}]}}
-{"id":724,"label":"artist","inE":{"writtenBy":[{"id":7893,"outV":723}]},"properties":{"name":[{"id":1801,"value":"Jones_Edwards"}]}}
-{"id":725,"label":"song","outE":{"sungBy":[{"id":7896,"inV":469}],"writtenBy":[{"id":7895,"inV":469}]},"properties":{"name":[{"id":1802,"value":"SGT PEPPERS BAND"}],"songType":[{"id":1804,"value":"cover"}],"performances":[{"id":1803,"value":1}]}}
-{"id":726,"label":"artist","inE":{"sungBy":[{"id":7898,"outV":128}]},"properties":{"name":[{"id":1805,"value":"Weir_Garcia"}]}}
-{"id":727,"label":"song","outE":{"sungBy":[{"id":7900,"inV":356}],"writtenBy":[{"id":7899,"inV":442}]},"properties":{"name":[{"id":1806,"value":"SHES MINE"}],"songType":[{"id":1808,"value":"cover"}],"performances":[{"id":1807,"value":3}]}}
-{"id":728,"label":"song","outE":{"sungBy":[{"id":7904,"inV":356}],"writtenBy":[{"id":7903,"inV":729}]},"properties":{"name":[{"id":1809,"value":"SICK AND TIRED"}],"songType":[{"id":1811,"value":"cover"}],"performances":[{"id":1810,"value":2}]}}
-{"id":729,"label":"artist","inE":{"writtenBy":[{"id":7903,"outV":728}]},"properties":{"name":[{"id":1812,"value":"Bartholomew_Kenner"}]}}
-{"id":730,"label":"artist","inE":{"writtenBy":[{"id":7905,"outV":317}]},"properties":{"name":[{"id":1813,"value":"Lawlor_Blake"}]}}
-{"id":731,"label":"song","outE":{"sungBy":[{"id":7908,"inV":351}],"writtenBy":[{"id":7907,"inV":732}]},"properties":{"name":[{"id":1814,"value":"SILVER THREADS AND GOLDEN NEEDLES"}],"songType":[{"id":1816,"value":"cover"}],"performances":[{"id":1815,"value":17}]}}
-{"id":732,"label":"artist","inE":{"writtenBy":[{"id":7907,"outV":731}]},"properties":{"name":[{"id":1817,"value":"Reynolds_Rhodes"}]}}
-{"id":733,"label":"song","outE":{"sungBy":[{"id":7914,"inV":340}],"writtenBy":[{"id":7913,"inV":734}]},"properties":{"name":[{"id":1818,"value":"SITTING ON TOP OF THE WORLD"}],"songType":[{"id":1820,"value":"cover"}],"performances":[{"id":1819,"value":44}]}}
-{"id":734,"label":"artist","inE":{"writtenBy":[{"id":7913,"outV":733}]},"properties":{"name":[{"id":1821,"value":"Jacobs_Carter"}]}}
-{"id":735,"label":"song","outE":{"sungBy":[{"id":7916,"inV":527}],"writtenBy":[{"id":7915,"inV":527}]},"properties":{"name":[{"id":1822,"value":"SLOW BLUES"}],"songType":[{"id":1824,"value":"cover"}],"performances":[{"id":1823,"value":1}]}}
-{"id":736,"label":"song","outE":{"sungBy":[{"id":7918,"inV":447}],"writtenBy":[{"id":7917,"inV":447}]},"properties":{"name":[{"id":1825,"value":"SLOW TRAIN"}],"songType":[{"id":1827,"value":"cover"}],"performances":[{"id":1826,"value":3}]}}
-{"id":737,"label":"artist","inE":{"writtenBy":[{"id":7919,"outV":113}]},"properties":{"name":[{"id":1828,"value":"Chester_Burnette"}]}}
-{"id":738,"label":"song","outE":{"sungBy":[{"id":7922,"inV":351}],"writtenBy":[{"id":7921,"inV":739}]},"properties":{"name":[{"id":1829,"value":"SO SAD (TO WATCH GOOD LOVE GO BAD)"}],"songType":[{"id":1831,"value":"cover"}],"performances":[{"id":1830,"value":1}]}}
-{"id":739,"label":"artist","inE":{"writtenBy":[{"id":7921,"outV":738}]},"properties":{"name":[{"id":1832,"value":"Don_Everley"}]}}
-{"id":740,"label":"song","outE":{"sungBy":[{"id":7924,"inV":574}],"writtenBy":[{"id":7923,"inV":741}]},"properties":{"name":[{"id":1833,"value":"SO WHAT"}],"songType":[{"id":1835,"value":"cover"}],"performances":[{"id":1834,"value":1}]}}
-{"id":741,"label":"artist","inE":{"writtenBy":[{"id":7923,"outV":740}]},"properties":{"name":[{"id":1836,"value":"Miles_Davis"}]}}
-{"id":742,"label":"song","outE":{"sungBy":[{"id":7926,"inV":537}],"writtenBy":[{"id":7925,"inV":451}]},"properties":{"name":[{"id":1837,"value":"SONS AND DAUGHTERS"}],"songType":[{"id":1839,"value":"cover"}],"performances":[{"id":1838,"value":1}]}}
-{"id":743,"label":"artist","inE":{"writtenBy":[{"id":7987,"outV":778},{"id":7929,"outV":136}]},"properties":{"name":[{"id":1840,"value":"Bruce_Hornsby"}]}}
-{"id":744,"label":"song","outE":{"sungBy":[{"id":7932,"inV":574}],"writtenBy":[{"id":7931,"inV":745}]},"properties":{"name":[{"id":1841,"value":"STARS AND STRIPES FOREVER"}],"songType":[{"id":1843,"value":"cover"}],"performances":[{"id":1842,"value":4}]}}
-{"id":745,"label":"artist","inE":{"writtenBy":[{"id":7931,"outV":744}]},"properties":{"name":[{"id":1844,"value":"John_Philip_Sousa"}]}}
-{"id":746,"label":"song","outE":{"sungBy":[{"id":7934,"inV":415}],"writtenBy":[{"id":7933,"inV":530}]},"properties":{"name":[{"id":1845,"value":"START ME UP"}],"songType":[{"id":1847,"value":"cover"}],"performances":[{"id":1846,"value":1}]}}
-{"id":747,"label":"song","outE":{"sungBy":[{"id":7936,"inV":340}],"writtenBy":[{"id":7935,"inV":748}]},"properties":{"name":[{"id":1848,"value":"STEALING"}],"songType":[{"id":1850,"value":"cover"}],"performances":[{"id":1849,"value":4}]}}
-{"id":748,"label":"artist","inE":{"writtenBy":[{"id":7935,"outV":747}]},"properties":{"name":[{"id":1851,"value":"Gus_Cannon"}]}}
-{"id":749,"label":"artist","inE":{"writtenBy":[{"id":7937,"outV":228}]},"properties":{"name":[{"id":1852,"value":"Bob_Marley"}]}}
-{"id":750,"label":"song","outE":{"sungBy":[{"id":7940,"inV":340}],"writtenBy":[{"id":7939,"inV":751}]},"properties":{"name":[{"id":1853,"value":"SWEET GEORGIA BROWN"}],"songType":[{"id":1855,"value":"cover"}],"performances":[{"id":1854,"value":1}]}}
-{"id":751,"label":"artist","inE":{"writtenBy":[{"id":7939,"outV":750}]},"properties":{"name":[{"id":1856,"value":"Bernie_Casey_Pinkard"}]}}
-{"id":752,"label":"song","outE":{"sungBy":[{"id":7942,"inV":340}],"writtenBy":[{"id":7941,"inV":446}]},"properties":{"name":[{"id":1857,"value":"SWING LOW SWEET CHARIOT"}],"songType":[{"id":1859,"value":"cover"}],"performances":[{"id":1858,"value":8}]}}
-{"id":753,"label":"artist","inE":{"writtenBy":[{"id":7943,"outV":272}]},"properties":{"name":[{"id":1860,"value":"Al_Green"}]}}
-{"id":754,"label":"song","outE":{"sungBy":[{"id":7948,"inV":527}],"writtenBy":[{"id":7947,"inV":755}]},"properties":{"name":[{"id":1861,"value":"TAKE IT ALL OFF"}],"songType":[{"id":1863,"value":"cover"}],"performances":[{"id":1862,"value":1}]}}
-{"id":755,"label":"artist","inE":{"writtenBy":[{"id":7947,"outV":754}]},"properties":{"name":[{"id":1864,"value":"Eva_Darby"}]}}
-{"id":756,"label":"song","outE":{"sungBy":[{"id":7950,"inV":340}],"writtenBy":[{"id":7949,"inV":446}]},"properties":{"name":[{"id":1865,"value":"TELL IT TO ME"}],"songType":[{"id":1867,"value":"cover"}],"performances":[{"id":1866,"value":3}]}}
-{"id":757,"label":"artist","inE":{"sungBy":[{"id":7952,"outV":255}],"writtenBy":[{"id":7951,"outV":255}]},"properties":{"name":[{"id":1868,"value":"Etta_James"}]}}
-{"id":758,"label":"artist","inE":{"writtenBy":[{"id":7953,"outV":139}]},"properties":{"name":[{"id":1869,"value":"Paul_McCartney"}]}}
-{"id":759,"label":"song","outE":{"sungBy":[{"id":7956,"inV":340}],"writtenBy":[{"id":7955,"inV":760}]},"properties":{"name":[{"id":1870,"value":"THATLL BE THE DAY"}],"songType":[{"id":1872,"value":"cover"}],"performances":[{"id":1871,"value":1}]}}
-{"id":760,"label":"artist","inE":{"writtenBy":[{"id":7955,"outV":759}]},"properties":{"name":[{"id":1873,"value":"Buddy_Holly"}]}}
-{"id":761,"label":"song","outE":{"sungBy":[{"id":7958,"inV":340}],"writtenBy":[{"id":7957,"inV":644}]},"properties":{"name":[{"id":1874,"value":"THATS ALL RIGHT MAMA"}],"songType":[{"id":1876,"value":"cover"}],"performances":[{"id":1875,"value":2}]}}
-{"id":762,"label":"song","outE":{"sungBy":[{"id":7960,"inV":356}],"writtenBy":[{"id":7959,"inV":763}]},"properties":{"name":[{"id":1877,"value":"THERES SOMETHING ON YOUR MIND"}],"songType":[{"id":1879,"value":"cover"}],"performances":[{"id":1878,"value":2}]}}
-{"id":763,"label":"artist","inE":{"writtenBy":[{"id":7959,"outV":762}]},"properties":{"name":[{"id":1880,"value":"Big_Jay_McNeely?"}]}}
-{"id":764,"label":"song","outE":{"sungBy":[{"id":7962,"inV":498}],"writtenBy":[{"id":7961,"inV":765}]},"properties":{"name":[{"id":1881,"value":"THINGS I USED TO DO"}],"songType":[{"id":1883,"value":"cover"}],"performances":[{"id":1882,"value":1}]}}
-{"id":765,"label":"artist","inE":{"writtenBy":[{"id":7961,"outV":764}]},"properties":{"name":[{"id":1884,"value":"Eddie_Jones"}]}}
-{"id":766,"label":"song","outE":{"sungBy":[{"id":7964,"inV":340}],"writtenBy":[{"id":7963,"inV":458}]},"properties":{"name":[{"id":1885,"value":"THIRTY DAYS"}],"songType":[{"id":1887,"value":"cover"}],"performances":[{"id":1886,"value":1}]}}
-{"id":767,"label":"song","outE":{"sungBy":[{"id":7966,"inV":447}],"writtenBy":[{"id":7965,"inV":447}]},"properties":{"name":[{"id":1888,"value":"TIMES THEY ARE A CHANGING THE"}],"songType":[{"id":1890,"value":"cover"}],"performances":[{"id":1889,"value":3}]}}
-{"id":768,"label":"song","outE":{"sungBy":[{"id":7968,"inV":340}],"writtenBy":[{"id":7967,"inV":446}]},"properties":{"name":[{"id":1891,"value":"TOM DOOLEY"}],"songType":[{"id":1893,"value":"cover"}],"performances":[{"id":1892,"value":1}]}}
-{"id":769,"label":"artist","inE":{"writtenBy":[{"id":7971,"outV":47}]},"properties":{"name":[{"id":1894,"value":"Dolly_Parton"}]}}
-{"id":770,"label":"song","outE":{"sungBy":[{"id":7976,"inV":340}],"writtenBy":[{"id":7975,"inV":447}]},"properties":{"name":[{"id":1895,"value":"TOUGH MAMA"}],"songType":[{"id":1897,"value":"cover"}],"performances":[{"id":1896,"value":1}]}}
-{"id":771,"label":"artist","inE":{"writtenBy":[{"id":7977,"outV":164}]},"properties":{"name":[{"id":1898,"value":"Scott_Malone"}]}}
-{"id":772,"label":"song","outE":{"sungBy":[{"id":7980,"inV":574}],"writtenBy":[{"id":7979,"inV":773}]},"properties":{"name":[{"id":1899,"value":"TWENTY SIX MILES (SANTA CATALINA)"}],"songType":[{"id":1901,"value":"cover"}],"performances":[{"id":1900,"value":1}]}}
-{"id":773,"label":"artist","inE":{"writtenBy":[{"id":7979,"outV":772}]},"properties":{"name":[{"id":1902,"value":"Belland_Larson"}]}}
-{"id":774,"label":"song","outE":{"sungBy":[{"id":7982,"inV":484}],"writtenBy":[{"id":7981,"inV":775}]},"properties":{"name":[{"id":1903,"value":"TWIST AND SHOUT"}],"songType":[{"id":1905,"value":"cover"}],"performances":[{"id":1904,"value":1}]}}
-{"id":775,"label":"artist","inE":{"writtenBy":[{"id":7981,"outV":774}]},"properties":{"name":[{"id":1906,"value":"Medley_Russell"}]}}
-{"id":776,"label":"song","outE":{"sungBy":[{"id":7984,"inV":356}],"writtenBy":[{"id":7983,"inV":446}]},"properties":{"name":[{"id":1907,"value":"TWO TRAINS"}],"songType":[{"id":1909,"value":"cover"}],"performances":[{"id":1908,"value":1}]}}
-{"id":777,"label":"song","outE":{"sungBy":[{"id":7986,"inV":623}],"writtenBy":[{"id":7985,"inV":446}]},"properties":{"name":[{"id":1910,"value":"UNCLE SAMS BLUES"}],"songType":[{"id":1912,"value":"cover"}],"performances":[{"id":1911,"value":1}]}}
-{"id":778,"label":"song","outE":{"sungBy":[{"id":7988,"inV":416}],"writtenBy":[{"id":7987,"inV":743}]},"properties":{"name":[{"id":1913,"value":"VALLEY ROAD THE"}],"songType":[{"id":1915,"value":"cover"}],"performances":[{"id":1914,"value":6}]}}
-{"id":779,"label":"song","outE":{"sungBy":[{"id":7990,"inV":453}],"writtenBy":[{"id":7989,"inV":478}]},"properties":{"name":[{"id":1916,"value":"VIOLA LEE BLUES"}],"songType":[{"id":1918,"value":"cover"}],"performances":[{"id":1917,"value":32}]}}
-{"id":780,"label":"song","outE":{"sungBy":[{"id":7994,"inV":351}],"writtenBy":[{"id":7993,"inV":781}]},"properties":{"name":[{"id":1919,"value":"WABASH CANNONBALL"}],"songType":[{"id":1921,"value":"cover"}],"performances":[{"id":1920,"value":1}]}}
-{"id":781,"label":"artist","inE":{"writtenBy":[{"id":7993,"outV":780}]},"properties":{"name":[{"id":1922,"value":"A.P.Carter"}]}}
-{"id":782,"label":"song","outE":{"sungBy":[{"id":7996,"inV":351}],"writtenBy":[{"id":7995,"inV":783}]},"properties":{"name":[{"id":1923,"value":"WAKE UP LITTLE SUSIE"}],"songType":[{"id":1925,"value":"cover"}],"performances":[{"id":1924,"value":14}]}}
-{"id":783,"label":"artist","inE":{"writtenBy":[{"id":7995,"outV":782}]},"properties":{"name":[{"id":1926,"value":"F_&_B_Bryant"}]}}
-{"id":784,"label":"song","outE":{"sungBy":[{"id":7998,"inV":451}],"writtenBy":[{"id":7997,"inV":451}]},"properties":{"name":[{"id":1927,"value":"WALK DOWN THE STREET"}],"songType":[{"id":1929,"value":"cover"}],"performances":[{"id":1928,"value":1}]}}
-{"id":785,"label":"artist","inE":{"writtenBy":[{"id":7999,"outV":30}]},"properties":{"name":[{"id":1930,"value":"Robert_Johnson"}]}}
-{"id":786,"label":"song","outE":{"sungBy":[{"id":8002,"inV":351}],"writtenBy":[{"id":8001,"inV":787}]},"properties":{"name":[{"id":1931,"value":"WALKING THE DOG"}],"songType":[{"id":1933,"value":"cover"}],"performances":[{"id":1932,"value":6}]}}
-{"id":787,"label":"artist","inE":{"writtenBy":[{"id":8001,"outV":786}]},"properties":{"name":[{"id":1934,"value":"Rufus_Thomas"}]}}
-{"id":788,"label":"song","outE":{"sungBy":[{"id":8010,"inV":415}],"writtenBy":[{"id":8009,"inV":789}]},"properties":{"name":[{"id":1935,"value":"WATCHING THE WHEELS"}],"songType":[{"id":1937,"value":"cover"}],"performances":[{"id":1936,"value":1}]}}
-{"id":789,"label":"artist","inE":{"writtenBy":[{"id":8009,"outV":788}]},"properties":{"name":[{"id":1938,"value":"John_Lennon"}]}}
-{"id":790,"label":"artist","inE":{"writtenBy":[{"id":8013,"outV":214}]},"properties":{"name":[{"id":1939,"value":"Warren_Zevon"}]}}
-{"id":791,"label":"artist","inE":{"writtenBy":[{"id":8015,"outV":95}]},"properties":{"name":[{"id":1940,"value":"Cleveland_Gaye"}]}}
-{"id":792,"label":"song","outE":{"sungBy":[{"id":8018,"inV":415}],"writtenBy":[{"id":8017,"inV":793}]},"properties":{"name":[{"id":1941,"value":"WHEN A MAN LOVES A WOMAN"}],"songType":[{"id":1943,"value":"cover"}],"performances":[{"id":1942,"value":1}]}}
-{"id":793,"label":"artist","inE":{"writtenBy":[{"id":8017,"outV":792}]},"properties":{"name":[{"id":1944,"value":"Lewis_Wright"}]}}
-{"id":794,"label":"song","outE":{"sungBy":[{"id":8022,"inV":340}],"writtenBy":[{"id":8021,"inV":446}]},"properties":{"name":[{"id":1945,"value":"WHISKEY IN THE JAR"}],"songType":[{"id":1947,"value":"cover"}],"performances":[{"id":1946,"value":0}]}}
-{"id":795,"label":"song","outE":{"sungBy":[{"id":8026,"inV":498}],"writtenBy":[{"id":8025,"inV":796}]},"properties":{"name":[{"id":1948,"value":"WHOS LOVING YOU TONIGHT"}],"songType":[{"id":1950,"value":"cover"}],"performances":[{"id":1949,"value":1}]}}
-{"id":796,"label":"artist","inE":{"writtenBy":[{"id":8025,"outV":795}]},"properties":{"name":[{"id":1951,"value":"Jimmy_Rodgers"}]}}
-{"id":797,"label":"song","outE":{"sungBy":[{"id":8032,"inV":798}],"writtenBy":[{"id":8031,"inV":446}]},"properties":{"name":[{"id":1952,"value":"WILL THE CIRCLE BE UNBROKEN"}],"songType":[{"id":1954,"value":"cover"}],"performances":[{"id":1953,"value":1}]}}
-{"id":798,"label":"artist","inE":{"sungBy":[{"id":8032,"outV":797}]},"properties":{"name":[{"id":1955,"value":"Allman_Brothers"}]}}
-{"id":799,"label":"artist","inE":{"writtenBy":[{"id":8033,"outV":238}]},"properties":{"name":[{"id":1956,"value":"Johnny_Otis"}]}}
-{"id":800,"label":"song","outE":{"sungBy":[{"id":8036,"inV":351}],"writtenBy":[{"id":8035,"inV":446}]},"properties":{"name":[{"id":1957,"value":"WINING BOY BLUES"}],"songType":[{"id":1959,"value":"cover"}],"performances":[{"id":1958,"value":1}]}}
-{"id":801,"label":"song","outE":{"sungBy":[{"id":8038,"inV":527}],"writtenBy":[{"id":8037,"inV":527}]},"properties":{"name":[{"id":1960,"value":"WO WOW HEY HEY"}],"songType":[{"id":1962,"value":"cover"}],"performances":[{"id":1961,"value":1}]}}
-{"id":802,"label":"song","outE":{"sungBy":[{"id":8040,"inV":340}],"writtenBy":[{"id":8039,"inV":803}]},"properties":{"name":[{"id":1963,"value":"WORKING MAN BLUES"}],"songType":[{"id":1965,"value":"cover"}],"performances":[{"id":1964,"value":1}]}}
-{"id":803,"label":"artist","inE":{"writtenBy":[{"id":8039,"outV":802}]},"properties":{"name":[{"id":1966,"value":"Merl_Haggard"}]}}
-{"id":804,"label":"artist","inE":{"writtenBy":[{"id":8041,"outV":55}]},"properties":{"name":[{"id":1967,"value":"Loretta_Lynn"}]}}
-{"id":805,"label":"song","outE":{"sungBy":[{"id":8044,"inV":356}],"writtenBy":[{"id":8043,"inV":806}]},"properties":{"name":[{"id":1968,"value":"YOU DONT LOVE ME"}],"songType":[{"id":1970,"value":"cover"}],"performances":[{"id":1969,"value":1}]}}
-{"id":806,"label":"artist","inE":{"writtenBy":[{"id":8043,"outV":805}]},"properties":{"name":[{"id":1971,"value":"Willie_Cobb"}]}}
-{"id":807,"label":"artist","inE":{"writtenBy":[{"id":8045,"outV":235}]},"properties":{"name":[{"id":1972,"value":"Hank_Williams"}]}}
-{"id":808,"label":"song","outE":{"sungBy":[{"id":8048,"inV":351}],"writtenBy":[{"id":8047,"inV":598}]},"properties":{"name":[{"id":1973,"value":"YOUNG BLOOD"}],"songType":[{"id":1975,"value":"cover"}],"performances":[{"id":1974,"value":1}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-typed-v2.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-typed-v2d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-typed-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-byteid-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v2d0.json
deleted file mode 100644
index cb08148..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v2d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":2,"value":29}],"name":[{"id":0,"value":"marko"}]}}
-{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":4,"value":27}],"name":[{"id":3,"value":"vadas"}]}}
-{"id":3,"label":"vertex","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":6,"value":"java"}],"name":[{"id":5,"value":"lop"}]}}
-{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":8,"value":32}],"name":[{"id":7,"value":"josh"}]}}
-{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":10,"value":"java"}],"name":[{"id":9,"value":"ripple"}]}}
-{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":12,"value":35}],"name":[{"id":11,"value":"peter"}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2d0.json
deleted file mode 100644
index 7401750..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":{"@type":"g:Int32","@value":1},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Float","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int32","@value":2},"value":{"@type":"g:Int32","@value":29}}]}}
-{"id":{"@type":"g:Int32","@value":2},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":3},"value":"vadas"}],"age":[{"id":{"@type":"g:Int32","@value":4},"value":{"@type":"g:Int32","@value":27}}]}}
-{"id":{"@type":"g:Int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":5},"value":"lop"}],"lang":[{"id":{"@type":"g:Int32","@value":6},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Float","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":7},"value":"josh"}],"age":[{"id":{"@type":"g:Int32","@value":8},"value":{"@type":"g:Int32","@value":32}}]}}
-{"id":{"@type":"g:Int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":9},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int32","@value":10},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}],"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2d0.json
deleted file mode 100644
index 5ccfe05..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":2,"value":29}]}}
-{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":3,"value":"vadas"}],"age":[{"id":4,"value":27}]}}
-{"id":3,"label":"vertex","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":5,"value":"lop"}],"lang":[{"id":6,"value":"java"}]}}
-{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":7,"value":"josh"}],"age":[{"id":8,"value":32}]}}
-{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":9,"value":"ripple"}],"lang":[{"id":10,"value":"java"}]}}
-{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":11,"value":"peter"}],"age":[{"id":12,"value":35}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2d0.json
deleted file mode 100644
index 2165e4d..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"person","outE":{"uses":[{"id":16,"inV":11,"properties":{"skill":5}},{"id":15,"inV":10,"properties":{"skill":4}}],"develops":[{"id":13,"inV":10,"properties":{"since":2009}},{"id":14,"inV":11,"properties":{"since":2010}}]},"properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}
-{"id":7,"label":"person","outE":{"uses":[{"id":19,"inV":10,"properties":{"skill":5}},{"id":20,"inV":11,"properties":{"skill":4}}],"develops":[{"id":17,"inV":10,"properties":{"since":2010}},{"id":18,"inV":11,"properties":{"since":2011}}]},"properties":{"name":[{"id":1,"value":"stephen"}],"location":[{"id":10,"value":"centreville","properties":{"startTime":1990,"endTime":2000}},{"id":11,"value":"dulles","properties":{"startTime":2000,"endTime":2006}},{"id":12,"value":"purcellville","properties":{"startTime":2006}}]}}
-{"id":8,"label":"person","outE":{"uses":[{"id":22,"inV":10,"properties":{"skill":3}},{"id":23,"inV":11,"properties":{"skill":3}}],"develops":[{"id":21,"inV":10,"properties":{"since":2012}}]},"properties":{"name":[{"id":2,"value":"matthias"}],"location":[{"id":13,"value":"bremen","properties":{"startTime":2004,"endTime":2007}},{"id":14,"value":"baltimore","properties":{"startTime":2007,"endTime":2011}},{"id":15,"value":"oakland","properties":{"startTime":2011,"endTime":2014}},{"id":16,"value":"seattle","properties":{"startTime":2014}}]}}
-{"id":9,"label":"person","outE":{"uses":[{"id":24,"inV":10,"properties":{"skill":5}},{"id":25,"inV":11,"properties":{"skill":3}}]},"properties":{"name":[{"id":3,"value":"daniel"}],"location":[{"id":17,"value":"spremberg","properties":{"startTime":1982,"endTime":2005}},{"id":18,"value":"kaiserslautern","properties":{"startTime":2005,"endTime":2009}},{"id":19,"value":"aachen","properties":{"startTime":2009}}]}}
-{"id":10,"label":"software","inE":{"uses":[{"id":19,"outV":7,"properties":{"skill":5}},{"id":22,"outV":8,"properties":{"skill":3}},{"id":24,"outV":9,"properties":{"skill":5}},{"id":15,"outV":1,"properties":{"skill":4}}],"develops":[{"id":17,"outV":7,"properties":{"since":2010}},{"id":21,"outV":8,"properties":{"since":2012}},{"id":13,"outV":1,"properties":{"since":2009}}]},"outE":{"traverses":[{"id":26,"inV":11}]},"properties":{"name":[{"id":4,"value":"gremlin"}]}}
-{"id":11,"label":"software","inE":{"traverses":[{"id":26,"outV":10}],"uses":[{"id":16,"outV":1,"properties":{"skill":5}},{"id":20,"outV":7,"properties":{"skill":4}},{"id":23,"outV":8,"properties":{"skill":3}},{"id":25,"outV":9,"properties":{"skill":3}}],"develops":[{"id":18,"outV":7,"properties":{"since":2011}},{"id":14,"outV":1,"properties":{"since":2010}}]},"properties":{"name":[{"id":5,"value":"tinkergraph"}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v2d0.json
deleted file mode 100644
index 8c259ea..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v2d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":1,"value":29}],"name":[{"id":0,"value":"marko"}]}}
-{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":3,"value":27}],"name":[{"id":2,"value":"vadas"}]}}
-{"id":3,"label":"software","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":5,"value":"java"}],"name":[{"id":4,"value":"lop"}]}}
-{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":7,"value":32}],"name":[{"id":6,"value":"josh"}]}}
-{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":9,"value":"java"}],"name":[{"id":8,"value":"ripple"}]}}
-{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":11,"value":35}],"name":[{"id":10,"value":"peter"}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2d0.json
deleted file mode 100644
index 20973ec..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v2d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}
-{"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}]}}
-{"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}]}}
-{"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v1d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2d0.json
deleted file mode 100644
index 18c265d..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v2d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":1,"value":29}]}}
-{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":2,"value":"vadas"}],"age":[{"id":3,"value":27}]}}
-{"id":3,"label":"software","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":4,"value":"lop"}],"lang":[{"id":5,"value":"java"}]}}
-{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":6,"value":"josh"}],"age":[{"id":7,"value":32}]}}
-{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":8,"value":"ripple"}],"lang":[{"id":9,"value":"java"}]}}
-{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":10,"value":"peter"}],"age":[{"id":11,"value":35}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v1.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v1d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v1.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2.json
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v1d0.json
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2d0.json
deleted file mode 100644
index 4d4811f..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2d0.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"id":2000,"label":"message","inE":{"link":[{"id":2003,"outV":2000}]},"outE":{"link":[{"id":2002,"inV":2001},{"id":2003,"inV":2000}]},"properties":{"name":[{"id":1,"value":"a"}]}}
-{"id":2001,"label":"message","inE":{"link":[{"id":2002,"outV":2000}]},"properties":{"name":[{"id":2,"value":"b"}]}}
-{"id":1000,"label":"loops","inE":{"self":[{"id":1001,"outV":1000}]},"outE":{"self":[{"id":1001,"inV":1000}]},"properties":{"name":[{"id":0,"value":"loop"}]}}
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v3.json
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v3d0.json
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v3.json
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1.kryo
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3.kryo
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v1d0.kryo
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo
deleted file mode 100644
index 57fa587..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo
+++ /dev/null
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1.kryo
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3.kryo
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v1d0.kryo
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3d0.kryo
deleted file mode 100644
index 7e6ed05..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-v3d0.kryo
+++ /dev/null
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1.kryo
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3.kryo
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v1d0.kryo
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3d0.kryo
deleted file mode 100644
index aa1c24d..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-v3d0.kryo
+++ /dev/null
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1.kryo
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3.kryo
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v1d0.kryo
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3d0.kryo
deleted file mode 100644
index 611e83e..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-v3d0.kryo
+++ /dev/null
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v1.kryo
similarity index 100%
rename from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v1d0.kryo
rename to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v1.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v1d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v3.kryo
similarity index 100%
copy from gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v1d0.kryo
copy to gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v3.kryo
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v3d0.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v3d0.kryo
deleted file mode 100644
index 8db5f4f..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink-v3d0.kryo
+++ /dev/null
Binary files differ
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Local.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Local.feature
index 315235e..703e1e5 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Local.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Local.feature
@@ -18,7 +18,7 @@
 @StepClassBranch @StepLocal
 Feature: Step - local()
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value
     Given the crew graph
     And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Repeat.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Repeat.feature
index bbc2615..545fa32 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Repeat.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Repeat.feature
@@ -334,7 +334,7 @@
           | lop |
           | ripple |
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_VX1X_repeatXrepeatXunionXout_uses_out_traversesXX_whereXloops_isX0X_timesX1X_timeX2X_name
       Given the crew graph
       And using the parameter vid1 defined as "v[marko].id"
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Union.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Union.feature
index 0f60240..c30662a 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Union.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/branch/Union.feature
@@ -18,6 +18,139 @@
 @StepClassBranch @StepUnion
 Feature: Step - union()
 
+  Scenario: g_unionXX
+    Given the modern graph
+    And the traversal of
+       """
+       g.union()
+       """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_unionXV_name
+    Given the modern graph
+    And the traversal of
+       """
+       g.union(__.V().values("name"))
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko  |
+      | vadas  |
+      | lop    |
+      | josh   |
+      | ripple |
+      | peter  |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_unionXVXv1X_VX4XX_name
+    Given the modern graph
+    And using the parameter v1 defined as "v[vadas]"
+    And using the parameter v4 defined as "v[josh]"
+    And the traversal of
+       """
+       g.union(__.V(v1), __.V(v4)).values("name")
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | vadas  |
+      | josh   |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_unionXV_hasLabelXsoftwareX_V_hasLabelXpersonXX_name
+    Given the modern graph
+    And the traversal of
+       """
+       g.union(__.V().hasLabel("software"), __.V().hasLabel("person")).values("name")
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko  |
+      | vadas  |
+      | lop    |
+      | josh   |
+      | ripple |
+      | peter  |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_unionXV_out_out_V_hasLabelXsoftwareXX_path
+    Given the modern graph
+    And the traversal of
+       """
+       g.union(__.V().out().out(), __.V().hasLabel("software")).path()
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | p[v[marko],v[josh],v[ripple]] |
+      | p[v[marko],v[josh],v[lop]] |
+      | p[v[lop]] |
+      | p[v[ripple]] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_unionXV_out_out_V_hasLabelXsoftwareXX_path_byXnameX
+    Given the modern graph
+    And the traversal of
+       """
+       g.union(__.V().out().out(), __.V().hasLabel("software")).path().by("name")
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | p[marko,josh,ripple] |
+      | p[marko,josh,lop] |
+      | p[lop] |
+      | p[ripple] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_unionXunionXV_out_outX_V_hasLabelXsoftwareXX_path_byXnameX
+    Given the modern graph
+    And the traversal of
+       """
+       g.union(__.union(__.V().out().out()), __.V().hasLabel("software")).path().by("name")
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | p[marko,josh,ripple] |
+      | p[marko,josh,lop] |
+      | p[lop] |
+      | p[ripple] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_unionXinjectX1X_injectX2X
+    Given the modern graph
+    And the traversal of
+       """
+       g.union(__.inject(1), __.inject(2))
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[1].i |
+      | d[2].i |
+
+  Scenario: g_V_unionXconstantX1X_constantX2X_constantX3XX
+    Given the modern graph
+    And using the parameter xx1 defined as "d[1].i"
+    And using the parameter xx2 defined as "d[2].i"
+    And using the parameter xx3 defined as "d[3].i"
+    And using the parameter v2 defined as "v[vadas]"
+    And the traversal of
+       """
+       g.V(v2).union(constant(xx1), constant(xx2), constant(xx3))
+       """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[1].i |
+      | d[2].i |
+      | d[3].i |
+
   Scenario: g_V_unionXout__inX_name
     Given the modern graph
     And the traversal of
@@ -152,3 +285,18 @@
       | result |
       | d[1].l   |
       | d[1].l   |
+
+  Scenario: g_unionXaddVXpersonX_propertyXname_aliceX_addVXpersonX_propertyXname_bobX_addVXpersonX_propertyXname_chrisX_name
+    Given the empty graph
+    And the traversal of
+      """
+      g.union(__.addV("person").property("name", "alice"),
+              __.addV("person").property("name", "bob"),
+              __.addV("person").property("name", "chris")).values("name")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | alice |
+      | bob |
+      | chris |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/All.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/All.feature
new file mode 100644
index 0000000..0e9689d
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/All.feature
@@ -0,0 +1,151 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassFilter @StepAll
+Feature: Step - all()
+
+  Scenario: g_V_valuesXageX_allXgtX32XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").all(P.gt(32))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  Scenario: g_V_valuesXageX_whereXisXP_gtX33XXX_fold_allXgtX33XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").where(__.is(P.gt(33))).fold().all(P.gt(33))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[35].i] |
+
+  Scenario: g_V_valuesXageX_order_byXdescX_fold_allXgtX10XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(desc).fold().all(P.gt(10))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[35].i,d[32].i,d[29].i,d[27].i] |
+
+  Scenario: g_V_valuesXageX_order_byXdescX_fold_allXgtX30XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(desc).fold().all(P.gt(30))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXabc_bcdX_allXeqXbcdXX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(["abc","bcd"]).all(P.eq("bcd"))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXbcd_bcdX_allXeqXbcdXX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[bcd,bcd]"
+    And the traversal of
+      """
+      g.inject(xx1).all(P.eq("bcd"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[bcd,bcd] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnull_abcX_allXTextP_startingWithXaXX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[null,abc]"
+    And the traversal of
+      """
+      g.inject(xx1).all(TextP.startingWith("a"))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX5_8_10_10_7X_allXgteX7XX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[5].i,d[8].i,d[10].i]"
+    And using the parameter xx2 defined as "l[d[10].i,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1,xx2).all(P.gte(7))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[10].i,d[7].i] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_allXeqXnullXX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).all(P.eq(null))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX7X_allXeqX7XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(7).all(P.eq(7))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnull_nullX_allXeqXnullXX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[null,null]"
+    And the traversal of
+      """
+      g.inject(xx1).all(P.eq(null))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[null,null] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_allXeqX3XX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And the traversal of
+      """
+      g.inject(xx1).all(P.eq(3))
+      """
+    When iterated to list
+    Then the result should be empty
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Any.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Any.feature
new file mode 100644
index 0000000..633c253
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Any.feature
@@ -0,0 +1,155 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassFilter @StepAny
+Feature: Step - any()
+
+  Scenario: g_V_valuesXageX_anyXgtX32XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").any(P.gt(32))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  Scenario: g_V_valuesXageX_order_byXdescX_fold_anyXeqX29XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(desc).fold().any(P.eq(29))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[35].i,d[32].i,d[29].i,d[27].i] |
+
+  Scenario: g_V_valuesXageX_order_byXdescX_fold_anyXgtX10XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(desc).fold().any(P.gt(10))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[35].i,d[32].i,d[29].i,d[27].i] |
+
+  Scenario: g_V_valuesXageX_order_byXdescX_fold_anyXgtX42XX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(desc).fold().any(P.gt(42))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXabc_cdeX_anyXeqXbcdXX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(["abc","cde"]).any(P.eq("bcd"))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXabc_bcdX_anyXeqXbcdXX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[abc,bcd]"
+    And the traversal of
+      """
+      g.inject(xx1).any(P.eq("bcd"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[abc,bcd] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnull_abcX_anyXTextP_startingWithXaXX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[null,abc]"
+    And the traversal of
+      """
+      g.inject(xx1).any(TextP.startingWith("a"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[null,abc] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX5_8_10_10_7X_anyXeqX7XX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[5].i,d[8].i,d[10].i]"
+    And using the parameter xx2 defined as "l[d[10].i,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1,xx2).any(P.eq(7))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[10].i,d[7].i] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_anyXeqXnullXX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).any(P.eq(null))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX7X_anyXeqX7XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(7).any(P.eq(7))
+      """
+    When iterated to list
+    Then the result should be empty
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnull_nullX_anyXeqXnullXX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[null,null]"
+    And the traversal of
+      """
+      g.inject(xx1).any(P.eq(null))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[null,null] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_anyXeqX3XX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And the traversal of
+      """
+      g.inject(xx1).any(P.eq(3))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[3].i,three] |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Dedup.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Dedup.feature
index bae90ba..e236aac 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Dedup.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Dedup.feature
@@ -319,7 +319,7 @@
       | result |
       | d[12].l |
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_V_both_properties_properties_dedup_count
     Given the crew graph
     And the traversal of
@@ -405,3 +405,37 @@
       Then the result should be unordered
         | result |
         | d[29].i |
+
+  Scenario: g_V_properties_dedup_count
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV('person').property('name','josh').
+        addV('person').property('name','josh').
+        addV('person').property('name','josh')
+      """
+    And the traversal of
+      """
+      g.V().properties("name").dedup().count()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[3].l |
+
+  Scenario: g_V_properties_dedup_byXvalueX_count
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV('person').property('name','josh').
+        addV('person').property('name','josh').
+        addV('person').property('name','josh')
+      """
+    And the traversal of
+      """
+      g.V().properties("name").dedup().by(value).count()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[1].l |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Drop.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Drop.feature
index 7ae64e3..9803faa 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Drop.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Drop.feature
@@ -88,7 +88,7 @@
     Then the result should be empty
     And the graph should return 0 for count of "g.E().properties()"
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_V_properties_propertiesXstartTimeX_drop
     Given the empty graph
     And the graph initializer of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature
index aa71fcb..c107577 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Has.feature
@@ -245,7 +245,7 @@
       | result |
       | e[josh-created->ripple] |
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_V_hasXlocationX
     Given the crew graph
     And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature
index 648f5eb..470019f 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/HasLabel.feature
@@ -42,7 +42,7 @@
       | e[marko-knows->vadas] |
       | e[marko-knows->josh] |
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_E_hasLabelXuses_traversesX
     Given the crew graph
     And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Where.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Where.feature
index 7b4f50b..160951b 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Where.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/filter/Where.feature
@@ -396,4 +396,16 @@
       | josh |
       | peter |
       | lop |
-      | ripple |
\ No newline at end of file
+      | ripple |
+
+  Scenario: g_V_hasLabelXpersonX_asXxX_whereXinEXknowsX_count_isXgteX1XXX_selectXxX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").as("x").where(__.inE("knows").count().is(P.gte(1))).select("x")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | v[vadas] |
+      | v[josh] |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/PartitionStrategy.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/PartitionStrategy.feature
index 7c72120..3b0c845 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/PartitionStrategy.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/PartitionStrategy.feature
@@ -75,8 +75,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -86,7 +86,7 @@
     When iterated to list
     Then the result should be unordered
       | result |
-      | d[1].i |
+      | d[1.0].d |
 
   @WithPartitionStrategy
   Scenario: g_withStrategiesXPartitionStrategyXwrite_a_read_bXX_V_bothE_weight
@@ -95,8 +95,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -106,7 +106,7 @@
     When iterated to list
     Then the result should be unordered
       | result |
-      | d[2].i |
+      | d[2.0].d |
 
   @WithPartitionStrategy
   Scenario: g_withStrategiesXPartitionStrategyXwrite_a_read_a_bXX_V_bothE_dedup_weight
@@ -115,8 +115,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -126,8 +126,8 @@
     When iterated to list
     Then the result should be unordered
       | result |
-      | d[1].i |
-      | d[2].i |
+      | d[1.0].d |
+      | d[2.0].d |
 
   @WithPartitionStrategy
   Scenario: g_withStrategiesXPartitionStrategyXwrite_a_read_cXX_V_bothE_weight
@@ -136,8 +136,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -154,8 +154,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -172,8 +172,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -190,8 +190,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -211,8 +211,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -229,8 +229,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -247,8 +247,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -265,8 +265,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
@@ -286,8 +286,8 @@
       """
       g.addV("person").property("_partition","a").property("name","alice").as("a").
         addV("person").property("_partition","b").property("name","bob").as("b").
-        addE("knows").from("a").to("b").property("_partition","a").property("weight",1).
-        addE("knows").from("b").to("a").property("_partition","b").property("weight",2)
+        addE("knows").from("a").to("b").property("_partition","a").property("weight",1.0d).
+        addE("knows").from("b").to("a").property("_partition","b").property("weight",2.0d)
       """
     And the traversal of
       """
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/Paths.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/Paths.feature
index ca09ee1..9f20091 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/Paths.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/Paths.feature
@@ -18,7 +18,7 @@
 @StepClassIntegrated
 Feature: Step - paths
 
-  @GraphComputerVerificationReferenceOnly
+  @GraphComputerVerificationReferenceOnly @InsertionOrderingRequired
   Scenario: g_V_shortestpath
     Given the modern graph
     And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/SubgraphStrategy.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/SubgraphStrategy.feature
index 45026f3..f31c26f 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/SubgraphStrategy.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/integrated/SubgraphStrategy.feature
@@ -611,7 +611,7 @@
       | marko |
       | josh |
 
-  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiMetaProperties
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiProperties @MetaProperties
   Scenario: g_withStrategiesXSubgraphStrategyXvertexProperties_hasXstartTime_gtX2005XXXX_V_propertiesXlocationX_value
     Given the crew graph
     And the traversal of
@@ -627,7 +627,7 @@
       | seattle |
       | aachen |
 
-  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiMetaProperties
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiProperties @MetaProperties
   Scenario: g_withStrategiesXSubgraphStrategyXvertexProperties_hasXstartTime_gtX2005XXXX_V_valuesXlocationX
     Given the crew graph
     And the traversal of
@@ -643,7 +643,7 @@
       | seattle |
       | aachen |
 
-  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiMetaProperties
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiProperties @MetaProperties
   Scenario: g_withStrategiesXSubgraphStrategyXvertexProperties_hasXstartTime_gtX2005XXXX_V_asXaX_propertiesXlocationX_asXbX_selectXaX_outE_properties_selectXbX_value_dedup
     Given the crew graph
     And the traversal of
@@ -660,7 +660,7 @@
       | seattle |
       | aachen |
 
-  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiMetaProperties
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiProperties @MetaProperties
   Scenario: g_withStrategiesXSubgraphStrategyXvertexProperties_hasXstartTime_gtX2005XXXX_V_asXaX_valuesXlocationX_asXbX_selectXaX_outE_properties_selectXbX_dedup
     Given the crew graph
     And the traversal of
@@ -677,7 +677,7 @@
       | seattle |
       | aachen |
 
-  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiMetaProperties
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiProperties @MetaProperties
   Scenario: g_withStrategiesXSubgraphStrategyXvertices_hasXname_neqXstephenXX_vertexProperties_hasXstartTime_gtX2005XXXX_V_propertiesXlocationX_value
     Given the crew graph
     And the traversal of
@@ -693,7 +693,7 @@
       | seattle |
       | aachen |
 
-  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiMetaProperties
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiProperties @MetaProperties
   Scenario: g_withStrategiesXSubgraphStrategyXvertices_hasXname_neqXstephenXX_vertexProperties_hasXstartTime_gtX2005XXXX_V_valuesXlocationX
     Given the crew graph
     And the traversal of
@@ -709,7 +709,7 @@
       | seattle |
       | aachen |
 
-  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiMetaProperties
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded @MultiProperties @MetaProperties
   Scenario: g_withStrategiesXSubgraphStrategyXedges_hasLabelXusesX_hasXskill_5XXX_V_outE_valueMap_selectXvaluesX_unfold
     Given the crew graph
     And the traversal of
@@ -759,6 +759,22 @@
       | e[josh-created->ripple] |
 
   @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded
+  Scenario: g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_E
+    Given the modern graph
+    And the traversal of
+      """
+      g.withStrategies(new SubgraphStrategy(checkAdjacentVertices: true,
+                                            vertices: __.has("name", P.within("josh", "lop", "ripple")),
+                                            edges: __.or(__.has("weight", 0.4).hasLabel("created"),
+                                                         __.has("weight", 1.0).hasLabel("created")))).E()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |
+      | e[josh-created->ripple] |
+
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded
   Scenario: g_withStrategiesXSubgraphStrategyXsubgraphDXX_VX4X_outE
     Given the modern graph
     And using the parameter vid4 defined as "v[josh].id"
@@ -913,4 +929,18 @@
     When iterated to list
     Then the result should be unordered
       | result |
-      | v[lop] |
\ No newline at end of file
+      | v[lop] |
+
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded
+  Scenario: g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV
+    Given the modern graph
+    And using the parameter eid9 defined as "e[marko-created->lop].id"
+    And the traversal of
+      """
+      g.withStrategies(new SubgraphStrategy(checkAdjacentVertices: true,
+                                            vertices: __.has("name", P.within("josh", "lop", "ripple")),
+                                            edges: __.or(__.has("weight", 0.4).hasLabel("created"),
+                                                         __.has("weight", 1.0).hasLabel("created")))).E(eid9).bothV()
+      """
+    When iterated to list
+    Then the result should be empty
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AddVertex.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AddVertex.feature
index 505969a..6b124e2 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AddVertex.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AddVertex.feature
@@ -119,7 +119,6 @@
     Then the result should have a count of 4
     And the graph should return 2 for count of "g.V().properties(\"name\")"
 
-  @MultiMetaProperties
   Scenario: g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenmX
     Given the empty graph
     And the graph initializer of
@@ -146,7 +145,7 @@
     And the graph should return 0 for count of "g.V().has(\"person\",\"name\",\"stephen\")"
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"stephenm\")"
 
-  @MultiMetaProperties
+  @MetaProperties
   Scenario: get_g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X
     Given the empty graph
     And the graph initializer of
@@ -174,7 +173,7 @@
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"stephenm\")"
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"stephenm\").properties(\"name\").has(\"since\",2010)"
 
-  @MultiMetaProperties
+  @MetaProperties
   Scenario: g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX
     Given the empty graph
     And the graph initializer of
@@ -202,7 +201,7 @@
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").properties(\"friendWeight\").has(\"acl\",\"private\")"
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").properties(\"friendWeight\").count()"
 
-  @MultiMetaProperties
+  @MultiProperties
   Scenario: g_addVXanimalX_propertyXname_mateoX_propertyXname_gateoX_propertyXname_cateoX_propertyXage_5X
     Given the empty graph
     And the graph initializer of
@@ -255,7 +254,7 @@
       | marko |
     And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X
     Given the empty graph
     And the graph initializer of
@@ -283,7 +282,7 @@
     And the graph should return 1 for count of "g.V().has(\"name\",\"stephenm\")"
     And the graph should return 1 for count of "g.V().has(\"name\",\"stephenm\").properties(\"name\").has(\"since\",2010)"
 
-  @MultiMetaProperties
+  @MultiProperties
   Scenario: g_V_addVXanimalX_propertyXname_valuesXnameXX_propertyXname_an_animalX_propertyXvaluesXnameX_labelX
     Given the empty graph
     And the graph initializer of
@@ -429,7 +428,6 @@
     Then the result should have a count of 1
     And the graph should return 1 for count of "g.V().hasLabel(\"person\")"
 
- 
   Scenario: g_addV_propertyXmapX
     Given the empty graph
     And the traversal of
@@ -450,6 +448,42 @@
     Then the result should have a count of 1
     And the graph should return 1 for count of "g.V().has(\"name\",\"foo\")"
 
+  @MultiProperties
+  Scenario: g_V_hasXname_fooX_propertyXname_setXbarX_age_43X
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV().property(Cardinality.single, "name", "foo").property("age", 42)
+      """
+    And the traversal of
+      """
+      g.V().has('name','foo').property(["name": Cardinality.set("bar"), "age": 43 ])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"name\",\"foo\")"
+    And the graph should return 1 for count of "g.V().has(\"name\",\"bar\")"
+    And the graph should return 1 for count of "g.V().has(\"age\",43)"
+    And the graph should return 0 for count of "g.V().has(\"age\",42)"
+
+  @MultiProperties
+  Scenario: g_V_hasXname_fooX_propertyXset_name_bar_age_singleX43XX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV().property(Cardinality.single, "name", "foo").property("age", 42)
+      """
+    And the traversal of
+      """
+      g.V().has('name','foo').property(Cardinality.set, ["name":"bar", "age": Cardinality.single(43) ])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"name\",\"foo\")"
+    And the graph should return 1 for count of "g.V().has(\"name\",\"bar\")"
+    And the graph should return 1 for count of "g.V().has(\"age\",43)"
+    And the graph should return 0 for count of "g.V().has(\"age\",42)"
+
   Scenario: g_addV_propertyXnullX
     Given the empty graph
     And the traversal of
@@ -505,7 +539,7 @@
     Then the result should have a count of 1
     And the graph should return 1 for count of "g.V().has(\"person\",\"age\",null)"
 
-  @AllowNullPropertyValues @MultiMetaProperties
+  @AllowNullPropertyValues @MetaProperties
   Scenario: g_addVXpersonX_propertyXname_markoX_propertyXfriendWeight_null_acl_nullX
     Given the empty graph
     And the traversal of
@@ -531,4 +565,31 @@
     When iterated to list
     Then the result should have a count of 1
     And the graph should return 0 for count of "g.V().has(\"person\",\"age\",50)"
-    And the graph should return 1 for count of "g.V().has(\"person\",\"age\",51)"
\ No newline at end of file
+    And the graph should return 1 for count of "g.V().has(\"person\",\"age\",51)"
+
+  Scenario: g_V_limitX3X_addVXsoftwareX_aggregateXa1X_byXlabelX_aggregateXa2X_byXlabelX_capXa1_a2X_selectXa_bX_byXunfoldX_foldX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property("age", 29).as("marko").
+        addV("person").property("name", "vadas").property("age", 27).as("vadas").
+        addV("software").property("name", "lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh").property("age", 32).as("josh").
+        addV("software").property("name", "ripple").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().limit(3).addV("software").aggregate("a1").by(T.label).aggregate("a2").by(T.label).cap("a1", "a2").
+        select("a1","a2").by(unfold().fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | m[{"a1": ["software", "software", "software"], "a2": ["software", "software", "software"]}] |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
new file mode 100644
index 0000000..a410fd7
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsDate.feature
@@ -0,0 +1,100 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepAsDate
+Feature: Step - asDate()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXstrX_asDate
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("2023-08-02T00:00:00Z").asDate()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-08-02T00:00:00Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1694017707000X_asDate
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(1694017707000).asDate()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-09-06T16:28:27Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1694017708000LX_asDate
+    Given the empty graph
+    And using the parameter xx1 defined as "d[1694017708000].l"
+    And the traversal of
+      """
+      g.inject(xx1).asDate()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-09-06T16:28:28Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1694017709000dX_asDate
+    Given the empty graph
+    And using the parameter xx1 defined as "d[1694017709000.1].d"
+    And the traversal of
+      """
+      g.inject(xx1).asDate()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-09-06T16:28:29Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1_2X_asDate
+    Given the empty graph
+    And using the parameter xx1 defined as "l[1,2]"
+    And the traversal of
+      """
+      g.inject(xx1).asDate()
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Can't parse"
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_asDate
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).asDate()
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Can't parse"
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXinvalidstrX_asDate
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject('This String is not an ISO 8601 Date').asDate()
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Can't parse"
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsString.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsString.feature
new file mode 100644
index 0000000..5d469cf
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/AsString.feature
@@ -0,0 +1,224 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepAsString
+Feature: Step - asString()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1_2X_asString
+    Given the empty graph
+    And using the parameter xx1 defined as "d[1].i"
+    And using the parameter xx2 defined as "d[2].i"
+    And the traversal of
+      """
+      g.inject(xx1, xx2).asString()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | 1 |
+      | 2 |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1_2X_asStringXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "d[1].i"
+    And using the parameter xx2 defined as "d[2].i"
+    And the traversal of
+      """
+      g.inject(xx1, xx2).asString(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | 1 |
+      | 2 |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXlist_1_2X_asStringXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[1].i,d[2].i]"
+    And the traversal of
+      """
+      g.inject(xx1).asString(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[1,2] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1_nullX_asString
+    Given the empty graph
+    And using the parameter xx1 defined as "d[1].i"
+    And the traversal of
+      """
+      g.inject(null, xx1).asString()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | null |
+      | 1 |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1_nullX_asStringXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[1].i,null]"
+    And the traversal of
+      """
+      g.inject(xx1).asString(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[1,null] |
+
+  Scenario: g_V_valueMapXnameX_asString
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().valueMap("name").asString()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | {name=[marko]} |
+      | {name=[vadas]} |
+      | {name=[lop]} |
+      | {name=[josh]} |
+      | {name=[ripple]} |
+      | {name=[peter]} |
+
+  Scenario: g_V_valueMapXnameX_order_fold_asStringXlocalX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().valueMap("name").order().fold().asString(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[{name=[josh]},{name=[lop]},{name=[marko]},{name=[peter]},{name=[ripple]},{name=[vadas]}] |
+
+  @UserSuppliedVertexIds
+  Scenario: g_V_asString
+    Given the modern graph
+    And the traversal of
+    """
+    g.V().asString()
+    """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[v[1]] |
+      | str[v[2]] |
+      | str[v[3]] |
+      | str[v[4]] |
+      | str[v[5]] |
+      | str[v[6]] |
+
+  @UserSuppliedVertexIds
+  Scenario: g_V_fold_asStringXlocalX_orderXlocalX
+    Given the modern graph
+    And the traversal of
+    """
+    g.V().fold().asString(Scope.local).order(local)
+    """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[str[v[1]],str[v[2]],str[v[3]],str[v[4]],str[v[5]],str[v[6]]] |
+
+  @UserSuppliedEdgeIds
+  Scenario: g_E_asString
+    Given the modern graph
+    And the traversal of
+    """
+    g.E().asString()
+    """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[e[7][1-knows->2]] |
+      | str[e[8][1-knows->4]] |
+      | str[e[9][1-created->3]] |
+      | str[e[10][4-created->5]] |
+      | str[e[11][4-created->3]] |
+      | str[e[12][6-created->3]] |
+
+  @UserSuppliedVertexPropertyIds
+  Scenario: g_V_properties
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().properties().asString()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[vp[name->marko]] |
+      | str[vp[age->29]] |
+      | str[vp[name->vadas]]  |
+      | str[vp[age->27]] |
+      | str[vp[name->lop]]  |
+      | str[vp[lang->java]]  |
+      | str[vp[name->josh]]  |
+      | str[vp[age->32]] |
+      | str[vp[name->ripple]]  |
+      | str[vp[lang->java]]  |
+      | str[vp[name->peter]]  |
+      | str[vp[age->35]] |
+
+  Scenario: g_V_hasLabelXpersonX_valuesXageX_asString
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("age").asString()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | 29 |
+      | 27 |
+      | 32 |
+      | 35 |
+
+  Scenario: g_V_hasLabelXpersonX_valuesXageX_order_fold_asStringXlocalX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("age").order().fold().asString(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[27,29,32,35] |
+
+  Scenario: g_V_hasLabelXpersonX_valuesXageX_asString_concatX_years_oldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("age").asString().concat(" years old")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | 29 years old |
+      | 27 years old |
+      | 32 years old |
+      | 35 years old |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Combine.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Combine.feature
new file mode 100644
index 0000000..f40f5cb
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Combine.feature
@@ -0,0 +1,256 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepCombine
+Feature: Step - combine()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_combineXinjectX1XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).combine(__.inject(1))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Incoming traverser for combine step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_combineXV_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").combine(__.V().fold())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "combine step can only take an array or an Iterable type for incoming traversers"
+
+  Scenario: g_V_fold_combineXconstantXnullXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().combine(__.constant(null))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for combine step must yield an iterable type, not null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_fold_combineXVX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().combine(__.V())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for combine step must yield an iterable type, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_combineX2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().combine(2)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "combine step can only take an array or an Iterable as an argument, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_combineXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().combine(null)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Argument provided for combine step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnonexistantX_fold_combineXV_valuesXnameX_foldX_unfold
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("nonexistant").fold().combine(__.V().values("name").fold()).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | vadas |
+      | lop |
+      | josh |
+      | ripple |
+      | peter |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_fold_combineXV_valuesXnonexistantX_foldX_unfold
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().combine(__.V().values("nonexistant").fold()).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | vadas |
+      | lop |
+      | josh |
+      | ripple |
+      | peter |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXageX_order_byXdescX_fold_combineXV_valuesXageX_order_byXdescX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(desc).fold().combine(__.V().values("age").order().by(desc).fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[35].i,d[32].i,d[29].i,d[27].i,d[35].i,d[32].i,d[29].i,d[27].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_combineXMARKOX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[MARKO]"
+    And the traversal of
+      """
+      g.V().out().path().by(values("name").toUpper()).combine(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[MARKO,LOP,MARKO] |
+      | l[MARKO,VADAS,MARKO] |
+      | l[MARKO,JOSH,MARKO] |
+      | l[JOSH,RIPPLE,MARKO] |
+      | l[JOSH,LOP,MARKO] |
+      | l[PETER,LOP,MARKO] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXxx1X_combineXV_valuesXnameX_foldX_unfold
+    Given the modern graph
+    And using the parameter xx1 defined as "l[marko]"
+    And the traversal of
+      """
+      g.inject(xx1).combine(__.V().values("name").fold()).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | marko |
+      | vadas |
+      | lop |
+      | josh |
+      | ripple |
+      | peter |
+
+  @MultiProperties @MetaProperties
+  Scenario: g_V_valueMapXlocationX_selectXvaluesX_unfold_combineXseattle_vancouverX_orderXlocalX
+    Given the crew graph
+    And using the parameter xx1 defined as "l[seattle,vancouver]"
+    And the traversal of
+      """
+      g.V().valueMap("location").select(values).unfold().combine(xx1).order(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[brussels,san diego,santa cruz,santa fe,seattle,vancouver] |
+      | l[centreville,dulles,purcellville,seattle,vancouver] |
+      | l[baltimore,bremen,oakland,seattle,seattle,vancouver] |
+      | l[aachen,kaiserslautern,seattle,spremberg,vancouver] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_combineXempty_listX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").combine(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[marko,josh,ripple] |
+      | l[marko,josh,lop] |
+
+  Scenario: g_V_valuesXageX_order_fold_combineXconstantX27X_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().fold().combine(__.constant(27).fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[27].i,d[29].i,d[32].i,d[35].i,d[27].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_combineXdave_kelvinX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[dave,kelvin]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").combine(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[marko,josh,ripple,dave,kelvin] |
+      | l[marko,josh,lop,dave,kelvin] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_combineXa_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,c]"
+    And the traversal of
+      """
+      g.inject(xx1).combine(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[a,null,b,a,c] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_combineXa_null_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,null,c]"
+    And the traversal of
+      """
+      g.inject(xx1).combine(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[a,null,b,a,null,c] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_combineXfive_three_7X
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And using the parameter xx2 defined as "l[five,three,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1).combine(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[3].i,three,five,three,d[7].i] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Concat.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Concat.feature
new file mode 100644
index 0000000..c9a0e71
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Concat.feature
@@ -0,0 +1,231 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepConcat
+Feature: Step - concat()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_bX_concat
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("a", "b").concat()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | a |
+      | b |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_bX_concat_XcX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("a", "b").concat("c")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | ac |
+      | bc |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_bX_concat_Xc_dX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("a", "b").concat("c", "d")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | acd |
+      | bcd |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_bX_concat_Xinject_c_dX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("a", "b").concat(__.inject("c"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | aa |
+      | bb |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXaX_concat_Xinject_List_b_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[b,c]"
+    And the traversal of
+      """
+      g.inject("a").concat(__.inject(xx1))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | aa |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXcX_concat_XdX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+      """
+      g.inject(xx1,"c").concat("d")
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "String concat() can only take string as argument"
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_concat_XinjectX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).concat()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnull_aX_concat_Xnull_bX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null, "a").concat(null, "b")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | b |
+      | ab |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXhello_hiX_concat_XV_valuesXnameXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.inject("hello", "hi").concat(__.V().order().by(id).values("name"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | hellomarko |
+      | himarko |
+
+  Scenario: g_V_hasLabel_value_concat_X_X_concat_XpersonX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("name").concat(" ").concat("person")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko person |
+      | vadas person |
+      | josh person |
+      | peter person |
+
+  Scenario: g_hasLabelXpersonX_valuesXnameX_asXaX_constantXMrX_concatXselectXaX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("name").as("a").constant("Mr.").concat(__.select("a"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | Mr.marko |
+      | Mr.vadas |
+      | Mr.josh |
+      | Mr.peter |
+
+  @GraphComputerVerificationStarGraphExceeded
+  Scenario: g_hasLabelXsoftwareX_asXaX_valuesXnameX_concatXunsesX_concatXselectXaXvaluesXlangX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").as("a").values("name").concat(" uses ").concat(__.select("a").values("lang"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | lop uses java |
+      | ripple uses java |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_labelX_concatXselectXaX_inV_valuesXnameXX
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE().as("a").V(vid1).values("name").concat(select("a").label()).concat(select("a").inV().values("name"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | markocreatedlop |
+      | markoknowsvadas |
+      | markoknowsjosh |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_VX1X_outE_asXaX_VX1X_valuesXnamesX_concatXselectXaX_label_selectXaX_inV_valuesXnameXX
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).outE().as("a").V(vid1).values("name").concat(select("a").label(), select("a").inV().values("name"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | markocreatedlop |
+      | markoknowsvadas |
+      | markoknowsjosh |
+
+  Scenario: g_addVXconstantXprefix_X_concatXVX1X_labelX_label
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property("age", 29).as("marko").
+        addV("person").property("name", "vadas").property("age", 27).as("vadas").
+        addV("software").property("name", "lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh").property("age", 32).as("josh").
+        addV("software").property("name", "ripple").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.addV(constant("prefix_").concat(__.V(vid1).label())).label()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | prefix_person |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
new file mode 100644
index 0000000..9d9d545
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Conjoin.feature
@@ -0,0 +1,155 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepConjoin
+Feature: Step - conjoin()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_conjoinX1X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).conjoin("1")
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Incoming traverser for conjoin step can't be null"
+
+  Scenario: g_V_valuesXnameX_conjoinX1X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").conjoin("1")
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "conjoin step can only take an array or an Iterable type for incoming traversers, encountered"
+
+  Scenario: g_V_valuesXnonexistantX_fold_conjoinX_X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("nonexistant").fold().conjoin(";")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[] |
+
+  Scenario: g_V_valuesXnameX_order_fold_conjoinX_X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").order().fold().conjoin("_")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | josh_lop_marko_peter_ripple_vadas |
+
+  Scenario: g_V_valuesXageX_order_fold_conjoinX_X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().fold().conjoin(";")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | 27;29;32;35 |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_conjoinXMARKOX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().out().path().by(values("name").toUpper()).conjoin("MARKO")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | MARKOMARKOLOP |
+      | MARKOMARKOVADAS |
+      | MARKOMARKOJOSH |
+      | JOSHMARKORIPPLE |
+      | JOSHMARKOLOP |
+      | PETERMARKOLOP |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXmarkoX_conjoinX_X
+    Given the modern graph
+    And using the parameter xx1 defined as "l[marko]"
+    And the traversal of
+      """
+      g.inject(xx1).conjoin("-")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+
+  @MultiProperties @MetaProperties
+  Scenario: g_V_valueMapXlocationX_selectXvaluesX_unfold_orderXlocalX_conjoinX1X
+    Given the crew graph
+    And the traversal of
+      """
+      g.V().valueMap("location").select(values).unfold().order(Scope.local).conjoin("1")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | brussels1san diego1santa cruz1santa fe |
+      | centreville1dulles1purcellville |
+      | baltimore1bremen1oakland1seattle |
+      | aachen1kaiserslautern1spremberg |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_conjoinXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").conjoin("")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | markojoshripple |
+      | markojoshlop |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_conjoinXxyzX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And the traversal of
+      """
+      g.inject(xx1).conjoin("xyz")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[axyzb] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_conjoinX_X
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And the traversal of
+      """
+      g.inject(xx1).conjoin(";")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | 3;three |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Count.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Count.feature
index 0deedd1..e2a55de 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Count.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Count.feature
@@ -168,4 +168,26 @@
     When iterated to list
     Then the result should be ordered
       | result |
-      | d[0].l |
\ No newline at end of file
+      | d[0].l |
+
+  Scenario: g_V_group_byXlabelX_count
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().group().by(label).count()
+      """
+    When iterated to list
+    Then the result should be ordered
+      | result |
+      | d[1].l |
+
+  Scenario: g_V_group_byXlabelX_countXlocalX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().group().by(label).count(local)
+      """
+    When iterated to list
+    Then the result should be ordered
+      | result |
+      | d[2].l |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
new file mode 100644
index 0000000..6bd3fc6
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateAdd.feature
@@ -0,0 +1,91 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepDateAdd
+Feature: Step - dateAdd()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstrXX_dateAddXDT_hour_2X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-02T00:00:00Z')).dateAdd(DT.hour, 2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-08-02T02:00:00Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstrXX_dateAddXhour_2X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-02T00:00:00Z')).dateAdd(hour, 2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-08-02T02:00:00Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstrXX_dateAddXhour_1X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-02T00:00:00Z')).dateAdd(hour, -1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-08-01T23:00:00Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstrXX_dateAddXminute_10X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-02T00:00:00Z')).dateAdd(minute, 10)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-08-02T00:10:00Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstrXX_dateAddXsecond_20X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-02T00:00:00Z')).dateAdd(second, 20)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-08-02T00:00:20Z] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstrXX_dateAddXday_11X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-09-06T00:00:00Z')).dateAdd(day, 11)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | dt[2023-09-17T00:00:00Z] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateDiff.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateDiff.feature
new file mode 100644
index 0000000..c931cd2
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/DateDiff.feature
@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepDateDiff
+Feature: Step - dateDiff()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstr1XX_dateDiffXdatetimeXstr2XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-02T00:00:00Z')).dateDiff(datetime('2023-08-09T00:00:00Z'))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[-604800].l |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstr1XX_dateDiffXconstantXdatetimeXstr2XXX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-08T00:00:00Z')).dateDiff(constant(datetime('2023-08-01T00:00:00Z')))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[604800].l |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXdatetimeXstr1XX_dateDiffXinjectXdatetimeXstr2XXX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(datetime('2023-08-08T00:00:00Z')).dateDiff(inject(datetime('2023-10-11T00:00:00Z')))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[0].l |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Difference.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Difference.feature
new file mode 100644
index 0000000..18d5043
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Difference.feature
@@ -0,0 +1,254 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepDifference
+Feature: Step - difference()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_differenceXinjectX1XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).difference(__.inject(1))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Incoming traverser for difference step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_differenceXV_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").difference(__.V().fold())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "difference step can only take an array or an Iterable type for incoming traversers"
+
+  Scenario: g_V_fold_differenceXconstantXnullXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().difference(__.constant(null))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for difference step must yield an iterable type, not null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_fold_differenceXVX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().difference(__.V())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for difference step must yield an iterable type, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_differenceX2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().difference(2)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "difference step can only take an array or an Iterable as an argument, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_differenceXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().difference(null)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Argument provided for difference step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnonexistantX_fold_differenceXV_valuesXnameX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("nonexistant").fold().difference(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_fold_differenceXV_valuesXnonexistantX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().difference(__.V().values("nonexistant").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,vadas,lop,josh,ripple,peter] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXageX_fold_differenceXV_valuesXageX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().difference(__.V().values("age").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_differenceXMARKOX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[MARKO]"
+    And the traversal of
+      """
+      g.V().out().path().by(values("name").toUpper()).difference(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[LOP] |
+      | s[VADAS] |
+      | s[JOSH] |
+      | s[JOSH,RIPPLE] |
+      | s[LOP,JOSH] |
+      | s[LOP,PETER] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXmarkoX_differenceXV_valuesXnameX_foldX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[marko]"
+    And the traversal of
+      """
+      g.inject(xx1).difference(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+
+  @MultiProperties @MetaProperties
+  Scenario: g_V_valueMapXlocationX_selectXvaluesX_unfold_differenceXseattle_vancouverX
+    Given the crew graph
+    And using the parameter xx1 defined as "l[seattle,vancouver]"
+    And the traversal of
+      """
+      g.V().valueMap("location").select(values).unfold().difference(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[san diego,santa cruz,brussels,santa fe] |
+      | s[centreville,dulles,purcellville] |
+      | s[bremen,baltimore,oakland] |
+      | s[spremberg,kaiserslautern,aachen] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_differenceXrippleX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[ripple]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").difference(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,josh] |
+      | s[josh,lop,marko] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_differenceXempty_listX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").difference(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,josh,ripple] |
+      | s[marko,josh,lop] |
+
+  Scenario: g_V_valuesXageX_fold_differenceXconstantX27X_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().difference(__.constant(27).fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[d[29].i,d[32].i,d[35].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_differenceXdave_kelvinX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[dave,kelvin]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").difference(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,josh,ripple] |
+      | s[marko,josh,lop] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_differenceXa_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,c]"
+    And the traversal of
+      """
+      g.inject(xx1).difference(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[null,b] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_differenceXa_null_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,null,c]"
+    And the traversal of
+      """
+      g.inject(xx1).difference(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[b] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_differenceXfive_three_7X
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And using the parameter xx2 defined as "l[five,three,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1).difference(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[d[3].i] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Disjunct.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Disjunct.feature
new file mode 100644
index 0000000..e6fcee1
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Disjunct.feature
@@ -0,0 +1,230 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepDisjunct
+Feature: Step - disjunct()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_disjunctXinjectX1XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).disjunct(__.inject(1))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Incoming traverser for disjunct step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_disjunctXV_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").disjunct(__.V().fold())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "disjunct step can only take an array or an Iterable type for incoming traversers, encountered"
+
+  Scenario: g_V_fold_disjunctXconstantXnullXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().disjunct(__.constant(null))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for disjunct step must yield an iterable type, not null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_fold_disjunctXVX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().disjunct(__.V())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for disjunct step must yield an iterable type, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_disjunctX2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().disjunct(2)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "disjunct step can only take an array or an Iterable as an argument, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_disjunctXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().disjunct(null)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Argument provided for disjunct step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnonexistantX_fold_disjunctXV_valuesXnameX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("nonexistant").fold().disjunct(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,vadas,lop,josh,ripple,peter] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_fold_disjunctXV_valuesXnonexistantX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().disjunct(__.V().values("nonexistant").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,vadas,lop,josh,ripple,peter] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXageX_fold_disjunctXV_valuesXageX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().disjunct(__.V().values("age").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_disjunctXMARKOX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[MARKO]"
+    And the traversal of
+      """
+      g.V().out().path().by(values("name").toUpper()).disjunct(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[LOP] |
+      | s[VADAS] |
+      | s[JOSH] |
+      | s[JOSH,RIPPLE,MARKO] |
+      | s[LOP,JOSH,MARKO] |
+      | s[LOP,PETER,MARKO] |
+
+  @MultiProperties @MetaProperties
+  Scenario: g_V_valueMapXlocationX_selectXvaluesX_unfold_disjunctXseattle_vancouverX
+    Given the crew graph
+    And using the parameter xx1 defined as "l[seattle,vancouver]"
+    And the traversal of
+      """
+      g.V().valueMap("location").select(values).unfold().disjunct(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[san diego,santa cruz,brussels,santa fe,seattle,vancouver] |
+      | s[centreville,dulles,purcellville,seattle,vancouver] |
+      | s[bremen,baltimore,oakland,vancouver] |
+      | s[spremberg,kaiserslautern,aachen,seattle,vancouver] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_disjunctXmarkoX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[marko]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").disjunct(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[josh,ripple] |
+      | s[josh,lop] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_disjunctXstephen_markoX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[stephen,marko]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").disjunct(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[stephen,josh,ripple] |
+      | s[stephen,josh,lop] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_disjunctXdave_kelvinX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[dave,kelvin]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").disjunct(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,josh,ripple,dave,kelvin] |
+      | s[marko,josh,lop,dave,kelvin] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_disjunctXa_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,c]"
+    And the traversal of
+      """
+      g.inject(xx1).disjunct(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[null,b,c] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_disjunctXa_null_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,null,c]"
+    And the traversal of
+      """
+      g.inject(xx1).disjunct(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[b,c] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_disjunctXfive_three_7X
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And using the parameter xx2 defined as "l[five,three,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1).disjunct(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[d[3].i,five,d[7].i] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Edge.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Edge.feature
new file mode 100644
index 0000000..f3d9232
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Edge.feature
@@ -0,0 +1,99 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepE
+Feature: Step - E()
+
+  Scenario: g_V_EX11X
+    Given the modern graph
+    And using the parameter eid11 defined as "e[josh-created->lop].id"
+    And the traversal of
+      """
+      g.V().E(eid11)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |
+      | e[josh-created->lop] |
+      | e[josh-created->lop] |
+      | e[josh-created->lop] |
+      | e[josh-created->lop] |
+      | e[josh-created->lop] |
+
+  Scenario: g_EX11X_E
+    Given the modern graph
+    And using the parameter eid11 defined as "e[josh-created->lop].id"
+    And the traversal of
+      """
+      g.E(eid11).E()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[marko-created->lop] |
+      | e[marko-knows->josh] |
+      | e[marko-knows->vadas] |
+      | e[peter-created->lop] |
+      | e[josh-created->lop] |
+      | e[josh-created->ripple] |
+      
+  Scenario: g_V_EXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().E(null)
+      """
+    When iterated to list
+    Then the result should be empty
+
+  Scenario: g_V_EXlistXnullXX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[null]"
+    And the traversal of
+      """
+      g.V().E(xx1)
+      """
+    When iterated to list
+    Then the result should be empty
+
+  Scenario: g_injectX1X_EX11_nullX
+    Given the modern graph
+    And using the parameter eid11 defined as "e[josh-created->lop].id"
+    And the traversal of
+      """
+      g.inject(1).E(eid11,null)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |
+
+ Scenario: g_injectX1X_coalesceXEX_hasLabelXtestsX_addEXtestsX_from_V_hasXnameX_XjoshXX_toXV_hasXnameX_XvadasXXX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "josh").
+        addV("person").property("name", "vadas")
+      """
+    And the traversal of
+      """
+      g.inject(1).coalesce(E().hasLabel("tests"), addE("tests").from(V().has("name","josh")).to(V().has("name","vadas")))
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.E().hasLabel(\"tests\")"
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Element.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Element.feature
index 6f5556d..a1f53e0 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Element.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Element.feature
@@ -97,7 +97,7 @@
       | e[josh-created->ripple] |
 
   # MetaProperty -> VertexProperty
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_VXv7_properties_properties_element_element
     Given the crew graph
     And using the parameter v7 defined as "v[stephen]"
@@ -110,7 +110,7 @@
       | result |
       | v[stephen] |
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_V_properties_properties_element_element
     Given the crew graph
     And using the parameter v7 defined as "v[stephen]"
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Format.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Format.feature
new file mode 100644
index 0000000..12f3aee
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Format.feature
@@ -0,0 +1,186 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepFormat
+Feature: Step - format()
+
+  Scenario: g_VX1X_formatXstrX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().has("name", "marko").format("Hello world")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | Hello world |
+
+  Scenario: g_V_formatXstrX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().format("%{name} is %{age} years old")
+      """
+    When iterated to list
+    # software don't have age, so filtered out
+    Then the result should be unordered
+      | result |
+      | marko is 29 years old |
+      | vadas is 27 years old |
+      | josh is 32 years old |
+      | peter is 35 years old |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX1X_asXageX_V_formatXstrX
+    Given the modern graph
+    And the traversal of
+      """
+      g.inject(1).as("age").V().format("%{name} is %{age} years old")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko is 29 years old |
+      | vadas is 27 years old |
+      | lop is 1 years old |
+      | josh is 32 years old |
+      | ripple is 1 years old |
+      | peter is 35 years old |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_formatXstrX_byXvaluesXnameXX_byXvaluesXageXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().format("%{_} is %{_} years old").by(values("name")).by(values("age"))
+      """
+    When iterated to list
+    # software don't have age, so filtered out
+    Then the result should be unordered
+      | result |
+      | marko is 29 years old |
+      | vadas is 27 years old |
+      | josh is 32 years old |
+      | peter is 35 years old |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_hasLabelXpersonX_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").format("%{_} %{_} %{_}").by(constant("hello")).by(values("name"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | hello marko hello |
+      | hello vadas hello |
+      | hello josh hello |
+      | hello peter hello |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_VX1X_formatXstrX_byXconstantXhelloXX_byXvaluesXnameXX
+    Given the modern graph
+    And using the parameter vid1 defined as "v[marko].id"
+    And the traversal of
+      """
+      g.V(vid1).format("%{_}").by(constant("hello")).by(values("name"))
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | hello |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_formatXstrX_byXbothE_countX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().format("%{name} has %{_} connections").by(bothE().count())
+      """
+    When iterated to list
+    # software don't have age, so filtered out
+    Then the result should be unordered
+      | result |
+      | marko has 3 connections |
+      | vadas has 1 connections |
+      | lop has 3 connections |
+      | josh has 3 connections |
+      | ripple has 1 connections |
+      | peter has 1 connections |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_projectXname_countX_byXvaluesXnameXX_byXbothE_countX_formatXstrX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().project("name","count").by(values("name")).by(bothE().count()).format("%{name} has %{count} connections")
+      """
+    When iterated to list
+    # software don't have age, so filtered out
+    Then the result should be unordered
+      | result |
+      | marko has 3 connections |
+      | vadas has 1 connections |
+      | lop has 3 connections |
+      | josh has 3 connections |
+      | ripple has 1 connections |
+      | peter has 1 connections |
+
+  Scenario: g_V_elementMap_formatXstrX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().elementMap().format("%{name} is %{age} years old")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko is 29 years old |
+      | vadas is 27 years old |
+      | josh is 32 years old |
+      | peter is 35 years old |
+
+  Scenario: g_V_hasLabelXpersonX_asXaX_valuesXnameX_asXp1X_selectXaX_inXknowsX_formatXstrX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").as("a").values("name").as("p1").select("a").in("knows").format("%{p1} knows %{name}")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | vadas knows marko |
+      | josh knows marko |
+
+  Scenario:  g_V_asXsX_label_asXsubjectX_selectXsX_outE_asXpX_label_asXpredicateX_selectXpX_inV_label_asXobjectX_formatXstrX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().as("s").label().as("subject").
+        select("s").outE().as("p").label().as("predicate").
+        select("p").inV().label().as("object").format("%{subject} %{predicate} %{object}")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | person created software |
+      | person knows person |
+      | person knows person |
+      | person created software |
+      | person created software |
+      | person created software |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Intersect.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Intersect.feature
new file mode 100644
index 0000000..c6b4484
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Intersect.feature
@@ -0,0 +1,226 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepIntersect
+Feature: Step - intersect()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_intersectXinjectX1XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).intersect(__.inject(1))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Incoming traverser for intersect step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_intersectXV_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").intersect(__.V().fold())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "intersect step can only take an array or an Iterable type for incoming traversers, encountered"
+
+  Scenario: g_V_fold_intersectXconstantXnullXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().intersect(__.constant(null))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for intersect step must yield an iterable type, not null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_fold_intersectXVX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().intersect(__.V())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for intersect step must yield an iterable type, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_intersectX2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().intersect(2)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "intersect step can only take an array or an Iterable as an argument, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_intersectXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().intersect(null)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Argument provided for intersect step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnonexistantX_fold_intersectXV_valuesXnameX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("nonexistant").fold().intersect(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_fold_intersectXV_valuesXnonexistantX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().intersect(__.V().values("nonexistant").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXageX_fold_intersectXV_valuesXageX_foldX_order_local
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().intersect(__.V().values("age").fold()).order(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[27].i,d[29].i,d[32].i,d[35].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_intersectXMARKOX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[MARKO]"
+    And the traversal of
+      """
+      g.V().out().path().by(values("name").toUpper()).intersect(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[MARKO] |
+      | s[MARKO] |
+      | s[MARKO] |
+      | s[] |
+      | s[] |
+      | s[] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXmarkoX_intersectX___V_valuesXnameX_foldX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[marko]"
+    And the traversal of
+      """
+      g.inject(xx1).intersect(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko] |
+
+  @MultiProperties @MetaProperties
+  Scenario: g_V_valueMapXlocationX_selectXvaluesX_unfold_intersectXseattle_vancouverX
+    Given the crew graph
+    And using the parameter xx1 defined as "l[seattle,vancouver]"
+    And the traversal of
+      """
+      g.V().valueMap("location").select(values).unfold().intersect(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+      | s[] |
+      | s[seattle] |
+      | s[] |
+
+  Scenario: g_V_valuesXageX_fold_intersectX___constantX27X_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().intersect(__.constant(27).fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[d[27].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_intersectXdave_kelvinX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[dave,kelvin]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").intersect(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[] |
+      | s[] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_intersectXa_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,c]"
+    And the traversal of
+      """
+      g.inject(xx1).intersect(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[a] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_intersectXa_null_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,null,c]"
+    And the traversal of
+      """
+      g.inject(xx1).intersect(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[a,null] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_intersectXfive_three_7X
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And using the parameter xx2 defined as "l[five,three,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1).intersect(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[three] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/LTrim.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/LTrim.feature
new file mode 100644
index 0000000..4ca4915
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/LTrim.feature
@@ -0,0 +1,126 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepLTrim
+Feature: Step - lTrim()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX__feature___test__nullX_lTrim
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("  feature", " one test", null, "", " ").lTrim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | feature |
+      | one test |
+      | null |
+      | str[] |
+      | str[] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX__feature__X_lTrim
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("  feature  ").lTrim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[feature  ] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXX_lTrim
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+    """
+    g.inject(xx1).lTrim()
+    """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The lTrim() step can only take string as argument"
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListX1_2XX_lTrimXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[1].i,d[2].i]"
+    And the traversal of
+    """
+    g.inject(xx1).lTrim(Scope.local)
+    """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The lTrim(local) step can only take string or list of strings"
+
+  Scenario: g_V_valuesXnameX_lTrim
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", " marko ").property("age", 29).as("marko").
+        addV("person").property("name", "  vadas  ").property("age", 27).as("vadas").
+        addV("software").property("name", "  lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh  ").property("age", 32).as("josh").
+        addV("software").property("name", "   ripple   ").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").lTrim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[marko ] |
+      | str[vadas  ] |
+      | str[lop] |
+      | str[josh  ] |
+      | str[ripple   ] |
+      | str[peter] |
+
+  Scenario: g_V_valuesXnameX_order_fold_lTrimXlocalX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", " marko ").property("age", 29).as("marko").
+        addV("person").property("name", "  vadas  ").property("age", 27).as("vadas").
+        addV("software").property("name", "  lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh  ").property("age", 32).as("josh").
+        addV("software").property("name", "   ripple   ").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").order().fold().lTrim(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[str[ripple   ],str[lop],str[vadas  ],str[marko ],str[josh  ],str[peter]] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Length.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Length.feature
new file mode 100644
index 0000000..e2d40c0
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Length.feature
@@ -0,0 +1,85 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepLength
+Feature: Step - length()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_length
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("feature", "test", null).length()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[7].i |
+      | d[4].i |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_lengthXlocalX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("feature", "test", null).length(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[7].i |
+      | d[4].i |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXX_length
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+      """
+      g.inject(xx1).length()
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The length() step can only take string as argument"
+
+  Scenario: g_V_valuesXnameX_length
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").length()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[5].i |
+      | d[5].i |
+      | d[3].i |
+      | d[4].i |
+      | d[6].i |
+      | d[5].i |
+
+  Scenario: g_V_valuesXnameX_order_fold_lengthXlocalX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").order().fold().length(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[4].i,d[3].i,d[5].i,d[5].i,d[6].i,d[5].i] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Merge.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Merge.feature
new file mode 100644
index 0000000..c49eac1
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Merge.feature
@@ -0,0 +1,300 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepMerge
+Feature: Step - merge()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_mergeXinjectX1XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).merge(__.inject(1))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Incoming traverser for merge step can't be null"
+
+  # Test that non-iterable data isn't accepted
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_mergeXV_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").merge(__.V().fold())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "merge step can only take an array or an Iterable type for incoming traversers, encountered"
+
+  Scenario: g_V_fold_mergeXconstantXnullXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().merge(__.constant(null))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for merge step must yield an iterable type, not null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_fold_mergeXVX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().merge(__.V())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for merge step must yield an iterable type, encountered"
+
+  Scenario: g_V_elementMap_mergeXconstantXaXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().elementMap().merge(__.constant("a"))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "merge step expected provided argument to evaluate to a Map, encountered"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_fold_mergeXV_asXaX_projectXaX_byXnameXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().merge(__.V().as("a").project("a").by("name"))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for merge step must yield an iterable type, encountered"
+
+  Scenario: g_V_fold_mergeXk_vX
+    Given the modern graph
+    And using the parameter xx1 defined as "m[{\"k\":\"v\"}]"
+    And the traversal of
+      """
+      g.V().fold().merge(xx1)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "step type mismatch: expected argument to be Iterable but got Map"
+
+  Scenario: g_V_valuesXnameX_fold_mergeX2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().merge(2)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "merge step can only take an array or an Iterable as an argument, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_mergeXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().merge(null)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Argument provided for merge step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnonexistantX_fold_mergeXV_valuesXnameX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("nonexistant").fold().merge(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,vadas,lop,josh,ripple,peter] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_fold_mergeXV_valuesXnonexistantX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().merge(__.V().values("nonexistant").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,vadas,lop,josh,ripple,peter] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXageX_fold_mergeXV_valuesXageX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().merge(__.V().values("age").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[d[35].i,d[32].i,d[29].i,d[27].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_mergeXMARKOX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[MARKO]"
+    And the traversal of
+      """
+      g.V().out().path().by(values("name").toUpper()).merge(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[MARKO,LOP] |
+      | s[MARKO,VADAS] |
+      | s[MARKO,JOSH] |
+      | s[MARKO,JOSH,RIPPLE] |
+      | s[MARKO,LOP,JOSH] |
+      | s[MARKO,LOP,PETER] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXmarkoX_mergeXV_valuesXnameX_foldX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[marko]"
+    And the traversal of
+      """
+      g.inject(xx1).merge(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,vadas,lop,josh,ripple,peter] |
+
+  @MultiProperties @MetaProperties
+  Scenario: g_V_valueMapXlocationX_selectXvaluesX_unfold_mergeXseattle_vancouverX
+    Given the crew graph
+    And using the parameter xx1 defined as "l[seattle,vancouver]"
+    And the traversal of
+      """
+      g.V().valueMap("location").select(values).unfold().merge(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[san diego,santa cruz,brussels,santa fe,seattle,vancouver] |
+      | s[centreville,dulles,purcellville,seattle,vancouver] |
+      | s[bremen,baltimore,oakland,seattle,vancouver] |
+      | s[spremberg,kaiserslautern,aachen,seattle,vancouver] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_mergeXempty_listX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").merge(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,josh,ripple] |
+      | s[marko,josh,lop] |
+
+  Scenario: g_V_valuesXageX_fold_mergeXconstantX27X_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().merge(__.constant(27).fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[d[27].i,d[29].i,d[32].i,d[35].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_mergeXdave_kelvinX
+    Given the modern graph
+    And using the parameter xx1 defined as "l[dave,kelvin]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").merge(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[marko,josh,ripple,dave,kelvin] |
+      | s[marko,josh,lop,dave,kelvin] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_mergeXa_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,c]"
+    And the traversal of
+      """
+      g.inject(xx1).merge(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[null,a,c,b] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_mergeXa_null_cX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,null,c]"
+    And the traversal of
+      """
+      g.inject(xx1).merge(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[null,a,c,b] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_mergeXfive_three_7X
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And using the parameter xx2 defined as "l[five,three,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1).merge(xx2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | s[d[3].i,five,three,d[7].i] |
+
+  Scenario: g_V_asXnameX_projectXnameX_byXnameX_mergeXother_blueprintX
+    Given the modern graph
+    And using the parameter xx1 defined as "m[{\"other\":\"blueprint\"}]"
+    And the traversal of
+      """
+      g.V().as("name").project("name").by("name").merge(xx1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | m[{"name":"marko", "other":"blueprint"}] |
+      | m[{"name":"lop", "other":"blueprint"}] |
+      | m[{"name":"vadas", "other":"blueprint"}] |
+      | m[{"name":"josh", "other":"blueprint"}] |
+      | m[{"name":"peter", "other":"blueprint"}] |
+      | m[{"name":"ripple", "other":"blueprint"}] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_hasXname_markoX_elementMap_mergeXV_hasXname_lopX_elementMapX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().has("name","marko").elementMap().merge(__.V().has("name","lop").elementMap())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | m[{"t[id]":"v[lop].id","t[label]":"software","name":"lop","age":29,"lang":"java"}] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
index 6991799..cea0550 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
@@ -619,7 +619,7 @@
       """
       g.addV("person").property("name", "marko").as("a").
         addV("person").property("name", "vadas").as("b").
-        addE("knows").property("weight", 1).from("a").to("b")
+        addE("knows").property("weight", 1.0d).from("a").to("b")
       """
     And using the parameter xx1 defined as "m[{\"t[label]\": \"knows\", \"D[OUT]\":\"v[marko]\", \"D[IN]\":\"v[vadas]\"}]"
     And using the parameter xx2 defined as "m[{\"t[label]\": \"knows\", \"D[OUT]\":\"v[marko]\", \"D[IN]\":\"v[vadas]\",\"created\":\"Y\"}]"
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature
index 175fc44..a9a61f4 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature
@@ -397,7 +397,7 @@
     Then the result should have a count of 1
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 19)"
 
-  @MultiMetaProperties
+  @MetaProperties
   Scenario: g_mergeVXlabel_person_name_markoX_propertyXname_vadas_acl_publicX
     Given the empty graph
     And the graph initializer of
@@ -511,7 +511,7 @@
     Then the result should have a count of 1
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 19)"
 
-  @MultiMetaProperties
+  @MetaProperties
   Scenario: g_injectX0X_mergeVXlabel_person_name_markoX_propertyXname_vadas_acl_publicX
     Given the empty graph
     And the graph initializer of
@@ -563,7 +563,7 @@
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\")"
     And the graph should return 2 for count of "g.V()"
 
-  @MultiMetaProperties
+  @MultiProperties
   Scenario: g_mergeVXlabel_person_name_stephenX_propertyXlist_name_steveX
     Given the empty graph
     And the graph initializer of
@@ -617,7 +617,7 @@
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"josh\")"
     And the graph should return 3 for count of "g.V()"
 
-  @MultiMetaProperties
+  @MultiProperties
   Scenario: g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_sideEffectXpropertiesXageX_dropX_selectXmXX_option
     Given the empty graph
     And the graph initializer of
@@ -638,7 +638,7 @@
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 19)"
     And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\")"
 
-  @MultiMetaProperties
+  @MultiProperties
   Scenario: g_withSideEffectXm_age_19X_V_hasXperson_name_markoX_mergeVXselectXcXX_optionXonMatch_sideEffectXpropertiesXageX_dropX_selectXmXX_option
     Given the empty graph
     And the graph initializer of
@@ -826,6 +826,177 @@
     When iterated to list
     Then the traversal will raise an error with message containing text of "Property key can not be a hidden key: ~label"
 
+  @MultiProperties
+  Scenario: g_mergeVXname_markoX_optionXonMatch_age_listX33XX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property(Cardinality.list, "age", 29).property(Cardinality.list, "age", 31).property(Cardinality.list, "age", 32)
+      """
+    And the traversal of
+      """
+      g.mergeV([name: "marko"]).
+          option(Merge.onMatch, [age: Cardinality.list(33)])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 33)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\")"
+    And the graph should return 4 for count of "g.V().has(\"person\",\"name\",\"marko\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_markoX_optionXonMatch_age_setX33XX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property(Cardinality.list, "age", 29).property(Cardinality.list, "age", 31).property(Cardinality.list, "age", 32)
+      """
+    And the traversal of
+      """
+      g.mergeV([name: "marko"]).
+          option(Merge.onMatch, [age: Cardinality.set(33)])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 33)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\")"
+    And the graph should return 4 for count of "g.V().has(\"person\",\"name\",\"marko\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_markoX_optionXonMatch_age_setX31XX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property(Cardinality.list, "age", 29).property(Cardinality.list, "age", 31).property(Cardinality.list, "age", 32)
+      """
+    And the traversal of
+      """
+      g.mergeV([name: "marko"]).
+          option(Merge.onMatch, [age: Cardinality.set(31)])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 31)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\")"
+    And the graph should return 3 for count of "g.V().has(\"person\",\"name\",\"marko\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_markoX_optionXonMatch_age_singleX33XX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property(Cardinality.list, "age", 29).property(Cardinality.list, "age", 31).property(Cardinality.list, "age", 32)
+      """
+    And the traversal of
+      """
+      g.mergeV([name: "marko"]).
+          option(Merge.onMatch, [age: Cardinality.single(33)])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 33)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\")"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_markoX_optionXonMatch_age_33_singleX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property(Cardinality.list, "age", 29).property(Cardinality.list, "age", 31).property(Cardinality.list, "age", 32)
+      """
+    And the traversal of
+      """
+      g.mergeV([name: "marko"]).
+          option(Merge.onMatch, [age: 33], Cardinality.single)
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\", 33)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\")"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_markoX_optionXonMatch_name_allen_age_setX31X_singleX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property(Cardinality.list, "age", 29).property(Cardinality.list, "age", 31).property(Cardinality.list, "age", 32)
+      """
+    And the traversal of
+      """
+      g.mergeV([name: "marko"]).
+          option(Merge.onMatch, [name: "allen", age: Cardinality.set(31)], single)
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 0 for count of "g.V().has(\"person\",\"name\",\"marko\")"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"allen\").has(\"age\", 31)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"allen\").has(\"age\")"
+    And the graph should return 3 for count of "g.V().has(\"person\",\"name\",\"allen\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_markoX_optionXonMatch_name_allen_age_singleX31X_singleX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "marko").property(Cardinality.list, "age", 29).property(Cardinality.list, "age", 31).property(Cardinality.list, "age", 32)
+      """
+    And the traversal of
+      """
+      g.mergeV([name: "marko"]).
+          option(Merge.onMatch, [name: "allen", age: Cardinality.single(31)], single)
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 0 for count of "g.V().has(\"person\",\"name\",\"marko\")"
+    And the graph should return 0 for count of "g.V().has(\"person\",\"name\",\"allen\").has(\"age\", 33)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"allen\").has(\"age\", 31)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"allen\").has(\"age\")"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"allen\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_aliceX_optionXonCreate_age_singleX81XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.mergeV([name: "alice", (T.label): "person"]).
+          option(Merge.onCreate, [age: Cardinality.single(81)])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").has(\"age\", 81)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").has(\"age\")"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_aliceX_optionXonCreate_age_setX81XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.mergeV([name: "alice", (T.label): "person"]).
+          option(Merge.onCreate, [age: Cardinality.set(81)])
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").has(\"age\", 81)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").has(\"age\")"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").properties(\"age\")"
+
+  @MultiProperties
+  Scenario: g_mergeVXname_aliceX_optionXonCreate_age_singleX81X_age_81_setX
+    Given the empty graph
+    And the traversal of
+      """
+      g.mergeV([name: "alice", (T.label): "person"]).
+          option(Merge.onCreate, [age: 81], Cardinality.set)
+      """
+    When iterated to list
+    Then the result should have a count of 1
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").has(\"age\", 81)"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").has(\"age\")"
+    And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"alice\").properties(\"age\")"
+
   # cannot use hidden namespace for label key for onMatch
   Scenario: g_mergeV_hidden_label_key_onMatch_matched_prohibited
     Given the empty graph
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Product.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Product.feature
new file mode 100644
index 0000000..d710fc1
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Product.feature
@@ -0,0 +1,311 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @Product
+Feature: Step - product()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_productXinjectX1XX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).product(__.inject(1))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Incoming traverser for product step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_productXV_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").product(__.V().fold())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "product step can only take an array or an Iterable type for incoming traversers, encountered"
+
+  Scenario: g_V_fold_productXconstantXnullXX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().product(__.constant(null))
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for product step must yield an iterable type, not null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_fold_productXVX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().fold().product(__.V())
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "traversal argument for product step must yield an iterable type, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_productX2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().product(2)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "product step can only take an array or an Iterable as an argument, encountered"
+
+  Scenario: g_V_valuesXnameX_fold_productXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().product(null)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "Argument provided for product step can't be null"
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnonexistantX_fold_productXV_valuesXnameX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("nonexistant").fold().product(__.V().values("name").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXnameX_fold_productXV_valuesXnonexistantX_foldX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().product(__.V().values("nonexistant").fold())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[] |
+
+  @GraphComputerVerificationMidVNotSupported
+  Scenario: g_V_valuesXageX_order_byXdescX_limitX3X_fold_productXV_valuesXageX_order_byXascX_limitX2X_foldX_unfold
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(desc).limit(3).fold().product(__.V().values("age").order().by(asc).limit(2).fold()).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[35].i,d[27].i] |
+      | l[d[35].i,d[29].i] |
+      | l[d[32].i,d[27].i] |
+      | l[d[32].i,d[29].i] |
+      | l[d[29].i,d[27].i] |
+      | l[d[29].i,d[29].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXvaluesXnameX_toUpperX_productXMARKOX_unfold
+    Given the modern graph
+    And using the parameter xx1 defined as "l[MARKO]"
+    And the traversal of
+      """
+      g.V().out().path().by(values("name").toUpper()).product(xx1).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[MARKO,MARKO] |
+      | l[LOP,MARKO] |
+      | l[MARKO,MARKO] |
+      | l[VADAS,MARKO] |
+      | l[MARKO,MARKO] |
+      | l[JOSH,MARKO] |
+      | l[JOSH,MARKO] |
+      | l[RIPPLE,MARKO] |
+      | l[JOSH,MARKO] |
+      | l[LOP,MARKO] |
+      | l[PETER,MARKO] |
+      | l[LOP,MARKO] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXmarkoX_productXV_valuesXnameX_order_foldX_unfold
+    Given the modern graph
+    And using the parameter xx1 defined as "l[marko]"
+    And the traversal of
+      """
+      g.inject(xx1).product(__.V().values("name").order().fold()).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[marko,josh] |
+      | l[marko,lop] |
+      | l[marko,marko] |
+      | l[marko,peter] |
+      | l[marko,ripple] |
+      | l[marko,vadas] |
+
+  @MultiProperties @MetaProperties
+  Scenario: g_V_valueMapXlocationX_selectXvaluesX_unfold_productXdulles_seattle_vancouverX_unfold
+    Given the crew graph
+    And using the parameter xx1 defined as "l[dulles,seattle,vancouver]"
+    And the traversal of
+      """
+      g.V().valueMap("location").select(values).unfold().product(xx1).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[san diego,dulles] |
+      | l[san diego,seattle] |
+      | l[san diego,vancouver] |
+      | l[santa cruz,dulles] |
+      | l[santa cruz,seattle] |
+      | l[santa cruz,vancouver] |
+      | l[brussels,dulles] |
+      | l[brussels,seattle] |
+      | l[brussels,vancouver] |
+      | l[santa fe,dulles] |
+      | l[santa fe,seattle] |
+      | l[santa fe,vancouver] |
+      | l[centreville,dulles] |
+      | l[centreville,seattle] |
+      | l[centreville,vancouver] |
+      | l[dulles,dulles] |
+      | l[dulles,seattle] |
+      | l[dulles,vancouver] |
+      | l[purcellville,dulles] |
+      | l[purcellville,seattle] |
+      | l[purcellville,vancouver] |
+      | l[bremen,dulles] |
+      | l[bremen,seattle] |
+      | l[bremen,vancouver] |
+      | l[baltimore,dulles] |
+      | l[baltimore,seattle] |
+      | l[baltimore,vancouver] |
+      | l[oakland,dulles] |
+      | l[oakland,seattle] |
+      | l[oakland,vancouver] |
+      | l[seattle,dulles] |
+      | l[seattle,seattle] |
+      | l[seattle,vancouver] |
+      | l[spremberg,dulles] |
+      | l[spremberg,seattle] |
+      | l[spremberg,vancouver] |
+      | l[kaiserslautern,dulles] |
+      | l[kaiserslautern,seattle] |
+      | l[kaiserslautern,vancouver] |
+      | l[aachen,dulles] |
+      | l[aachen,seattle] |
+      | l[aachen,vancouver] |
+
+  Scenario: g_V_valuesXageX_order_byXascX_fold_productXconstantX27X_foldX_unfold
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").order().by(asc).fold().product(__.constant(27).fold()).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[27].i,d[27].i] |
+      | l[d[29].i,d[27].i] |
+      | l[d[32].i,d[27].i] |
+      | l[d[35].i,d[27].i] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_productXdave_kelvinX_unfold
+    Given the modern graph
+    And using the parameter xx1 defined as "l[dave,kelvin]"
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").product(xx1).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[marko,dave] |
+      | l[marko,kelvin] |
+      | l[josh,dave] |
+      | l[josh,kelvin] |
+      | l[ripple,dave] |
+      | l[ripple,kelvin] |
+      | l[marko,dave] |
+      | l[marko,kelvin] |
+      | l[josh,dave] |
+      | l[josh,kelvin] |
+      | l[lop,dave] |
+      | l[lop,kelvin] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_productXa_cX_unfold
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,c]"
+    And the traversal of
+      """
+      g.inject(xx1).product(xx2).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[a,a] |
+      | l[a,c] |
+      | l[null,a] |
+      | l[null,c] |
+      | l[b,a] |
+      | l[b,c] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXa_null_bX_productXa_null_cX_unfold
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,null,b]"
+    And using the parameter xx2 defined as "l[a,null,c]"
+    And the traversal of
+      """
+      g.inject(xx1).product(xx2).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[a,a] |
+      | l[a,null] |
+      | l[a,c] |
+      | l[null,a] |
+      | l[null,null] |
+      | l[null,c] |
+      | l[b,a] |
+      | l[b,null] |
+      | l[b,c] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_productXfive_three_7X_unfold
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And using the parameter xx2 defined as "l[five,three,d[7].i]"
+    And the traversal of
+      """
+      g.inject(xx1).product(xx2).unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[3].i,five] |
+      | l[d[3].i,three] |
+      | l[d[3].i,d[7].i] |
+      | l[three,five] |
+      | l[three,three] |
+      | l[three,d[7].i] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/RTrim.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/RTrim.feature
new file mode 100644
index 0000000..23df32f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/RTrim.feature
@@ -0,0 +1,126 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepRTrim
+Feature: Step - rTrim()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX__feature___test__nullX_rTrim
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("feature  ", "one test ", null, "", " ").rTrim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | feature |
+      | one test |
+      | null |
+      | str[] |
+      | str[] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX__feature__X_rTrim
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("  feature  ").rTrim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[  feature] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXX_rTrim
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+    """
+    g.inject(xx1).rTrim()
+    """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The rTrim() step can only take string as argument"
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListX1_2XX_rTrimXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[1].i,d[2].i]"
+    And the traversal of
+    """
+    g.inject(xx1).rTrim(Scope.local)
+    """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The rTrim(local) step can only take string or list of strings"
+
+  Scenario: g_V_valuesXnameX_rTrim
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", " marko ").property("age", 29).as("marko").
+        addV("person").property("name", "  vadas  ").property("age", 27).as("vadas").
+        addV("software").property("name", "  lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh  ").property("age", 32).as("josh").
+        addV("software").property("name", "   ripple   ").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").rTrim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[ marko] |
+      | str[  vadas] |
+      | str[  lop] |
+      | str[josh] |
+      | str[   ripple] |
+      | str[peter] |
+
+  Scenario: g_V_valuesXnameX_order_fold_rTrimXlocalX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", " marko ").property("age", 29).as("marko").
+        addV("person").property("name", "  vadas  ").property("age", 27).as("vadas").
+        addV("software").property("name", "  lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh  ").property("age", 32).as("josh").
+        addV("software").property("name", "   ripple   ").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").order().fold().rTrim(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[str[   ripple],str[  lop],str[  vadas],str[ marko],str[josh],str[peter]] |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Replace.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Replace.feature
new file mode 100644
index 0000000..3201db3
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Replace.feature
@@ -0,0 +1,92 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepReplace
+Feature: Step - replace()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXthat_this_test_nullX_replaceXh_jX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("that", "this", "test", null).replace("h", "j")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | tjat |
+      | tjis |
+      | test |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXthat_this_test_nullX_fold_replaceXlocal_h_jX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("that", "this", "test", null).fold().replace(Scope.local, "h", "j")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[tjat,tjis,test,null] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXcX_replaceXa_bX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+      """
+      g.inject(xx1).replace("a", "b")
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The replace() step can only take string as argument"
+
+  Scenario: g_V_hasLabelXsoftwareX_valueXnameX_replaceXnull_iX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").replace(null, "g")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | lop |
+      | ripple |
+
+  Scenario: g_V_hasLabelXsoftwareX_valueXnameX_replaceXa_iX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").replace("p", "g")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | log |
+      | riggle |
+
+  Scenario: g_V_hasLabelXsoftwareX_valueXnameX_order_fold_replaceXloacl_a_iX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").order().fold().replace(Scope.local, "p", "g")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[log,riggle] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Reverse.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Reverse.feature
new file mode 100644
index 0000000..8864378
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Reverse.feature
@@ -0,0 +1,152 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepReverse
+Feature: Step - reverse()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_reverse
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("feature", "test one", null).reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | erutaef |
+      | eno tset |
+      | null |
+
+  Scenario: g_V_valuesXnameX_reverse
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | okram |
+      | sadav |
+      | pol |
+      | hsoj |
+      | elppir |
+      | retep |
+
+  Scenario: g_V_valuesXageX_reverse
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[29].i |
+      | d[27].i |
+      | d[32].i |
+      | d[35].i |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_path_byXnameX_reverse
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().out().path().by("name").reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[lop,marko] |
+      | l[vadas,marko] |
+      | l[josh,marko] |
+      | l[ripple,josh] |
+      | l[lop,josh] |
+      | l[lop,peter] |
+
+  @GraphComputerVerificationReferenceOnly
+  Scenario: g_V_out_out_path_byXnameX_reverse
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().out().out().path().by("name").reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[ripple,josh,marko] |
+      | l[lop,josh,marko] |
+
+  Scenario: g_V_valuesXageX_fold_orderXlocalX_byXdescX_reverse
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").fold().order(local).by(desc).reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[d[27].i,d[29].i,d[32].i,d[35].i] |
+
+  Scenario: g_V_valuesXnameX_fold_orderXlocalX_by_reverse
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").fold().order(local).by().reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[vadas,ripple,peter,marko,lop,josh] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXnullX_reverse
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject(null).reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXbX_reverse
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("b").reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | b |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX3_threeX_reverse
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[3].i,three]"
+    And the traversal of
+      """
+      g.inject(xx1).reverse()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[three,d[3].i] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
index 6229fa1..8478989 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Select.feature
@@ -128,7 +128,7 @@
       | m[{"a": "lop", "b": "lop"}] |
       | m[{"a": "peter", "b": "peter"}] |
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_V_hasXname_gremlinX_inEXusesX_order_byXskill_ascX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX
     Given the crew graph
     And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ShortestPath.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ShortestPath.feature
index 1393812..c15196a 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ShortestPath.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ShortestPath.feature
@@ -300,7 +300,7 @@
       | result                     |
       | p[v[marko],v[lop],v[josh]] |
 
-  @MultiMetaProperties
+  @MultiProperties @MetaProperties
   Scenario: g_V_hasXname_danielX_shortestPath_targetXhasXname_stephenXX_edgesXbothEXusesXX
     Given the crew graph
     And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Split.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Split.feature
new file mode 100644
index 0000000..54e04f1
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Split.feature
@@ -0,0 +1,85 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepSplit
+Feature: Step - split()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXthat_this_testX_spiltXhX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("that", "this", "test", null).split("h")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[t,at] |
+      | l[t,is] |
+      | l[test] |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXhello_worldX_spiltXnullX
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("hello world").split(null)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[hello,world] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXcX_splitXa_bX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+      """
+      g.inject(xx1).split("a")
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The split() step can only take string as argument"
+
+  Scenario: g_V_hasLabelXpersonX_valueXnameX_splitXnullX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("name").split(null)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[marko] |
+      | l[vadas] |
+      | l[josh] |
+      | l[peter] |
+
+  Scenario: g_V_hasLabelXpersonX_valueXnameX_order_fold_splitXlocal_aX_unfold
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("name").order().fold().split(Scope.local, "a").unfold()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[josh] |
+      | l[m,rko] |
+      | l[peter] |
+      | l[v,d,s] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Substring.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Substring.feature
new file mode 100644
index 0000000..0bb2ced
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Substring.feature
@@ -0,0 +1,152 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepSubstring
+Feature: Step - substring()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXthat_this_testX_substringX1_8X
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("test", "hello world", null).substring(1, 8)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | est |
+      | ello wo |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXcX_substringX1_2X
+    Given the empty graph
+    And using the parameter xx1 defined as "l[aa,bb]"
+    And the traversal of
+      """
+      g.inject(xx1).substring(1, 2)
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The substring() step can only take string as argument"
+
+  Scenario: g_V_hasLabelXpersonX_valueXnameX_substringX2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").substring(2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | p |
+      | pple |
+
+  Scenario: g_V_hasLabelXsoftwareX_valueXnameX_substringX1_4X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").substring(1, 4)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | op |
+      | ipp |
+
+  Scenario: g_V_hasLabelXpersonX_valueXnameX_order_fold_substringXlocal_2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").order().fold().substring(Scope.local, 2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[p,pple]|
+
+  Scenario: g_V_hasLabelXsoftwareX_valueXnameX_order_fold_substringXlocal_1_4X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").order().fold().substring(Scope.local, 1, 4)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[op,ipp] |
+
+  Scenario: g_V_hasLabelXsoftwareX_valueXnameX_substringX1_0X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").substring(1, 0)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | str[] |
+      | str[] |
+
+  Scenario: g_V_hasLabelXpersonX_valueXnameX_substringXneg3X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("person").values("name").substring(-3)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | rko |
+      | osh |
+      | das |
+      | ter |
+
+Scenario: g_V_hasLabelXsoftwareX_valueXnameX_substringX1_neg1X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").substring(1, -1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | o |
+      | ippl |
+
+Scenario: g_V_hasLabelXsoftwareX_valueXnameX_substringXneg4_2X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").substring(-4, 2)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | lo |
+      | str[] |
+
+Scenario: g_V_hasLabelXsoftwareX_valueXnameX_substringXneg3_neg1X
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().hasLabel("software").values("name").substring(-3, -1)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | lo |
+      | pl |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ToLower.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ToLower.feature
new file mode 100644
index 0000000..3e07ab6
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ToLower.feature
@@ -0,0 +1,145 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepToLower
+Feature: Step - toLower()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_toLower
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("FEATURE", "tESt", null).toLower()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | feature |
+      | test |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_toLowerXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[FEATURE,tESt,null]"
+    And the traversal of
+      """
+      g.inject(xx1).toLower(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[feature,test,null] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXX_toLower
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+      """
+      g.inject(xx1).toLower()
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The toLower() step can only take string as argument"
+
+  Scenario: g_V_valuesXnameX_toLower
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "MARKO").property("age", 29).as("marko").
+        addV("person").property("name", "VADAS").property("age", 27).as("vadas").
+        addV("software").property("name", "LOP").property("lang", "java").as("lop").
+        addV("person").property("name","JOSH").property("age", 32).as("josh").
+        addV("software").property("name", "RIPPLE").property("lang", "java").as("ripple").
+        addV("person").property("name", "PETER").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").toLower()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | vadas |
+      | lop |
+      | josh |
+      | ripple |
+      | peter |
+
+  Scenario: g_V_valuesXnameX_toLowerXlocalX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "MARKO").property("age", 29).as("marko").
+        addV("person").property("name", "VADAS").property("age", 27).as("vadas").
+        addV("software").property("name", "LOP").property("lang", "java").as("lop").
+        addV("person").property("name","JOSH").property("age", 32).as("josh").
+        addV("software").property("name", "RIPPLE").property("lang", "java").as("ripple").
+        addV("person").property("name", "PETER").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").toLower(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | vadas |
+      | lop |
+      | josh |
+      | ripple |
+      | peter |
+
+  Scenario: g_V_valuesXnameX_order_fold_toLowerXlocalX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", "MARKO").property("age", 29).as("marko").
+        addV("person").property("name", "VADAS").property("age", 27).as("vadas").
+        addV("software").property("name", "LOP").property("lang", "java").as("lop").
+        addV("person").property("name","JOSH").property("age", 32).as("josh").
+        addV("software").property("name", "RIPPLE").property("lang", "java").as("ripple").
+        addV("person").property("name", "PETER").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").order().fold().toLower(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[josh,lop,marko,peter,ripple,vadas] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ToUpper.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ToUpper.feature
new file mode 100644
index 0000000..a0c531e
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ToUpper.feature
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepToUpper
+Feature: Step - toUpper()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_toUpper
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("feature", "tESt", null).toUpper()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | FEATURE |
+      | TEST |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_toUpperXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[feature,tESt,null]"
+    And the traversal of
+      """
+      g.inject(xx1).toUpper(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[FEATURE,TEST,null] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXfeature_test_nullX_asString_toUpper
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("feature", "tESt", null).asString().toUpper()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | FEATURE |
+      | TEST |
+      | null |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXX_toUpper
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+      """
+      g.inject(xx1).toUpper()
+      """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The toUpper() step can only take string as argument"
+
+  Scenario: g_V_valuesXnameX_toUpper
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").toUpper()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | MARKO |
+      | VADAS |
+      | LOP |
+      | JOSH |
+      | RIPPLE |
+      | PETER |
+
+  Scenario: g_V_valuesXnameX_toUpperXlocalX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").toUpper(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | MARKO |
+      | VADAS |
+      | LOP |
+      | JOSH |
+      | RIPPLE |
+      | PETER |
+
+  Scenario: g_V_valuesXnameX_order_fold_toUpperXlocalX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("name").order().fold().toUpper(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[JOSH,LOP,MARKO,PETER,RIPPLE,VADAS] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Trim.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Trim.feature
new file mode 100644
index 0000000..feda185
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/Trim.feature
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+@StepClassMap @StepTrim
+Feature: Step - trim()
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectX__feature___test__nullX_trim
+    Given the empty graph
+    And the traversal of
+      """
+      g.inject("  feature  ", " one test ", null, "", " ").trim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | feature |
+      | one test |
+      | null |
+      | str[] |
+      | str[] |
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListXa_bXX_trim
+    Given the empty graph
+    And using the parameter xx1 defined as "l[a,b]"
+    And the traversal of
+    """
+    g.inject(xx1).trim()
+    """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The trim() step can only take string as argument"
+
+  @GraphComputerVerificationInjectionNotSupported
+  Scenario: g_injectXListX1_2XX_trimXlocalX
+    Given the empty graph
+    And using the parameter xx1 defined as "l[d[1].i,d[2].i]"
+    And the traversal of
+    """
+    g.inject(xx1).trim(Scope.local)
+    """
+    When iterated to list
+    Then the traversal will raise an error with message containing text of "The trim(local) step can only take string or list of strings"
+
+  Scenario: g_V_valuesXnameX_trim
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", " marko ").property("age", 29).as("marko").
+        addV("person").property("name", "  vadas  ").property("age", 27).as("vadas").
+        addV("software").property("name", "  lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh  ").property("age", 32).as("josh").
+        addV("software").property("name", "   ripple   ").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").trim()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | vadas |
+      | lop |
+      | josh |
+      | ripple |
+      | peter |
+
+  Scenario: g_V_valuesXnameX_order_fold_trimXlocalX
+    Given the empty graph
+    And the graph initializer of
+      """
+      g.addV("person").property("name", " marko ").property("age", 29).as("marko").
+        addV("person").property("name", "  vadas  ").property("age", 27).as("vadas").
+        addV("software").property("name", "  lop").property("lang", "java").as("lop").
+        addV("person").property("name","josh  ").property("age", 32).as("josh").
+        addV("software").property("name", "   ripple   ").property("lang", "java").as("ripple").
+        addV("person").property("name", "peter").property("age", 35).as('peter').
+        addE("knows").from("marko").to("vadas").property("weight", 0.5d).
+        addE("knows").from("marko").to("josh").property("weight", 1.0d).
+        addE("created").from("marko").to("lop").property("weight", 0.4d).
+        addE("created").from("josh").to("ripple").property("weight", 1.0d).
+        addE("created").from("josh").to("lop").property("weight", 0.4d).
+        addE("created").from("peter").to("lop").property("weight", 0.2d)
+      """
+    And the traversal of
+      """
+      g.V().values("name").order().fold().trim(Scope.local)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | l[ripple,lop,vadas,marko,josh,peter] |
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ValueMap.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ValueMap.feature
index 8a985d2..65e495f 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ValueMap.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/ValueMap.feature
@@ -184,7 +184,9 @@
       | m[{"name": ["josh"], "age": [32], "t[label]":"person", "t[id]":"v[josh].id"}] |
       | m[{"name": ["peter"], "age": [35], "t[label]":"person", "t[id]":"v[peter].id"}] |
 
-  @MultiMetaProperties
+# NOTE: Insertion order is required for this test due to TINKERPOP-2974.
+# This annotation should be removed once the bug is fixed
+  @MultiProperties @MetaProperties @InsertionOrderingRequired
   Scenario: g_VX1X_valueMapXname_locationX_byXunfoldX_by
     Given the crew graph
     And using the parameter vid1 defined as "v[marko].id"
@@ -213,6 +215,9 @@
       | m[{"name": ["lop"]}] |
       | m[{"name": ["ripple"]}] |
 
+# NOTE: Insertion order is required for this test due to TINKERPOP-2974.
+# This annotation should be removed once the bug is fixed
+  @InsertionOrderingRequired
   Scenario: g_V_valueMapXname_ageX_byXisXxXXbyXunfoldX
     Given the modern graph
     And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature
index 5f8287b..994e3cb 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature
@@ -269,4 +269,20 @@
       | v[lop] |
       | null |
       | null |
-      | null |
\ No newline at end of file
+      | null |
+
+  Scenario: g_V_aggregateXaX_hasXperson_age_gteX30XXX_capXaX_unfold_valuesXnameX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().aggregate("a").has("person","age", P.gte(30)).cap("a").unfold().values("name")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | marko |
+      | josh |
+      | peter |
+      | lop |
+      | vadas |
+      | ripple |
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature
index d0bb27b..e19e6d8 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature
@@ -18,6 +18,7 @@
 @StepClassSideEffect @StepInject
 Feature: Step - inject()
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_VX1X_out_injectXv2X_name
     Given the modern graph
     And using the parameter vid1 defined as "v[marko].id"
@@ -34,7 +35,7 @@
       | vadas |
       | josh  |
 
-
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path
     Given the modern graph
     And using the parameter vid1 defined as "v[marko].id"
@@ -69,8 +70,9 @@
       | vadas |
       | josh  |
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_injectXnull_1_3_nullX
-    Given the empty graph
+    Given the modern graph
     And the traversal of
       """
       g.inject(null, 1, 3, null)
@@ -83,8 +85,9 @@
       | d[3].i |
       | null |
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_injectX10_20_null_20_10_10X_groupCountXxX_dedup_asXyX_projectXa_bX_by_byXselectXxX_selectXselectXyXXX
-    Given the empty graph
+    Given the modern graph
     And the traversal of
       """
       g.inject(10,20,null,20,10,10).groupCount("x").dedup().as("y").project("a","b").by().by(__.select("x").select(__.select("y")))
@@ -96,8 +99,9 @@
       | m[{"a":"d[20].i", "b":"d[2].l"}] |
       | m[{"a":null, "b":"d[1].l"}] |
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_injectXname_marko_age_nullX_selectXname_ageX
-    Given the empty graph
+    Given the modern graph
     And using the parameter xx1 defined as "m[{\"name\":\"marko\", \"age\":null}]"
     And the traversal of
       """
@@ -108,8 +112,9 @@
       | result |
       | m[{"name":"marko", "age":null}] |
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_injectXnull_nullX
-    Given the empty graph
+    Given the modern graph
     And the traversal of
       """
       g.inject(null, null)
@@ -120,8 +125,9 @@
       | null |
       | null |
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_injectXnullX
-    Given the empty graph
+    Given the modern graph
     And the traversal of
       """
       g.inject(null)
@@ -131,8 +137,9 @@
       | result |
       | null |
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_inject
-    Given the empty graph
+    Given the modern graph
     And the traversal of
       """
       g.inject()
@@ -140,6 +147,7 @@
     When iterated to list
     Then the result should be empty
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_VX1X_valuesXageX_injectXnull_nullX
     Given the modern graph
     And using the parameter xx1 defined as "v[marko].id"
@@ -181,8 +189,9 @@
       | result |
       | d[29].i |
 
+  @GraphComputerVerificationInjectionNotSupported
   Scenario: g_injectXnull_1_3_nullX_asXaX_selectXaX
-    Given the empty graph
+    Given the modern graph
     And the traversal of
       """
       g.inject(null, 1, 3, null).as("a").select("a")
diff --git a/gremlin-tools/gremlin-benchmark/pom.xml b/gremlin-tools/gremlin-benchmark/pom.xml
index 5de10d7..81474d3 100644
--- a/gremlin-tools/gremlin-benchmark/pom.xml
+++ b/gremlin-tools/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>gremlin-tools</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-benchmark</artifactId>
@@ -31,6 +31,8 @@
         <!-- Skip benchmarks by default because they are time consuming. -->
         <skipBenchmarks>true</skipBenchmarks>
         <skipTests>${skipBenchmarks}</skipTests>
+        <!-- JDK17 fails javadoc generation here in benchmarks - not needed in any event -->
+        <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
 
     <dependencies>
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java
index b6c7a3f..97d5601 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractGraphBenchmark.java
@@ -64,13 +64,13 @@
         String graphFile;
         if(loadGraphWithData != null) {
             if (loadGraphWithData.equals(LoadGraphWith.GraphData.GRATEFUL)) {
-                graphFile = "grateful-dead-v3d0.kryo";
+                graphFile = "grateful-dead-v3.kryo";
             } else if (loadGraphWithData.equals(LoadGraphWith.GraphData.MODERN)) {
-                graphFile = "tinkerpop-modern-v3d0.kryo";
+                graphFile = "tinkerpop-modern-v3.kryo";
             } else if (loadGraphWithData.equals(LoadGraphWith.GraphData.CLASSIC)) {
-                graphFile = "tinkerpop-classic-v3d0.kryo";
+                graphFile = "tinkerpop-classic-v3.kryo";
             } else if (loadGraphWithData.equals(LoadGraphWith.GraphData.CREW)) {
-                graphFile = "tinkerpop-crew-v3d0.kryo";
+                graphFile = "tinkerpop-crew-v3.kryo";
             } else {
                 throw new RuntimeException("Could not load graph with " + loadGraphWithData);
             }
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java
index e247434..e091087 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphBinaryReaderWriterBenchmark.java
@@ -20,7 +20,7 @@
 
 import io.netty.buffer.UnpooledByteBufAllocator;
 import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.structure.Graph;
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java
index e787ca7..4974e9f 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/GraphSONMapperBenchmark.java
@@ -23,7 +23,6 @@
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3d0;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -46,7 +45,7 @@
 public class GraphSONMapperBenchmark extends AbstractBenchmarkBase {
     private static final ObjectMapper mapper = GraphSONMapper.build()
             .version(GraphSONVersion.V3_0)
-            .addCustomModule(GraphSONXModuleV3d0.build().create(false))
+            .addDefaultXModule(true)
             .create().createMapper();
 
     @State(Scope.Thread)
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java
index 2d4ce84..4385abb 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/driver/SerializationBenchmark.java
@@ -22,12 +22,13 @@
 import io.netty.buffer.Unpooled;
 import io.netty.buffer.UnpooledByteBufAllocator;
 import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
 import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
 import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
@@ -112,7 +113,7 @@
             .create();
 
     private static final GraphBinaryMessageSerializerV1 binarySerializer = new GraphBinaryMessageSerializerV1();
-    private static final GraphSONMessageSerializerV3d0 graphsonSerializer = new GraphSONMessageSerializerV3d0();
+    private static final GraphSONMessageSerializerV3 graphsonSerializer = new GraphSONMessageSerializerV3();
 
     static {
         bytecode.addStep("V");
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/GremlinScriptCheckerBenchmark.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/GremlinScriptCheckerBenchmark.java
new file mode 100644
index 0000000..9b7ce46
--- /dev/null
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/GremlinScriptCheckerBenchmark.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.jsr223;
+
+import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinScriptChecker;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import java.util.Optional;
+
+/**
+ * @author Valentyn Kahamlyk
+ */
+@State(Scope.Thread)
+public class GremlinScriptCheckerBenchmark extends AbstractBenchmarkBase {
+
+    @Benchmark
+    public Optional<String> testParseRequestId() {
+        return GremlinScriptChecker.parse("g.with('requestId', '4F53FB59-CFC9-4984-B477-452073A352FD').with(true).V().out('knows')").getRequestId();
+    }
+
+    @Benchmark
+    public Optional<String> testParseMaterializeProperties() {
+        return GremlinScriptChecker.parse("g.with('materializeProperties', 'all').with(true).V().out('knows')").getMaterializeProperties();
+    }
+
+    @Benchmark
+    public GremlinScriptChecker.Result testParseAll() {
+        return GremlinScriptChecker.parse("g.with('evaluationTimeout', 1000L).with('materializeProperties', 'all').with('requestId', '4F53FB59-CFC9-4984-B477-452073A352FD').with(true).V().out('knows')");
+    }
+}
diff --git a/gremlin-tools/gremlin-coverage/pom.xml b/gremlin-tools/gremlin-coverage/pom.xml
index 46706c9..c4fe374 100644
--- a/gremlin-tools/gremlin-coverage/pom.xml
+++ b/gremlin-tools/gremlin-coverage/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>gremlin-tools</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-coverage</artifactId>
     <name>Apache TinkerPop :: Gremlin Coverage</name>
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
deleted file mode 100644
index 223fc4b..0000000
--- a/gremlin-tools/gremlin-io-test/pom.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>gremlin-tools</artifactId>
-        <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
-    </parent>
-    <artifactId>gremlin-io-test</artifactId>
-    <name>Apache TinkerPop :: Gremlin IO Test</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-driver</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>tinkergraph-gremlin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-            <version>${groovy.version}</version>
-            <classifier>indy</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-json</artifactId>
-            <version>${groovy.version}</version>
-            <classifier>indy</classifier>
-            <exclusions>
-                <!-- exclude non-indy type -->
-                <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>groovy</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-test</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>io</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>io</name>
-                </property>
-            </activation>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.gmavenplus</groupId>
-                        <artifactId>gmavenplus-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.codehaus.groovy</groupId>
-                                <artifactId>groovy-all</artifactId>
-                                <version>${groovy.version}</version>
-                                <type>pom</type>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>ch.qos.logback</groupId>
-                                <artifactId>logback-classic</artifactId>
-                                <version>${logback.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>generate-io-files-graphson</id>
-                                <phase>generate-test-resources</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <properties>
-                                        <property>
-                                            <name>projectBuildDir</name>
-                                            <value>${project.build.directory}</value>
-                                        </property>
-                                        <property>
-                                            <name>projectBaseDir</name>
-                                            <value>${project.build.directory}</value>
-                                        </property>
-                                        <property>
-                                            <name>projectVersion</name>
-                                            <value>${project.version}</value>
-                                        </property>
-                                    </properties>
-                                    <scripts>
-                                        <script>${project.basedir}/scripts/generate-graphson-resources.groovy</script>
-                                    </scripts>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>generate-io-files-graphbinary</id>
-                                <phase>generate-test-resources</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <properties>
-                                        <property>
-                                            <name>projectBuildDir</name>
-                                            <value>${project.build.directory}</value>
-                                        </property>
-                                        <property>
-                                            <name>projectBaseDir</name>
-                                            <value>${project.build.directory}</value>
-                                        </property>
-                                        <property>
-                                            <name>projectVersion</name>
-                                            <value>${project.version}</value>
-                                        </property>
-                                    </properties>
-                                    <scripts>
-                                        <script>${project.basedir}/scripts/generate-graphbinary-resources.groovy</script>
-                                    </scripts>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>generate-io-model-csv</id>
-                                <phase>generate-test-resources</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <properties>
-                                        <property>
-                                            <name>projectBuildDir</name>
-                                            <value>${project.build.directory}</value>
-                                        </property>
-                                    </properties>
-                                    <scripts>
-                                        <script>
-                                            <![CDATA[
-import org.apache.tinkerpop.gremlin.structure.io.Model
-import java.io.File
-
-Model.instance().saveAsCsv(new File(projectBuildDir, "dev-docs/model.csv"))
-]]>
-                                        </script>
-                                    </scripts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/scripts/generate-graphbinary-resources.groovy b/gremlin-tools/gremlin-io-test/scripts/generate-graphbinary-resources.groovy
deleted file mode 100644
index 12ecadd..0000000
--- a/gremlin-tools/gremlin-io-test/scripts/generate-graphbinary-resources.groovy
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import io.netty.buffer.ByteBufAllocator
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
-import org.apache.tinkerpop.gremlin.structure.*
-import org.apache.tinkerpop.gremlin.structure.io.*
-import org.apache.commons.configuration2.BaseConfiguration
-
-new File("${projectBuildDir}/test-case-data/io/graphbinary").mkdirs()
-
-conf = new BaseConfiguration()
-conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
-graph = TinkerGraph.open(conf)
-TinkerFactory.generateTheCrew(graph)
-g = graph.traversal()
-
-model = Model.instance()
-
-allocator = ByteBufAllocator.DEFAULT
-factory = new NettyBufferFactory()
-
-toGraphBinary = { o, type, mapper, suffix = "" ->
-    def fileToWriteTo = new File("${projectBuildDir}/test-case-data/io/graphbinary/" + type.title.toLowerCase().replace(" ","") + "-" + suffix + ".gbin")
-    if (fileToWriteTo.exists()) fileToWriteTo.delete()
-    filestream = new FileOutputStream(fileToWriteTo)
-    try {
-        buffer = factory.create(allocator.buffer())
-        writer.write(o, buffer)
-        buffer.readerIndex(0)
-        buffer.readBytes(filestream, buffer.readableBytes())
-    } catch (Exception ex) {
-        if (ex.message == "Serializer for type org.apache.tinkerpop.gremlin.driver.message.RequestMessage not found" ||
-                ex.message == "Serializer for type org.apache.tinkerpop.gremlin.driver.message.ResponseMessage not found" )
-            fileToWriteTo.delete()
-        else
-            throw ex
-    } finally {
-        filestream.close()
-        buffer.release()
-    }
-}
-
-toGraphBinaryV1d0 = { o, type, mapper ->
-    toGraphBinary(o, type, mapper, "v1")
-}
-
-writeSupportedObjects = { mapper, toGraphBinaryFunction ->
-    model.entries().findAll{it.hasGraphBinaryCompatibility()}.each {
-        toGraphBinaryFunction(it.getObject(), it, mapper)
-    }
-}
-
-writer = new GraphBinaryWriter()
-
-writeSupportedObjects(writer, toGraphBinaryV1d0)
-
-def ver = "_" + "${projectVersion}".replace(".","_").replace("-SNAPSHOT","")
-def target = "${projectBaseDir}/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/" + ver
-def targetDir = new File(target)
-if (!targetDir.exists()) targetDir.mkdirs()
-new File("${projectBuildDir}/test-case-data/io/graphbinary/").listFiles().each {
-    def copyTo = new File(target + "/" + it.name)
-    if (copyTo.exists()) copyTo.delete()
-    java.nio.file.Files.copy(it.toPath(), new File(target + "/" + it.name).toPath())
-}
diff --git a/gremlin-tools/gremlin-io-test/scripts/generate-graphson-resources.groovy b/gremlin-tools/gremlin-io-test/scripts/generate-graphson-resources.groovy
deleted file mode 100644
index 537fb83..0000000
--- a/gremlin-tools/gremlin-io-test/scripts/generate-graphson-resources.groovy
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.nio.file.Files
-import org.apache.tinkerpop.gremlin.driver.ser.*
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
-import org.apache.tinkerpop.gremlin.structure.*
-import org.apache.tinkerpop.gremlin.structure.io.graphson.*
-import org.apache.tinkerpop.gremlin.structure.io.Model
-import org.apache.commons.configuration2.BaseConfiguration
-
-new File("${projectBuildDir}/dev-docs/").mkdirs()
-new File("${projectBuildDir}/test-case-data/io/graphson/").mkdirs()
-
-conf = new BaseConfiguration()
-conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
-graph = TinkerGraph.open(conf)
-TinkerFactory.generateTheCrew(graph)
-g = graph.traversal()
-
-model = Model.instance()
-
-toJsonV1d0NoTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v1d0")
-}
-
-toJson = { o, type, mapper, comment = "", suffix = "" ->
-    def jsonSample = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(o)
-
-    def fileToWriteTo = new File("${projectBuildDir}/test-case-data/io/graphson/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".json")
-    if (fileToWriteTo.exists()) fileToWriteTo.delete()
-    fileToWriteTo.withWriter{ it.write(jsonSample) }
-
-    return "==== " + type + "\n\n" +
-            (comment.isEmpty() ? "" : comment + "\n\n") +
-            "[source,json]\n" +
-            "----\n" +
-            jsonSample + "\n" +
-            "----\n" +
-            "\n"
-}
-
-writeSupportedV1Objects = { writer, mapper ->
-    writer.write("=== Graph Structure\n\n")
-    model.entries("Graph Structure").findAll{it.isCompatibleWith(GraphSONCompatibility.V1D0_3_4_0)}.each {
-        writer.write(toJsonV1d0NoTypes(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-
-    writer.write("\n")
-    writer.write("=== RequestMessage\n\n")
-    model.entries("RequestMessage").findAll{it.isCompatibleWith(GraphSONCompatibility.V1D0_3_4_0)}.each {
-        writer.write(toJsonV1d0NoTypes(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-
-    writer.write("\n")
-    writer.write("=== ResponseMessage\n\n")
-    model.entries("ResponseMessage").findAll{it.isCompatibleWith(GraphSONCompatibility.V1D0_3_4_0)}.each {
-        writer.write(toJsonV1d0NoTypes(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-}
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV1d0.instance()).
-        addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
-        version(GraphSONVersion.V1_0).create().createMapper()
-
-v1GraphSONFile = new File("${projectBuildDir}/dev-docs/out-graphson-1d0.txt")
-if (v1GraphSONFile.exists()) v1GraphSONFile.delete()
-new File("${projectBuildDir}/dev-docs/out-graphson-1d0.txt").withWriter { writeSupportedV1Objects(it, mapper) }
-
-toJsonV2d0PartialTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v2d0-partial")
-}
-
-toJsonV2d0NoTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v2d0-no-types")
-}
-
-toJsonV3d0 = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v3d0")
-}
-
-writeSupportedV2V3Objects = { writer, mapper, toJsonFunction, modelFilter, extendedText ->
-    writer.write("=== Core\n\n")
-    model.entries("Core").findAll(modelFilter).each {
-        writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-
-    writer.write("\n")
-    writer.write("=== Graph Structure\n\n")
-    model.entries("Graph Structure").findAll(modelFilter).each {
-        writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-
-    writer.write("\n")
-    writer.write("=== Graph Process\n\n")
-    model.entries("Graph Process").findAll(modelFilter).each {
-        writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-
-    writer.write("\n")
-    writer.write("=== RequestMessage\n\n")
-    model.entries("RequestMessage").findAll(modelFilter).each {
-        writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-
-    writer.write("\n")
-    writer.write("=== ResponseMessage\n\n")
-    model.entries("ResponseMessage").findAll(modelFilter).each {
-        writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-
-    writer.write("\n")
-    writer.write("=== Extended\n\n")
-    writer.write(extendedText)
-    model.entries("Extended").findAll(modelFilter).each {
-        writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
-    }
-}
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        typeInfo(TypeInfo.PARTIAL_TYPES).
-        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-        version(GraphSONVersion.V2_0).create().createMapper()
-
-v2ExtendedDescription = """Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:
-
-[source,java]
-----
-mapper = GraphSONMapper.build().
-                        typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                        version(GraphSONVersion.V2_0).create().createMapper()
-----
-
-"""
-
-file = new File("${projectBuildDir}/dev-docs/out-graphson-2d0-partial.txt")
-if (file.exists()) file.delete()
-file.withWriter { writeSupportedV2V3Objects(it, mapper, toJsonV2d0PartialTypes, {it.isCompatibleWith(GraphSONCompatibility.V2D0_PARTIAL_3_5_0)}, v2ExtendedDescription) }
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        typeInfo(TypeInfo.NO_TYPES).
-        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-        version(GraphSONVersion.V2_0).create().createMapper()
-
-file = new File("${projectBuildDir}/dev-docs/out-graphson-2d0-no-type.txt")
-if (file.exists()) file.delete()
-file.withWriter { writeSupportedV2V3Objects(it, mapper, toJsonV2d0NoTypes, {it.isCompatibleWith(GraphSONCompatibility.V2D0_NO_TYPE_3_5_0)}, v2ExtendedDescription) }
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-        version(GraphSONVersion.V3_0).create().createMapper()
-
-v3ExtendedDescription = """Note that the "extended" types require the addition of the separate `GraphSONXModuleV3d0` module as follows:
-
-[source,java]
-----
-mapper = GraphSONMapper.build().
-                        typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV3d0.build().create(false)).
-                        version(GraphSONVersion.V3_0).create().createMapper()
-----
-
-"""
-
-file = new File("${projectBuildDir}/dev-docs/out-graphson-3d0.txt")
-if (file.exists()) file.delete()
-file.withWriter { writeSupportedV2V3Objects(it, mapper, toJsonV3d0, {it.isCompatibleWith(GraphSONCompatibility.V3D0_PARTIAL_3_5_0)}, v3ExtendedDescription) }
-
-def ver = "_" + "${projectVersion}".replace(".","_").replace("-SNAPSHOT","")
-def target = "${projectBaseDir}/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/" + ver
-def targetDir = new File(target)
-if (!targetDir.exists()) targetDir.mkdirs()
-new File("${projectBuildDir}/test-case-data/io/graphson/").listFiles().each {
-    def copyTo = new File(target + "/" + it.name)
-    if (copyTo.exists()) copyTo.delete()
-    Files.copy(it.toPath(), new File(target + "/" + it.name).toPath())
-}
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibilities.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibilities.java
deleted file mode 100644
index 05f5f4d..0000000
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibilities.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io;
-
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONCompatibility;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Compatibilities {
-
-    public static final Compatibilities UNTYPED_GRAPHSON = Compatibilities.with(GraphSONCompatibility.class)
-            .configuredAs(".*no-types|v1d0");
-
-    private final Class<? extends Enum<? extends Compatibility>> compatibility;
-
-    /**
-     * Initialized to 4.0.0 which is non-existent, but obviously the high-end of whatever would be tested.
-     */
-    private String releaseVersionBefore = "4.0.0";
-
-    /**
-     * Initialized to 3.0.0 which is non-existent, but obviously the low-end of whatever would be tested.
-     */
-    private String releaseVersionAfter = "3.0.0";
-
-    /**
-     * Initialized to 0.0 which is non-existent, but obviously the low-end of whatever would be tested.
-     */
-    private String ioVersionBefore = "4.0";
-
-    /**
-     * Initialized to 3.0 which is non-existent, but obviously the high-end of whatever would be tested.
-     */
-    private String ioVersionAfter = "0.0";
-
-    private String configuredAs = ".*";
-
-    private List<Compatibilities> compatibilitiesToJoin = Collections.emptyList();
-
-    private Compatibilities(final Class<? extends Enum<? extends Compatibility>> c) {
-        this.compatibility = c;
-    }
-
-    public static Compatibilities with(final Class<? extends Enum<? extends Compatibility>> c) {
-        return new Compatibilities(c);
-    }
-
-    /**
-     * Finds {@link Compatibility} instances before (and not inclusive of) the specified version.
-     */
-    public Compatibilities beforeRelease(final String before) {
-        this.releaseVersionBefore = before;
-        return this;
-    }
-
-    /**
-     * Finds {@link Compatibility} instances after (and not inclusive of) the specified version.
-     */
-    public Compatibilities afterRelease(final String after) {
-        this.releaseVersionAfter = after;
-        return this;
-    }
-
-    /**
-     * Finds {@link Compatibility} instances between (and not inclusive of) the specified versions.
-     */
-    public Compatibilities betweenReleases(final String start, final String end) {
-        return beforeRelease(end).afterRelease(start);
-    }
-
-    /**
-     * Finds {@link Compatibility} instances before (and not inclusive of) the specified version.
-     */
-    public Compatibilities before(final String before) {
-        this.ioVersionBefore = before;
-        return this;
-    }
-
-    /**
-     * Finds {@link Compatibility} instances after (and not inclusive of) the specified version.
-     */
-    public Compatibilities after(final String after) {
-        this.ioVersionAfter = after;
-        return this;
-    }
-
-    /**
-     * Finds {@link Compatibility} instances between (and not inclusive of) the specified versions.
-     */
-    public Compatibilities between(final String start, final String end) {
-        return before(end).after(start);
-    }
-
-    public Compatibilities configuredAs(final String regex) {
-        this.configuredAs = regex;
-        return this;
-    }
-
-    public Compatibilities join(final Compatibilities... compatibilities) {
-        this.compatibilitiesToJoin = Arrays.asList(compatibilities);
-        return this;
-    }
-
-    public List<Compatibility> match() {
-        final Compatibility[] enumArray = (Compatibility[]) compatibility.getEnumConstants();
-        final List<Compatibility> enums = Arrays.asList(enumArray);
-        final Pattern pattern = Pattern.compile(configuredAs);
-
-        final List<Compatibility> thisMatch = enums.stream()
-                .filter(c -> beforeRelease(c, releaseVersionBefore))
-                .filter(c -> afterRelease(c, releaseVersionAfter))
-                .filter(c -> beforeIo(c, ioVersionBefore))
-                .filter(c -> afterIo(c, ioVersionAfter))
-                .filter(c -> pattern.matcher(c.getConfiguration()).matches())
-                .collect(Collectors.toList());
-        final List<Compatibility> matches = new ArrayList<>(thisMatch);
-        compatibilitiesToJoin.forEach(c -> matches.addAll(c.match()));
-        return matches;
-    }
-
-    public Compatibility[] matchToArray() {
-        final List<Compatibility> list = match();
-        final Compatibility [] compatibilities = new Compatibility[list.size()];
-        list.toArray(compatibilities);
-        return compatibilities;
-    }
-
-    private static boolean afterRelease(final Compatibility version, final String after) {
-        return versionCompare(version.getReleaseVersion(), after) > 0;
-    }
-
-    private static boolean beforeRelease(final Compatibility version, final String before) {
-        return versionCompare(version.getReleaseVersion(), before) < 0;
-    }
-
-    private static boolean afterIo(final Compatibility version, final String after) {
-        return versionCompare(version.getVersion(), after) > 0;
-    }
-
-    private static boolean beforeIo(final Compatibility version, final String before) {
-        return versionCompare(version.getVersion(), before) < 0;
-    }
-
-    /**
-     * @return The result is a negative integer if v1 is less than v2.
-     *         The result is a positive integer if v1 is greater than v2.
-     *         The result is zero if the strings are equal.
-     */
-    private static int versionCompare(final String v1, final String v2) {
-        final String[] vals1 = v1.split("\\.");
-        final String[] vals2 = v2.split("\\.");
-        int i = 0;
-
-        // set index to first non-equal ordinal or length of shortest version string
-        while (i < vals1.length && i < vals2.length && vals1[i].equals(vals2[i])) {
-            i++;
-        }
-
-        // compare first non-equal ordinal number
-        if (i < vals1.length && i < vals2.length) {
-            int diff = Integer.valueOf(vals1[i]).compareTo(Integer.valueOf(vals2[i]));
-            return Integer.signum(diff);
-        }
-
-        // the strings are equal or one string is a substring of the other
-        // e.g. "1.2.3" = "1.2.3" or "1.2.3" < "1.2.3.4"
-        return Integer.signum(vals1.length - vals2.length);
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
deleted file mode 100644
index dda5fb3..0000000
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io;
-
-import java.io.IOException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface Compatibility {
-    public byte[] readFromResource(final String resource) throws IOException;
-
-    public default Class resolve(final Class clazz) {
-        return clazz;
-    }
-
-    /**
-     * Gets the TinkerPop version.
-     */
-    public String getReleaseVersion();
-
-    /**
-     * Gets the version of the IO type (i.e. GraphSON 2.0)
-     */
-    public String getVersion();
-
-    public String getConfiguration();
-}
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
deleted file mode 100644
index 4218883..0000000
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io;
-
-import org.apache.commons.configuration2.BaseConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Pick;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphbinary.GraphBinaryCompatibility;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONCompatibility;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Defines the supported types for IO and the versions (and configurations) to which they apply and are tested.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Model {
-
-    private static final List<Compatibility> ALL = Collections.unmodifiableList(new ArrayList<Compatibility>() {{
-        addAll(Arrays.asList(GraphSONCompatibility.values()));
-        addAll(Arrays.asList(GraphBinaryCompatibility.values()));
-    }});
-
-    private static final Model model = new Model();
-
-    private final Map<String, List<Entry>> entries = new HashMap<>();
-    
-    private Model() {
-        final Configuration conf = new BaseConfiguration();
-        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
-        final TinkerGraph graph = TinkerGraph.open(conf);
-        TinkerFactory.generateTheCrew(graph);
-        final GraphTraversalSource g = graph.traversal();
-
-        // TODO: gotta fix graphbinary
-        final Compatibility[] noTypeGraphSONPlusBrokenGraphBinary = Compatibilities.with(GraphSONCompatibility.class)
-                .configuredAs(".*no-types|v1d0").join(Compatibilities.with(GraphBinaryCompatibility.class)).matchToArray();
-
-        // the inverse of this definition is basically 3.4.0 or better for GraphSON with no support for
-        // untyped GraphSON anywhere along the way
-        final Compatibility[] before3_4_0 = Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*no-types|v1d0")
-                .join(Compatibilities.with(GraphSONCompatibility.class).beforeRelease("3.4.0")).matchToArray();
-
-        // the inverse of this definition is basically 3.5.0 or better for GraphSON with no support for
-        // untyped GraphSON anywhere along the way
-        List<Compatibility> c = Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*no-types|v1d0").match();
-        final Compatibility[] before3_5_0 = Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*no-types|v1d0")
-                        .join(Compatibilities.with(GraphSONCompatibility.class).beforeRelease("3.5.0")).matchToArray();
-
-        final Compatibility[] noGraphSONBeforeV3 = Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*v2d0-partial|v1d0|v2d0-no-types").matchToArray();
-
-        // IMPORTANT - the "title" or name of the Entry needs to be unique
-
-        addCoreEntry(File.class, "Class", "");
-        addCoreEntry(new Date(1481750076295L), "Date");
-        addCoreEntry(100.00d, "Double");
-        addCoreEntry(100.00f, "Float", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addCoreEntry(100, "Integer");
-        addCoreEntry(Arrays.asList(1,"person", true), "List", "List is used to distinguish between different collection types as JSON is not explicit enough for all of Gremlin's requirements.", noGraphSONBeforeV3);
-        addCoreEntry(100L, "Long", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-
-        final Map<Object,Object> map = new HashMap<>();
-        map.put("test", 123);
-        map.put(new Date(1481750076295L), "red");
-        map.put(Arrays.asList(1,2,3), new Date(1481750076295L));
-        addCoreEntry(map, "Map", "Map is redefined so that to provide the ability to allow for non-String keys, which is not possible in JSON.", noGraphSONBeforeV3);
-
-        addCoreEntry(new HashSet<>(Arrays.asList(1,"person", true)), "Set", "Allows a JSON collection to behave as a Set.", noGraphSONBeforeV3);
-        addCoreEntry(new java.sql.Timestamp(1481750076295L), "Timestamp", "");
-        addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID");
-
-        addGraphStructureEntry(graph.edges().next(), "Edge", "");
-        addGraphStructureEntry(g.V().out().out().path().next(), "Path", "");
-        addGraphStructureEntry(graph.edges().next().properties().next(), "Property", "");
-        addGraphStructureEntry(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
-        addGraphStructureEntry(graph.vertices().next(), "Vertex", "");
-        addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty", "");
-
-        addGraphProcessEntry(SackFunctions.Barrier.normSack, "Barrier", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-
-        final BulkSet<String> bulkSet = new BulkSet<>();
-        bulkSet.add("marko", 1);
-        bulkSet.add("josh", 2);
-        addGraphProcessEntry(bulkSet, "BulkSet", "", before3_4_0);
-
-        addGraphProcessEntry(g.V().hasLabel("person").out().in().tree().asAdmin().getBytecode(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(VertexProperty.Cardinality.list, "Cardinality", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(Column.keys, "Column", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(Direction.OUT, "Direction", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(Operator.sum, "Operator", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(Order.shuffle, "Order", "", before3_5_0);
-        addGraphProcessEntry(Pick.any, "Pick", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(Pop.all, "Pop", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        final TraversalMetrics tm = createStaticTraversalMetrics();
-        final MutableMetrics metrics = new MutableMetrics(tm.getMetrics("7.0.0()"));
-        metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")));
-        addGraphProcessEntry(metrics, "Metrics", "");
-        addGraphProcessEntry(P.gt(0), "P", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(P.within(1), "P within", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(P.without(1,2), "P without", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and", "");
-        addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or", "");
-        addGraphProcessEntry(Scope.local, "Scope", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addGraphProcessEntry(T.label, "T", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        // TextP was only added at 3.4.0 and is not supported with untyped GraphSON of any sort
-        addGraphProcessEntry(TextP.containing("ark"), "TextP", "", before3_4_0);
-        addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics", "");
-        addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-
-        final Map<String,Object> requestBindings = new HashMap<>();
-        requestBindings.put("x", 1);
-
-        final Map<String,Object> requestAliases = new HashMap<>();
-        requestAliases.put("g", "social");
-
-        RequestMessage requestMessage;
-        requestMessage = RequestMessage.build("authentication").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create();
-        addRequestMessageEntry(requestMessage, "Authentication Response", "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.");
-        requestMessage = RequestMessage.build("eval").processor("session").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "session", "unique-session-identifier").create();
-        addRequestMessageEntry(requestMessage, "Session Eval", "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.");
-        requestMessage = RequestMessage.build("eval").processor("session").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session","unique-session-identifier").create();
-        addRequestMessageEntry(requestMessage, "Session Eval Aliased", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
-        requestMessage = RequestMessage.build("close").processor("session").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("session", "unique-session-identifier").create();
-        addRequestMessageEntry(requestMessage, "Session Close", "The following `RequestMessage` is an example of a request to close a session.");
-        requestMessage = RequestMessage.build("eval").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy").create();
-        addRequestMessageEntry(requestMessage, "Sessionless Eval", "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.");
-        requestMessage = RequestMessage.build("eval").
-                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-                add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases).create();
-        addRequestMessageEntry(requestMessage, "Sessionless Eval Aliased", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
-
-        ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create();
-        addResponseMessageEntry(responseMessage, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different depending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server).");
-        responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-                code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-                result(Collections.singletonList(graph.vertices().next())).create();
-        addResponseMessageEntry(responseMessage, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.");
-        
-        addExtendedEntry(new BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(new BigInteger("123456789987654321123456789987654321"), "BigInteger", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(new Byte("1"), "Byte", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addEntry("Extended", () -> java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", "");
-        addExtendedEntry("x".charAt(0), "Char", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(Duration.ofDays(5), "Duration","The following example is a `Duration` of five days.", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        try {
-            addEntry("Extended", InetAddress.getByName("localhost"), "InetAddress", "");
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-        addExtendedEntry(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(LocalDate.of(2016, 1, 1), "LocalDate", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(LocalTime.of(12, 30, 45), "LocalTime", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(MonthDay.of(1, 1), "MonthDay", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(Period.of(1, 6, 15), "Period", "The following example is a `Period` of one year, six months and fifteen days.", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(new Short("100"), "Short", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(Year.of(2016), "Year", "The following example is of the `Year` \"2016\".", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(YearMonth.of(2016, 6), "YearMonth", "The following example is a `YearMonth` of \"June 2016\"", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-        addExtendedEntry(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", "", noTypeGraphSONPlusBrokenGraphBinary);
-        addExtendedEntry(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
-    }
-
-    private static DefaultTraversalMetrics createStaticTraversalMetrics() {
-        // based on g.V().hasLabel("person").out().out().tree().profile().next()
-        final List<MutableMetrics> traversalMutableMetrics = new ArrayList<>();
-        final MutableMetrics m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])");
-        m7.setDuration(100, TimeUnit.MILLISECONDS);
-        m7.setCount("traverserCount", 4);
-        m7.setCount("elementCount", 4);
-        m7.setAnnotation("percentDur", 25.0d);
-        traversalMutableMetrics.add(m7);
-
-        final MutableMetrics m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)");
-        m2.setDuration(100, TimeUnit.MILLISECONDS);
-        m2.setCount("traverserCount", 13);
-        m2.setCount("elementCount", 13);
-        m2.setAnnotation("percentDur", 25.0d);
-        traversalMutableMetrics.add(m2);
-
-        final MutableMetrics m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)");
-        m3.setDuration(100, TimeUnit.MILLISECONDS);
-        m3.setCount("traverserCount", 7);
-        m3.setCount("elementCount", 7);
-        m3.setAnnotation("percentDur", 25.0d);
-        traversalMutableMetrics.add(m3);
-
-        final MutableMetrics m4 = new MutableMetrics("4.0.0()", "TreeStep");
-        m4.setDuration(100, TimeUnit.MILLISECONDS);
-        m4.setCount("traverserCount", 1);
-        m4.setCount("elementCount", 1);
-        m4.setAnnotation("percentDur", 25.0d);
-        traversalMutableMetrics.add(m4);
-
-        return new DefaultTraversalMetrics(4000, traversalMutableMetrics);
-    }
-
-    public static Model instance() {
-        return model;
-    }
-
-    public Set<String> groups() {
-        return Collections.unmodifiableSet(entries.keySet());
-    }
-
-    public List<Entry> entries(final String key) {
-        return Collections.unmodifiableList(entries.get(key));
-    }
-
-    public List<Entry> entries() {
-        return Collections.unmodifiableList(entries.values().stream().flatMap(Collection::stream).collect(Collectors.toList()));
-    }
-
-    public Optional<Entry> find(final String resource) {
-        return entries.values().stream().flatMap(Collection::stream).filter(e -> e.getResourceName().equals(resource)).findFirst();
-    }
-
-    private void addCoreEntry(final Object obj, final String title) {
-        addEntry("Core", obj, title, "");
-    }
-
-    private void addCoreEntry(final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
-        addEntry("Core", obj, title, description, incompatibleWith);
-    }
-
-    private void addGraphStructureEntry(final Object obj, final String title, final String description, final Compatibility... incompatibilities) {
-        addEntry("Graph Structure", obj, title, description, incompatibilities);
-    }
-
-    private void addGraphProcessEntry(final Object obj, final String title) {
-        addGraphProcessEntry(obj, title, "");
-    }
-
-    private void addGraphProcessEntry(final Object obj, final String title, final String description) {
-        addEntry("Graph Process", obj, title, description);
-    }
-
-    private void addGraphProcessEntry(final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
-        addEntry("Graph Process", obj, title, description, incompatibleWith);
-    }
-
-    private void addRequestMessageEntry(final Object obj, final String title, final String description) {
-        final List<Compatibility> incompatibilityList = Compatibilities.with(GraphBinaryCompatibility.class).match();
-
-        final Compatibility[] incompatibilities = new Compatibility[incompatibilityList.size()];
-        incompatibilityList.toArray(incompatibilities);
-        addEntry("RequestMessage", obj, title, description, incompatibilities);
-    }
-
-    private void addResponseMessageEntry(final Object obj, final String title, final String description) {
-        final List<Compatibility> incompatibilityList = Compatibilities.with(GraphBinaryCompatibility.class).match();
-
-        // TODO: temporary problem? seems to be something breaking in vertex serialization
-        if (title.equals("Standard Result"))
-            incompatibilityList.addAll(Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*no-types").match());
-
-        final Compatibility[] incompatibilities = new Compatibility[incompatibilityList.size()];
-        incompatibilityList.toArray(incompatibilities);
-        addEntry("ResponseMessage", obj, title, description, incompatibilities);
-    }
-
-    private void addExtendedEntry(final Object obj, final String title) {
-        addExtendedEntry(obj, title, "");
-    }
-
-    private void addExtendedEntry(final Object obj, final String title, final String description) {
-        addEntry("Extended", obj, title, description);
-    }
-
-    private void addExtendedEntry(final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
-        addEntry("Extended", obj, title, description, incompatibleWith);
-    }
-    
-    private void addEntry(final String group, final Object obj, final String title, final String description) {
-        addEntry(group, obj, title, description, ALL);
-    }
-
-    private void addEntry(final String group, final Supplier<?> maker, final String title, final String description, final Compatibility... incompatibleWith) {
-        addEntry(group, null, title, description, Collections.unmodifiableList(ALL.stream()
-                .filter(c -> !Arrays.asList(incompatibleWith).contains(c))
-                .collect(Collectors.toList())), maker);
-    }
-
-    private void addEntry(final String group, final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
-        addEntry(group, obj, title, description, Collections.unmodifiableList(ALL.stream()
-                .filter(c -> !Arrays.asList(incompatibleWith).contains(c))
-                .collect(Collectors.toList())), null);
-    }
-
-    private void addEntry(final String group, final Object obj, final String title, final String description,
-                            final List<Compatibility> compatibleWith) {
-        addEntry(group, obj, title, description, compatibleWith, null);
-    }
-
-    private void addEntry(final String group, final Object obj, final String title, final String description,
-                          final List<Compatibility> compatibleWith, final Supplier<?> maker) {
-        if (!entries.containsKey(group))
-            entries.put(group, new ArrayList<>());
-
-        entries.get(group).add(new Entry(title, obj, description, compatibleWith, maker));
-    }
-
-    private Map<Compatibility, String> createIncompatibilityMap(final String msg, final Compatibility... incompatibilities) {
-        final Map<Compatibility, String> m = new HashMap<>();
-        Arrays.asList(incompatibilities).forEach(c -> m.put(c, msg));
-        return m;
-    }
-
-    public void saveAsCsv(final String file) throws Exception {
-        saveAsCsv(new File(file));
-    }
-
-    public void saveAsCsv(final File file) throws Exception {
-        file.getParentFile().mkdirs();
-
-        final List<Compatibility> compatibilities = Stream.of(GraphSONCompatibility.values()).
-                collect(Collectors.toList());
-
-        final List<String> headers = new ArrayList<>();
-        headers.add("resource");
-        headers.addAll(compatibilities.stream().map(c -> {
-            if (c instanceof GraphSONCompatibility)
-                return "graphson-" + ((GraphSONCompatibility) c).name();
-            else if (c instanceof GraphBinaryCompatibility)
-                return "graphbinary-" + ((GraphBinaryCompatibility) c).name();
-            else
-                throw new IllegalStateException("No support for the provided Compatibility type");
-        }).collect(Collectors.toList()));
-
-        try (final PrintWriter writer = new PrintWriter(file)) {
-            writer.println(String.join(",", headers));
-
-            final List<Entry> sorted = new ArrayList<>(entries());
-            sorted.sort(Comparator.comparing(Entry::getResourceName));
-
-            sorted.forEach(e -> {
-                writer.write(e.getResourceName());
-                writer.write(",");
-                final List<String> compatibleList = new ArrayList<>();
-                compatibilities.forEach(c -> compatibleList.add(Boolean.toString(e.isCompatibleWith(c))));
-                writer.println(String.join(",", compatibleList));
-            });
-        }
-    }
-
-    public static class Entry {
-
-        private final String title;
-        private final Object object;
-        private final String description;
-        private final List<Compatibility> compatibleWith;
-        private final Supplier<?> maker;
-
-        public Entry(final String title, final Object object, final String description,
-                     final List<Compatibility> compatibleWith, final Supplier<?> maker) {
-            this.title = title;
-            this.object = object;
-            this.description = description;
-            this.compatibleWith = compatibleWith;
-            this.maker = maker;
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public String getResourceName() {
-            return title.replace(" ", "").toLowerCase();
-        }
-
-        public <T> T getObject() {
-            return (T) ((null == object) ? maker.get() : object);
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public boolean isCompatibleWith(final Compatibility compatibility) {
-            return compatibleWith.contains(compatibility);
-        }
-
-        public boolean hasGraphSONCompatibility() {
-            return compatibleWith.stream().anyMatch(c -> c instanceof GraphSONCompatibility);
-        }
-
-        public boolean hasGraphBinaryCompatibility() {
-            return compatibleWith.stream().anyMatch(c -> c instanceof GraphBinaryCompatibility);
-        }
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibility.java
deleted file mode 100644
index 19a8797..0000000
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibility.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphbinary;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public enum GraphBinaryCompatibility implements Compatibility {
-    V1_3_4_3("3.4.3", "1.0", "v1"),
-    V1_3_4_4("3.4.4", "1.0", "v1"),
-    V1_3_4_5("3.4.5", "1.0", "v1"),
-    V1_3_4_6("3.4.6", "1.0", "v1"),
-    V1_3_4_7("3.4.7", "1.0", "v1"),
-    V1_3_4_8("3.4.8", "1.0", "v1"),
-    V1_3_4_9("3.4.9", "1.0", "v1"),
-    V1_3_4_10("3.4.10", "1.0", "v1"),
-    V1_3_4_11("3.4.11", "1.0", "v1"),
-    V1_3_4_12("3.4.12", "1.0", "v1"),
-    V1_3_4_13("3.4.13", "1.0", "v1"),
-
-    V1_3_5_0("3.5.0", "1.0", "v1"),
-    V1_3_5_1("3.5.1", "1.0", "v1"),
-    V1_3_5_2("3.5.2", "1.0", "v1"),
-    V1_3_5_3("3.5.3", "1.0", "v1"),
-    V1_3_5_4("3.5.4", "1.0", "v1"),
-    V1_3_5_5("3.5.5", "1.0", "v1"),
-    V1_3_5_6("3.5.6", "1.0", "v1"),
-    V1_3_5_7("3.5.7", "1.0", "v1"),
-
-    V1_3_6_0("3.6.0", "1.0", "v1"),
-    V1_3_6_1("3.6.1", "1.0", "v1"),
-    V1_3_6_2("3.6.2", "1.0", "v1"),
-    V1_3_6_3("3.6.3", "1.0", "v1"),
-    V1_3_6_4("3.6.4", "1.0", "v1");
-
-    private static final String SEP = File.separator;
-
-    private final String graphBinaryVersion;
-    private final String tinkerpopVersion;
-    private final String configuration;
-
-    GraphBinaryCompatibility(final String tinkerpopVersion, final String graphBinaryVersion, final String configuration) {
-        this.tinkerpopVersion = tinkerpopVersion;
-        this.graphBinaryVersion = graphBinaryVersion;
-        this.configuration = configuration;
-    }
-
-    @Override
-    public byte[] readFromResource(final String resource) throws IOException {
-        final String testResource = "_" + tinkerpopVersion.replace(".", "_") + SEP + resource + "-" + configuration + ".gbin";
-        return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
-    }
-
-    @Override
-    public String getReleaseVersion() {
-        return tinkerpopVersion;
-    }
-
-    @Override
-    public String getVersion() {
-        return graphBinaryVersion;
-    }
-
-    @Override
-    public String getConfiguration() {
-        return configuration;
-    }
-
-    @Override
-    public String toString() {
-        return tinkerpopVersion + "-" + configuration;
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
deleted file mode 100644
index 170eeec..0000000
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public enum GraphSONCompatibility implements Compatibility {
-    V1D0_3_2_3("3.2.3", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_3("3.2.3", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_3("3.2.3", "2.0", "v2d0-no-types"),
-    V1D0_3_2_4("3.2.4", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_4("3.2.4", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_4("3.2.4", "2.0", "v2d0-no-types"),
-    V1D0_3_2_5("3.2.5", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_5("3.2.5", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_5("3.2.5", "2.0", "v2d0-no-types"),
-    V1D0_3_2_6("3.2.6", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_6("3.2.6", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_6("3.2.6", "2.0", "v2d0-no-types"),
-    V1D0_3_2_7("3.2.7", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_7("3.2.7", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_7("3.2.7", "2.0", "v2d0-no-types"),
-    V1D0_3_2_8("3.2.8", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_8("3.2.8", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_8("3.2.8", "2.0", "v2d0-no-types"),
-    V1D0_3_2_9("3.2.9", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_9("3.2.9", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_9("3.2.9", "2.0", "v2d0-no-types"),
-    V1D0_3_2_10("3.2.10", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_2_10("3.2.10", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_2_10("3.2.10", "2.0", "v2d0-no-types"),
-    V1D0_3_3_0("3.3.0", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_0("3.3.0", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_0("3.3.0", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_0("3.3.0", "3.0", "v3d0"),
-    V1D0_3_3_1("3.3.1", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_1("3.3.1", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_1("3.3.1", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_1("3.3.1", "3.0", "v3d0"),
-    V1D0_3_3_2("3.3.2", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_2("3.3.2", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_2("3.3.2", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_2("3.3.2", "3.0", "v3d0"),
-    V1D0_3_3_3("3.3.3", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_3("3.3.3", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_3("3.3.3", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_3("3.3.3", "3.0", "v3d0"),
-    V1D0_3_3_4("3.3.4", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_4("3.3.4", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_4("3.3.4", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_4("3.3.4", "3.0", "v3d0"),
-    V1D0_3_3_5("3.3.5", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_5("3.3.5", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_5("3.3.5", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_5("3.3.5", "3.0", "v3d0"),
-    V1D0_3_3_6("3.3.6", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_6("3.3.6", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_6("3.3.6", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_6("3.3.6", "3.0", "v3d0"),
-    V1D0_3_3_7("3.3.7", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_7("3.3.7", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_7("3.3.7", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_7("3.3.7", "3.0", "v3d0"),
-    V1D0_3_3_8("3.3.8", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_8("3.3.8", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_8("3.3.8", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_8("3.3.8", "3.0", "v3d0"),
-    V1D0_3_3_9("3.3.9", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_9("3.3.9", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_9("3.3.9", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_9("3.3.9", "3.0", "v3d0"),
-    V1D0_3_3_10("3.3.10", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_10("3.3.10", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_10("3.3.10", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_10("3.3.10", "3.0", "v3d0"),
-    V1D0_3_3_11("3.3.11", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_3_11("3.3.11", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_3_11("3.3.11", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_3_11("3.3.11", "3.0", "v3d0"),
-    V1D0_3_4_0("3.4.0", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_0("3.4.0", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_0("3.4.0", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_0("3.4.0", "3.0", "v3d0"),
-    V1D0_3_4_1("3.4.1", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_1("3.4.1", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_1("3.4.1", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_1("3.4.1", "3.0", "v3d0"),
-    V1D0_3_4_2("3.4.2", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_2("3.4.2", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_2("3.4.2", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_2("3.4.2", "3.0", "v3d0"),
-    V1D0_3_4_3("3.4.3", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_3("3.4.3", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_3("3.4.3", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_3("3.4.3", "3.0", "v3d0"),
-    V1D0_3_4_4("3.4.4", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_4("3.4.4", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_4("3.4.4", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_4("3.4.4", "3.0", "v3d0"),
-    V1D0_3_4_5("3.4.5", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_5("3.4.5", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_5("3.4.5", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_5("3.4.5", "3.0", "v3d0"),
-    V1D0_3_4_6("3.4.6", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_6("3.4.6", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_6("3.4.6", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_6("3.4.6", "3.0", "v3d0"),
-    V1D0_3_4_7("3.4.7", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_7("3.4.7", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_7("3.4.7", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_7("3.4.7", "3.0", "v3d0"),
-    V1D0_3_4_8("3.4.8", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_8("3.4.8", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_8("3.4.8", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_8("3.4.8", "3.0", "v3d0"),
-    V1D0_3_4_9("3.4.9", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_9("3.4.9", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_9("3.4.9", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_9("3.4.9", "3.0", "v3d0"),
-    V1D0_3_4_10("3.4.10", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_10("3.4.10", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_10("3.4.10", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_10("3.4.10", "3.0", "v3d0"),
-    V1D0_3_4_11("3.4.11", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_11("3.4.11", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_11("3.4.11", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_11("3.4.11", "3.0", "v3d0"),
-    V1D0_3_4_12("3.4.12", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_12("3.4.12", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_12("3.4.12", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_12("3.4.12", "3.0", "v3d0"),
-    V1D0_3_4_13("3.4.13", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_4_13("3.4.13", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_4_13("3.4.13", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_4_13("3.4.13", "3.0", "v3d0"),
-
-    V1D0_3_5_0("3.5.0", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_0("3.5.0", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_0("3.5.0", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_0("3.5.0", "3.0", "v3d0"),
-    V1D0_3_5_1("3.5.1", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_1("3.5.1", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_1("3.5.1", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_1("3.5.1", "3.0", "v3d0"),
-    V1D0_3_5_2("3.5.2", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_2("3.5.2", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_2("3.5.2", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_2("3.5.2", "3.0", "v3d0"),
-    V1D0_3_5_3("3.5.3", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_3("3.5.3", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_3("3.5.3", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_3("3.5.3", "3.0", "v3d0"),
-    V1D0_3_5_4("3.5.4", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_4("3.5.4", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_4("3.5.4", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_4("3.5.4", "3.0", "v3d0"),
-    V1D0_3_5_5("3.5.5", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_5("3.5.5", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_5("3.5.5", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_5("3.5.5", "3.0", "v3d0"),
-    V1D0_3_5_6("3.5.6", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_6("3.5.6", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_6("3.5.6", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_6("3.5.6", "3.0", "v3d0"),
-    V1D0_3_5_7("3.5.7", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_5_7("3.5.7", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_5_7("3.5.7", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_5_7("3.5.7", "3.0", "v3d0"),
-
-    V1D0_3_6_0("3.6.0", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_6_0("3.6.0", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_6_0("3.6.0", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_6_0("3.6.0", "3.0", "v3d0"),
-    V1D0_3_6_1("3.6.1", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_6_1("3.6.1", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_6_1("3.6.1", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_6_1("3.6.1", "3.0", "v3d0"),
-    V1D0_3_6_2("3.6.2", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_6_2("3.6.2", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_6_2("3.6.2", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_6_2("3.6.2", "3.0", "v3d0"),
-    V1D0_3_6_3("3.6.3", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_6_3("3.6.3", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_6_3("3.6.3", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_6_3("3.6.3", "3.0", "v3d0"),
-    V1D0_3_6_4("3.6.4", "1.0", "v1d0"),
-    V2D0_PARTIAL_3_6_4("3.6.4", "2.0", "v2d0-partial"),
-    V2D0_NO_TYPE_3_6_4("3.6.4", "2.0", "v2d0-no-types"),
-    V3D0_PARTIAL_3_6_4("3.6.4", "3.0", "v3d0");
-
-    private static final String SEP = File.separator;
-
-    private final String graphSONVersion;
-    private final String tinkerpopVersion;
-    private final String configuration;
-
-    GraphSONCompatibility(final String tinkerpopVersion, final String graphSONVersion, final String configuration) {
-        this.tinkerpopVersion = tinkerpopVersion;
-        this.configuration = configuration;
-        this.graphSONVersion = graphSONVersion;
-    }
-
-    public byte[] readFromResource(final String resource) throws IOException {
-        final String testResource = "_" + tinkerpopVersion.replace(".", "_") + SEP + resource + "-" + configuration + ".json";
-        return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
-    }
-
-    @Override
-    public String getReleaseVersion() {
-        return tinkerpopVersion;
-    }
-
-    @Override
-    public String getVersion() {
-        return graphSONVersion;
-    }
-
-    @Override
-    public String getConfiguration() {
-        return configuration;
-    }
-
-    @Override
-    public String toString() {
-        return tinkerpopVersion + "-" + configuration;
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
deleted file mode 100644
index b3c2266..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io;
-
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphbinary.GraphBinaryCompatibility;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.util.Iterator;
-import java.util.List;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeThat;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractCompatibilityTest {
-    protected final Model model = Model.instance();
-
-    public abstract Compatibility getCompatibility();
-
-    protected void assumeCompatibility(final String resource) {
-        final Model.Entry e = model.find(resource).orElseThrow(() -> new IllegalStateException("Could not find model"));
-        assumeThat("Test model is not compatible with IO - see comments in Model for details", e.isCompatibleWith(getCompatibility()), is(true));
-    }
-
-    protected <T> T findModelEntryObject(final String resourceName) {
-        return model.find(resourceName).orElseThrow(() -> new IllegalStateException("Could not find requested model entry")).getObject();
-    }
-
-    protected void assertVertex(final Vertex expected, final Vertex actual) {
-        assertEquals(expected.id(), actual.id());
-        assertEquals(expected.label(), actual.label());
-
-        if (!(getCompatibility() instanceof GraphBinaryCompatibility)) {
-            assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
-            for (String k : expected.keys()) {
-                final Iterator<VertexProperty<Object>> expectedVps = expected.properties(k);
-                final List<VertexProperty<Object>> actualVps = IteratorUtils.list(actual.properties(k));
-                while (expectedVps.hasNext()) {
-                    final VertexProperty expectedVp = expectedVps.next();
-                    final VertexProperty<Object> found = actualVps.stream()
-                            .filter(vp -> vp.id().equals(expectedVp.id()))
-                            .findFirst()
-                            .orElseThrow(() -> new RuntimeException("Could not find VertexProperty for " + expectedVp.id()));
-                    assertVertexProperty(expectedVp, found);
-                }
-            }
-        }
-    }
-
-    protected void assertEdge(final Edge expected, final Edge actual) {
-        assertEquals(expected.id(), actual.id());
-        assertEquals(expected.label(), actual.label());
-        assertEquals(expected.inVertex().id(), actual.inVertex().id());
-        assertEquals(expected.outVertex().id(), actual.outVertex().id());
-        assertEquals(expected.inVertex().label(), actual.inVertex().label());
-        assertEquals(expected.outVertex().label(), actual.outVertex().label());
-        if (!(getCompatibility() instanceof GraphBinaryCompatibility)) {
-            assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
-            final Iterator<Property<Object>> itty = expected.properties();
-            while(itty.hasNext()) {
-                final Property p = itty.next();
-                assertProperty(p, actual.property(p.key()));
-            }
-        }
-    }
-
-    protected void assertVertexProperty(final VertexProperty expected, final VertexProperty actual) {
-        assertEquals(expected.id(), actual.id());
-        assertEquals(expected.label(), actual.label());
-
-        if (!(getCompatibility() instanceof GraphBinaryCompatibility)) {
-            assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
-            final Iterator<Property> itty = expected.properties();
-            while (itty.hasNext()) {
-                final Property p = itty.next();
-                assertProperty(p, actual.property(p.key()));
-            }
-        }
-    }
-
-    protected void assertProperty(final Property expected, final Property actual) {
-        assertEquals(expected.key(), actual.key());
-        assertEquals(expected.value(), actual.value());
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
deleted file mode 100644
index 43cecd9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
+++ /dev/null
@@ -1,1077 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io;
-
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Operator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Pop;
-import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.TextP;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Column;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.function.Lambda;
-import org.junit.Test;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.sql.Timestamp;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibilityTest {
-
-    public abstract <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception;
-
-    public abstract byte[] write(final Object o, final Class<?> clazz) throws Exception;
-
-    @Test
-    public void shouldReadWriteAuthenticationChallenge() throws Exception {
-        final String resourceName = "authenticationchallenge";
-        assumeCompatibility(resourceName);
-
-        final ResponseMessage resource = findModelEntryObject(resourceName);
-        final ResponseMessage fromStatic = read(getCompatibility().readFromResource(resourceName), ResponseMessage.class);
-        final ResponseMessage recycled = read(write(fromStatic, ResponseMessage.class), ResponseMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertResponseMessage(resource, fromStatic, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteAuthenticationResponse() throws Exception {
-        final String resourceName = "authenticationresponse";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final RequestMessage fromStatic = read(getCompatibility().readFromResource(resourceName), RequestMessage.class);
-        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class), RequestMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertRequestMessage(resource, fromStatic, recycled);
-        assertEquals(resource.getArgs().get("saslMechanism"), recycled.getArgs().get("saslMechanism"));
-        assertEquals(resource.getArgs().get("sasl"), recycled.getArgs().get("sasl"));
-        assertEquals(resource.getArgs().get("saslMechanism"), fromStatic.getArgs().get("saslMechanism"));
-        assertEquals(resource.getArgs().get("sasl"), fromStatic.getArgs().get("sasl"));
-    }
-
-    @Test
-    public void shouldReadWriteBarrier() throws Exception {
-        final String resourceName = "barrier";
-        assumeCompatibility(resourceName);
-
-        final SackFunctions.Barrier resource = findModelEntryObject(resourceName);
-        final SackFunctions.Barrier fromStatic = read(getCompatibility().readFromResource(resourceName), SackFunctions.Barrier.class);
-        final SackFunctions.Barrier recycled = read(write(fromStatic, SackFunctions.Barrier.class), SackFunctions.Barrier.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteBigDecimal() throws Exception {
-        final String resourceName = "bigdecimal";
-        assumeCompatibility(resourceName);
-
-        final BigDecimal resource = findModelEntryObject(resourceName);
-        final BigDecimal fromStatic = read(getCompatibility().readFromResource(resourceName), BigDecimal.class);
-        final BigDecimal recycled = read(write(fromStatic, BigDecimal.class), BigDecimal.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteBigInteger() throws Exception {
-        final String resourceName = "biginteger";
-        assumeCompatibility(resourceName);
-
-        final BigInteger resource = findModelEntryObject(resourceName);
-        final BigInteger fromStatic = read(getCompatibility().readFromResource(resourceName), BigInteger.class);
-        final BigInteger recycled = read(write(fromStatic, BigInteger.class), BigInteger.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteBinding() throws Exception {
-        final String resourceName = "binding";
-        assumeCompatibility(resourceName);
-
-        final Bytecode.Binding resource = findModelEntryObject(resourceName);
-        final Bytecode.Binding fromStatic = read(getCompatibility().readFromResource(resourceName), Bytecode.Binding.class);
-        final Bytecode.Binding recycled = read(write(fromStatic, Bytecode.Binding.class), Bytecode.Binding.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteByte() throws Exception {
-        final String resourceName = "byte";
-        assumeCompatibility(resourceName);
-
-        final Byte resource = findModelEntryObject(resourceName);
-        final Byte fromStatic = read(getCompatibility().readFromResource(resourceName), Byte.class);
-        final Byte recycled = read(write(fromStatic, Byte.class), Byte.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteByteBuffer() throws Exception {
-        final String resourceName = "bytebuffer";
-        assumeCompatibility(resourceName);
-
-        final ByteBuffer resource = findModelEntryObject(resourceName);
-        final ByteBuffer fromStatic = read(getCompatibility().readFromResource(resourceName), ByteBuffer.class);
-        // have to re-read because once the bytebuffer is flushed to array it will be emptied
-        final ByteBuffer recycled = read(write(read(getCompatibility().readFromResource(resourceName), ByteBuffer.class), ByteBuffer.class), ByteBuffer.class);
-        assertNotSame(fromStatic, recycled);
-        final byte[] resourceArray = resource.array();
-        final byte[] fromStaticArray = fromStatic.array();
-        final byte[] recycledArray = recycled.array();
-        assertThat(Arrays.equals(fromStaticArray, recycledArray), is(true));
-        assertThat(Arrays.equals(resourceArray, fromStaticArray), is(true));
-        assertThat(Arrays.equals(resourceArray, recycledArray), is(true));
-    }
-
-    @Test
-    public void shouldReadWriteBytecode() throws Exception {
-        final String resourceName = "bytecode";
-        assumeCompatibility(resourceName);
-
-        final Bytecode fromStatic = read(getCompatibility().readFromResource(resourceName), Bytecode.class);
-        final Bytecode recycled = read(write(fromStatic, Bytecode.class), Bytecode.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        // can't reasonably assert the bytecode against the original model as changes to strategies over time might
-        // alter the bytecode form and then break the test. the assertions as they are ensure that the core of
-        // serialization is correct by ensuring the contents of bytecode (whether they are valid for a specific version
-        // or not). it seems beyond the scope of these tests to validate that bytecode itself is unchanging and fully
-        // backward compatible (at least for now).
-    }
-
-    @Test
-    public void shouldReadWriteCardinality() throws Exception {
-        final String resourceName = "cardinality";
-        assumeCompatibility(resourceName);
-
-        final VertexProperty.Cardinality resource = findModelEntryObject(resourceName);
-        final VertexProperty.Cardinality fromStatic = read(getCompatibility().readFromResource(resourceName), VertexProperty.Cardinality.class);
-        final VertexProperty.Cardinality recycled = read(write(fromStatic, VertexProperty.Cardinality.class), VertexProperty.Cardinality.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteChar() throws Exception {
-        final String resourceName = "char";
-        assumeCompatibility(resourceName);
-
-        final Character resource = findModelEntryObject(resourceName);
-        final Character fromStatic = read(getCompatibility().readFromResource(resourceName), Character.class);
-        final Character recycled = read(write(fromStatic, Character.class), Character.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteClass() throws Exception {
-        final String resourceName = "class";
-        assumeCompatibility(resourceName);
-
-        final Class resource = findModelEntryObject(resourceName);
-        final Class fromStatic = read(getCompatibility().readFromResource(resourceName), Class.class);
-        final Class recycled = read(write(fromStatic, Class.class), Class.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteColumn() throws Exception {
-        final String resourceName = "column";
-        assumeCompatibility(resourceName);
-
-        final Column resource = findModelEntryObject(resourceName);
-        final Column fromStatic = read(getCompatibility().readFromResource(resourceName), Column.class);
-        final Column recycled = read(write(fromStatic, Column.class), Column.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteDate() throws Exception {
-        final String resourceName = "date";
-        assumeCompatibility(resourceName);
-
-        final Date resource = findModelEntryObject(resourceName);
-        final Date fromStatic = read(getCompatibility().readFromResource(resourceName), Date.class);
-        final Date recycled = read(write(fromStatic, Date.class), Date.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteDirection() throws Exception {
-        final String resourceName = "direction";
-        assumeCompatibility(resourceName);
-
-        final Direction resource = findModelEntryObject(resourceName);
-        final Direction fromStatic = read(getCompatibility().readFromResource(resourceName), Direction.class);
-        final Direction recycled = read(write(fromStatic, Direction.class), Direction.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteDouble() throws Exception {
-        final String resourceName = "double";
-        assumeCompatibility(resourceName);
-
-        final Double resource = findModelEntryObject(resourceName);
-        final Double fromStatic = read(getCompatibility().readFromResource(resourceName), Double.class);
-        final Double recycled = read(write(fromStatic, Double.class), Double.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteDuration() throws Exception {
-        final String resourceName = "duration";
-        assumeCompatibility(resourceName);
-
-        final Duration resource = findModelEntryObject(resourceName);
-        final Duration fromStatic = read(getCompatibility().readFromResource(resourceName), Duration.class);
-        final Duration recycled = read(write(fromStatic, Duration.class), Duration.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteEdge() throws Exception {
-        final String resourceName = "edge";
-        assumeCompatibility(resourceName);
-
-        final Edge resource = findModelEntryObject(resourceName);
-        final Edge fromStatic = read(getCompatibility().readFromResource(resourceName), Edge.class);
-        final Edge recycled = (Edge) read(write(fromStatic, Edge.class), getCompatibility().resolve(Edge.class));
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-        assertEdge(resource, fromStatic);
-        assertEdge(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteFloat() throws Exception {
-        final String resourceName = "float";
-        assumeCompatibility(resourceName);
-
-        final Float resource = findModelEntryObject(resourceName);
-        final Float fromStatic = read(getCompatibility().readFromResource(resourceName), Float.class);
-        final Float recycled = read(write(fromStatic, Float.class), Float.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteINetAddress() throws Exception {
-        final String resourceName = "inetaddress";
-        assumeCompatibility(resourceName);
-
-        final InetAddress resource = findModelEntryObject(resourceName);
-        final InetAddress fromStatic = read(getCompatibility().readFromResource(resourceName), InetAddress.class);
-        final InetAddress recycled = read(write(fromStatic, Float.class), InetAddress.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteInstant() throws Exception {
-        final String resourceName = "instant";
-        assumeCompatibility(resourceName);
-
-        final Instant resource = findModelEntryObject(resourceName);
-        final Instant fromStatic = read(getCompatibility().readFromResource(resourceName), Instant.class);
-        final Instant recycled = read(write(fromStatic, Instant.class), Instant.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteInteger() throws Exception {
-        final String resourceName = "integer";
-        assumeCompatibility(resourceName);
-
-        final Integer resource = findModelEntryObject(resourceName);
-        final Integer fromStatic = read(getCompatibility().readFromResource(resourceName), Integer.class);
-        final Integer recycled = read(write(fromStatic, Integer.class), Integer.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteLambda() throws Exception {
-        final String resourceName = "lambda";
-        assumeCompatibility(resourceName);
-
-        final Lambda resource = findModelEntryObject(resourceName);
-        final Lambda fromStatic = read(getCompatibility().readFromResource(resourceName), Lambda.class);
-        final Lambda recycled = read(write(fromStatic, Lambda.class), Lambda.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteLocalDate() throws Exception {
-        final String resourceName = "localdate";
-        assumeCompatibility(resourceName);
-
-        final LocalDate resource = findModelEntryObject(resourceName);
-        final LocalDate fromStatic = read(getCompatibility().readFromResource(resourceName), LocalDate.class);
-        final LocalDate recycled = read(write(fromStatic, LocalDate.class), LocalDate.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteLocalDateTime() throws Exception {
-        final String resourceName = "localdatetime";
-        assumeCompatibility(resourceName);
-
-        final LocalDateTime resource = findModelEntryObject(resourceName);
-        final LocalDateTime fromStatic = read(getCompatibility().readFromResource(resourceName), LocalDateTime.class);
-        final LocalDateTime recycled = read(write(fromStatic, LocalDateTime.class), LocalDateTime.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteLocalTime() throws Exception {
-        final String resourceName = "localtime";
-        assumeCompatibility(resourceName);
-
-        final LocalTime resource = findModelEntryObject(resourceName);
-        final LocalTime fromStatic = read(getCompatibility().readFromResource(resourceName), LocalTime.class);
-        final LocalTime recycled = read(write(fromStatic, LocalTime.class), LocalTime.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteLong() throws Exception {
-        final String resourceName = "long";
-        assumeCompatibility(resourceName);
-
-        final Long resource = findModelEntryObject(resourceName);
-        final Long fromStatic = read(getCompatibility().readFromResource(resourceName), Long.class);
-        final Long recycled = read(write(fromStatic, Long.class), Long.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteList() throws Exception {
-        final String resourceName = "list";
-        assumeCompatibility(resourceName);
-
-        final List resource = findModelEntryObject(resourceName);
-        final List fromStatic = read(getCompatibility().readFromResource(resourceName), List.class);
-        final List recycled = read(write(fromStatic, List.class), List.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteMap() throws Exception {
-        final String resourceName = "map";
-        assumeCompatibility(resourceName);
-
-        final Map resource = findModelEntryObject(resourceName);
-        final Map fromStatic = read(getCompatibility().readFromResource(resourceName), Map.class);
-        final Map recycled = read(write(fromStatic, Map.class), Map.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteMetrics() throws Exception {
-        final String resourceName = "metrics";
-        assumeCompatibility(resourceName);
-
-        final Metrics fromStatic = (Metrics) read(getCompatibility().readFromResource(resourceName), getCompatibility().resolve(Metrics.class));
-        final Metrics recycled = (Metrics) read(write(fromStatic, Metrics.class), getCompatibility().resolve(Metrics.class));
-        assertNotSame(fromStatic, recycled);
-        // have to do compares on the object read from resources because it has statically calculated values. the
-        // "new" one from Model is generated dynamically from a traversal and thus has variations in properties that
-        // are based on time
-        assertEquals(fromStatic.getAnnotations(), recycled.getAnnotations());
-        assertEquals(fromStatic.getCounts(), recycled.getCounts());
-        assertEquals(fromStatic.getDuration(TimeUnit.MILLISECONDS), recycled.getDuration(TimeUnit.MILLISECONDS));
-    }
-
-    @Test
-    public void shouldReadWriteMonthDay() throws Exception {
-        final String resourceName = "monthday";
-        assumeCompatibility(resourceName);
-
-        final MonthDay resource = findModelEntryObject(resourceName);
-        final MonthDay fromStatic = read(getCompatibility().readFromResource(resourceName), MonthDay.class);
-        final MonthDay recycled = read(write(fromStatic, MonthDay.class), MonthDay.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteOffsetDateTime() throws Exception {
-        final String resourceName = "offsetdatetime";
-        assumeCompatibility(resourceName);
-
-        final OffsetDateTime resource = findModelEntryObject(resourceName);
-        final OffsetDateTime fromStatic = read(getCompatibility().readFromResource(resourceName), OffsetDateTime.class);
-        final OffsetDateTime recycled = read(write(fromStatic, OffsetDateTime.class), OffsetDateTime.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteOffsetTime() throws Exception {
-        final String resourceName = "offsettime";
-        assumeCompatibility(resourceName);
-
-        final OffsetTime resource = findModelEntryObject(resourceName);
-        final OffsetTime fromStatic = read(getCompatibility().readFromResource(resourceName), OffsetTime.class);
-        final OffsetTime recycled = read(write(fromStatic, OffsetTime.class), OffsetTime.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteOperator() throws Exception {
-        final String resourceName = "operator";
-        assumeCompatibility(resourceName);
-
-        final Operator resource = findModelEntryObject(resourceName);
-        final Operator fromStatic = read(getCompatibility().readFromResource(resourceName), Operator.class);
-        final Operator recycled = read(write(fromStatic, Operator.class), Operator.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteOrder() throws Exception {
-        final String resourceName = "order";
-        assumeCompatibility(resourceName);
-
-        final Order resource = findModelEntryObject(resourceName);
-        final Order fromStatic = read(getCompatibility().readFromResource(resourceName), Order.class);
-        final Order recycled = read(write(fromStatic, Order.class), Order.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteP() throws Exception {
-        final String resourceName = "p";
-        assumeCompatibility(resourceName);
-
-        final P resource = findModelEntryObject(resourceName);
-        final P fromStatic = read(getCompatibility().readFromResource(resourceName), P.class);
-        final P recycled = read(write(fromStatic, P.class), P.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWritePAnd() throws Exception {
-        final String resourceName = "pand";
-        assumeCompatibility(resourceName);
-
-        final P resource = findModelEntryObject(resourceName);
-        final P fromStatic = read(getCompatibility().readFromResource(resourceName), P.class);
-        final P recycled = read(write(fromStatic, P.class), P.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWritePath() throws Exception {
-        final String resourceName = "path";
-        assumeCompatibility(resourceName);
-
-        final Path resource = findModelEntryObject(resourceName);
-        final Path fromStatic = read(getCompatibility().readFromResource(resourceName), Path.class);
-        final Path recycled = (Path) read(write(fromStatic, Path.class), getCompatibility().resolve(Path.class));
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWritePeriod() throws Exception {
-        final String resourceName = "period";
-        assumeCompatibility(resourceName);
-
-        final Period resource = findModelEntryObject(resourceName);
-        final Period fromStatic = read(getCompatibility().readFromResource(resourceName), Period.class);
-        final Period recycled = read(write(fromStatic, Period.class), Period.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWritePop() throws Exception {
-        final String resourceName = "pop";
-        assumeCompatibility(resourceName);
-
-        final Pop resource = findModelEntryObject(resourceName);
-        final Pop fromStatic = read(getCompatibility().readFromResource(resourceName), Pop.class);
-        final Pop recycled = read(write(fromStatic, Pop.class), Pop.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWritePOr() throws Exception {
-        final String resourceName = "por";
-        assumeCompatibility(resourceName);
-
-        final P resource = findModelEntryObject(resourceName);
-        final P fromStatic = read(getCompatibility().readFromResource(resourceName), P.class);
-        final P recycled = read(write(fromStatic, P.class), P.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteProperty() throws Exception {
-        final String resourceName = "property";
-        assumeCompatibility(resourceName);
-
-        final Property resource = findModelEntryObject(resourceName);
-        final Property fromStatic = read(getCompatibility().readFromResource(resourceName), Property.class);
-        final Property recycled = (Property) read(write(fromStatic, Property.class), getCompatibility().resolve(Property.class));
-        assertNotSame(fromStatic, recycled);
-        assertProperty(resource, fromStatic);
-        assertProperty(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteScope() throws Exception {
-        final String resourceName = "scope";
-        assumeCompatibility(resourceName);
-
-        final Scope resource = findModelEntryObject(resourceName);
-        final Scope fromStatic = read(getCompatibility().readFromResource(resourceName), Scope.class);
-        final Scope recycled = read(write(fromStatic, Scope.class), Scope.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteSessionClose() throws Exception {
-        final String resourceName = "sessionclose";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final RequestMessage fromStatic = read(getCompatibility().readFromResource(resourceName), RequestMessage.class);
-        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class), RequestMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertRequestMessage(resource, fromStatic, recycled);
-        assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
-        assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionEval() throws Exception {
-        final String resourceName = "sessioneval";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final RequestMessage fromStatic = read(getCompatibility().readFromResource(resourceName), RequestMessage.class);
-        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class), RequestMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertRequestMessage(resource, fromStatic, recycled);
-        assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
-        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
-        assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
-        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionEvalAliased() throws Exception {
-        final String resourceName = "sessionevalaliased";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final RequestMessage fromStatic = read(getCompatibility().readFromResource(resourceName), RequestMessage.class);
-        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class), RequestMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertRequestMessage(resource, fromStatic, recycled);
-        assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
-        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) recycled.getArgs().get("aliases")).get("g"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
-        assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
-        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) fromStatic.getArgs().get("aliases")).get("g"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionlessEval() throws Exception {
-        final String resourceName = "sessionlesseval";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final RequestMessage fromStatic = read(getCompatibility().readFromResource(resourceName), RequestMessage.class);
-        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class), RequestMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertRequestMessage(resource, fromStatic, recycled);
-        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
-        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionlessEvalAliased() throws Exception {
-        final String resourceName = "sessionlessevalaliased";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final RequestMessage fromStatic = read(getCompatibility().readFromResource(resourceName), RequestMessage.class);
-        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class), RequestMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertRequestMessage(resource, fromStatic, recycled);
-        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) recycled.getArgs().get("aliases")).get("g"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
-        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
-        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
-        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) fromStatic.getArgs().get("aliases")).get("g"));
-        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
-    }
-
-    @Test
-    public void shouldReadWriteSet() throws Exception {
-        final String resourceName = "set";
-        assumeCompatibility(resourceName);
-
-        final Set resource = findModelEntryObject(resourceName);
-        final Set fromStatic = read(getCompatibility().readFromResource(resourceName), Set.class);
-        final Set recycled = read(write(fromStatic, Set.class), Set.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteShort() throws Exception {
-        final String resourceName = "short";
-        assumeCompatibility(resourceName);
-
-        final Short resource = findModelEntryObject(resourceName);
-        final Short fromStatic = read(getCompatibility().readFromResource(resourceName), Short.class);
-        final Short recycled = read(write(fromStatic, Short.class), Short.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteStandardResult() throws Exception {
-        final String resourceName = "standardresult";
-        assumeCompatibility(resourceName);
-
-        final ResponseMessage resource = findModelEntryObject(resourceName);
-        final ResponseMessage fromStatic = read(getCompatibility().readFromResource(resourceName), ResponseMessage.class);
-        final ResponseMessage recycled = read(write(fromStatic, HashMap.class), ResponseMessage.class);
-        assertNotSame(fromStatic, recycled);
-        assertResponseMessage(resource, fromStatic, recycled);
-    }
-
-    @Test
-    @org.junit.Ignore("No serializers now that Gryo is gone")
-    public void shouldReadWriteStarGraph() throws Exception {
-        final String resourceName = "stargraph";
-        assumeCompatibility(resourceName);
-
-        final StarGraph resource = findModelEntryObject(resourceName);
-        final StarGraph fromStatic = read(getCompatibility().readFromResource(resourceName), StarGraph.class);
-        final StarGraph recycled = read(write(fromStatic, StarGraph.class), StarGraph.class);
-        assertNotSame(fromStatic.getStarVertex(), recycled.getStarVertex());
-        assertEquals(fromStatic.getStarVertex(), recycled.getStarVertex());
-        assertEquals(resource.getStarVertex(), fromStatic.getStarVertex());
-        assertEquals(resource.getStarVertex(), recycled.getStarVertex());
-        assertVertex(resource.getStarVertex(), fromStatic.getStarVertex());
-        assertVertex(resource.getStarVertex(), recycled.getStarVertex());
-    }
-
-    @Test
-    public void shouldReadWriteT() throws Exception {
-        final String resourceName = "t";
-        assumeCompatibility(resourceName);
-
-        final T resource = findModelEntryObject(resourceName);
-        final T fromStatic = read(getCompatibility().readFromResource(resourceName), T.class);
-        final T recycled = read(write(fromStatic, T.class), T.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteTextP() throws Exception {
-        final String resourceName = "textp";
-        assumeCompatibility(resourceName);
-
-        final TextP resource = findModelEntryObject(resourceName);
-        final TextP fromStatic = read(getCompatibility().readFromResource(resourceName), TextP.class);
-        final TextP recycled = read(write(fromStatic, TextP.class), TextP.class);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteTimestamp() throws Exception {
-        final String resourceName = "timestamp";
-        assumeCompatibility(resourceName);
-
-        final Timestamp resource = findModelEntryObject(resourceName);
-        final Timestamp fromStatic = read(getCompatibility().readFromResource(resourceName), Timestamp.class);
-        final Timestamp recycled = read(write(fromStatic, Timestamp.class), Timestamp.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteTinkerGraph() throws Exception {
-        final String resourceName = "tinkergraph";
-        assumeCompatibility(resourceName);
-
-        final TinkerGraph fromStatic = read(getCompatibility().readFromResource(resourceName), TinkerGraph.class);
-        final TinkerGraph recycled = read(write(fromStatic, TinkerGraph.class), TinkerGraph.class);
-        assertNotSame(fromStatic, recycled);
-
-        IoTest.assertCrewGraph(fromStatic, false);
-        IoTest.assertCrewGraph(recycled, false);
-    }
-
-    @Test
-    public void shouldReadWriteTraversalMetrics() throws Exception {
-        final String resourceName = "traversalmetrics";
-        assumeCompatibility(resourceName);
-
-        final TraversalMetrics resource = findModelEntryObject(resourceName);
-        final TraversalMetrics fromStatic = (TraversalMetrics) read(getCompatibility().readFromResource(resourceName), getCompatibility().resolve(TraversalMetrics.class));
-        final TraversalMetrics recycled = (TraversalMetrics) read(write(fromStatic, TraversalMetrics.class), getCompatibility().resolve(TraversalMetrics.class));
-        assertNotSame(fromStatic, recycled);
-
-        // need to assert against each other since the model version can change between test runs as it is dynamically
-        // generated
-        assertEquals(recycled.getDuration(TimeUnit.MILLISECONDS), fromStatic.getDuration(TimeUnit.MILLISECONDS));
-        final Collection<? extends Metrics> resourceMetrics = resource.getMetrics();
-        resourceMetrics.forEach(m -> {
-            assertEquals(recycled.getMetrics(m.getId()).getAnnotations(), fromStatic.getMetrics(m.getId()).getAnnotations());
-            assertEquals(recycled.getMetrics(m.getId()).getName(), fromStatic.getMetrics(m.getId()).getName());
-            assertEquals(recycled.getMetrics(m.getId()).getCounts(), fromStatic.getMetrics(m.getId()).getCounts());
-        });
-    }
-
-    @Test
-    public void shouldReadWriteTraverser() throws Exception {
-        final String resourceName = "traverser";
-        assumeCompatibility(resourceName);
-
-        final Traverser resource = findModelEntryObject(resourceName);
-        final Traverser fromStatic = (Traverser) read(getCompatibility().readFromResource(resourceName), getCompatibility().resolve(Traverser.class));
-        final Traverser recycled = (Traverser) read(write(fromStatic, Traverser.class), getCompatibility().resolve(Traverser.class));
-        assertNotSame(fromStatic, recycled);
-        assertEquals(resource.bulk(), recycled.bulk());
-        assertEquals(resource.bulk(), fromStatic.bulk());
-        assertEquals(resource.get(), recycled.get());
-        assertEquals(resource.get(), fromStatic.get());
-        assertVertex((Vertex) resource.get(), (Vertex) recycled.get());
-        assertVertex((Vertex) resource.get(), (Vertex) fromStatic.get());
-    }
-
-    @Test
-    @org.junit.Ignore("No serializers now that Gryo is gone")
-    public void shouldReadWriteTree() throws Exception {
-        final String resourceName = "tree";
-        assumeCompatibility(resourceName);
-
-        final Tree resource = findModelEntryObject(resourceName);
-        final Tree fromStatic = read(getCompatibility().readFromResource(resourceName), Tree.class);
-        final Tree recycled = read(write(fromStatic, Tree.class), Tree.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(resource.size(), fromStatic.size());
-        assertVertex((Vertex) resource.keySet().iterator().next(), (Vertex) fromStatic.keySet().iterator().next());
-        assertEquals(resource.getLeafObjects().size(), fromStatic.getLeafObjects().size());
-        assertVertex((Vertex) resource.getLeafObjects().get(0), (Vertex) fromStatic.getLeafObjects().get(0));
-        assertEquals(resource.getObjectsAtDepth(1).size(), fromStatic.getObjectsAtDepth(1).size());
-        assertVertex((Vertex) resource.getObjectsAtDepth(1).get(0), (Vertex) fromStatic.getObjectsAtDepth(1).get(0));
-        assertEquals(resource.size(), recycled.size());
-        assertVertex((Vertex) resource.keySet().iterator().next(), (Vertex) recycled.keySet().iterator().next());
-        assertEquals(resource.getLeafObjects().size(), recycled.getLeafObjects().size());
-        assertVertex((Vertex) resource.getLeafObjects().get(0), (Vertex) recycled.getLeafObjects().get(0));
-        assertEquals(resource.getObjectsAtDepth(1).size(), recycled.getObjectsAtDepth(1).size());
-        assertVertex((Vertex) resource.getObjectsAtDepth(1).get(0), (Vertex) recycled.getObjectsAtDepth(1).get(0));
-    }
-
-    @Test
-    public void shouldReadWriteUUID() throws Exception {
-        final String resourceName = "uuid";
-        assumeCompatibility(resourceName);
-
-        final UUID resource = findModelEntryObject(resourceName);
-        final UUID fromStatic = read(getCompatibility().readFromResource(resourceName), UUID.class);
-        final UUID recycled = read(write(fromStatic, UUID.class), UUID.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteVertex() throws Exception {
-        final String resourceName = "vertex";
-        assumeCompatibility(resourceName);
-
-        final Vertex resource = findModelEntryObject(resourceName);
-        final Vertex fromStatic = read(getCompatibility().readFromResource(resourceName), Vertex.class);
-        final Vertex recycled = (Vertex) read(write(fromStatic, Vertex.class), getCompatibility().resolve(Vertex.class));
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-        assertVertex(resource, fromStatic);
-        assertVertex(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteVertexProperty() throws Exception {
-        final String resourceName = "vertexproperty";
-        assumeCompatibility(resourceName);
-
-        final VertexProperty resource = findModelEntryObject(resourceName);
-        final VertexProperty fromStatic = read(getCompatibility().readFromResource(resourceName), VertexProperty.class);
-        final VertexProperty recycled = (VertexProperty) read(write(fromStatic, VertexProperty.class), getCompatibility().resolve(VertexProperty.class));
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-        assertVertexProperty(resource, recycled);
-        assertVertexProperty(resource, fromStatic);
-    }
-
-    @Test
-    public void shouldReadWriteYear() throws Exception {
-        final String resourceName = "year";
-        assumeCompatibility(resourceName);
-
-        final Year resource = findModelEntryObject(resourceName);
-        final Year fromStatic = read(getCompatibility().readFromResource(resourceName), Year.class);
-        final Year recycled = read(write(fromStatic, Year.class), Year.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteYearMonth() throws Exception {
-        final String resourceName = "yearmonth";
-        assumeCompatibility(resourceName);
-
-        final YearMonth resource = findModelEntryObject(resourceName);
-        final YearMonth fromStatic = read(getCompatibility().readFromResource(resourceName), YearMonth.class);
-        final YearMonth recycled = read(write(fromStatic, YearMonth.class), YearMonth.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteZoneDateTime() throws Exception {
-        final String resourceName = "zoneddatetime";
-        assumeCompatibility(resourceName);
-
-        final ZonedDateTime resource = findModelEntryObject(resourceName);
-        final ZonedDateTime fromStatic = read(getCompatibility().readFromResource(resourceName), ZonedDateTime.class);
-        final ZonedDateTime recycled = read(write(fromStatic, ZonedDateTime.class), ZonedDateTime.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    @Test
-    public void shouldReadWriteZoneOffset() throws Exception {
-        final String resourceName = "zoneoffset";
-        assumeCompatibility(resourceName);
-
-        final ZoneOffset resource = findModelEntryObject(resourceName);
-        final ZoneOffset fromStatic = read(getCompatibility().readFromResource(resourceName), ZoneOffset.class);
-        final ZoneOffset recycled = read(write(fromStatic, ZoneOffset.class), ZoneOffset.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource, fromStatic);
-        assertEquals(resource, recycled);
-    }
-
-    private static void assertResponseMessage(final ResponseMessage resource, final ResponseMessage fromStatic,
-                                              final ResponseMessage recycled) {
-        assertEquals(resource.getRequestId(), recycled.getRequestId());
-        assertEquals(resource.getStatus().getCode().getValue(), recycled.getStatus().getCode().getValue());
-        assertEquals(resource.getStatus().getMessage(), recycled.getStatus().getMessage());
-        assertEquals(resource.getStatus().getAttributes(), recycled.getStatus().getAttributes());
-        assertEquals(resource.getResult().getData(), recycled.getResult().getData());
-        assertEquals(resource.getResult().getMeta(), recycled.getResult().getMeta());
-        assertEquals(resource.getStatus().getMessage(), recycled.getStatus().getMessage());
-        assertEquals(resource.getRequestId(), fromStatic.getRequestId());
-        assertEquals(resource.getStatus().getCode().getValue(), fromStatic.getStatus().getCode().getValue());
-        assertEquals(resource.getStatus().getMessage(), fromStatic.getStatus().getMessage());
-        assertEquals(resource.getStatus().getAttributes(), fromStatic.getStatus().getAttributes());
-        assertEquals(resource.getResult().getData(), fromStatic.getResult().getData());
-        assertEquals(resource.getResult().getMeta(), fromStatic.getResult().getMeta());
-        assertEquals(resource.getStatus().getMessage(), fromStatic.getStatus().getMessage());
-    }
-
-    private static void assertRequestMessage(final RequestMessage resource, final RequestMessage fromStatic,
-                                             final RequestMessage recycled) {
-        assertEquals(resource.getRequestId(), recycled.getRequestId());
-        assertEquals(resource.getOp(), recycled.getOp());
-        assertEquals(resource.getProcessor(), recycled.getProcessor());
-        assertEquals(resource.getArgs(), recycled.getArgs());
-        assertEquals(resource.getRequestId(), fromStatic.getRequestId());
-        assertEquals(resource.getOp(), fromStatic.getOp());
-        assertEquals(resource.getProcessor(), fromStatic.getProcessor());
-        assertEquals(resource.getArgs(), fromStatic.getArgs());
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
deleted file mode 100644
index 3658c85..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io;
-
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractUntypedCompatibilityTest extends AbstractCompatibilityTest {
-
-    public abstract <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception;
-
-    public abstract byte[] write(final Object o, final Class<?> clazz) throws Exception;
-
-    @Test
-    public void shouldReadWriteAuthenticationChallenge() throws Exception {
-        final String resourceName = "authenticationchallenge";
-        assumeCompatibility(resourceName);
-
-        final ResponseMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, ResponseMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) fromStatic.get("status")).get("code"));
-        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
-        assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) recycled.get("status")).get("code"));
-    }
-
-    @Test
-    public void shouldReadWriteAuthenticationResponse() throws Exception {
-        final String resourceName = "authenticationresponse";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, RequestMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(resource.getOp(), fromStatic.get("op"));
-        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
-        assertEquals(resource.getArgs().get("saslMechanism"), ((Map) fromStatic.get("args")).get("saslMechanism"));
-        assertEquals(resource.getArgs().get("sasl"), ((Map) fromStatic.get("args")).get("sasl"));
-        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
-        assertEquals(resource.getOp(), recycled.get("op"));
-        assertEquals(resource.getProcessor(), recycled.get("processor"));
-        assertEquals(resource.getArgs().get("saslMechanism"), ((Map) recycled.get("args")).get("saslMechanism"));
-        assertEquals(resource.getArgs().get("sasl"), ((Map) recycled.get("args")).get("sasl"));
-    }
-
-    @Test
-    public void shouldReadWriteEdge() throws Exception {
-        final String resourceName = "edge";
-        assumeCompatibility(resourceName);
-
-        final Edge resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, Edge.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(resource.id(), fromStatic.get("id"));
-        assertEquals(resource.label(), fromStatic.get("label"));
-        assertEquals(resource.id(), fromStatic.get("id"));
-        assertEquals(resource.inVertex().label(), fromStatic.get("inVLabel"));
-        assertEquals(resource.outVertex().label(), fromStatic.get("outVLabel"));
-        assertEquals(resource.inVertex().id(), fromStatic.get("inV"));
-        assertEquals(resource.outVertex().id(), fromStatic.get("outV"));
-        assertEquals(resource.id(), recycled.get("id"));
-        assertEquals(resource.label(), recycled.get("label"));
-        assertEquals(resource.id(), recycled.get("id"));
-        assertEquals(resource.inVertex().label(), recycled.get("inVLabel"));
-        assertEquals(resource.outVertex().label(), recycled.get("outVLabel"));
-        assertEquals(resource.inVertex().id(), recycled.get("inV"));
-        assertEquals(resource.outVertex().id(), recycled.get("outV"));
-
-        // deal with incompatibilities
-        if (getCompatibility().getConfiguration().equals("v1d0")) {
-            assertEquals("edge", fromStatic.get("type"));
-            assertEquals(IteratorUtils.count(resource.properties()), ((Map) fromStatic.get("properties")).size());
-            assertEquals(resource.value("since"), ((Map) fromStatic.get("properties")).get("since"));
-            assertEquals("edge", recycled.get("type"));
-            assertEquals(IteratorUtils.count(resource.properties()), ((Map) recycled.get("properties")).size());
-            assertEquals(resource.value("since"), ((Map) recycled.get("properties")).get("since"));
-        } else if (getCompatibility().getConfiguration().contains("no-types")) {
-            assertEquals(IteratorUtils.count(resource.properties()), ((Map) fromStatic.get("properties")).size());
-            assertEquals(resource.keys().iterator().next(), ((Map) ((Map) fromStatic.get("properties")).get("since")).get("key"));
-            assertEquals(resource.value("since"), ((Map) ((Map) fromStatic.get("properties")).get("since")).get("value"));
-            assertEquals(IteratorUtils.count(resource.properties()), ((Map) recycled.get("properties")).size());
-            assertEquals(resource.keys().iterator().next(), ((Map) ((Map) recycled.get("properties")).get("since")).get("key"));
-            assertEquals(resource.value("since"), ((Map) ((Map) recycled.get("properties")).get("since")).get("value"));
-        }
-    }
-
-    @Test
-    public void shouldReadWritePath() throws Exception {
-        final String resourceName = "path";
-        assumeCompatibility(resourceName);
-
-        final Path resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, Path.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(resource.labels().size(), ((List) fromStatic.get("labels")).size());
-        assertEquals(resource.labels().get(0).size(), ((List) ((List) fromStatic.get("labels")).get(0)).size());
-        assertEquals(resource.labels().get(1).size(), ((List) ((List) fromStatic.get("labels")).get(1)).size());
-        assertEquals(resource.labels().get(2).size(), ((List) ((List) fromStatic.get("labels")).get(2)).size());
-        assertEquals(resource.objects().size(), ((List) fromStatic.get("objects")).size());
-        assertEquals(((Vertex) resource.objects().get(0)).id(), ((Map) ((List) fromStatic.get("objects")).get(0)).get("id"));
-        assertEquals(((Vertex) resource.objects().get(0)).label(), ((Map) ((List) fromStatic.get("objects")).get(0)).get("label"));
-        assertEquals(((Vertex) resource.objects().get(1)).id(), ((Map) ((List) fromStatic.get("objects")).get(1)).get("id"));
-        assertEquals(((Vertex) resource.objects().get(1)).label(), ((Map) ((List) fromStatic.get("objects")).get(1)).get("label"));
-        assertEquals(((Vertex) resource.objects().get(2)).id(), ((Map) ((List) fromStatic.get("objects")).get(2)).get("id"));
-        assertEquals(((Vertex) resource.objects().get(2)).label(), ((Map) ((List) fromStatic.get("objects")).get(2)).get("label"));
-        assertEquals(resource.labels().size(), ((List) recycled.get("labels")).size());
-        assertEquals(resource.labels().get(0).size(), ((List) ((List) recycled.get("labels")).get(0)).size());
-        assertEquals(resource.labels().get(1).size(), ((List) ((List) recycled.get("labels")).get(1)).size());
-        assertEquals(resource.labels().get(2).size(), ((List) ((List) recycled.get("labels")).get(2)).size());
-        assertEquals(resource.objects().size(), ((List) recycled.get("objects")).size());
-        assertEquals(((Vertex) resource.objects().get(0)).id(), ((Map) ((List) recycled.get("objects")).get(0)).get("id"));
-        assertEquals(((Vertex) resource.objects().get(0)).label(), ((Map) ((List) recycled.get("objects")).get(0)).get("label"));
-        assertEquals(((Vertex) resource.objects().get(1)).id(), ((Map) ((List) recycled.get("objects")).get(1)).get("id"));
-        assertEquals(((Vertex) resource.objects().get(1)).label(), ((Map) ((List) recycled.get("objects")).get(1)).get("label"));
-        assertEquals(((Vertex) resource.objects().get(2)).id(), ((Map) ((List) recycled.get("objects")).get(2)).get("id"));
-        assertEquals(((Vertex) resource.objects().get(2)).label(), ((Map) ((List) recycled.get("objects")).get(2)).get("label"));
-    }
-
-    @Test
-    public void shouldReadWriteProperty() throws Exception {
-        final String resourceName = "property";
-        assumeCompatibility(resourceName);
-
-        final Property resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, Path.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(2, fromStatic.size());
-        assertEquals(resource.key(), fromStatic.get("key"));
-        assertEquals(resource.value(), fromStatic.get("value"));
-        assertEquals(2, recycled.size());
-        assertEquals(resource.key(), recycled.get("key"));
-        assertEquals(resource.value(), recycled.get("value"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionClose() throws Exception {
-        final String resourceName = "sessionclose";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, RequestMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(resource.getOp(), fromStatic.get("op"));
-        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
-        assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
-        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
-        assertEquals(resource.getOp(), recycled.get("op"));
-        assertEquals(resource.getProcessor(), recycled.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
-        assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionEval() throws Exception {
-        final String resourceName = "sessioneval";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, RequestMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(resource.getOp(), fromStatic.get("op"));
-        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
-        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
-        assertEquals(resource.getOp(), recycled.get("op"));
-        assertEquals(resource.getProcessor(), recycled.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionEvalAliased() throws Exception {
-        final String resourceName = "sessionevalaliased";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, RequestMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(resource.getOp(), fromStatic.get("op"));
-        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
-        assertEquals(resource.getArgs().get("aliased"), ((Map) fromStatic.get("args")).get("aliased"));
-        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
-        assertEquals(resource.getOp(), recycled.get("op"));
-        assertEquals(resource.getProcessor(), recycled.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
-        assertEquals(resource.getArgs().get("aliased"), ((Map) recycled.get("args")).get("aliased"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionlessEval() throws Exception {
-        final String resourceName = "sessionlesseval";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, RequestMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(resource.getOp(), fromStatic.get("op"));
-        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
-        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
-        assertEquals(resource.getOp(), recycled.get("op"));
-        assertEquals(resource.getProcessor(), recycled.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
-    }
-
-    @Test
-    public void shouldReadWriteSessionlessEvalAliased() throws Exception {
-        final String resourceName = "sessionlessevalaliased";
-        assumeCompatibility(resourceName);
-
-        final RequestMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, RequestMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(resource.getOp(), fromStatic.get("op"));
-        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
-        assertEquals(resource.getArgs().get("aliased"), ((Map) fromStatic.get("args")).get("aliased"));
-        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
-        assertEquals(resource.getOp(), recycled.get("op"));
-        assertEquals(resource.getProcessor(), recycled.get("processor"));
-        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
-        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
-        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
-        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
-        assertEquals(resource.getArgs().get("aliased"), ((Map) recycled.get("args")).get("aliased"));
-    }
-
-    @Test
-    public void shouldReadWriteStandardResult() throws Exception {
-        final String resourceName = "standardresult";
-        assumeCompatibility(resourceName);
-
-        final ResponseMessage resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, ResponseMessage.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(fromStatic, recycled);
-        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
-        assertEquals(resource.getStatus().getCode().getValue(), ((Map) fromStatic.get("status")).get("code"));
-        assertEquals(resource.getStatus().getMessage(), ((Map) fromStatic.get("status")).get("message"));
-        assertEquals(resource.getStatus().getAttributes(), ((Map) fromStatic.get("status")).get("attributes"));
-        assertEquals(resource.getResult().getMeta(), ((Map) fromStatic.get("result")).get("meta"));
-        assertEquals(((List) resource.getResult().getData()).size(), ((List) ((Map) fromStatic.get("result")).get("data")).size());
-    }
-
-    @Test
-    public void shouldReadWriteVertex() throws Exception {
-        final String resourceName = "vertex";
-        assumeCompatibility(resourceName);
-
-        final Vertex resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, Edge.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(resource.id(), fromStatic.get("id"));
-        assertEquals(resource.label(), fromStatic.get("label"));
-        assertEquals(resource.id(), fromStatic.get("id"));
-        assertEquals(resource.id(), recycled.get("id"));
-        assertEquals(resource.label(), recycled.get("label"));
-        assertEquals(resource.id(), recycled.get("id"));
-        assertEquals(IteratorUtils.count(resource.keys()), ((Map) fromStatic.get("properties")).size());
-        assertEquals(resource.value("name"), ((Map) ((List) ((Map) fromStatic.get("properties")).get("name")).get(0)).get("value"));
-        assertEquals(IteratorUtils.list(resource.values("location")).get(0), ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(0)).get("value"));
-        assertEquals(IteratorUtils.list(resource.values("location")).get(1), ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(1)).get("value"));
-        assertEquals(IteratorUtils.list(resource.values("location")).get(2), ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(2)).get("value"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(0)).get("properties")).get("startTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("endTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(0)).get("properties")).get("endTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(1)).get("properties")).get("startTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("endTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(1)).get("properties")).get("endTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(2)).get("properties")).get("startTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("endTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(2)).get("properties")).get("endTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(3)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(3)).get("properties")).get("startTime"));
-        assertEquals(IteratorUtils.count(resource.keys()), ((Map) recycled.get("properties")).size());
-        assertEquals(resource.value("name"), ((Map) ((List) ((Map) recycled.get("properties")).get("name")).get(0)).get("value"));
-        assertEquals(IteratorUtils.list(resource.values("location")).get(0), ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(0)).get("value"));
-        assertEquals(IteratorUtils.list(resource.values("location")).get(1), ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(1)).get("value"));
-        assertEquals(IteratorUtils.list(resource.values("location")).get(2), ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(2)).get("value"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(0)).get("properties")).get("startTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("endTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(0)).get("properties")).get("endTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(1)).get("properties")).get("startTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("endTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(1)).get("properties")).get("endTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(2)).get("properties")).get("startTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("endTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(2)).get("properties")).get("endTime"));
-        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(3)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(3)).get("properties")).get("startTime"));
-
-        // deal with incompatibilities
-        if (getCompatibility().getConfiguration().equals("v1d0")) {
-            assertEquals("vertex", fromStatic.get("type"));
-        }
-    }
-
-    @Test
-    public void shouldReadWriteVertexProperty() throws Exception {
-        final String resourceName = "vertexproperty";
-        assumeCompatibility(resourceName);
-
-        final VertexProperty resource = findModelEntryObject(resourceName);
-        final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
-        final HashMap recycled = read(write(resource, Edge.class), HashMap.class);
-        assertNotSame(fromStatic, recycled);
-        assertEquals(3, fromStatic.size());
-        assertEquals(resource.id().toString(), fromStatic.get("id").toString());
-        assertEquals(resource.key(), fromStatic.get("label"));
-        assertEquals(resource.value(), fromStatic.get("value"));
-        assertEquals(3, recycled.size());
-        assertEquals(resource.id().toString(), fromStatic.get("id").toString());
-        assertEquals(resource.key(), recycled.get("label"));
-        assertEquals(resource.value(), recycled.get("value"));
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/CompatibilitiesTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/CompatibilitiesTest.java
deleted file mode 100644
index 02557c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/CompatibilitiesTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io;
-
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class CompatibilitiesTest {
-
-    @Test
-    public void shouldFindVersionsBeforeRelease3_2_4() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .beforeRelease("3.2.4").match();
-        assertThat(compatibilityList, containsInAnyOrder(MockCompatibility.V1D0_3_2_3,
-                MockCompatibility.V1D0_3_2_2, MockCompatibility.V1D0_3_2_2_PARTIAL));
-    }
-
-    @Test
-    public void shouldFindVersionsAfterRelease3_2_x() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .afterRelease("3.2.7").match();
-        assertThat(compatibilityList, containsInAnyOrder(
-                MockCompatibility.V1D0_3_3_0, MockCompatibility.V1D0_3_3_1,
-                MockCompatibility.V3D0_3_3_0, MockCompatibility.V3D0_3_3_1));
-    }
-
-    @Test
-    public void shouldFindVersionsBetweenReleases3_2_3And3_2_5() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .betweenReleases("3.2.3", "3.2.5").match();
-        assertThat(compatibilityList, containsInAnyOrder(MockCompatibility.V1D0_3_2_4,
-                MockCompatibility.V1D0_3_2_4_PARTIAL));
-    }
-
-    @Test
-    public void shouldFindVersionsBefore3_0() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .before("3.0").match();
-        assertThat(compatibilityList, containsInAnyOrder(MockCompatibility.V1D0_3_2_2,
-                MockCompatibility.V1D0_3_2_2_PARTIAL,
-                MockCompatibility.V1D0_3_2_4_PARTIAL,
-                MockCompatibility.V1D0_3_2_3,
-                MockCompatibility.V1D0_3_2_4, MockCompatibility.V1D0_3_2_5,
-                MockCompatibility.V1D0_3_2_6, MockCompatibility.V1D0_3_3_0, MockCompatibility.V1D0_3_3_1));
-    }
-
-    @Test
-    public void shouldFindVersionsAfter1_0() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .after("1.0").match();
-        assertThat(compatibilityList, containsInAnyOrder(MockCompatibility.V3D0_3_3_0, MockCompatibility.V3D0_3_3_1));
-    }
-
-    @Test
-    public void shouldFindVersionsAfterRelease3_2_4AndAfter1_0() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .afterRelease("3.2.7")
-                .after("1.0")
-                .match();
-        assertThat(compatibilityList, containsInAnyOrder(MockCompatibility.V3D0_3_3_0, MockCompatibility.V3D0_3_3_1));
-    }
-
-    @Test
-    public void shouldFindGraphSONWithConfigurationPartial() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .configuredAs(".*partial.*").match();
-        assertThat(compatibilityList, containsInAnyOrder(MockCompatibility.V1D0_3_2_4_PARTIAL, MockCompatibility.V1D0_3_2_2_PARTIAL));
-    }
-
-    @Test
-    public void shouldFindGraphSONAfterVersion3_2_3WithConfigurationPartial() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .afterRelease("3.2.3")
-                .configuredAs(".*partial.*").match();
-        assertThat(compatibilityList, containsInAnyOrder(MockCompatibility.V1D0_3_2_4_PARTIAL));
-    }
-
-    @Test
-    public void shouldJoinCompatibilities() {
-        final List<Compatibility> compatibilityList = Compatibilities.with(MockCompatibility.class)
-                .afterRelease("3.3.0")
-                .after("1.0")
-                .join(Compatibilities.with(MockCompatibility.class)
-                        .configuredAs(".*partial.*"))
-                .match();
-        assertThat(compatibilityList, containsInAnyOrder(
-                MockCompatibility.V1D0_3_2_4_PARTIAL, MockCompatibility.V1D0_3_2_2_PARTIAL,
-                MockCompatibility.V3D0_3_3_1));
-    }
-
-    enum MockCompatibility implements Compatibility {
-        V1D0_3_2_2("3.2.2", "1.0", "v1d0"),
-        V1D0_3_2_2_PARTIAL("3.2.2", "1.0", "v1d0-partial"),
-        V1D0_3_2_3("3.2.3", "1.0", "v1d0"),
-        V1D0_3_2_4("3.2.4", "1.0", "v1d0"),
-        V1D0_3_2_4_PARTIAL("3.2.4", "1.0", "v1d0-partial"),
-        V1D0_3_2_5("3.2.5", "1.0", "v1d0"),
-        V1D0_3_2_6("3.2.6", "1.0", "v1d0"),
-        V1D0_3_3_0("3.3.0", "1.0", "v1d0"),
-        V3D0_3_3_0("3.3.0", "3.0", "v3d0"),
-        V1D0_3_3_1("3.3.1", "1.0", "v1d0"),
-        V3D0_3_3_1("3.3.1", "3.0", "v3d0");
-
-        private final String mockVersion;
-        private final String tinkerpopVersion;
-        private final String configuration;
-
-        MockCompatibility(final String tinkerpopVersion, final String mockVersion, final String configuration) {
-            this.tinkerpopVersion = tinkerpopVersion;
-            this.mockVersion = mockVersion;
-            this.configuration = configuration;
-        }
-
-        @Override
-        public byte[] readFromResource(final String resource) throws IOException {
-            return new byte[0];
-        }
-
-        @Override
-        public String getReleaseVersion() {
-            return tinkerpopVersion;
-        }
-
-        @Override
-        public String getVersion() {
-            return mockVersion;
-        }
-
-        @Override
-        public String getConfiguration() {
-            return configuration;
-        }
-
-        @Override
-        public String toString() {
-            return tinkerpopVersion + "-" + configuration;
-        }
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
deleted file mode 100644
index db427f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphbinary;
-
-import io.netty.buffer.ByteBufAllocator;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.tinkerpop.gremlin.driver.ser.NettyBufferFactory;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
-import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
-import org.apache.tinkerpop.gremlin.structure.io.Buffer;
-import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(Parameterized.class)
-public class GraphBinaryCompatibilityTest extends AbstractTypedCompatibilityTest {
-
-    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
-    private static final GraphBinaryWriter writerV1 = new GraphBinaryWriter();
-    private static final GraphBinaryReader readerV1 = new GraphBinaryReader();
-    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
-
-    @Parameterized.Parameters(name = "expect({0})")
-    public static Iterable<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-                {GraphBinaryCompatibility.V1_3_4_4, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_4, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_5, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_6, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_7, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_8, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_9, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_10, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_11, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_12, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_4_13, readerV1, writerV1 },
-
-                {GraphBinaryCompatibility.V1_3_5_0, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_5_1, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_5_2, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_5_3, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_5_4, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_5_5, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_5_6, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_5_7, readerV1, writerV1 },
-
-                {GraphBinaryCompatibility.V1_3_6_0, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_6_1, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_6_2, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_6_3, readerV1, writerV1 },
-                {GraphBinaryCompatibility.V1_3_6_4, readerV1, writerV1 },
-
-        });
-    }
-
-    @Parameterized.Parameter(value = 0)
-    public Compatibility compatibility;
-
-    @Parameterized.Parameter(value = 1)
-    public GraphBinaryReader reader;
-
-    @Parameterized.Parameter(value = 2)
-    public GraphBinaryWriter writer;
-
-    @Override
-    public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
-        final Buffer buffer = bufferFactory.create(allocator.buffer());
-        buffer.writeBytes(bytes);
-        return reader.read(buffer);
-    }
-
-    @Override
-    public byte[] write(final Object o, final Class<?> clazz) throws Exception  {
-        final Buffer buffer = bufferFactory.create(allocator.buffer());
-        try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
-            writer.write(o, buffer);
-            buffer.readerIndex(0);
-            buffer.readBytes(stream, buffer.readableBytes());
-            return stream.toByteArray();
-        }
-    }
-
-    @Override
-    public Compatibility getCompatibility() {
-        return compatibility;
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
deleted file mode 100644
index 6044c45..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
-import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(Parameterized.class)
-public class GraphSONTypedCompatibilityTest extends AbstractTypedCompatibilityTest {
-
-    private static ObjectMapper mapperV2 = GraphSONMapper.build().
-            addRegistry(TinkerIoRegistryV2d0.instance()).
-            typeInfo(TypeInfo.PARTIAL_TYPES).
-            addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-            addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-            version(GraphSONVersion.V2_0).create().createMapper();
-
-    private static ObjectMapper mapperV3 = GraphSONMapper.build().
-            addRegistry(TinkerIoRegistryV3d0.instance()).
-            addCustomModule(GraphSONXModuleV3d0.build().create(false)).
-            addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0.GremlinServerModule()).
-            version(GraphSONVersion.V3_0).create().createMapper();
-
-    @Parameterized.Parameters(name = "expect({0})")
-    public static Iterable<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_3, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_4, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_5, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_6, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_7, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_8, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_9, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_2_10, mapperV2 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_0, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_0, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_1, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_1, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_2, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_2, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_3, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_3, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_4, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_4, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_5, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_5, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_6, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_6, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_7, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_7, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_8, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_8, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_9, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_9, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_10, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_10, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_3_11, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_3_11, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_0, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_0, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_1, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_1, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_2, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_2, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_3, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_3, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_4, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_4, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_5, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_5, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_6, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_6, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_7, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_7, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_8, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_8, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_9, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_9, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_10, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_10, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_11, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_11, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_12, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_12, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_4_13, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_4_13, mapperV3 },
-
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_0, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_0, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_1, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_1, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_2, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_2, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_3, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_3, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_4, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_4, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_5, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_5, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_6, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_6, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_5_7, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_5_7, mapperV3 },
-
-                {GraphSONCompatibility.V2D0_PARTIAL_3_6_0, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_6_0, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_6_1, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_6_1, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_6_2, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_6_2, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_6_3, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_6_3, mapperV3 },
-                {GraphSONCompatibility.V2D0_PARTIAL_3_6_4, mapperV2 },
-                {GraphSONCompatibility.V3D0_PARTIAL_3_6_4, mapperV3 },
-        });
-    }
-
-    @Parameterized.Parameter(value = 0)
-    public Compatibility compatibility;
-
-    @Parameterized.Parameter(value = 1)
-    public ObjectMapper mapper;
-
-    @Override
-    public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
-        return mapper.readValue(bytes, clazz);
-    }
-
-    @Override
-    public byte[] write(final Object o, final Class<?> clazz) throws Exception  {
-        return mapper.writeValueAsBytes(o);
-    }
-
-    @Override
-    public Compatibility getCompatibility() {
-        return compatibility;
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
deleted file mode 100644
index 20bb7a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractUntypedCompatibilityTest;
-import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(Parameterized.class)
-public class GraphSONUntypedCompatibilityTest extends AbstractUntypedCompatibilityTest {
-
-    private static ObjectMapper mapperV1 = GraphSONMapper.build().
-            addRegistry(TinkerIoRegistryV1d0.instance()).
-            addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
-            version(GraphSONVersion.V1_0).create().createMapper();
-
-    private static ObjectMapper mapperV2 = GraphSONMapper.build().
-                    addRegistry(TinkerIoRegistryV2d0.instance()).
-                    typeInfo(TypeInfo.NO_TYPES).
-                    addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                    addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-                    version(GraphSONVersion.V2_0).create().createMapper();
-
-    @Parameterized.Parameters(name = "expect({0})")
-    public static Iterable<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-                {GraphSONCompatibility.V1D0_3_2_3, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_3, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_2_4, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_4, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_2_5, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_5, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_2_6, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_6, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_2_7, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_7, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_2_8, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_8, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_2_9, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_9, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_2_10, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_2_10, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_0, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_0, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_1, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_1, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_2, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_2, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_3, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_3, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_4, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_4, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_5, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_5, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_6, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_6, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_7, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_7, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_8, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_8, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_9, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_9, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_10, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_10, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_3_11, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_3_11, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_0, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_0, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_1, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_1, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_2, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_2, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_3, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_3, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_4, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_4, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_5, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_5, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_6, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_6, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_7, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_7, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_8, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_8, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_9, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_9, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_10, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_10, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_11, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_11, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_12, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_12, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_4_13, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_4_13, mapperV2 },
-
-                {GraphSONCompatibility.V1D0_3_5_0, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_0, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_5_1, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_1, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_5_2, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_2, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_5_3, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_3, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_5_4, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_4, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_5_5, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_5, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_5_6, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_6, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_5_7, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_5_7, mapperV2 },
-
-                {GraphSONCompatibility.V1D0_3_6_0, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_6_0, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_6_1, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_6_1, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_6_2, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_6_2, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_6_3, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_6_3, mapperV2 },
-                {GraphSONCompatibility.V1D0_3_6_4, mapperV1 },
-                {GraphSONCompatibility.V2D0_NO_TYPE_3_6_4, mapperV2 },
-
-        });
-    }
-
-    @Parameterized.Parameter(value = 0)
-    public Compatibility compatibility;
-
-    @Parameterized.Parameter(value = 1)
-    public ObjectMapper mapper;
-
-    @Override
-    public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
-        return mapper.readValue(bytes, clazz);
-    }
-
-    @Override
-    public byte[] write(final Object o, final Class<?> clazz) throws Exception  {
-        return mapper.writeValueAsBytes(o);
-    }
-
-    @Override
-    public Compatibility getCompatibility() {
-        return compatibility;
-    }
-}
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/logback-silent.xml b/gremlin-tools/gremlin-io-test/src/test/resources/logback-silent.xml
deleted file mode 100644
index 4c5947d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/logback-silent.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configuration>
-    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>[%p] %C - %m%n</pattern>
-        </encoder>
-    </appender>
-    <root level="OFF">
-        <appender-ref ref="stdout"/>
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/logback-test.xml b/gremlin-tools/gremlin-io-test/src/test/resources/logback-test.xml
deleted file mode 100644
index 5d94c3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<configuration>
-    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>[%p] %C - %m%n</pattern>
-        </encoder>
-    </appender>
-    <root level="WARN">
-        <appender-ref ref="stdout"/>
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_11/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_12/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_13/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_4/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_5/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_6/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_7/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_8/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_9/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_0/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_1/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_2/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_3/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_4/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_5/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_6/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_5_7/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_0/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_1/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_2/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_3/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/barrier-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/barrier-v1.gbin
deleted file mode 100644
index f905861..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/barrier-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bigdecimal-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bigdecimal-v1.gbin
deleted file mode 100644
index 921d957..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bigdecimal-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/biginteger-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/biginteger-v1.gbin
deleted file mode 100644
index d841fbe..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/biginteger-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/binding-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/binding-v1.gbin
deleted file mode 100644
index 79620eb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/binding-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bulkset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bulkset-v1.gbin
deleted file mode 100644
index 4542906..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bulkset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/byte-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/byte-v1.gbin
deleted file mode 100644
index af9544f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/byte-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bytebuffer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bytebuffer-v1.gbin
deleted file mode 100644
index 39793d2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bytebuffer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bytecode-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bytecode-v1.gbin
deleted file mode 100644
index bc76c2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/bytecode-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/cardinality-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/cardinality-v1.gbin
deleted file mode 100644
index 3c875a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/cardinality-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/char-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/char-v1.gbin
deleted file mode 100644
index b9d97e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/char-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/class-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/class-v1.gbin
deleted file mode 100644
index 6be272d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/class-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/column-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/column-v1.gbin
deleted file mode 100644
index c6805c8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/column-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/date-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/date-v1.gbin
deleted file mode 100644
index e68e17a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/date-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/direction-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/direction-v1.gbin
deleted file mode 100644
index 3caaba3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/direction-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/double-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/double-v1.gbin
deleted file mode 100644
index e538a62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/double-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/duration-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/duration-v1.gbin
deleted file mode 100644
index 7ffa3ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/duration-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/edge-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/edge-v1.gbin
deleted file mode 100644
index 086e85d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/edge-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/float-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/float-v1.gbin
deleted file mode 100644
index 322772c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/float-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/inetaddress-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/inetaddress-v1.gbin
deleted file mode 100644
index b613ddb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/inetaddress-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/instant-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/instant-v1.gbin
deleted file mode 100644
index 3335532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/instant-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/integer-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/integer-v1.gbin
deleted file mode 100644
index 7dc246a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/integer-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/lambda-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/lambda-v1.gbin
deleted file mode 100644
index b0e98f9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/lambda-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/list-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/list-v1.gbin
deleted file mode 100644
index 1aa405d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/list-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localdate-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localdate-v1.gbin
deleted file mode 100644
index 2c9e211..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localdate-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localdatetime-v1.gbin
deleted file mode 100644
index 2e0c83c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localtime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localtime-v1.gbin
deleted file mode 100644
index 05785c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/localtime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/long-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/long-v1.gbin
deleted file mode 100644
index cee0083..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/long-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/map-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/map-v1.gbin
deleted file mode 100644
index 46cd9e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/map-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/metrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/metrics-v1.gbin
deleted file mode 100644
index dea77a5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/metrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/monthday-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/monthday-v1.gbin
deleted file mode 100644
index c128263..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/monthday-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/offsetdatetime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/offsetdatetime-v1.gbin
deleted file mode 100644
index 4b2aabb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/offsetdatetime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/offsettime-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/offsettime-v1.gbin
deleted file mode 100644
index a4c8c5b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/offsettime-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/operator-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/operator-v1.gbin
deleted file mode 100644
index 84717cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/operator-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/order-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/order-v1.gbin
deleted file mode 100644
index 311b6ad..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/order-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/p-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/p-v1.gbin
deleted file mode 100644
index ac60799..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/p-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pand-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pand-v1.gbin
deleted file mode 100644
index 3237c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pand-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/path-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/path-v1.gbin
deleted file mode 100644
index ba075ac..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/path-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/period-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/period-v1.gbin
deleted file mode 100644
index f7dab35..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/period-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pick-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pick-v1.gbin
deleted file mode 100644
index 77aca2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pick-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pop-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pop-v1.gbin
deleted file mode 100644
index f698c94..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pop-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/por-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/por-v1.gbin
deleted file mode 100644
index 7c0b3ab..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/por-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/property-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/property-v1.gbin
deleted file mode 100644
index ddc34e5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/property-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pwithin-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pwithin-v1.gbin
deleted file mode 100644
index 5ad30a9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pwithin-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pwithout-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pwithout-v1.gbin
deleted file mode 100644
index 5b195db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/pwithout-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/scope-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/scope-v1.gbin
deleted file mode 100644
index 534b956..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/scope-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/set-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/set-v1.gbin
deleted file mode 100644
index 02df059..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/set-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/short-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/short-v1.gbin
deleted file mode 100644
index e1d2d7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/short-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/t-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/t-v1.gbin
deleted file mode 100644
index a6376db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/t-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/textp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/textp-v1.gbin
deleted file mode 100644
index c796468..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/textp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/timestamp-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/timestamp-v1.gbin
deleted file mode 100644
index 4fc4e5e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/timestamp-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/tinkergraph-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/tinkergraph-v1.gbin
deleted file mode 100644
index a0a76d1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/tinkergraph-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/traversalmetrics-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/traversalmetrics-v1.gbin
deleted file mode 100644
index c947e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/traversalmetrics-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/traverser-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/traverser-v1.gbin
deleted file mode 100644
index 8e47cc0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/traverser-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/uuid-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/uuid-v1.gbin
deleted file mode 100644
index 7f1775d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/uuid-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/vertex-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/vertex-v1.gbin
deleted file mode 100644
index 7fb9d65..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/vertex-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/vertexproperty-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/vertexproperty-v1.gbin
deleted file mode 100644
index 89f0329..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/vertexproperty-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/year-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/year-v1.gbin
deleted file mode 100644
index 1fe0c74..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/year-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/yearmonth-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/yearmonth-v1.gbin
deleted file mode 100644
index 481a121..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/yearmonth-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/zoneoffset-v1.gbin b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/zoneoffset-v1.gbin
deleted file mode 100644
index 2867c97..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_6_4/zoneoffset-v1.gbin
+++ /dev/null
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/biginteger-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/byte-v2d0-partial.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/byte-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytebuffer-v2d0-partial.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/char-v2d0-partial.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/char-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/duration-v2d0-partial.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/duration-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/inetaddress-v2d0-partial.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/instant-v2d0-partial.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/instant-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localdate-v2d0-partial.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localdate-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localdatetime-v2d0-partial.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localtime-v2d0-partial.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/localtime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/metrics-v2d0-no-types.json
deleted file mode 100644
index 14ed07d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 0.076725,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 14.050242090844497
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 0.1419,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.985393974465094
-    },
-    "id" : "2.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/metrics-v2d0-partial.json
deleted file mode 100644
index b04948d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.085131
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 12.447581281911814
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.195446
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 28.577486124026926
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/monthday-v2d0-partial.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/monthday-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/offsettime-v2d0-partial.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/period-v2d0-partial.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/period-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithin-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithin-v1d0.json
deleted file mode 100644
index 117ad4b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithin-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "within",
-  "value" : [ 1 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithout-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithout-v1d0.json
deleted file mode 100644
index 93ffd43..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithout-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "without",
-  "value" : [ 1, 2 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/short-v2d0-partial.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/short-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v1d0.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v1d0.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v2d0-no-types.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v2d0-partial.json
deleted file mode 100644
index 66b2e1b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "id" : {
-    "@type" : "g:Int32",
-    "@value" : 1
-  },
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 16
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 5
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 15
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 4
-        }
-      }
-    } ],
-    "develops" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 13
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2009
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 14
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2010
-        }
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 0
-      },
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 6
-      },
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 1997
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 7
-      },
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 8
-      },
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 9
-      },
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index ed93860..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.691678,
-  "metrics" : [ {
-    "dur" : 0.192903,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 27.88913338287469
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 0.173669,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.108359670251186
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 0.152729,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 22.08093939665567
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 0.172377,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 24.921567550218455
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index e746aec..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.604199
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.101711
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 16.834023227446586
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.149789
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 24.79133530508988
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.162188
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 26.843473756163117
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.190511
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 31.531167711300416
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v1d0.json
deleted file mode 100644
index db030dd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v1d0.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "7" : {
-    "key" : {
-      "id" : 7,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 1,
-          "value" : "stephen"
-        } ],
-        "location" : [ {
-          "id" : 10,
-          "value" : "centreville",
-          "properties" : {
-            "startTime" : 1990,
-            "endTime" : 2000
-          }
-        }, {
-          "id" : 11,
-          "value" : "dulles",
-          "properties" : {
-            "startTime" : 2000,
-            "endTime" : 2006
-          }
-        }, {
-          "id" : 12,
-          "value" : "purcellville",
-          "properties" : {
-            "startTime" : 2006
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "8" : {
-    "key" : {
-      "id" : 8,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 2,
-          "value" : "matthias"
-        } ],
-        "location" : [ {
-          "id" : 13,
-          "value" : "bremen",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2007
-          }
-        }, {
-          "id" : 14,
-          "value" : "baltimore",
-          "properties" : {
-            "startTime" : 2007,
-            "endTime" : 2011
-          }
-        }, {
-          "id" : 15,
-          "value" : "oakland",
-          "properties" : {
-            "startTime" : 2011,
-            "endTime" : 2014
-          }
-        }, {
-          "id" : 16,
-          "value" : "seattle",
-          "properties" : {
-            "startTime" : 2014
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "9" : {
-    "key" : {
-      "id" : 9,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 3,
-          "value" : "daniel"
-        } ],
-        "location" : [ {
-          "id" : 17,
-          "value" : "spremberg",
-          "properties" : {
-            "startTime" : 1982,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 18,
-          "value" : "kaiserslautern",
-          "properties" : {
-            "startTime" : 2005,
-            "endTime" : 2009
-          }
-        }, {
-          "id" : 19,
-          "value" : "aachen",
-          "properties" : {
-            "startTime" : 2009
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v2d0-no-types.json
deleted file mode 100644
index 50c2417..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,269 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v2d0-partial.json
deleted file mode 100644
index 03b4a5a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/tree-v2d0-partial.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/year-v2d0-partial.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/year-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/yearmonth-v2d0-partial.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index b893667..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : {
-    "@type" : "g:UUID",
-    "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
-  },
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-no-types.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-no-types.json
deleted file mode 100644
index 1cdc40a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "has", "label", {
-    "predicate" : "eq",
-    "value" : "person"
-  } ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-partial.json
deleted file mode 100644
index 879f7a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "has", {
-      "@type" : "g:T",
-      "@value" : "label"
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "eq",
-        "value" : "person"
-      }
-    } ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-no-types.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-no-types.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-no-types.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-no-types.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-no-types.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
deleted file mode 100644
index 906aa31..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics
-
-import java.time.*
-import java.nio.file.*
-import org.apache.tinkerpop.gremlin.driver.ser.*
-import org.apache.tinkerpop.gremlin.process.traversal.*
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
-import org.apache.tinkerpop.gremlin.structure.*
-import org.apache.tinkerpop.gremlin.structure.io.graphson.*
-import org.apache.tinkerpop.gremlin.driver.message.*
-import org.apache.tinkerpop.gremlin.process.traversal.step.*
-import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
-import org.apache.commons.configuration.BaseConfiguration
-
-import java.util.concurrent.TimeUnit
-
-new File("dev-docs/").mkdirs()
-new File("test-case-data/io/graphson").mkdirs()
-
-conf = new BaseConfiguration()
-conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
-graph = TinkerGraph.open(conf)
-TinkerFactory.generateTheCrew(graph)
-g = graph.traversal()
-
-toJson = { o, type, mapper, comment = "", suffix = "" ->
-    def jsonSample = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(o)
-
-    def fileToWriteTo = new File("test-case-data/io/graphson/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".json")
-    if (fileToWriteTo.exists()) fileToWriteTo.delete()
-    fileToWriteTo.withWriter{ it.write(jsonSample) }
-
-    return type + "\n" +
-            "^".multiply(type.length()) + "\n\n" +
-            (comment.isEmpty() ? "" : comment + "\n\n") +
-            "[source,json]\n" +
-            "----\n" +
-            jsonSample + "\n" +
-            "----\n" +
-            "\n"
-}
-
-toJsonV1d0NoTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v1d0")
-}
-
-writeSupportedV1Objects = { writer, mapper ->
-    writer.write("Graph Structure\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    writer.write(toJsonV1d0NoTypes(graph.edges().next(), "Edge", mapper))
-    writer.write(toJsonV1d0NoTypes(g.V().out().out().path().next(), "Path", mapper))
-    writer.write(toJsonV1d0NoTypes(graph.edges().next().properties().next(), "Property", mapper))
-    writer.write(toJsonV1d0NoTypes(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper))
-    writer.write(toJsonV1d0NoTypes(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`."))
-    writer.write(toJsonV1d0NoTypes(g.V(1).out().out().tree().next(), "Tree", mapper))
-    writer.write(toJsonV1d0NoTypes(graph.vertices().next(), "Vertex", mapper))
-    writer.write(toJsonV1d0NoTypes(graph.vertices().next().properties().next(), "VertexProperty", mapper))
-
-    writer.write("\n")
-    writer.write("RequestMessage\n")
-    writer.write("~~~~~~~~~~~~~~\n\n")
-    def msg = null
-    msg = RequestMessage.build("authentication").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
-    writer.write(toJsonV1d0NoTypes(msg, "Authentication Response", mapper, "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Session Eval Aliased", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-    msg = RequestMessage.build("close").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Session Close", mapper, "The following `RequestMessage` is an example of a request to close a session."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
-    writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval Aliased", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-
-    writer.write("\n")
-    writer.write("ResponseMessage\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Authentication Challenge", mapper, "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server)."))
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-            result(Arrays.asList(graph.vertices().next())).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Standard Result", mapper, "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script."))
-}
-
-createStaticTraversalMetrics = {
-    // based on g.V().hasLabel("person").out().out().tree().profile().next()
-    def traversalMutableMetrics = new ArrayList<>()
-    def m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])")
-    m7.setDuration(100, TimeUnit.MILLISECONDS)
-    m7.setCount("traverserCount", 4)
-    m7.setCount("elementCount", 4)
-    m7.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m7)
-
-    def m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)")
-    m2.setDuration(100, TimeUnit.MILLISECONDS)
-    m2.setCount("traverserCount", 13)
-    m2.setCount("elementCount", 13)
-    m2.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m2)
-
-    def m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)")
-    m3.setDuration(100, TimeUnit.MILLISECONDS)
-    m3.setCount("traverserCount", 7)
-    m3.setCount("elementCount", 7)
-    m3.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m3)
-
-    def m4 = new MutableMetrics("4.0.0()", "TreeStep")
-    m4.setDuration(100, TimeUnit.MILLISECONDS)
-    m4.setCount("traverserCount", 1)
-    m4.setCount("elementCount", 1)
-    m4.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m4)
-
-    return new DefaultTraversalMetrics(4000, traversalMutableMetrics)
-}
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV1d0.instance()).
-        addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
-        version(GraphSONVersion.V1_0).create().createMapper()
-
-v1GraphSONFile = new File("dev-docs/out-graphson-1d0.txt")
-if (v1GraphSONFile.exists()) v1GraphSONFile.delete()
-new File("dev-docs/out-graphson-1d0.txt").withWriter { writeSupportedV1Objects(it, mapper) }
-
-toJsonV2d0PartialTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v2d0-partial")
-}
-
-toJsonV2d0NoTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v2d0-no-types")
-}
-
-writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
-    writer.write("Core\n")
-    writer.write("~~~~\n\n")
-    writer.write(toJsonFunction(File, "Class", mapper))
-    writer.write(toJsonFunction(new Date(1481750076295L), "Date", mapper))
-    writer.write(toJsonFunction(100.00d, "Double", mapper))
-    writer.write(toJsonFunction(100.00f, "Float", mapper))
-    writer.write(toJsonFunction(100, "Integer", mapper))
-    writer.write(toJsonFunction(100L, "Long", mapper))
-    writer.write(toJsonFunction(new java.sql.Timestamp(1481750076295L), "Timestamp", mapper))
-    writer.write(toJsonFunction(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", mapper))
-
-    writer.write("\n")
-    writer.write("Graph Structure\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    writer.write(toJsonFunction(graph.edges().next(), "Edge", mapper))
-    writer.write(toJsonFunction(g.V().out().out().path().next(), "Path", mapper))
-    writer.write(toJsonFunction(graph.edges().next().properties().next(), "Property", mapper))
-    writer.write(toJsonFunction(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper))
-    writer.write(toJsonFunction(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`."))
-    writer.write(toJsonFunction(g.V(1).out().out().tree().next(), "Tree", mapper))
-    writer.write(toJsonFunction(graph.vertices().next(), "Vertex", mapper))
-    writer.write(toJsonFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper))
-
-    writer.write("\n")
-    writer.write("Graph Process\n")
-    writer.write("~~~~~~~~~~~~~\n\n")
-    writer.write(toJsonFunction(SackFunctions.Barrier.normSack, "Barrier", mapper))
-    writer.write(toJsonFunction(new Bytecode.Binding("x", 1), "Binding", mapper, "A \"Binding\" refers to a `Bytecode.Binding`."))
-    writer.write(toJsonFunction(g.V().hasLabel('person').out().in().tree().asAdmin().getBytecode(), "Bytecode", mapper, "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language."))
-    writer.write(toJsonFunction(VertexProperty.Cardinality.list, "Cardinality", mapper))
-    writer.write(toJsonFunction(Column.keys, "Column", mapper))
-    writer.write(toJsonFunction(Direction.OUT, "Direction", mapper))
-    writer.write(toJsonFunction(Operator.sum, "Operator", mapper))
-    writer.write(toJsonFunction(Order.incr, "Order", mapper))
-    writer.write(toJsonFunction(Pop.all, "Pop", mapper))
-    writer.write(toJsonFunction(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper))
-    def tm = createStaticTraversalMetrics()
-    def metrics = new MutableMetrics(tm.getMetrics("7.0.0()"))
-    metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")))
-    writer.write(toJsonFunction(metrics, "Metrics", mapper))
-    writer.write(toJsonFunction(P.gt(0), "P", mapper))
-    writer.write(toJsonFunction(P.gt(0).and(P.lt(10)), "P and", mapper))
-    writer.write(toJsonFunction(P.gt(0).or(P.within(-1, -10, -100)), "P or", mapper))
-    writer.write(toJsonFunction(Scope.local, "Scope", mapper))
-    writer.write(toJsonFunction(T.label, "T", mapper))
-    writer.write(toJsonFunction(createStaticTraversalMetrics(), "TraversalMetrics", mapper))
-    writer.write(toJsonFunction(g.V().hasLabel('person').nextTraverser(), "Traverser", mapper))
-
-    writer.write("\n")
-    writer.write("RequestMessage\n")
-    writer.write("~~~~~~~~~~~~~~\n\n")
-    def msg = null
-    msg = RequestMessage.build("authentication").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
-    writer.write(toJsonFunction(msg, "Authentication Response", mapper, "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonFunction(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonFunction(msg, "Session Eval Aliased", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-    msg = RequestMessage.build("close").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonFunction(msg, "Session Close", mapper, "The following `RequestMessage` is an example of a request to close a session."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
-    writer.write(toJsonFunction(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
-    writer.write(toJsonFunction(msg, "Sessionless Eval Aliased", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-
-    writer.write("\n")
-    writer.write("ResponseMessage\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-    writer.write(toJsonFunction(msg, "Authentication Challenge", mapper, "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server)."))
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-            result(Arrays.asList(graph.vertices().next())).create()
-    writer.write(toJsonFunction(msg, "Standard Result", mapper, "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script."))
-
-    writer.write("\n")
-    writer.write("Extended\n")
-    writer.write("~~~~~~~~\n\n")
-    writer.write("""Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:\n
-[source,java]
-----
-mapper = GraphSONMapper.build().
-                        typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                        version(GraphSONVersion.V2_0).create().createMapper()
-----\n
-""")
-    writer.write(toJsonFunction(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", mapper))
-    writer.write(toJsonFunction(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", mapper))
-    writer.write(toJsonFunction(new Byte("1"), "Byte", mapper))
-    writer.write(toJsonFunction(java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", mapper))
-    writer.write(toJsonFunction("x".charAt(0), "Char", mapper))
-    writer.write(toJsonFunction(Duration.ofDays(5), "Duration", mapper,"The following example is a `Duration` of five days."))
-    writer.write(toJsonFunction(java.net.InetAddress.getByName("localhost"), "InetAddress", mapper))
-    writer.write(toJsonFunction(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", mapper))
-    writer.write(toJsonFunction(LocalDate.of(2016, 1, 1), "LocalDate", mapper))
-    writer.write(toJsonFunction(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper))
-    writer.write(toJsonFunction(LocalTime.of(12, 30, 45), "LocalTime", mapper))
-    writer.write(toJsonFunction(MonthDay.of(1, 1), "MonthDay", mapper))
-    writer.write(toJsonFunction(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", mapper))
-    writer.write(toJsonFunction(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", mapper))
-    writer.write(toJsonFunction(Period.of(1, 6, 15), "Period", mapper, "The following example is a `Period` of one year, six months and fifteen days."))
-    writer.write(toJsonFunction(new Short("100"), "Short", mapper))
-    writer.write(toJsonFunction(Year.of(2016), "Year", mapper, "The following example is of the `Year` \"2016\"."))
-    writer.write(toJsonFunction(YearMonth.of(2016, 6), "YearMonth", mapper, "The following example is a `YearMonth` of \"June 2016\""))
-    writer.write(toJsonFunction(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", mapper))
-    writer.write(toJsonFunction(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds."))
-}
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        typeInfo(TypeInfo.PARTIAL_TYPES).
-        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-        version(GraphSONVersion.V2_0).create().createMapper()
-
-file = new File("dev-docs/out-graphson-2d0-partial.txt")
-file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0PartialTypes) }
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        typeInfo(TypeInfo.NO_TYPES).
-        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-        version(GraphSONVersion.V2_0).create().createMapper()
-
-file = new File("dev-docs/out-graphson-2d0-no-type.txt")
-file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0NoTypes) }
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-no-types.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-no-types.json
deleted file mode 100644
index 06a9522..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-partial.json
deleted file mode 100644
index 54ff76d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-partial.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-no-types.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index b01e98f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : {
-    "@type" : "g:UUID",
-    "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
-  },
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 761b71a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "requestId" : {
-    "@type" : "g:UUID",
-    "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
-  },
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v1d0.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v1d0.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-no-types.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-partial.json
deleted file mode 100644
index 66b2e1b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "id" : {
-    "@type" : "g:Int32",
-    "@value" : 1
-  },
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 16
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 5
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 15
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 4
-        }
-      }
-    } ],
-    "develops" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 13
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2009
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 14
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2010
-        }
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 0
-      },
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 6
-      },
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 1997
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 7
-      },
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 8
-      },
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 9
-      },
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json
deleted file mode 100644
index 7efbb83..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json
deleted file mode 100644
index 79231e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json
deleted file mode 100644
index 74dcffc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-no-types.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-no-types.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-no-types.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index b893667..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : {
-    "@type" : "g:UUID",
-    "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
-  },
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bigdecimal-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bigdecimal-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/biginteger-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/biginteger-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/byte-v2d0-no-types.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/byte-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/char-v2d0-no-types.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/char-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/duration-v2d0-no-types.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/duration-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/instant-v2d0-no-types.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/instant-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdate-v2d0-no-types.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdate-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdatetime-v2d0-no-types.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localtime-v2d0-no-types.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localtime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy
deleted file mode 100644
index 4624bda..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics
-
-import java.time.*
-import java.nio.file.*
-import org.apache.tinkerpop.gremlin.driver.ser.*
-import org.apache.tinkerpop.gremlin.process.traversal.*
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
-import org.apache.tinkerpop.gremlin.structure.*
-import org.apache.tinkerpop.gremlin.structure.io.graphson.*
-import org.apache.tinkerpop.gremlin.driver.message.*
-import org.apache.tinkerpop.gremlin.process.traversal.step.*
-import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
-import org.apache.commons.configuration.BaseConfiguration
-
-import java.util.concurrent.TimeUnit
-
-new File("dev-docs/").mkdirs()
-new File("test-case-data/io/graphson").mkdirs()
-
-conf = new BaseConfiguration()
-conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name())
-graph = TinkerGraph.open(conf)
-TinkerFactory.generateTheCrew(graph)
-g = graph.traversal()
-
-toJson = { o, type, mapper, comment = "", suffix = "" ->
-    def jsonSample = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(o)
-
-    def fileToWriteTo = new File("test-case-data/io/graphson/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".json")
-    if (fileToWriteTo.exists()) fileToWriteTo.delete()
-    fileToWriteTo.withWriter{ it.write(jsonSample) }
-
-    return type + "\n" +
-            "^".multiply(type.length()) + "\n\n" +
-            (comment.isEmpty() ? "" : comment + "\n\n") +
-            "[source,json]\n" +
-            "----\n" +
-            jsonSample + "\n" +
-            "----\n" +
-            "\n"
-}
-
-toJsonV1d0NoTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v1d0")
-}
-
-writeSupportedV1Objects = { writer, mapper ->
-    writer.write("Graph Structure\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    writer.write(toJsonV1d0NoTypes(graph.edges().next(), "Edge", mapper))
-    writer.write(toJsonV1d0NoTypes(g.V().out().out().path().next(), "Path", mapper))
-    writer.write(toJsonV1d0NoTypes(graph.edges().next().properties().next(), "Property", mapper))
-    writer.write(toJsonV1d0NoTypes(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper))
-    writer.write(toJsonV1d0NoTypes(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`."))
-    writer.write(toJsonV1d0NoTypes(g.V(1).out().out().tree().next(), "Tree", mapper))
-    writer.write(toJsonV1d0NoTypes(graph.vertices().next(), "Vertex", mapper))
-    writer.write(toJsonV1d0NoTypes(graph.vertices().next().properties().next(), "VertexProperty", mapper))
-
-    writer.write("\n")
-    writer.write("RequestMessage\n")
-    writer.write("~~~~~~~~~~~~~~\n\n")
-    def msg = null
-    msg = RequestMessage.build("authentication").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
-    writer.write(toJsonV1d0NoTypes(msg, "Authentication Response", mapper, "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Session Eval Aliased", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-    msg = RequestMessage.build("close").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Session Close", mapper, "The following `RequestMessage` is an example of a request to close a session."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
-    writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval Aliased", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-
-    writer.write("\n")
-    writer.write("ResponseMessage\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Authentication Challenge", mapper, "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server)."))
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-            result(Arrays.asList(graph.vertices().next())).create()
-    writer.write(toJsonV1d0NoTypes(msg, "Standard Result", mapper, "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script."))
-}
-
-createStaticTraversalMetrics = {
-    // based on g.V().hasLabel("person").out().out().tree().profile().next()
-    def traversalMutableMetrics = new ArrayList<>()
-    def m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])")
-    m7.setDuration(100, TimeUnit.MILLISECONDS)
-    m7.setCount("traverserCount", 4)
-    m7.setCount("elementCount", 4)
-    m7.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m7)
-
-    def m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)")
-    m2.setDuration(100, TimeUnit.MILLISECONDS)
-    m2.setCount("traverserCount", 13)
-    m2.setCount("elementCount", 13)
-    m2.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m2)
-
-    def m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)")
-    m3.setDuration(100, TimeUnit.MILLISECONDS)
-    m3.setCount("traverserCount", 7)
-    m3.setCount("elementCount", 7)
-    m3.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m3)
-
-    def m4 = new MutableMetrics("4.0.0()", "TreeStep")
-    m4.setDuration(100, TimeUnit.MILLISECONDS)
-    m4.setCount("traverserCount", 1)
-    m4.setCount("elementCount", 1)
-    m4.setAnnotation("percentDur", 25.0d)
-    traversalMutableMetrics.add(m4)
-
-    return new DefaultTraversalMetrics(4000, traversalMutableMetrics)
-}
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV1d0.instance()).
-        addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
-        version(GraphSONVersion.V1_0).create().createMapper()
-
-v1GraphSONFile = new File("dev-docs/out-graphson-1d0.txt")
-if (v1GraphSONFile.exists()) v1GraphSONFile.delete()
-new File("dev-docs/out-graphson-1d0.txt").withWriter { writeSupportedV1Objects(it, mapper) }
-
-toJsonV2d0PartialTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v2d0-partial")
-}
-
-toJsonV2d0NoTypes = { o, type, mapper, comment = "" ->
-    toJson(o, type, mapper, comment, "v2d0-no-types")
-}
-
-writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
-    writer.write("Core\n")
-    writer.write("~~~~\n\n")
-    writer.write(toJsonFunction(File, "Class", mapper))
-    writer.write(toJsonFunction(new Date(1481750076295L), "Date", mapper))
-    writer.write(toJsonFunction(100.00d, "Double", mapper))
-    writer.write(toJsonFunction(100.00f, "Float", mapper))
-    writer.write(toJsonFunction(100, "Integer", mapper))
-    writer.write(toJsonFunction(100L, "Long", mapper))
-    writer.write(toJsonFunction(new java.sql.Timestamp(1481750076295L), "Timestamp", mapper))
-    writer.write(toJsonFunction(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", mapper))
-
-    writer.write("\n")
-    writer.write("Graph Structure\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    writer.write(toJsonFunction(graph.edges().next(), "Edge", mapper))
-    writer.write(toJsonFunction(g.V().out().out().path().next(), "Path", mapper))
-    writer.write(toJsonFunction(graph.edges().next().properties().next(), "Property", mapper))
-    writer.write(toJsonFunction(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper))
-    writer.write(toJsonFunction(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`."))
-    writer.write(toJsonFunction(g.V(1).out().out().tree().next(), "Tree", mapper))
-    writer.write(toJsonFunction(graph.vertices().next(), "Vertex", mapper))
-    writer.write(toJsonFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper))
-
-    writer.write("\n")
-    writer.write("Graph Process\n")
-    writer.write("~~~~~~~~~~~~~\n\n")
-    writer.write(toJsonFunction(SackFunctions.Barrier.normSack, "Barrier", mapper))
-    writer.write(toJsonFunction(new Bytecode.Binding("x", 1), "Binding", mapper, "A \"Binding\" refers to a `Bytecode.Binding`."))
-    writer.write(toJsonFunction(g.V().hasLabel('person').out().in().tree().asAdmin().getBytecode(), "Bytecode", mapper, "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language."))
-    writer.write(toJsonFunction(VertexProperty.Cardinality.list, "Cardinality", mapper))
-    writer.write(toJsonFunction(Column.keys, "Column", mapper))
-    writer.write(toJsonFunction(Direction.OUT, "Direction", mapper))
-    writer.write(toJsonFunction(Operator.sum, "Operator", mapper))
-    writer.write(toJsonFunction(Order.incr, "Order", mapper))
-    writer.write(toJsonFunction(Pop.all, "Pop", mapper))
-    writer.write(toJsonFunction(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper))
-    def tm = createStaticTraversalMetrics()
-    def metrics = new MutableMetrics(tm.getMetrics("7.0.0()"))
-    metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")))
-    writer.write(toJsonFunction(metrics, "Metrics", mapper))
-    writer.write(toJsonFunction(P.gt(0), "P", mapper))
-    writer.write(toJsonFunction(P.gt(0).and(P.lt(10)), "P and", mapper))
-    writer.write(toJsonFunction(P.gt(0).or(P.within(-1, -10, -100)), "P or", mapper))
-    writer.write(toJsonFunction(Scope.local, "Scope", mapper))
-    writer.write(toJsonFunction(T.label, "T", mapper))
-    writer.write(toJsonFunction(createStaticTraversalMetrics(), "TraversalMetrics", mapper))
-    writer.write(toJsonFunction(g.V().hasLabel('person').nextTraverser(), "Traverser", mapper))
-
-    writer.write("\n")
-    writer.write("RequestMessage\n")
-    writer.write("~~~~~~~~~~~~~~\n\n")
-    def msg = null
-    msg = RequestMessage.build("authentication").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
-    writer.write(toJsonFunction(msg, "Authentication Response", mapper, "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonFunction(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonFunction(msg, "Session Eval Aliased", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-    msg = RequestMessage.build("close").processor("session").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
-    writer.write(toJsonFunction(msg, "Session Close", mapper, "The following `RequestMessage` is an example of a request to close a session."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
-    writer.write(toJsonFunction(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters."))
-    msg = RequestMessage.build("eval").
-            overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
-            add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
-    writer.write(toJsonFunction(msg, "Sessionless Eval Aliased", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
-
-    writer.write("\n")
-    writer.write("ResponseMessage\n")
-    writer.write("~~~~~~~~~~~~~~~\n\n")
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-    writer.write(toJsonFunction(msg, "Authentication Challenge", mapper, "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server)."))
-    msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
-            code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
-            result(Arrays.asList(graph.vertices().next())).create()
-    writer.write(toJsonFunction(msg, "Standard Result", mapper, "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script."))
-
-    writer.write("\n")
-    writer.write("Extended\n")
-    writer.write("~~~~~~~~\n\n")
-    writer.write("""Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:\n
-[source,java]
-----
-mapper = GraphSONMapper.build().
-                        typeInfo(TypeInfo.PARTIAL_TYPES).
-                        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-                        version(GraphSONVersion.V2_0).create().createMapper()
-----\n
-""")
-    writer.write(toJsonFunction(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", mapper))
-    writer.write(toJsonFunction(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", mapper))
-    writer.write(toJsonFunction(new Byte("1"), "Byte", mapper))
-    writer.write(toJsonFunction(java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", mapper))
-    writer.write(toJsonFunction("x".charAt(0), "Char", mapper))
-    writer.write(toJsonFunction(Duration.ofDays(5), "Duration", mapper,"The following example is a `Duration` of five days."))
-    writer.write(toJsonFunction(java.net.InetAddress.getByName("localhost"), "InetAddress", mapper))
-    writer.write(toJsonFunction(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", mapper))
-    writer.write(toJsonFunction(LocalDate.of(2016, 1, 1), "LocalDate", mapper))
-    writer.write(toJsonFunction(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper))
-    writer.write(toJsonFunction(LocalTime.of(12, 30, 45), "LocalTime", mapper))
-    writer.write(toJsonFunction(MonthDay.of(1, 1), "MonthDay", mapper))
-    writer.write(toJsonFunction(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", mapper))
-    writer.write(toJsonFunction(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", mapper))
-    writer.write(toJsonFunction(Period.of(1, 6, 15), "Period", mapper, "The following example is a `Period` of one year, six months and fifteen days."))
-    writer.write(toJsonFunction(new Short("100"), "Short", mapper))
-    writer.write(toJsonFunction(Year.of(2016), "Year", mapper, "The following example is of the `Year` \"2016\"."))
-    writer.write(toJsonFunction(YearMonth.of(2016, 6), "YearMonth", mapper, "The following example is a `YearMonth` of \"June 2016\""))
-    writer.write(toJsonFunction(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", mapper))
-    writer.write(toJsonFunction(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds."))
-}
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        typeInfo(TypeInfo.PARTIAL_TYPES).
-        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-        version(GraphSONVersion.V2_0).create().createMapper()
-
-file = new File("dev-docs/out-graphson-2d0-partial.txt")
-file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0PartialTypes) }
-
-mapper = GraphSONMapper.build().
-        addRegistry(TinkerIoRegistryV2d0.instance()).
-        typeInfo(TypeInfo.NO_TYPES).
-        addCustomModule(GraphSONXModuleV2d0.build().create(false)).
-        addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
-        version(GraphSONVersion.V2_0).create().createMapper()
-
-file = new File("dev-docs/out-graphson-2d0-no-type.txt")
-file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0NoTypes) }
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/monthday-v2d0-no-types.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/monthday-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsetdatetime-v2d0-no-types.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsetdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsettime-v2d0-no-types.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsettime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v2d0-no-types.json
deleted file mode 100644
index 06a9522..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v2d0-partial.json
deleted file mode 100644
index 54ff76d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/path-v2d0-partial.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/period-v2d0-no-types.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/period-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index b01e98f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : {
-    "@type" : "g:UUID",
-    "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
-  },
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 761b71a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "requestId" : {
-    "@type" : "g:UUID",
-    "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
-  },
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/short-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/short-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/short-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v1d0.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v1d0.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v2d0-no-types.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v2d0-partial.json
deleted file mode 100644
index 66b2e1b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "id" : {
-    "@type" : "g:Int32",
-    "@value" : 1
-  },
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 16
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 5
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 15
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 4
-        }
-      }
-    } ],
-    "develops" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 13
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2009
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 14
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2010
-        }
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 0
-      },
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 6
-      },
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 1997
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 7
-      },
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 8
-      },
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 9
-      },
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json
deleted file mode 100644
index 7efbb83..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json
deleted file mode 100644
index 79231e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json
deleted file mode 100644
index 74dcffc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/year-v2d0-no-types.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/year-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/yearmonth-v2d0-no-types.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/yearmonth-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneddatetime-v2d0-no-types.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneddatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneoffset-v2d0-no-types.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneoffset-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bigdecimal-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bigdecimal-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/biginteger-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/biginteger-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/byte-v2d0-no-types.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/byte-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/char-v2d0-no-types.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/char-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/duration-v2d0-no-types.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/duration-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/instant-v2d0-no-types.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/instant-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdate-v2d0-no-types.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdate-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdatetime-v2d0-no-types.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localtime-v2d0-no-types.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localtime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/monthday-v2d0-no-types.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/monthday-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsetdatetime-v2d0-no-types.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsetdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsettime-v2d0-no-types.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsettime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/period-v2d0-no-types.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/period-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/short-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/short-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/short-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/stargraph-v2d0-no-types.json
deleted file mode 100644
index c8f8fdb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "starVertex" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/stargraph-v2d0-partial.json
deleted file mode 100644
index 59ff13a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "starVertex" : {
-    "@type" : "g:Vertex",
-    "@value" : {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      },
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 0
-            },
-            "value" : "marko",
-            "label" : "name"
-          }
-        } ],
-        "location" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 6
-            },
-            "value" : "san diego",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 1997
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 7
-            },
-            "value" : "santa cruz",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 8
-            },
-            "value" : "brussels",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 9
-            },
-            "value" : "santa fe",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        } ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tree-v2d0-no-types.json
deleted file mode 100644
index 79231e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tree-v2d0-partial.json
deleted file mode 100644
index 74dcffc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/tree-v2d0-partial.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/year-v2d0-no-types.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/year-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/yearmonth-v2d0-no-types.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/yearmonth-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneddatetime-v2d0-no-types.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneddatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneoffset-v2d0-no-types.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneoffset-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bigdecimal-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bigdecimal-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/biginteger-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/biginteger-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/biginteger-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/byte-v2d0-no-types.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/byte-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/byte-v2d0-partial.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/byte-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index 2d341b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"AQIDBAU="
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytebuffer-v2d0-partial.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/char-v2d0-no-types.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/char-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/char-v2d0-partial.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/char-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/duration-v2d0-no-types.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/duration-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/duration-v2d0-partial.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/duration-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/inetaddress-v2d0-partial.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/instant-v2d0-no-types.json
deleted file mode 100644
index b1a24ec..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/instant-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2017-10-13T19:52:33.809Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/instant-v2d0-partial.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/instant-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdate-v2d0-no-types.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdate-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdate-v2d0-partial.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdate-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdatetime-v2d0-no-types.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdatetime-v2d0-partial.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localtime-v2d0-no-types.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localtime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localtime-v2d0-partial.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/localtime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/metrics-v2d0-no-types.json
deleted file mode 100644
index 88430f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 0.038667,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 19.65395778162947
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 0.04619,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 23.47780562064461
-    },
-    "id" : "2.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/metrics-v2d0-partial.json
deleted file mode 100644
index 1e8bcdb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.058716
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 21.402170981169764
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.0576
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 20.995385389252988
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/monthday-v2d0-no-types.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/monthday-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/monthday-v2d0-partial.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/monthday-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsetdatetime-v2d0-no-types.json
deleted file mode 100644
index 6ffa091..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsetdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2017-10-13T15:52:33.810-04:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsettime-v2d0-no-types.json
deleted file mode 100644
index df912ca..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsettime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"15:52:33.810-04:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsettime-v2d0-partial.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/period-v2d0-no-types.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/period-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/period-v2d0-partial.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/period-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/short-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/short-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/short-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/short-v2d0-partial.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/short-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v1d0.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v1d0.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v2d0-no-types.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v2d0-partial.json
deleted file mode 100644
index 66b2e1b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "id" : {
-    "@type" : "g:Int32",
-    "@value" : 1
-  },
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 16
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 5
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 15
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 4
-        }
-      }
-    } ],
-    "develops" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 13
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2009
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 14
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2010
-        }
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 0
-      },
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 6
-      },
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 1997
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 7
-      },
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 8
-      },
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 9
-      },
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 4b21100..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.185665,
-  "metrics" : [ {
-    "dur" : 0.034527,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 18.596396736056878
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 0.044219,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 23.81655131554143
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 0.064533,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 34.75776263700752
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 0.042386,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 22.829289311394177
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index d64afa9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.199533
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.045776
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 22.941568562593655
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.065332
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 32.74245362922424
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.034725
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 17.40313632331494
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.0537
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 26.912841484867165
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v1d0.json
deleted file mode 100644
index db030dd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v1d0.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "7" : {
-    "key" : {
-      "id" : 7,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 1,
-          "value" : "stephen"
-        } ],
-        "location" : [ {
-          "id" : 10,
-          "value" : "centreville",
-          "properties" : {
-            "startTime" : 1990,
-            "endTime" : 2000
-          }
-        }, {
-          "id" : 11,
-          "value" : "dulles",
-          "properties" : {
-            "startTime" : 2000,
-            "endTime" : 2006
-          }
-        }, {
-          "id" : 12,
-          "value" : "purcellville",
-          "properties" : {
-            "startTime" : 2006
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "8" : {
-    "key" : {
-      "id" : 8,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 2,
-          "value" : "matthias"
-        } ],
-        "location" : [ {
-          "id" : 13,
-          "value" : "bremen",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2007
-          }
-        }, {
-          "id" : 14,
-          "value" : "baltimore",
-          "properties" : {
-            "startTime" : 2007,
-            "endTime" : 2011
-          }
-        }, {
-          "id" : 15,
-          "value" : "oakland",
-          "properties" : {
-            "startTime" : 2011,
-            "endTime" : 2014
-          }
-        }, {
-          "id" : 16,
-          "value" : "seattle",
-          "properties" : {
-            "startTime" : 2014
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "9" : {
-    "key" : {
-      "id" : 9,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 3,
-          "value" : "daniel"
-        } ],
-        "location" : [ {
-          "id" : 17,
-          "value" : "spremberg",
-          "properties" : {
-            "startTime" : 1982,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 18,
-          "value" : "kaiserslautern",
-          "properties" : {
-            "startTime" : 2005,
-            "endTime" : 2009
-          }
-        }, {
-          "id" : 19,
-          "value" : "aachen",
-          "properties" : {
-            "startTime" : 2009
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v2d0-no-types.json
deleted file mode 100644
index 50c2417..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,269 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v2d0-partial.json
deleted file mode 100644
index 03b4a5a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/tree-v2d0-partial.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/year-v2d0-no-types.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/year-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/year-v2d0-partial.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/year-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/yearmonth-v2d0-no-types.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/yearmonth-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/yearmonth-v2d0-partial.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneddatetime-v2d0-no-types.json
deleted file mode 100644
index 563c612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneddatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2017-10-13T15:52:33.812-04:00[America/New_York]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneoffset-v2d0-no-types.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneoffset-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/biginteger-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/byte-v2d0-partial.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/byte-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytebuffer-v2d0-partial.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/char-v2d0-partial.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/char-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/duration-v2d0-partial.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/duration-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/inetaddress-v2d0-partial.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/instant-v2d0-partial.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/instant-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localdate-v2d0-partial.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localdate-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localdatetime-v2d0-partial.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localtime-v2d0-partial.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/localtime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/metrics-v2d0-no-types.json
deleted file mode 100644
index 3ea5cdf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 0.185849,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 22.937807782975206
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 0.222958,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 27.517865297508116
-    },
-    "id" : "2.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/metrics-v2d0-partial.json
deleted file mode 100644
index d029e7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.176074
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 11.94580512096829
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.529935
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 35.953634476301616
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/monthday-v2d0-partial.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/monthday-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/offsettime-v2d0-partial.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/period-v2d0-partial.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/period-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithin-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithin-v1d0.json
deleted file mode 100644
index 117ad4b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithin-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "within",
-  "value" : [ 1 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithout-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithout-v1d0.json
deleted file mode 100644
index 93ffd43..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithout-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "without",
-  "value" : [ 1, 2 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/short-v2d0-partial.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/short-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v1d0.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v1d0.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v2d0-no-types.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v2d0-partial.json
deleted file mode 100644
index 66b2e1b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "id" : {
-    "@type" : "g:Int32",
-    "@value" : 1
-  },
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 16
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 5
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 15
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 4
-        }
-      }
-    } ],
-    "develops" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 13
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2009
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 14
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2010
-        }
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 0
-      },
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 6
-      },
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 1997
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 7
-      },
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 8
-      },
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 9
-      },
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 9d85120..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.660111,
-  "metrics" : [ {
-    "dur" : 0.090351,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 13.687243509046207
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 0.157197,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 23.813722237623672
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 0.199673,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 30.24839761797637
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 0.21289,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 32.25063663535375
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index 1b70253..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.805907
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.115216
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 14.296438670963274
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.222926
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 27.66150436712921
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.218694
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 27.136381741317546
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.249071
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 30.90567522058997
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v1d0.json
deleted file mode 100644
index db030dd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v1d0.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "7" : {
-    "key" : {
-      "id" : 7,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 1,
-          "value" : "stephen"
-        } ],
-        "location" : [ {
-          "id" : 10,
-          "value" : "centreville",
-          "properties" : {
-            "startTime" : 1990,
-            "endTime" : 2000
-          }
-        }, {
-          "id" : 11,
-          "value" : "dulles",
-          "properties" : {
-            "startTime" : 2000,
-            "endTime" : 2006
-          }
-        }, {
-          "id" : 12,
-          "value" : "purcellville",
-          "properties" : {
-            "startTime" : 2006
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "8" : {
-    "key" : {
-      "id" : 8,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 2,
-          "value" : "matthias"
-        } ],
-        "location" : [ {
-          "id" : 13,
-          "value" : "bremen",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2007
-          }
-        }, {
-          "id" : 14,
-          "value" : "baltimore",
-          "properties" : {
-            "startTime" : 2007,
-            "endTime" : 2011
-          }
-        }, {
-          "id" : 15,
-          "value" : "oakland",
-          "properties" : {
-            "startTime" : 2011,
-            "endTime" : 2014
-          }
-        }, {
-          "id" : 16,
-          "value" : "seattle",
-          "properties" : {
-            "startTime" : 2014
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "9" : {
-    "key" : {
-      "id" : 9,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 3,
-          "value" : "daniel"
-        } ],
-        "location" : [ {
-          "id" : 17,
-          "value" : "spremberg",
-          "properties" : {
-            "startTime" : 1982,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 18,
-          "value" : "kaiserslautern",
-          "properties" : {
-            "startTime" : 2005,
-            "endTime" : 2009
-          }
-        }, {
-          "id" : 19,
-          "value" : "aachen",
-          "properties" : {
-            "startTime" : 2009
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v2d0-no-types.json
deleted file mode 100644
index 50c2417..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,269 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v2d0-partial.json
deleted file mode 100644
index 03b4a5a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/tree-v2d0-partial.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/year-v2d0-partial.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/year-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/yearmonth-v2d0-partial.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/biginteger-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/byte-v2d0-partial.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/byte-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytebuffer-v2d0-partial.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/char-v2d0-partial.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/char-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/duration-v2d0-partial.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/duration-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/inetaddress-v2d0-partial.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/instant-v2d0-partial.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/instant-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localdate-v2d0-partial.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localdate-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localdatetime-v2d0-partial.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localtime-v2d0-partial.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/localtime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/metrics-v2d0-no-types.json
deleted file mode 100644
index 4e3a36b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 0.110371,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 13.763978036696127
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 0.200887,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.051909069028774
-    },
-    "id" : "2.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/metrics-v2d0-partial.json
deleted file mode 100644
index 1cdba72..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.185895
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 21.255709981533677
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.244286
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 27.93228633663593
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/monthday-v2d0-partial.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/monthday-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/offsettime-v2d0-partial.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/period-v2d0-partial.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/period-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithin-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithin-v1d0.json
deleted file mode 100644
index 117ad4b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithin-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "within",
-  "value" : [ 1 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithout-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithout-v1d0.json
deleted file mode 100644
index 93ffd43..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithout-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "without",
-  "value" : [ 1, 2 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/short-v2d0-partial.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/short-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v1d0.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v1d0.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v2d0-no-types.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v2d0-partial.json
deleted file mode 100644
index 66b2e1b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "id" : {
-    "@type" : "g:Int32",
-    "@value" : 1
-  },
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 16
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 5
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 15
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 4
-        }
-      }
-    } ],
-    "develops" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 13
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2009
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 14
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2010
-        }
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 0
-      },
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 6
-      },
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 1997
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 7
-      },
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 8
-      },
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 9
-      },
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 54b2928..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.543845,
-  "metrics" : [ {
-    "dur" : 0.094859,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 17.442285945444013
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 0.117034,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 21.519734483170755
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 0.204381,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 37.58074451360222
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 0.127571,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 23.45723505778301
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index 5ec3fc9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.605947
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.11929
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 19.686540241968356
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.174927
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 28.868366375277045
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.164905
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 27.214426344218225
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.146825
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 24.230667038536374
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v1d0.json
deleted file mode 100644
index db030dd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v1d0.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "7" : {
-    "key" : {
-      "id" : 7,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 1,
-          "value" : "stephen"
-        } ],
-        "location" : [ {
-          "id" : 10,
-          "value" : "centreville",
-          "properties" : {
-            "startTime" : 1990,
-            "endTime" : 2000
-          }
-        }, {
-          "id" : 11,
-          "value" : "dulles",
-          "properties" : {
-            "startTime" : 2000,
-            "endTime" : 2006
-          }
-        }, {
-          "id" : 12,
-          "value" : "purcellville",
-          "properties" : {
-            "startTime" : 2006
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "8" : {
-    "key" : {
-      "id" : 8,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 2,
-          "value" : "matthias"
-        } ],
-        "location" : [ {
-          "id" : 13,
-          "value" : "bremen",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2007
-          }
-        }, {
-          "id" : 14,
-          "value" : "baltimore",
-          "properties" : {
-            "startTime" : 2007,
-            "endTime" : 2011
-          }
-        }, {
-          "id" : 15,
-          "value" : "oakland",
-          "properties" : {
-            "startTime" : 2011,
-            "endTime" : 2014
-          }
-        }, {
-          "id" : 16,
-          "value" : "seattle",
-          "properties" : {
-            "startTime" : 2014
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "9" : {
-    "key" : {
-      "id" : 9,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 3,
-          "value" : "daniel"
-        } ],
-        "location" : [ {
-          "id" : 17,
-          "value" : "spremberg",
-          "properties" : {
-            "startTime" : 1982,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 18,
-          "value" : "kaiserslautern",
-          "properties" : {
-            "startTime" : 2005,
-            "endTime" : 2009
-          }
-        }, {
-          "id" : 19,
-          "value" : "aachen",
-          "properties" : {
-            "startTime" : 2009
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v2d0-no-types.json
deleted file mode 100644
index 50c2417..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,269 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v2d0-partial.json
deleted file mode 100644
index 03b4a5a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/tree-v2d0-partial.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/year-v2d0-partial.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/year-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/yearmonth-v2d0-partial.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/biginteger-v2d0-partial.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/byte-v2d0-partial.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/byte-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytebuffer-v2d0-partial.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/char-v2d0-partial.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/char-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/duration-v2d0-partial.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/duration-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/inetaddress-v2d0-partial.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/instant-v2d0-partial.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/instant-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localdate-v2d0-partial.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localdate-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localdatetime-v2d0-partial.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localtime-v2d0-partial.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/localtime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/metrics-v2d0-no-types.json
deleted file mode 100644
index 1c4f532..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 0.154106,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 14.492227540743109
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 0.32757,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 30.804893875132834
-    },
-    "id" : "2.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/metrics-v2d0-partial.json
deleted file mode 100644
index 78fc182..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.226023
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 15.263924212198281
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.425817
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 28.75653546880466
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/monthday-v2d0-partial.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/monthday-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/offsettime-v2d0-partial.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/period-v2d0-partial.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/period-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithin-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithin-v1d0.json
deleted file mode 100644
index 117ad4b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithin-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "within",
-  "value" : [ 1 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithout-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithout-v1d0.json
deleted file mode 100644
index 93ffd43..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithout-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "without",
-  "value" : [ 1, 2 ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/short-v2d0-partial.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/short-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v1d0.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v1d0.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v2d0-no-types.json
deleted file mode 100644
index 4fc3915..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : 16,
-      "inV" : 11,
-      "properties" : {
-        "skill" : 5
-      }
-    }, {
-      "id" : 15,
-      "inV" : 10,
-      "properties" : {
-        "skill" : 4
-      }
-    } ],
-    "develops" : [ {
-      "id" : 13,
-      "inV" : 10,
-      "properties" : {
-        "since" : 2009
-      }
-    }, {
-      "id" : 14,
-      "inV" : 11,
-      "properties" : {
-        "since" : 2010
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v2d0-partial.json
deleted file mode 100644
index 66b2e1b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "id" : {
-    "@type" : "g:Int32",
-    "@value" : 1
-  },
-  "label" : "person",
-  "outE" : {
-    "uses" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 16
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 5
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 15
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "skill" : {
-          "@type" : "g:Int32",
-          "@value" : 4
-        }
-      }
-    } ],
-    "develops" : [ {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 13
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 10
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2009
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 14
-      },
-      "inV" : {
-        "@type" : "g:Int32",
-        "@value" : 11
-      },
-      "properties" : {
-        "since" : {
-          "@type" : "g:Int32",
-          "@value" : 2010
-        }
-      }
-    } ]
-  },
-  "properties" : {
-    "name" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 0
-      },
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 6
-      },
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 1997
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 7
-      },
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2001
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 8
-      },
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2004
-        },
-        "endTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    }, {
-      "id" : {
-        "@type" : "g:Int64",
-        "@value" : 9
-      },
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : {
-          "@type" : "g:Int32",
-          "@value" : 2005
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 3235f28..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.625789,
-  "metrics" : [ {
-    "dur" : 0.099721,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 15.93524334879648
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 0.156114,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 24.946747226301518
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 0.155405,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 24.83345025240137
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 0.214549,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 34.284559172500636
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index 61e1837..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.527443
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.081108
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 15.377585824439798
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.151225
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 28.67134458131021
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.141336
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 26.79645004294303
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 0.153774
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 29.154619551306965
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
deleted file mode 100644
index db030dd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "7" : {
-    "key" : {
-      "id" : 7,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 1,
-          "value" : "stephen"
-        } ],
-        "location" : [ {
-          "id" : 10,
-          "value" : "centreville",
-          "properties" : {
-            "startTime" : 1990,
-            "endTime" : 2000
-          }
-        }, {
-          "id" : 11,
-          "value" : "dulles",
-          "properties" : {
-            "startTime" : 2000,
-            "endTime" : 2006
-          }
-        }, {
-          "id" : 12,
-          "value" : "purcellville",
-          "properties" : {
-            "startTime" : 2006
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "8" : {
-    "key" : {
-      "id" : 8,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 2,
-          "value" : "matthias"
-        } ],
-        "location" : [ {
-          "id" : 13,
-          "value" : "bremen",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2007
-          }
-        }, {
-          "id" : 14,
-          "value" : "baltimore",
-          "properties" : {
-            "startTime" : 2007,
-            "endTime" : 2011
-          }
-        }, {
-          "id" : 15,
-          "value" : "oakland",
-          "properties" : {
-            "startTime" : 2011,
-            "endTime" : 2014
-          }
-        }, {
-          "id" : 16,
-          "value" : "seattle",
-          "properties" : {
-            "startTime" : 2014
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "9" : {
-    "key" : {
-      "id" : 9,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 3,
-          "value" : "daniel"
-        } ],
-        "location" : [ {
-          "id" : 17,
-          "value" : "spremberg",
-          "properties" : {
-            "startTime" : 1982,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 18,
-          "value" : "kaiserslautern",
-          "properties" : {
-            "startTime" : 2005,
-            "endTime" : 2009
-          }
-        }, {
-          "id" : 19,
-          "value" : "aachen",
-          "properties" : {
-            "startTime" : 2009
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v2d0-no-types.json
deleted file mode 100644
index 50c2417..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,269 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-}, {
-  "key" : {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v2d0-partial.json
deleted file mode 100644
index 03b4a5a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v2d0-partial.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  }, {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/year-v2d0-partial.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/year-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/yearmonth-v2d0-partial.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-no-types.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-no-types.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-no-types.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-no-types.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-no-types.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-no-types.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-no-types.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-no-types.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-no-types.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v1d0.json
deleted file mode 100644
index e4935e2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v1d0.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "starVertex" : {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
deleted file mode 100644
index c8f8fdb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "starVertex" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
deleted file mode 100644
index 59ff13a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "starVertex" : {
-    "@type" : "g:Vertex",
-    "@value" : {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      },
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 0
-            },
-            "value" : "marko",
-            "label" : "name"
-          }
-        } ],
-        "location" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 6
-            },
-            "value" : "san diego",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 1997
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 7
-            },
-            "value" : "santa cruz",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 8
-            },
-            "value" : "brussels",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 9
-            },
-            "value" : "santa fe",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        } ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v3d0.json
deleted file mode 100644
index 59ff13a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v3d0.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "starVertex" : {
-    "@type" : "g:Vertex",
-    "@value" : {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      },
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 0
-            },
-            "value" : "marko",
-            "label" : "name"
-          }
-        } ],
-        "location" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 6
-            },
-            "value" : "san diego",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 1997
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 7
-            },
-            "value" : "santa cruz",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 8
-            },
-            "value" : "brussels",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 9
-            },
-            "value" : "santa fe",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        } ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v1d0.json
deleted file mode 100644
index db030dd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v1d0.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "1" : {
-    "key" : {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "7" : {
-    "key" : {
-      "id" : 7,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 1,
-          "value" : "stephen"
-        } ],
-        "location" : [ {
-          "id" : 10,
-          "value" : "centreville",
-          "properties" : {
-            "startTime" : 1990,
-            "endTime" : 2000
-          }
-        }, {
-          "id" : 11,
-          "value" : "dulles",
-          "properties" : {
-            "startTime" : 2000,
-            "endTime" : 2006
-          }
-        }, {
-          "id" : 12,
-          "value" : "purcellville",
-          "properties" : {
-            "startTime" : 2006
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "8" : {
-    "key" : {
-      "id" : 8,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 2,
-          "value" : "matthias"
-        } ],
-        "location" : [ {
-          "id" : 13,
-          "value" : "bremen",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2007
-          }
-        }, {
-          "id" : 14,
-          "value" : "baltimore",
-          "properties" : {
-            "startTime" : 2007,
-            "endTime" : 2011
-          }
-        }, {
-          "id" : 15,
-          "value" : "oakland",
-          "properties" : {
-            "startTime" : 2011,
-            "endTime" : 2014
-          }
-        }, {
-          "id" : 16,
-          "value" : "seattle",
-          "properties" : {
-            "startTime" : 2014
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  },
-  "9" : {
-    "key" : {
-      "id" : 9,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 3,
-          "value" : "daniel"
-        } ],
-        "location" : [ {
-          "id" : 17,
-          "value" : "spremberg",
-          "properties" : {
-            "startTime" : 1982,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 18,
-          "value" : "kaiserslautern",
-          "properties" : {
-            "startTime" : 2005,
-            "endTime" : 2009
-          }
-        }, {
-          "id" : 19,
-          "value" : "aachen",
-          "properties" : {
-            "startTime" : 2009
-          }
-        } ]
-      }
-    },
-    "value" : {
-      "10" : {
-        "key" : {
-          "id" : 10,
-          "label" : "software",
-          "type" : "vertex",
-          "properties" : {
-            "name" : [ {
-              "id" : 4,
-              "value" : "gremlin"
-            } ]
-          }
-        },
-        "value" : {
-          "11" : {
-            "key" : {
-              "id" : 11,
-              "label" : "software",
-              "type" : "vertex",
-              "properties" : {
-                "name" : [ {
-                  "id" : 5,
-                  "value" : "tinkergraph"
-                } ]
-              }
-            },
-            "value" : { }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json
deleted file mode 100644
index 79231e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json
deleted file mode 100644
index 74dcffc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v3d0.json
deleted file mode 100644
index 77ba971..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v3d0.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Map",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Map",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Map",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-no-types.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-no-types.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-no-types.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v2d0-no-types.json
deleted file mode 100644
index 7dd6c03..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"normSack"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v2d0-no-types.json
deleted file mode 100644
index 7914536..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-123456789987654321123456789987654321
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v2d0-no-types.json
deleted file mode 100644
index 661b153..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "x",
-  "value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v2d0-no-types.json
deleted file mode 100644
index 56a6051..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v2d0-no-types.json
deleted file mode 100644
index 6088abf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v2d0-no-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v2d0-no-types.json
deleted file mode 100644
index 0617890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"list"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v2d0-no-types.json
deleted file mode 100644
index 3403a0c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"x"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v2d0-no-types.json
deleted file mode 100644
index 02597c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"keys"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v2d0-no-types.json
deleted file mode 100644
index f6d62d7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"OUT"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v2d0-no-types.json
deleted file mode 100644
index 0e15a3c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"PT120H"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v2d0-no-types.json
deleted file mode 100644
index 40f2c7c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-14T16:39:19.349Z"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v2d0-no-types.json
deleted file mode 100644
index c7cabbf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "script" : "{ it.get() }",
-  "language" : "gremlin-groovy",
-  "arguments" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v2d0-no-types.json
deleted file mode 100644
index 5e4fd2a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v2d0-no-types.json
deleted file mode 100644
index 4be6ada..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-01-01T12:30"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v2d0-no-types.json
deleted file mode 100644
index 720616d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"12:30:45"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v2d0-no-types.json
deleted file mode 100644
index 09813a6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"--01-01"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v2d0-no-types.json
deleted file mode 100644
index d85a355..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2007-12-03T10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v2d0-no-types.json
deleted file mode 100644
index b8f08fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"10:15:30+01:00"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v2d0-no-types.json
deleted file mode 100644
index 2571e55..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"sum"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json
deleted file mode 100644
index 7446df0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"shuffle"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v2d0-no-types.json
deleted file mode 100644
index 4b9ce34..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "predicate" : "gt",
-  "value" : 0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v2d0-no-types.json
deleted file mode 100644
index a58ce89..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"P1Y6M15D"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v2d0-no-types.json
deleted file mode 100644
index 1e74759..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"any"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v2d0-no-types.json
deleted file mode 100644
index 99a6195..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"all"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v2d0-no-types.json
deleted file mode 100644
index 8fde6b5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"local"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v2d0-no-types.json
deleted file mode 100644
index 4fd2fd3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v2d0-no-types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko",
-          "label" : "name"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v2d0-no-types.json
deleted file mode 100644
index c8f8fdb..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v2d0-no-types.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "starVertex" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v2d0-partial.json
deleted file mode 100644
index 59ff13a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v2d0-partial.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "starVertex" : {
-    "@type" : "g:Vertex",
-    "@value" : {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      },
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 0
-            },
-            "value" : "marko",
-            "label" : "name"
-          }
-        } ],
-        "location" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 6
-            },
-            "value" : "san diego",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 1997
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 7
-            },
-            "value" : "santa cruz",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 8
-            },
-            "value" : "brussels",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 9
-            },
-            "value" : "santa fe",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        } ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v3d0.json
deleted file mode 100644
index 59ff13a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/stargraph-v3d0.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "starVertex" : {
-    "@type" : "g:Vertex",
-    "@value" : {
-      "id" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      },
-      "label" : "person",
-      "properties" : {
-        "name" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 0
-            },
-            "value" : "marko",
-            "label" : "name"
-          }
-        } ],
-        "location" : [ {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 6
-            },
-            "value" : "san diego",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 1997
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 7
-            },
-            "value" : "santa cruz",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2001
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 8
-            },
-            "value" : "brussels",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2004
-              },
-              "endTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        }, {
-          "@type" : "g:VertexProperty",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int64",
-              "@value" : 9
-            },
-            "value" : "santa fe",
-            "label" : "location",
-            "properties" : {
-              "startTime" : {
-                "@type" : "g:Int32",
-                "@value" : 2005
-              }
-            }
-          }
-        } ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v2d0-no-types.json
deleted file mode 100644
index bad8612..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"label"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v2d0-no-types.json
deleted file mode 100644
index 6d1f029..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v2d0-no-types.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "bulk" : 1,
-  "value" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v2d0-no-types.json
deleted file mode 100644
index 79231e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v2d0-no-types.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[ {
-  "key" : {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  },
-  "value" : [ {
-    "key" : {
-      "id" : 10,
-      "label" : "software",
-      "properties" : {
-        "name" : [ {
-          "id" : 4,
-          "value" : "gremlin",
-          "label" : "name"
-        } ]
-      }
-    },
-    "value" : [ {
-      "key" : {
-        "id" : 11,
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "id" : 5,
-            "value" : "tinkergraph",
-            "label" : "name"
-          } ]
-        }
-      },
-      "value" : [ ]
-    } ]
-  } ]
-} ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v2d0-partial.json
deleted file mode 100644
index 74dcffc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v2d0-partial.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "@type" : "g:Tree",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Tree",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Tree",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Tree",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v3d0.json
deleted file mode 100644
index 77ba971..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/tree-v3d0.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "key" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    },
-    "value" : {
-      "@type" : "g:Map",
-      "@value" : [ {
-        "key" : {
-          "@type" : "g:Vertex",
-          "@value" : {
-            "id" : {
-              "@type" : "g:Int32",
-              "@value" : 10
-            },
-            "label" : "software",
-            "properties" : {
-              "name" : [ {
-                "@type" : "g:VertexProperty",
-                "@value" : {
-                  "id" : {
-                    "@type" : "g:Int64",
-                    "@value" : 4
-                  },
-                  "value" : "gremlin",
-                  "label" : "name"
-                }
-              } ]
-            }
-          }
-        },
-        "value" : {
-          "@type" : "g:Map",
-          "@value" : [ {
-            "key" : {
-              "@type" : "g:Vertex",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int32",
-                  "@value" : 11
-                },
-                "label" : "software",
-                "properties" : {
-                  "name" : [ {
-                    "@type" : "g:VertexProperty",
-                    "@value" : {
-                      "id" : {
-                        "@type" : "g:Int64",
-                        "@value" : 5
-                      },
-                      "value" : "tinkergraph",
-                      "label" : "name"
-                    }
-                  } ]
-                }
-              }
-            },
-            "value" : {
-              "@type" : "g:Map",
-              "@value" : [ ]
-            }
-          } ]
-        }
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v2d0-no-types.json
deleted file mode 100644
index 313df40..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v2d0-no-types.json
deleted file mode 100644
index 185b577..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-06"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v2d0-no-types.json
deleted file mode 100644
index 7333537..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v2d0-no-types.json
deleted file mode 100644
index 37ec508..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"+03:06:09"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_11/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_4/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_5/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_6/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_7/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_8/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_9/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_10/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_11/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_12/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_13/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_2/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_3/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_4/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_5/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_6/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_7/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_8/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_9/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_0/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_1/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_2/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_3/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_4/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_5/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_6/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_5_7/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_0/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_1/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_2/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_3/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v1d0.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v2d0-no-types.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v2d0-partial.json
deleted file mode 100644
index 8c5b82c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v2d0-partial.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v3d0.json
deleted file mode 100644
index d1734c6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationchallenge-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 407,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : null,
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v1d0.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v1d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v2d0-no-types.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v2d0-no-types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v2d0-partial.json
deleted file mode 100644
index 838e1fd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v2d0-partial.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "saslMechanism" : "PLAIN",
-    "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v3d0.json
deleted file mode 100644
index daceca2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/authenticationresponse-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "authentication",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/barrier-v2d0-partial.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/barrier-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/barrier-v3d0.json
deleted file mode 100644
index 7ddccdd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/barrier-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Barrier",
-  "@value" : "normSack"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bigdecimal-v2d0-partial.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bigdecimal-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bigdecimal-v3d0.json
deleted file mode 100644
index 475337c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bigdecimal-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigDecimal",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/biginteger-v2d0-partial.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/biginteger-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/biginteger-v3d0.json
deleted file mode 100644
index 58e6114..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/biginteger-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:BigInteger",
-  "@value" : 123456789987654321123456789987654321
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/binding-v2d0-partial.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/binding-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/binding-v3d0.json
deleted file mode 100644
index 579b8c7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/binding-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Binding",
-  "@value" : {
-    "key" : "x",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bulkset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bulkset-v2d0-partial.json
deleted file mode 100644
index c844975..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bulkset-v2d0-partial.json
+++ /dev/null
@@ -1 +0,0 @@
-[ "marko", "josh", "josh" ]
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bulkset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bulkset-v3d0.json
deleted file mode 100644
index c216a36..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bulkset-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:BulkSet",
-  "@value" : [ "marko", {
-    "@type" : "g:Int64",
-    "@value" : 1
-  }, "josh", {
-    "@type" : "g:Int64",
-    "@value" : 2
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/byte-v2d0-partial.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/byte-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/byte-v3d0.json
deleted file mode 100644
index 979625b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/byte-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Byte",
-  "@value" : 1
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v2d0-no-types.json
deleted file mode 100644
index e0046e9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v2d0-partial.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v3d0.json
deleted file mode 100644
index 5724115..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytebuffer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ByteBuffer",
-  "@value" : "c29tZSBieXRlcyBmb3IgeW91"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytecode-v2d0-partial.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytecode-v2d0-partial.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytecode-v3d0.json
deleted file mode 100644
index 269d277..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/bytecode-v3d0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@type" : "g:Bytecode",
-  "@value" : {
-    "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/cardinality-v2d0-partial.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/cardinality-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/cardinality-v3d0.json
deleted file mode 100644
index 834e64e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/cardinality-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Cardinality",
-  "@value" : "list"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/char-v2d0-partial.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/char-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/char-v3d0.json
deleted file mode 100644
index 8f27e9d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/char-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Char",
-  "@value" : "x"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v2d0-no-types.json
deleted file mode 100644
index 2fbd64d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"java.io.File"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v2d0-partial.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v3d0.json
deleted file mode 100644
index 80f15a2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/class-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Class",
-  "@value" : "java.io.File"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/column-v2d0-partial.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/column-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/column-v3d0.json
deleted file mode 100644
index 0b3a56e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/column-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Column",
-  "@value" : "keys"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v2d0-partial.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v3d0.json
deleted file mode 100644
index cf4007a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/date-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Date",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/direction-v2d0-partial.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/direction-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/direction-v3d0.json
deleted file mode 100644
index 78cb7e4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/direction-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Direction",
-  "@value" : "OUT"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v2d0-no-types.json
deleted file mode 100644
index e772e62..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100.0
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v2d0-partial.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v3d0.json
deleted file mode 100644
index 9ae4964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/double-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Double",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/duration-v2d0-partial.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/duration-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/duration-v3d0.json
deleted file mode 100644
index 05c0ce9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/duration-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Duration",
-  "@value" : "PT120H"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v1d0.json
deleted file mode 100644
index 0f7f168..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "type" : "edge",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : 2009
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v2d0-no-types.json
deleted file mode 100644
index a8e73db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v2d0-no-types.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "id" : 13,
-  "label" : "develops",
-  "inVLabel" : "software",
-  "outVLabel" : "person",
-  "inV" : 10,
-  "outV" : 1,
-  "properties" : {
-    "since" : {
-      "key" : "since",
-      "value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v2d0-partial.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v2d0-partial.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v3d0.json
deleted file mode 100644
index ba1c52e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/edge-v3d0.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "@type" : "g:Edge",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 13
-    },
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : {
-      "@type" : "g:Int32",
-      "@value" : 10
-    },
-    "outV" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "properties" : {
-      "since" : {
-        "@type" : "g:Property",
-        "@value" : {
-          "key" : "since",
-          "value" : {
-            "@type" : "g:Int32",
-            "@value" : 2009
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/float-v2d0-partial.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/float-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/float-v3d0.json
deleted file mode 100644
index 7179aaf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/float-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Float",
-  "@value" : 100.0
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v2d0-no-types.json
deleted file mode 100644
index e34c016..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"localhost"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v2d0-partial.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v3d0.json
deleted file mode 100644
index fba98c0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/inetaddress-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:InetAddress",
-  "@value" : "localhost"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/instant-v2d0-partial.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/instant-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/instant-v3d0.json
deleted file mode 100644
index 3749741..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/instant-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Instant",
-  "@value" : "2016-12-14T16:39:19.349Z"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v2d0-no-types.json
deleted file mode 100644
index 105d7d9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-100
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v2d0-partial.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v3d0.json
deleted file mode 100644
index 750ce7a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/integer-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int32",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/lambda-v2d0-partial.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/lambda-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/lambda-v3d0.json
deleted file mode 100644
index 5be179b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/lambda-v3d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "@type" : "g:Lambda",
-  "@value" : {
-    "script" : "{ it.get() }",
-    "language" : "gremlin-groovy",
-    "arguments" : 1
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/list-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/list-v3d0.json
deleted file mode 100644
index b714e2d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/list-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:List",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdate-v2d0-partial.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdate-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdate-v3d0.json
deleted file mode 100644
index 36fb81d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdate-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDate",
-  "@value" : "2016-01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdatetime-v2d0-partial.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdatetime-v3d0.json
deleted file mode 100644
index 2d83668..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalDateTime",
-  "@value" : "2016-01-01T12:30"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localtime-v2d0-partial.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localtime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localtime-v3d0.json
deleted file mode 100644
index eff65a7..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/localtime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:LocalTime",
-  "@value" : "12:30:45"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/long-v2d0-partial.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/long-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/long-v3d0.json
deleted file mode 100644
index 84b9a23..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/long-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Int64",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/map-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/map-v3d0.json
deleted file mode 100644
index 7ad59c9..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/map-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:Map",
-  "@value" : [ {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "red", {
-    "@type" : "g:List",
-    "@value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 3
-    } ]
-  }, {
-    "@type" : "g:Date",
-    "@value" : 1481750076295
-  }, "test", {
-    "@type" : "g:Int32",
-    "@value" : 123
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v2d0-no-types.json
deleted file mode 100644
index 1855cb5..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v2d0-no-types.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dur" : 100.0,
-  "counts" : {
-    "traverserCount" : 4,
-    "elementCount" : 4
-  },
-  "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-  "annotations" : {
-    "percentDur" : 25.0
-  },
-  "id" : "7.0.0()",
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v2d0-partial.json
deleted file mode 100644
index 7b1e964..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v2d0-partial.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    },
-    "counts" : {
-      "traverserCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      },
-      "elementCount" : {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      }
-    },
-    "id" : "7.0.0()",
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v3d0.json
deleted file mode 100644
index f6e678b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/metrics-v3d0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "@type" : "g:Metrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 100.0
-    }, "counts", {
-      "@type" : "g:Map",
-      "@value" : [ "traverserCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      }, "elementCount", {
-        "@type" : "g:Int64",
-        "@value" : 4
-      } ]
-    }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-      "@type" : "g:Map",
-      "@value" : [ "percentDur", {
-        "@type" : "g:Double",
-        "@value" : 25.0
-      } ]
-    }, "id", "7.0.0()", "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/monthday-v2d0-partial.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/monthday-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/monthday-v3d0.json
deleted file mode 100644
index 5da5914..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/monthday-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:MonthDay",
-  "@value" : "--01-01"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsetdatetime-v2d0-partial.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsetdatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsetdatetime-v3d0.json
deleted file mode 100644
index 03f45cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsetdatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetDateTime",
-  "@value" : "2007-12-03T10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsettime-v2d0-partial.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsettime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsettime-v3d0.json
deleted file mode 100644
index b124953..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/offsettime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:OffsetTime",
-  "@value" : "10:15:30+01:00"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/operator-v2d0-partial.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/operator-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/operator-v3d0.json
deleted file mode 100644
index 14c1400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/operator-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Operator",
-  "@value" : "sum"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/order-v2d0-partial.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/order-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/order-v3d0.json
deleted file mode 100644
index 4be0432..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/order-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Order",
-  "@value" : "shuffle"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/p-v2d0-partial.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/p-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/p-v3d0.json
deleted file mode 100644
index 5bdfb3b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/p-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "gt",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 0
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v2d0-no-types.json
deleted file mode 100644
index 194cdd0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "and",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "lt",
-    "value" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v2d0-partial.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v2d0-partial.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v3d0.json
deleted file mode 100644
index c271958..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pand-v3d0.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "and",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "lt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v1d0.json
deleted file mode 100644
index 2eee883..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v1d0.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v2d0-no-types.json
deleted file mode 100644
index a592d2f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "labels" : [ [ ], [ ], [ ] ],
-  "objects" : [ {
-    "id" : 1,
-    "label" : "person"
-  }, {
-    "id" : 10,
-    "label" : "software"
-  }, {
-    "id" : 11,
-    "label" : "software"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v2d0-partial.json
deleted file mode 100644
index 9ccaa00..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v2d0-partial.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : [ [ ], [ ], [ ] ],
-    "objects" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software"
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v3d0.json
deleted file mode 100644
index 216b393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/path-v3d0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "@type" : "g:Path",
-  "@value" : {
-    "labels" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      }, {
-        "@type" : "g:Set",
-        "@value" : [ ]
-      } ]
-    },
-    "objects" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 10
-          },
-          "label" : "software"
-        }
-      }, {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 11
-          },
-          "label" : "software"
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/period-v2d0-partial.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/period-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/period-v3d0.json
deleted file mode 100644
index 20438a1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/period-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Period",
-  "@value" : "P1Y6M15D"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pick-v2d0-partial.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pick-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pick-v3d0.json
deleted file mode 100644
index 3ca2f2e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pick-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pick",
-  "@value" : "any"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pop-v2d0-partial.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pop-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pop-v3d0.json
deleted file mode 100644
index 271515f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pop-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Pop",
-  "@value" : "all"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v2d0-no-types.json
deleted file mode 100644
index 4d17d67..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v2d0-no-types.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "predicate" : "or",
-  "value" : [ {
-    "predicate" : "gt",
-    "value" : 0
-  }, {
-    "predicate" : "within",
-    "value" : [ -1, -10, -100 ]
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v2d0-partial.json
deleted file mode 100644
index 71fcb7d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v2d0-partial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : [ {
-          "@type" : "g:Int32",
-          "@value" : -1
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -10
-        }, {
-          "@type" : "g:Int32",
-          "@value" : -100
-        } ]
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v3d0.json
deleted file mode 100644
index a71b1cf..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/por-v3d0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "or",
-    "value" : [ {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "gt",
-        "value" : {
-          "@type" : "g:Int32",
-          "@value" : 0
-        }
-      }
-    }, {
-      "@type" : "g:P",
-      "@value" : {
-        "predicate" : "within",
-        "value" : {
-          "@type" : "g:List",
-          "@value" : [ {
-            "@type" : "g:Int32",
-            "@value" : -1
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -10
-          }, {
-            "@type" : "g:Int32",
-            "@value" : -100
-          } ]
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v1d0.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v1d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v2d0-no-types.json
deleted file mode 100644
index c051c0a..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v2d0-no-types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "key" : "since",
-  "value" : 2009
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v2d0-partial.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v3d0.json
deleted file mode 100644
index 296fe32..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/property-v3d0.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:Property",
-  "@value" : {
-    "key" : "since",
-    "value" : {
-      "@type" : "g:Int32",
-      "@value" : 2009
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithin-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithin-v2d0-partial.json
deleted file mode 100644
index afa3826..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithin-v2d0-partial.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithin-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithin-v3d0.json
deleted file mode 100644
index 83f99cc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithin-v3d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "within",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithout-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithout-v2d0-partial.json
deleted file mode 100644
index 8c2291b..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithout-v2d0-partial.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : [ {
-      "@type" : "g:Int32",
-      "@value" : 1
-    }, {
-      "@type" : "g:Int32",
-      "@value" : 2
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithout-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithout-v3d0.json
deleted file mode 100644
index 9a16890..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/pwithout-v3d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@type" : "g:P",
-  "@value" : {
-    "predicate" : "without",
-    "value" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }, {
-        "@type" : "g:Int32",
-        "@value" : 2
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/scope-v2d0-partial.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/scope-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/scope-v3d0.json
deleted file mode 100644
index 4a74af0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/scope-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Scope",
-  "@value" : "local"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v1d0.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v1d0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v2d0-no-types.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v2d0-no-types.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v2d0-partial.json
deleted file mode 100644
index ac825e8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v2d0-partial.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "session" : "unique-session-identifier"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v3d0.json
deleted file mode 100644
index 4be1ccd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionclose-v3d0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "close",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "session", "unique-session-identifier" ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v1d0.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v1d0.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v2d0-no-types.json
deleted file mode 100644
index 8bce82f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v2d0-no-types.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v2d0-partial.json
deleted file mode 100644
index 8ff8b96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v2d0-partial.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v3d0.json
deleted file mode 100644
index 301c393..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessioneval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v1d0.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v1d0.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v2d0-no-types.json
deleted file mode 100644
index 5f4ef46..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v2d0-partial.json
deleted file mode 100644
index 394e5d3..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "session" : "unique-session-identifier",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v3d0.json
deleted file mode 100644
index 7448160..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "session",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "session", "unique-session-identifier", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v1d0.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v1d0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v2d0-no-types.json
deleted file mode 100644
index 8c9a807..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v2d0-no-types.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v2d0-partial.json
deleted file mode 100644
index 81e2f6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v2d0-partial.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "g.V(x)",
-    "language" : "gremlin-groovy",
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v3d0.json
deleted file mode 100644
index dc8c8e6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlesseval-v3d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "g.V(x)", "language", "gremlin-groovy", "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v1d0.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v1d0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v2d0-no-types.json
deleted file mode 100644
index 59f0c6c..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v2d0-no-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v2d0-partial.json
deleted file mode 100644
index 0f6a54e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v2d0-partial.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "gremlin" : "social.V(x)",
-    "language" : "gremlin-groovy",
-    "aliases" : {
-      "g" : "social"
-    },
-    "bindings" : {
-      "x" : {
-        "@type" : "g:Int32",
-        "@value" : 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v3d0.json
deleted file mode 100644
index fc03a37..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/sessionlessevalaliased-v3d0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
-  "op" : "eval",
-  "processor" : "",
-  "args" : {
-    "@type" : "g:Map",
-    "@value" : [ "gremlin", "social.V(x)", "language", "gremlin-groovy", "aliases", {
-      "@type" : "g:Map",
-      "@value" : [ "g", "social" ]
-    }, "bindings", {
-      "@type" : "g:Map",
-      "@value" : [ "x", {
-        "@type" : "g:Int32",
-        "@value" : 1
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/set-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/set-v3d0.json
deleted file mode 100644
index 32deea2..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/set-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:Set",
-  "@value" : [ {
-    "@type" : "g:Int32",
-    "@value" : 1
-  }, "person", true ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/short-v2d0-partial.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/short-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/short-v3d0.json
deleted file mode 100644
index c68f5cd..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/short-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Int16",
-  "@value" : 100
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v1d0.json
deleted file mode 100644
index 9b93727..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v1d0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "id" : 1,
-      "label" : "person",
-      "type" : "vertex",
-      "properties" : {
-        "name" : [ {
-          "id" : 0,
-          "value" : "marko"
-        } ],
-        "location" : [ {
-          "id" : 6,
-          "value" : "san diego",
-          "properties" : {
-            "startTime" : 1997,
-            "endTime" : 2001
-          }
-        }, {
-          "id" : 7,
-          "value" : "santa cruz",
-          "properties" : {
-            "startTime" : 2001,
-            "endTime" : 2004
-          }
-        }, {
-          "id" : 8,
-          "value" : "brussels",
-          "properties" : {
-            "startTime" : 2004,
-            "endTime" : 2005
-          }
-        }, {
-          "id" : 9,
-          "value" : "santa fe",
-          "properties" : {
-            "startTime" : 2005
-          }
-        } ]
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v2d0-partial.json
deleted file mode 100644
index 857c6db..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v2d0-partial.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : { }
-  },
-  "result" : {
-    "data" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    } ],
-    "meta" : { }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v3d0.json
deleted file mode 100644
index dfca400..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/standardresult-v3d0.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
-  "status" : {
-    "message" : "",
-    "code" : 200,
-    "attributes" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  },
-  "result" : {
-    "data" : {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Vertex",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int32",
-            "@value" : 1
-          },
-          "label" : "person",
-          "properties" : {
-            "name" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 0
-                },
-                "value" : "marko",
-                "label" : "name"
-              }
-            } ],
-            "location" : [ {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 6
-                },
-                "value" : "san diego",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 1997
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 7
-                },
-                "value" : "santa cruz",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2001
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 8
-                },
-                "value" : "brussels",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2004
-                  },
-                  "endTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            }, {
-              "@type" : "g:VertexProperty",
-              "@value" : {
-                "id" : {
-                  "@type" : "g:Int64",
-                  "@value" : 9
-                },
-                "value" : "santa fe",
-                "label" : "location",
-                "properties" : {
-                  "startTime" : {
-                    "@type" : "g:Int32",
-                    "@value" : 2005
-                  }
-                }
-              }
-            } ]
-          }
-        }
-      } ]
-    },
-    "meta" : {
-      "@type" : "g:Map",
-      "@value" : [ ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/t-v2d0-partial.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/t-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/t-v3d0.json
deleted file mode 100644
index 9693983..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/t-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:T",
-  "@value" : "label"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/textp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/textp-v2d0-partial.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/textp-v2d0-partial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/textp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/textp-v3d0.json
deleted file mode 100644
index 2820989..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/textp-v3d0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@type" : "g:TextP",
-  "@value" : {
-    "predicate" : "containing",
-    "value" : "ark"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v2d0-no-types.json
deleted file mode 100644
index 03b71a0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-1481750076295
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v2d0-partial.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v3d0.json
deleted file mode 100644
index 1ca0e17..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/timestamp-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:Timestamp",
-  "@value" : 1481750076295
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v1d0.json
deleted file mode 100644
index 13719f6..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v1d0.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "type" : "vertex",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2009
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2010
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : 2011
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : 4
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : 2012
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 5
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : 3
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "type" : "edge",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v2d0-no-types.json
deleted file mode 100644
index 94ad061..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v2d0-no-types.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
-  "vertices" : [ {
-    "id" : 1,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 0,
-        "value" : "marko",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 6,
-        "value" : "san diego",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1997,
-          "endTime" : 2001
-        }
-      }, {
-        "id" : 7,
-        "value" : "santa cruz",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2001,
-          "endTime" : 2004
-        }
-      }, {
-        "id" : 8,
-        "value" : "brussels",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 9,
-        "value" : "santa fe",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005
-        }
-      } ]
-    }
-  }, {
-    "id" : 7,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 1,
-        "value" : "stephen",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 10,
-        "value" : "centreville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1990,
-          "endTime" : 2000
-        }
-      }, {
-        "id" : 11,
-        "value" : "dulles",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2000,
-          "endTime" : 2006
-        }
-      }, {
-        "id" : 12,
-        "value" : "purcellville",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2006
-        }
-      } ]
-    }
-  }, {
-    "id" : 8,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 2,
-        "value" : "matthias",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 13,
-        "value" : "bremen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2004,
-          "endTime" : 2007
-        }
-      }, {
-        "id" : 14,
-        "value" : "baltimore",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2007,
-          "endTime" : 2011
-        }
-      }, {
-        "id" : 15,
-        "value" : "oakland",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2011,
-          "endTime" : 2014
-        }
-      }, {
-        "id" : 16,
-        "value" : "seattle",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2014
-        }
-      } ]
-    }
-  }, {
-    "id" : 9,
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "id" : 3,
-        "value" : "daniel",
-        "label" : "name"
-      } ],
-      "location" : [ {
-        "id" : 17,
-        "value" : "spremberg",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 1982,
-          "endTime" : 2005
-        }
-      }, {
-        "id" : 18,
-        "value" : "kaiserslautern",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2005,
-          "endTime" : 2009
-        }
-      }, {
-        "id" : 19,
-        "value" : "aachen",
-        "label" : "location",
-        "properties" : {
-          "startTime" : 2009
-        }
-      } ]
-    }
-  }, {
-    "id" : 10,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 4,
-        "value" : "gremlin",
-        "label" : "name"
-      } ]
-    }
-  }, {
-    "id" : 11,
-    "label" : "software",
-    "properties" : {
-      "name" : [ {
-        "id" : 5,
-        "value" : "tinkergraph",
-        "label" : "name"
-      } ]
-    }
-  } ],
-  "edges" : [ {
-    "id" : 13,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2009
-      }
-    }
-  }, {
-    "id" : 14,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 15,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 16,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 1,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 17,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2010
-      }
-    }
-  }, {
-    "id" : 18,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2011
-      }
-    }
-  }, {
-    "id" : 19,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 20,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 7,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 4
-      }
-    }
-  }, {
-    "id" : 21,
-    "label" : "develops",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "since" : {
-        "key" : "since",
-        "value" : 2012
-      }
-    }
-  }, {
-    "id" : 22,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 23,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 8,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 24,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 10,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 5
-      }
-    }
-  }, {
-    "id" : 25,
-    "label" : "uses",
-    "inVLabel" : "software",
-    "outVLabel" : "person",
-    "inV" : 11,
-    "outV" : 9,
-    "properties" : {
-      "skill" : {
-        "key" : "skill",
-        "value" : 3
-      }
-    }
-  }, {
-    "id" : 26,
-    "label" : "traverses",
-    "inVLabel" : "software",
-    "outVLabel" : "software",
-    "inV" : 11,
-    "outV" : 10
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v2d0-partial.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v2d0-partial.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v3d0.json
deleted file mode 100644
index 24e95ed..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/tinkergraph-v3d0.json
+++ /dev/null
@@ -1,829 +0,0 @@
-{
-  "@type" : "tinker:graph",
-  "@value" : {
-    "vertices" : [ {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 1
-              },
-              "value" : "stephen",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 10
-              },
-              "value" : "centreville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1990
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 11
-              },
-              "value" : "dulles",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2000
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 12
-              },
-              "value" : "purcellville",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2006
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 2
-              },
-              "value" : "matthias",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 13
-              },
-              "value" : "bremen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 14
-              },
-              "value" : "baltimore",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2007
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 15
-              },
-              "value" : "oakland",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2011
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 16
-              },
-              "value" : "seattle",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2014
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 3
-              },
-              "value" : "daniel",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 17
-              },
-              "value" : "spremberg",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1982
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 18
-              },
-              "value" : "kaiserslautern",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 19
-              },
-              "value" : "aachen",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2009
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 4
-              },
-              "value" : "gremlin",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    }, {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "label" : "software",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 5
-              },
-              "value" : "tinkergraph",
-              "label" : "name"
-            }
-          } ]
-        }
-      }
-    } ],
-    "edges" : [ {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 13
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2009
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 14
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 15
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 16
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 17
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2010
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 18
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2011
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 19
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 20
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 7
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 4
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 21
-        },
-        "label" : "develops",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "since" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "since",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 2012
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 22
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 23
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 8
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 24
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 5
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 25
-        },
-        "label" : "uses",
-        "inVLabel" : "software",
-        "outVLabel" : "person",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 9
-        },
-        "properties" : {
-          "skill" : {
-            "@type" : "g:Property",
-            "@value" : {
-              "key" : "skill",
-              "value" : {
-                "@type" : "g:Int32",
-                "@value" : 3
-              }
-            }
-          }
-        }
-      }
-    }, {
-      "@type" : "g:Edge",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 26
-        },
-        "label" : "traverses",
-        "inVLabel" : "software",
-        "outVLabel" : "software",
-        "inV" : {
-          "@type" : "g:Int32",
-          "@value" : 11
-        },
-        "outV" : {
-          "@type" : "g:Int32",
-          "@value" : 10
-        }
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v2d0-no-types.json
deleted file mode 100644
index 06fc02d..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v2d0-no-types.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dur" : 0.004,
-  "metrics" : [ {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 4,
-      "elementCount" : 4
-    },
-    "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "7.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 13,
-      "elementCount" : 13
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "2.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 7,
-      "elementCount" : 7
-    },
-    "name" : "VertexStep(OUT,vertex)",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "3.0.0()"
-  }, {
-    "dur" : 100.0,
-    "counts" : {
-      "traverserCount" : 1,
-      "elementCount" : 1
-    },
-    "name" : "TreeStep",
-    "annotations" : {
-      "percentDur" : 25.0
-    },
-    "id" : "4.0.0()"
-  } ]
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v2d0-partial.json
deleted file mode 100644
index fdd18a4..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v2d0-partial.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "dur" : {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    },
-    "metrics" : [ {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 4
-          }
-        },
-        "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "7.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 13
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "2.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          }
-        },
-        "name" : "VertexStep(OUT,vertex)",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "3.0.0()"
-      }
-    }, {
-      "@type" : "g:Metrics",
-      "@value" : {
-        "dur" : {
-          "@type" : "g:Double",
-          "@value" : 100.0
-        },
-        "counts" : {
-          "traverserCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          },
-          "elementCount" : {
-            "@type" : "g:Int64",
-            "@value" : 1
-          }
-        },
-        "name" : "TreeStep",
-        "annotations" : {
-          "percentDur" : {
-            "@type" : "g:Double",
-            "@value" : 25.0
-          }
-        },
-        "id" : "4.0.0()"
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v3d0.json
deleted file mode 100644
index 46f7636..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traversalmetrics-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:TraversalMetrics",
-  "@value" : {
-    "@type" : "g:Map",
-    "@value" : [ "dur", {
-      "@type" : "g:Double",
-      "@value" : 0.004
-    }, "metrics", {
-      "@type" : "g:List",
-      "@value" : [ {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 4
-            } ]
-          }, "name", "TinkerGraphStep(vertex,[~label.eq(person)])", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "7.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 13
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "2.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 7
-            } ]
-          }, "name", "VertexStep(OUT,vertex)", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "3.0.0()" ]
-        }
-      }, {
-        "@type" : "g:Metrics",
-        "@value" : {
-          "@type" : "g:Map",
-          "@value" : [ "dur", {
-            "@type" : "g:Double",
-            "@value" : 100.0
-          }, "counts", {
-            "@type" : "g:Map",
-            "@value" : [ "traverserCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            }, "elementCount", {
-              "@type" : "g:Int64",
-              "@value" : 1
-            } ]
-          }, "name", "TreeStep", "annotations", {
-            "@type" : "g:Map",
-            "@value" : [ "percentDur", {
-              "@type" : "g:Double",
-              "@value" : 25.0
-            } ]
-          }, "id", "4.0.0()" ]
-        }
-      } ]
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traverser-v2d0-partial.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traverser-v2d0-partial.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traverser-v3d0.json
deleted file mode 100644
index a59a29e..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/traverser-v3d0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "@type" : "g:Traverser",
-  "@value" : {
-    "bulk" : {
-      "@type" : "g:Int64",
-      "@value" : 1
-    },
-    "value" : {
-      "@type" : "g:Vertex",
-      "@value" : {
-        "id" : {
-          "@type" : "g:Int32",
-          "@value" : 1
-        },
-        "label" : "person",
-        "properties" : {
-          "name" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 0
-              },
-              "value" : "marko",
-              "label" : "name"
-            }
-          } ],
-          "location" : [ {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 6
-              },
-              "value" : "san diego",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 1997
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 7
-              },
-              "value" : "santa cruz",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2001
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 8
-              },
-              "value" : "brussels",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2004
-                },
-                "endTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          }, {
-            "@type" : "g:VertexProperty",
-            "@value" : {
-              "id" : {
-                "@type" : "g:Int64",
-                "@value" : 9
-              },
-              "value" : "santa fe",
-              "label" : "location",
-              "properties" : {
-                "startTime" : {
-                  "@type" : "g:Int32",
-                  "@value" : 2005
-                }
-              }
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v2d0-no-types.json
deleted file mode 100644
index b36ff96..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v2d0-no-types.json
+++ /dev/null
@@ -1 +0,0 @@
-"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v2d0-partial.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v3d0.json
deleted file mode 100644
index 1cf09f0..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/uuid-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "g:UUID",
-  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v1d0.json
deleted file mode 100644
index a885f58..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v1d0.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "type" : "vertex",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v2d0-no-types.json
deleted file mode 100644
index 8e6155f..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v2d0-no-types.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id" : 1,
-  "label" : "person",
-  "properties" : {
-    "name" : [ {
-      "id" : 0,
-      "value" : "marko",
-      "label" : "name"
-    } ],
-    "location" : [ {
-      "id" : 6,
-      "value" : "san diego",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 1997,
-        "endTime" : 2001
-      }
-    }, {
-      "id" : 7,
-      "value" : "santa cruz",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2001,
-        "endTime" : 2004
-      }
-    }, {
-      "id" : 8,
-      "value" : "brussels",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2004,
-        "endTime" : 2005
-      }
-    }, {
-      "id" : 9,
-      "value" : "santa fe",
-      "label" : "location",
-      "properties" : {
-        "startTime" : 2005
-      }
-    } ]
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v2d0-partial.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v2d0-partial.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v3d0.json
deleted file mode 100644
index f102230..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertex-v3d0.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "@type" : "g:Vertex",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int32",
-      "@value" : 1
-    },
-    "label" : "person",
-    "properties" : {
-      "name" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 0
-          },
-          "value" : "marko",
-          "label" : "name"
-        }
-      } ],
-      "location" : [ {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 6
-          },
-          "value" : "san diego",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 1997
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 7
-          },
-          "value" : "santa cruz",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2001
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 8
-          },
-          "value" : "brussels",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2004
-            },
-            "endTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      }, {
-        "@type" : "g:VertexProperty",
-        "@value" : {
-          "id" : {
-            "@type" : "g:Int64",
-            "@value" : 9
-          },
-          "value" : "santa fe",
-          "label" : "location",
-          "properties" : {
-            "startTime" : {
-              "@type" : "g:Int32",
-              "@value" : 2005
-            }
-          }
-        }
-      } ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v1d0.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v1d0.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v2d0-no-types.json
deleted file mode 100644
index 74025a8..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v2d0-no-types.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id" : 0,
-  "value" : "marko",
-  "label" : "name"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v2d0-partial.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v2d0-partial.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v3d0.json
deleted file mode 100644
index af184b1..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/vertexproperty-v3d0.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@type" : "g:VertexProperty",
-  "@value" : {
-    "id" : {
-      "@type" : "g:Int64",
-      "@value" : 0
-    },
-    "value" : "marko",
-    "label" : "name"
-  }
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/year-v2d0-partial.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/year-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/year-v3d0.json
deleted file mode 100644
index ff420bc..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/year-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:Year",
-  "@value" : "2016"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/yearmonth-v2d0-partial.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/yearmonth-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/yearmonth-v3d0.json
deleted file mode 100644
index 98a5e27..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/yearmonth-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:YearMonth",
-  "@value" : "2016-06"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneddatetime-v2d0-partial.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneddatetime-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneddatetime-v3d0.json
deleted file mode 100644
index 367fc47..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneddatetime-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZonedDateTime",
-  "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneoffset-v2d0-partial.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneoffset-v2d0-partial.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneoffset-v3d0.json
deleted file mode 100644
index 8591794..0000000
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_6_4/zoneoffset-v3d0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@type" : "gx:ZoneOffset",
-  "@value" : "+03:06:09"
-}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-socket-server/Dockerfile b/gremlin-tools/gremlin-socket-server/Dockerfile
new file mode 100644
index 0000000..9eef686
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/Dockerfile
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM alpine
+
+LABEL maintainer="dev@tinkerpop.apache.org"
+
+ARG SOCKET_SERVER_DIR
+ARG SOCKET_SERVER_VERSION
+
+RUN apk add --no-cache --update \
+    bash \
+    openjdk11-jdk
+
+COPY ${SOCKET_SERVER_DIR}/gremlin-socket-server-${SOCKET_SERVER_VERSION}.jar /opt/gremlin-socket-server/gremlin-socket-server.jar
+COPY ${SOCKET_SERVER_DIR}/libs/ /opt/gremlin-socket-server/libs/
+COPY ${SOCKET_SERVER_DIR}/../conf/ opt/gremlin-socket-server/conf/
+
+WORKDIR /opt/gremlin-socket-server
+
+EXPOSE 45943
+
+ENTRYPOINT ["java","-jar","gremlin-socket-server.jar"]
diff --git a/gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml b/gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml
new file mode 100644
index 0000000..a358d4c
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/conf/test-ws-gremlin.yaml
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This file is to be used to configure an instance of Gremlin-Socket-Server as
+# well as any driver trying to run tests against it.
+# Gremlin-Socket-Server listens for requests with the specific request ids below
+# and triggers response behavior accordingly. Driver's should use the request id
+# corresponding with the desired behavior whenever sending a  request to
+#  gremlin-socket-server.
+
+# Port exposed by gremlin-socket-server
+PORT: 45943
+
+# Configures which serializer will be used. Ex: GraphBinaryV1 or GraphSONV2
+SERIALIZER: GraphBinaryV1
+
+# If a request with this ID comes to the server, the server responds back with a single
+# vertex picked from Modern graph.
+SINGLE_VERTEX_REQUEST_ID: 6457272a-4018-4538-b9ae-08dd5ddc0aa1
+
+# If a request with this ID comes to the server, the server responds back with a single
+# vertex picked from Modern graph. After a 2 second delay, server sends a Close WebSocket
+# frame on the same connection.
+SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID: 3cb39c94-9454-4398-8430-03485d08bdae
+
+# Server waits for 1 second, then responds with a 500 error status code
+FAILED_AFTER_DELAY_REQUEST_ID: edf79c8b-1d32-4102-a5d2-a5feeca40864
+
+# Server waits for 1 second then responds with a close web socket frame
+CLOSE_CONNECTION_REQUEST_ID: 0150143b-00f9-48a7-a268-28142d902e18
+
+# Same as CLOSE_CONNECTION_REQUEST_ID
+CLOSE_CONNECTION_REQUEST_ID_2: 3c4cf18a-c7f2-4dad-b9bf-5c701eb33000
+
+# If a request with this ID comes to the server, the server responds with the user agent (if any)
+# that was captured during the web socket handshake.
+USER_AGENT_REQUEST_ID: 20ad7bfb-4abf-d7f4-f9d3-9f1d55bee4ad
+
+# If a request with this ID comes to the server, the server responds with a string containing all overridden
+# per request settings from the request message. String will be of the form
+# "requestId=19436d9e-f8fc-4b67-8a76-deec60918424 evaluationTimeout=1234, batchSize=12, userAgent=testUserAgent"
+PER_REQUEST_SETTINGS_REQUEST_ID: 19436d9e-f8fc-4b67-8a76-deec60918424
diff --git a/gremlin-tools/gremlin-socket-server/pom.xml b/gremlin-tools/gremlin-socket-server/pom.xml
new file mode 100644
index 0000000..995f4de
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/pom.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>gremlin-tools</artifactId>
+        <groupId>org.apache.tinkerpop</groupId>
+        <version>3.7.3-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>gremlin-socket-server</artifactId>
+    <name>Apache TinkerPop :: Gremlin Socket Server</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-util</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>tinkergraph-gremlin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <!-- LOGGING -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-json</artifactId>
+            <version>${groovy.version}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <!--
+        provides a way to convert maven.exec.skip value to skipImageBuild for use in skipping image building for testing
+        under incompatible platforms
+        -->
+        <maven.exec.skip>false</maven.exec.skip> <!-- default -->
+        <skipImageBuild>${maven.exec.skip}</skipImageBuild>
+    </properties>
+
+    <build>
+        <directory>${basedir}/target</directory>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources
+                </directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/libs
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.apache.tinkerpop.gremlin.socket.server.SocketServerRunner</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>libs/</classpathPrefix>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+            <!--
+            gremlin socket server image will be generated on each build as language variants will need the latest to do
+            their work.
+            -->
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>build-image</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skipImageBuild}</skip>
+                            <executable>docker</executable>
+                            <arguments>
+                                <argument>build</argument>
+                                <argument>-f</argument>
+                                <argument>./Dockerfile</argument>
+                                <argument>--build-arg</argument>
+                                <argument>SOCKET_SERVER_DIR=target/</argument>
+                                <argument>--build-arg</argument>
+                                <argument>SOCKET_SERVER_VERSION=${project.version}</argument>
+                                <argument>-t</argument>
+                                <argument>tinkerpop/gremlin-socket-server:${project.version}</argument>
+                                <argument>.</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>remove-dangling-images</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skipImageBuild}</skip>
+                            <executable>docker</executable>
+                            <arguments>
+                                <argument>image</argument>
+                                <argument>prune</argument>
+                                <argument>--filter</argument>
+                                <argument>label=maintainer=dev@tinkerpop.apache.org</argument>
+                                <argument>-f</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <!-- Overrides the config from the gremlin-tools pom-->
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SimpleSocketServer.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SimpleSocketServer.java
new file mode 100644
index 0000000..e728b03
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SimpleSocketServer.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.socket.server;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+
+/**
+ * A Simple Netty Server intended to be used as a base for gremlin test servers.
+ * Server behavior is defined by the {@link ChannelInitializer} passed in the start method.
+ */
+public class SimpleSocketServer {
+    private final SocketServerSettings settings;
+    private EventLoopGroup bossGroup;
+    private EventLoopGroup workerGroup;
+
+    public SimpleSocketServer(final SocketServerSettings settings) {
+        this.settings = settings;
+    }
+
+    public Channel start(final ChannelInitializer<SocketChannel> channelInitializer) throws InterruptedException {
+        bossGroup = new NioEventLoopGroup(1);
+        workerGroup = new NioEventLoopGroup();
+        final ServerBootstrap b = new ServerBootstrap();
+        b.group(bossGroup, workerGroup)
+                .channel(NioServerSocketChannel.class)
+                .handler(new LoggingHandler(LogLevel.INFO))
+                .childHandler(channelInitializer);
+        return b.bind(settings.PORT).sync().channel();
+    }
+
+    public void stop() {
+        bossGroup.shutdownGracefully();
+        workerGroup.shutdownGracefully();
+    }
+
+    public void stopSync() throws InterruptedException {
+        bossGroup.shutdownGracefully().sync();
+        workerGroup.shutdownGracefully().sync();
+    }
+}
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerRunner.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerRunner.java
new file mode 100644
index 0000000..9886569
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerRunner.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.socket.server;
+
+import io.netty.channel.Channel;
+
+import java.io.IOException;
+import java.nio.file.FileSystems;
+
+/**
+ * A simple main class to create and run a SimpleSocketServer
+ */
+public class SocketServerRunner {
+
+    public static void main(final String[] args) throws InterruptedException, IOException {
+        final SocketServerSettings settings = SocketServerSettings.read(FileSystems.getDefault().getPath("conf", "test-ws-gremlin.yaml"));
+        final SimpleSocketServer server = new SimpleSocketServer(settings);
+        final Channel channel = server.start(new TestWSGremlinInitializer(settings));
+        while(channel.isOpen()) {
+            Thread.sleep(1000);
+        }
+    }
+
+}
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerSettings.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerSettings.java
new file mode 100644
index 0000000..08a418d
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/SocketServerSettings.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.socket.server;
+
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * Encapsulates all constants that are needed by SimpleSocketServer. UUID request id constants are used
+ * to coordinate custom response behavior between a test client and the server.
+ */
+public class SocketServerSettings {
+    public int PORT = 0;
+
+    /**
+     * Configures which serializer will be used. Ex: "GraphBinaryV1" or "GraphSONV2"
+     */
+    public String SERIALIZER = "GraphBinaryV1";
+    /**
+     * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
+     * graph.
+     */
+    public UUID SINGLE_VERTEX_REQUEST_ID = null;
+
+    /**
+     * If a request with this ID comes to the server, the server responds back with a single vertex picked from Modern
+     * graph. After a 2 second delay, server sends a Close WebSocket frame on the same connection.
+     */
+    public UUID SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID = null;
+
+    /**
+     * Server waits for 1 second, then responds with a 500 error status code
+     */
+    public UUID FAILED_AFTER_DELAY_REQUEST_ID = null;
+
+    /**
+     * Server waits for 1 second then responds with a close web socket frame
+     */
+    public UUID CLOSE_CONNECTION_REQUEST_ID = null;
+
+    /**
+     * Same as CLOSE_CONNECTION_REQUEST_ID
+     */
+    public UUID CLOSE_CONNECTION_REQUEST_ID_2 = null;
+
+    /**
+     * If a request with this ID comes to the server, the server responds with the user agent (if any) that was captured
+     * during the web socket handshake.
+     */
+    public UUID USER_AGENT_REQUEST_ID = null;
+
+    /**
+     * If a request with this ID comes to the server, the server responds with a string containing all overridden
+     * per request settings from the request message. String will be of the form
+     * "requestId=19436d9e-f8fc-4b67-8a76-deec60918424 evaluationTimeout=1234, batchSize=12, userAgent=testUserAgent"
+     */
+    public UUID PER_REQUEST_SETTINGS_REQUEST_ID = null;
+
+    public static SocketServerSettings read(final Path confFilePath) throws IOException {
+        return read(Files.newInputStream(confFilePath));
+    }
+
+    public static SocketServerSettings read(final InputStream confInputStream) {
+        Objects.requireNonNull(confInputStream);
+        final LoaderOptions options = new LoaderOptions();
+        final Yaml yaml = new Yaml(new Constructor(SocketServerSettings.class, options));
+        return yaml.load(confInputStream);
+    }
+}
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestChannelizers.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestChannelizers.java
new file mode 100644
index 0000000..8639f7a
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestChannelizers.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.socket.server;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
+import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler;
+
+/**
+ * Class that holds the channelizers that can used for testing with the SimpleSocketServer.
+ */
+public class TestChannelizers {
+
+    /**
+     * A base ChannelInitializer that setups the pipeline for HTTP handling. This class should be sub-classed by a
+     * handler that handles the actual data being received.
+     */
+    public static abstract class TestHttpServerInitializer extends ChannelInitializer<SocketChannel> {
+        protected static final String WEBSOCKET_PATH = "/gremlin";
+
+        @Override
+        public void initChannel(SocketChannel ch) {
+            final ChannelPipeline pipeline = ch.pipeline();
+            pipeline.addLast(new HttpServerCodec());
+            pipeline.addLast(new HttpObjectAggregator(65536));
+        }
+    }
+
+    /**
+     * A vanilla WebSocket server Initializer implementation using Netty. This initializer would configure the server
+     * for WebSocket handshake and decoding incoming WebSocket frames.
+     */
+    public static abstract class TestWebSocketServerInitializer extends TestChannelizers.TestHttpServerInitializer {
+
+        @Override
+        public void initChannel(SocketChannel ch) {
+            super.initChannel(ch);
+
+            final ChannelPipeline pipeline = ch.pipeline();
+            pipeline.addLast(new WebSocketServerCompressionHandler());
+            pipeline.addLast(new WebSocketServerProtocolHandler(WEBSOCKET_PATH, null, true));
+            this.postInit(ch.pipeline());
+        }
+
+        public abstract void postInit(final ChannelPipeline ch);
+    }
+
+    /**
+     * An initializer that adds a handler that will drop WebSocket frames.
+     */
+    public static class TestWSNoOpInitializer extends TestHttpServerInitializer {
+
+        @Override
+        public void initChannel(SocketChannel ch) {
+            super.initChannel(ch);
+            ch.pipeline().addLast(new TestHandlers.NoOpWebSocketServerHandler(WEBSOCKET_PATH));
+        }
+    }
+
+    /**
+     * An initializer that adds a handler to mimics a server that is throttling connections.
+     */
+    public static class TestConnectionThrottlingInitializer extends TestHttpServerInitializer {
+        int connectionCount = 0;
+        private SocketServerSettings settings;
+
+        public TestConnectionThrottlingInitializer(SocketServerSettings settings) { this.settings = settings; }
+
+        @Override
+        public void initChannel(SocketChannel ch) {
+            super.initChannel(ch);
+
+            final ChannelPipeline pipeline = ch.pipeline();
+            if (connectionCount < 1) {
+                pipeline.addLast(new WebSocketServerCompressionHandler());
+                pipeline.addLast(new WebSocketServerProtocolHandler(WEBSOCKET_PATH, null, true));
+                pipeline.addLast(new TestWSGremlinInitializer.ClientTestConfigurableHandler(settings));
+            } else {
+                pipeline.addLast(new TestHandlers.NoOpWebSocketServerHandler(WEBSOCKET_PATH));
+            }
+
+            connectionCount++;
+        }
+    }
+}
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestHandlers.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestHandlers.java
new file mode 100644
index 0000000..c2f0af0
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestHandlers.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.socket.server;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.util.ReferenceCountUtil;
+
+/**
+ * Class that holds the handlers that can used by the initializers in TestChannelizers.
+ */
+public class TestHandlers {
+
+    /**
+     * Handler that will drop requests to the WebSocket path.
+     */
+    public static class NoOpWebSocketServerHandler extends ChannelInboundHandlerAdapter {
+        private String websocketPath;
+
+        public NoOpWebSocketServerHandler(String websocketPath) {
+            this.websocketPath = websocketPath;
+        }
+
+        @Override
+        public void channelRead(ChannelHandlerContext ctx, Object msg) {
+            if ((msg instanceof HttpRequest) && ((HttpRequest) msg).uri().endsWith(websocketPath)) {
+                ReferenceCountUtil.release(msg);
+            }
+        }
+    }
+}
diff --git a/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestWSGremlinInitializer.java b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestWSGremlinInitializer.java
new file mode 100644
index 0000000..f3a6ce6
--- /dev/null
+++ b/gremlin-tools/gremlin-socket-server/src/main/java/org/apache/tinkerpop/gremlin/socket/server/TestWSGremlinInitializer.java
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.socket.server;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractMessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+
+/**
+ * Initializer which partially mimics the Gremlin Server. This initializer injects a handler in the
+ * server pipeline that can be modified to send the desired response for a test case.
+ * This handler identifies incoming requests with ids matching those in {@link SocketServerSettings}
+ * and delivers the response which corresponds to the request id.
+ */
+public class TestWSGremlinInitializer extends TestChannelizers.TestWebSocketServerInitializer {
+    private static final Logger logger = LoggerFactory.getLogger(TestWSGremlinInitializer.class);
+    private static final String USER_AGENT_HEADER = "User-Agent";
+
+    private final SocketServerSettings settings;
+
+    /**
+     * Gremlin serializer used for serializing/deserializing the request/response. This should be same as client.
+     */
+    private static AbstractMessageSerializer SERIALIZER;
+    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+    public TestWSGremlinInitializer(final SocketServerSettings settings) {
+        this.settings = settings;
+        switch(settings.SERIALIZER) {
+            case "GraphSONV2":
+                SERIALIZER = new GraphSONMessageSerializerV2();
+                break;
+            case "GraphSONV3":
+                SERIALIZER = new GraphSONMessageSerializerV3();
+                break;
+            case "GraphBinaryV1":
+                SERIALIZER = new GraphBinaryMessageSerializerV1();
+                break;
+            default:
+                logger.warn("Could not recognize serializer [%s], defaulting to GraphBinaryV1", settings.SERIALIZER);
+                SERIALIZER = new GraphBinaryMessageSerializerV1();
+                break;
+        }
+    }
+
+    @Override
+    public void postInit(ChannelPipeline pipeline) {
+        pipeline.addLast(new ClientTestConfigurableHandler(settings));
+    }
+
+    /**
+     * Handler introduced in the server pipeline to configure expected response for test cases.
+     */
+    static class ClientTestConfigurableHandler extends MessageToMessageDecoder<BinaryWebSocketFrame> {
+        private SocketServerSettings settings;
+        private String userAgent = "";
+
+        public ClientTestConfigurableHandler(SocketServerSettings settings) { this.settings = settings; }
+
+        @Override
+        protected void decode(final ChannelHandlerContext ctx, final BinaryWebSocketFrame frame, final List<Object> objects)
+                throws Exception {
+            final ByteBuf messageBytes = frame.content();
+            final byte len = messageBytes.readByte();
+            if (len <= 0) {
+                objects.add(RequestMessage.INVALID);
+                return;
+            }
+
+            final ByteBuf contentTypeBytes = ctx.alloc().buffer(len);
+            try {
+                messageBytes.readBytes(contentTypeBytes);
+            } finally {
+                contentTypeBytes.release();
+            }
+            final RequestMessage msg = SERIALIZER.deserializeRequest(messageBytes.discardReadBytes());
+            if (msg.getRequestId().equals(settings.SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID)) {
+                logger.info("sending vertex result frame");
+                ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSingleVertexResponse(
+                        settings.SINGLE_VERTEX_DELAYED_CLOSE_CONNECTION_REQUEST_ID)));
+                logger.info("waiting for 2 sec");
+                Thread.sleep(2000);
+                logger.info("sending close frame");
+                ctx.channel().writeAndFlush(new CloseWebSocketFrame());
+            } else if (msg.getRequestId().equals(settings.SINGLE_VERTEX_REQUEST_ID)) {
+                logger.info("sending vertex result frame");
+                ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSingleVertexResponse(settings.SINGLE_VERTEX_REQUEST_ID)));
+            } else if (msg.getRequestId().equals(settings.FAILED_AFTER_DELAY_REQUEST_ID)) {
+                logger.info("waiting for 1 sec");
+                Thread.sleep(1000);
+                final ResponseMessage responseMessage = ResponseMessage.build(msg)
+                        .code(ResponseStatusCode.SERVER_ERROR)
+                        .statusAttributeException(new RuntimeException()).create();
+                ctx.channel().writeAndFlush(new BinaryWebSocketFrame(SERIALIZER.serializeResponseAsBinary(responseMessage, allocator)));
+            } else if (msg.getRequestId().equals(settings.CLOSE_CONNECTION_REQUEST_ID) || msg.getRequestId().equals(settings.CLOSE_CONNECTION_REQUEST_ID_2)) {
+                Thread.sleep(1000);
+                ctx.channel().writeAndFlush(new CloseWebSocketFrame());
+            } else if (msg.getRequestId().equals(settings.USER_AGENT_REQUEST_ID)) {
+                ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSimpleBinaryResponse(settings.USER_AGENT_REQUEST_ID, userAgent)));
+            } else if (msg.getRequestId().equals(settings.PER_REQUEST_SETTINGS_REQUEST_ID)) {
+                String response = String.format("requestId=%s evaluationTimeout=%d, batchSize=%d, userAgent=%s, materializeProperties=%s",
+                        msg.getRequestId(), msg.getArgs().get("evaluationTimeout"),
+                        msg.getArgs().get("batchSize"), msg.getArgs().get("userAgent"), msg.getArgs().get("materializeProperties"));
+                ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSimpleBinaryResponse(settings.PER_REQUEST_SETTINGS_REQUEST_ID, response)));
+            } else {
+                try {
+                    Thread.sleep(Long.parseLong((String) msg.getArgs().get("gremlin")));
+                    ctx.channel().writeAndFlush(new BinaryWebSocketFrame(returnSingleVertexResponse(msg.getRequestId())));
+                } catch (NumberFormatException nfe) {
+                    // Ignore. Only return a vertex if the query was a long value.
+                    logger.warn("Request unknown request with RequestId: %s", msg.getRequestId());
+                }
+            }
+        }
+
+        private ByteBuf returnSingleVertexResponse(final UUID requestID) throws SerializationException {
+            final TinkerGraph graph = TinkerFactory.createClassic();
+            final GraphTraversalSource g = graph.traversal();
+            final List<Vertex> t = new ArrayList<>(1);
+            t.add(g.V().limit(1).next());
+
+            return SERIALIZER.serializeResponseAsBinary(ResponseMessage.build(requestID).result(t).create(), allocator);
+        }
+
+        /**
+         * Packages a string message into a ResponseMessage and serializes it into a ByteBuf
+         * @throws SerializationException
+         */
+        private ByteBuf returnSimpleBinaryResponse(final UUID requestID, String message) throws SerializationException {
+            //Need to package message in a list of size 1 as some GLV's serializers require all messages to be in a list
+            final List<String> messageList = new ArrayList<>(1);
+            messageList.add(message);
+            return SERIALIZER.serializeResponseAsBinary(ResponseMessage.build(requestID).result(messageList).create(), allocator);
+        }
+
+        /**
+         * Captures and stores User-Agent if included in header
+         */
+        @Override
+        public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) {
+            if(evt instanceof WebSocketServerProtocolHandler.HandshakeComplete) {
+                WebSocketServerProtocolHandler.HandshakeComplete handshake = (WebSocketServerProtocolHandler.HandshakeComplete) evt;
+                HttpHeaders requestHeaders = handshake.requestHeaders();
+                if(requestHeaders.contains(USER_AGENT_HEADER)) {
+                    userAgent = requestHeaders.get(USER_AGENT_HEADER);
+                }
+                else {
+                    ctx.fireUserEventTriggered(evt);
+                }
+            }
+        }
+    }
+}
diff --git a/gremlin-tools/pom.xml b/gremlin-tools/pom.xml
index 1bc44f4..bfbb441 100644
--- a/gremlin-tools/pom.xml
+++ b/gremlin-tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-tools</artifactId>
@@ -30,7 +30,7 @@
     <modules>
         <module>gremlin-benchmark</module>
         <module>gremlin-coverage</module>
-        <module>gremlin-io-test</module>
+        <module>gremlin-socket-server</module>
     </modules>
 
     <build>
diff --git a/gremlin-util/pom.xml b/gremlin-util/pom.xml
new file mode 100644
index 0000000..d2d968b
--- /dev/null
+++ b/gremlin-util/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>tinkerpop</artifactId>
+        <groupId>org.apache.tinkerpop</groupId>
+        <version>3.7.3-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>gremlin-util</artifactId>
+    <name>Apache TinkerPop :: Gremlin Util</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <!-- LOGGING -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <!-- TEST -->
+        <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>tinkergraph-gremlin</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/MessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/MessageSerializer.java
new file mode 100644
index 0000000..a46cad1
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/MessageSerializer.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util;
+
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * Serializes data to and from Gremlin Server.  Typically, the object being serialized or deserialized will be an item
+ * from an {@link Iterator} as returned from the {@code ScriptEngine} or an incoming {@link RequestMessage}.
+ * {@link MessageSerializer} instances are instantiated to a cache via {@link ServiceLoader} and indexed based on
+ * the mime types they support.  If a mime type is supported more than once, the first {@link MessageSerializer}
+ * instance loaded for that mime type is assigned. If a mime type is not found the server default is chosen. The
+ * default may change from version to version so it is best to not rely on it when developing applications and to
+ * always be explicit in specifying the type you wish to bind to.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public interface MessageSerializer<M> {
+
+    static final Logger logger = LoggerFactory.getLogger(MessageSerializer.class);
+
+    /**
+     * Gets the "mapper" that performs the underlying serialization work.
+     */
+    M getMapper();
+
+    /**
+     * Serialize a {@link ResponseMessage} to a Netty {@code ByteBuf}.
+     *
+     * @param responseMessage The response message to serialize to bytes.
+     * @param allocator       The Netty allocator for the {@code ByteBuf} to return back.
+     */
+    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
+
+    /**
+     * Serialize a {@link ResponseMessage} to a Netty {@code ByteBuf}.
+     *
+     * @param requestMessage The request message to serialize to bytes.
+     * @param allocator      The Netty allocator for the {@code ByteBuf} to return back.
+     */
+    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException;
+
+    /**
+     * Deserialize a Netty {@code ByteBuf} into a {@link RequestMessage}.
+     */
+    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException;
+
+    /**
+     * Deserialize a Netty {@code ByteBuf} into a {@link ResponseMessage}.
+     */
+    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException;
+
+    /**
+     * The list of mime types that the serializer supports. They should be ordered in preferred ordered where the
+     * greatest fidelity match is first.
+     */
+    public String[] mimeTypesSupported();
+
+    /**
+     * Configure the serializer with mapper settings as required.  The default implementation does not perform any
+     * function and it is up to the interface implementation to determine how the configuration will be executed
+     * and what its requirements are.  An implementation may choose to use the list of available graphs to help
+     * initialize a serializer.  The implementation should account for the possibility of a null value being
+     * provided for that parameter.
+     */
+    public default void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/Tokens.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/Tokens.java
new file mode 100644
index 0000000..6391852
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/Tokens.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util;
+
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.process.traversal.Failure;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+
+/**
+ * String constants used in gremlin-driver and gremlin-server.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class Tokens {
+    private Tokens() {}
+
+    public static final String OPS_AUTHENTICATION = "authentication";
+    public static final String OPS_BYTECODE = "bytecode";
+    public static final String OPS_EVAL = "eval";
+    public static final String OPS_INVALID = "invalid";
+    public static final String OPS_CLOSE = "close";
+
+    /**
+     * The key for the unique identifier of the request.
+     */
+    public static final String REQUEST_ID = "requestId";
+
+    /**
+     * Argument name that allows definition of the number of iterations each {@link ResponseMessage} should contain -
+     * overrides the @{code resultIterationBatchSize} server setting.
+     */
+    public static final String ARGS_BATCH_SIZE = "batchSize";
+
+    /**
+     * Argument name that allows to provide a map of key/value pairs to apply as variables in the context of
+     * the Gremlin request sent to the server.
+     */
+    public static final String ARGS_BINDINGS = "bindings";
+
+    /**
+     * Argument name that allows definition of alias names for {@link Graph} and {@link TraversalSource} objects on
+     * the remote system.
+     */
+    public static final String ARGS_ALIASES = "aliases";
+    public static final String ARGS_FORCE = "force";
+
+    /**
+     * Argument name that corresponds to the Gremlin to evaluate.
+     */
+    public static final String ARGS_GREMLIN = "gremlin";
+
+    /**
+     * Argument name that allows definition of the flavor of Gremlin used (e.g. gremlin-groovy) to process the request.
+     */
+    public static final String ARGS_LANGUAGE = "language";
+
+    /**
+     * Argument name that allows the override of the server setting that determines the maximum time to wait for a
+     * request to execute on the server.
+     */
+    public static final String ARGS_EVAL_TIMEOUT = "evaluationTimeout";
+    public static final String ARGS_HOST = "host";
+    public static final String ARGS_SESSION = "session";
+    public static final String ARGS_MANAGE_TRANSACTION = "manageTransaction";
+    /**
+     * The name of the argument that allows to control the serialization of properties on the server.
+     */
+    public static final String ARGS_MATERIALIZE_PROPERTIES = "materializeProperties";
+
+    /**
+     * The name of the value denoting that all properties of Element should be returned.
+     * Should be used with {@code ARGS_MATERIALIZE_PROPERTIES}
+     */
+
+    public static final String MATERIALIZE_PROPERTIES_ALL = "all";
+    /**
+     * The name of the value denoting that only `ID` and `Label` of Element should be returned.
+     * Should be used with {@code ARGS_MATERIALIZE_PROPERTIES}
+     */
+    public static final String MATERIALIZE_PROPERTIES_TOKENS = "tokens";
+
+    /**
+     * Argument name that is intended to be used with a session which when its value is {@code true} makes it so
+     * that a processing error or request timeout will not close the session, but leave it to continue processing in
+     * whatever state it may hold. This argument only applies to the {@code UnifiedChannelizer}.
+     */
+    public static final String ARGS_MAINTAIN_STATE_AFTER_EXCEPTION = "maintainStateAfterException";
+    public static final String ARGS_SASL = "sasl";
+    public static final String ARGS_SASL_MECHANISM = "saslMechanism";
+
+    /**
+     * A value that is a custom string that the user can pass to a server that might accept it for purpose of
+     * identifying the kind of client it came from.
+     */
+    public static final String ARGS_USER_AGENT = "userAgent";
+
+    public static final String VAL_TRAVERSAL_SOURCE_ALIAS = "g";
+
+    /**
+     * The value of this key holds a string representation of the data held by a {@link Failure} as produced by
+     * {@link Failure#format()}.
+     */
+    public static final String STATUS_ATTRIBUTE_FAIL_STEP_MESSAGE = "failStepMessage";
+
+    /**
+     * Refers to the hierarchy of exception names for a particular exception thrown on the server.
+     */
+    public static final String STATUS_ATTRIBUTE_EXCEPTIONS = "exceptions";
+
+    /**
+     * Refers to the stacktrace for an exception thrown on the server
+     */
+    public static final String STATUS_ATTRIBUTE_STACK_TRACE = "stackTrace";
+
+    /**
+     * A {@link ResultSet#statusAttributes()} key for user-facing warnings.
+     * <p>
+     * Implementations that set this key should consider using one of
+     * these two recommended value types:
+     * <ul>
+     *     <li>A {@code List} implementation containing
+     *     references for which {@code String#valueOf(Object)} produces
+     *     a meaningful return value.  For example, a list of strings.</li>
+     *     <li>Otherwise, any single non-list object for which
+     *     {@code String#valueOf(Object)} produces a meaningful return value.
+     *     For example, a string.</li>
+     * </ul>
+     */
+    public static final String STATUS_ATTRIBUTE_WARNINGS = "warnings";
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java
new file mode 100644
index 0000000..bea8fc6
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/RequestMessage.java
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.message;
+
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * The model for a request message sent to the server.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class RequestMessage {
+    /**
+     * An "invalid" message.  Used internally only.
+     */
+    public static final RequestMessage INVALID = new RequestMessage(Tokens.OPS_INVALID);
+
+    private final UUID requestId;
+    private final String op;
+    private final String processor;
+    private final Map<String, Object> args;
+
+    private RequestMessage(final UUID requestId, final String op, final String processor, final Map<String, Object> args) {
+        this.requestId = requestId;
+        this.op = op;
+        this.processor = processor;
+        this.args = Optional.ofNullable(args).orElse(new HashMap<>());
+    }
+
+    /**
+     * Empty constructor for serialization.
+     */
+    private RequestMessage() {
+        this(null);
+    }
+
+    private RequestMessage(final String op) {
+        this(null, op, null, null);
+    }
+
+    /**
+     * The id of the current request and is used to track the message within Gremlin Server and in its response.  This
+     * value should be unique per request made.
+     */
+    public UUID getRequestId() {
+        return requestId;
+    }
+
+    /**
+     * The operation or command to perform as defined by a particular Processor.
+     */
+    public String getOp() {
+        return op;
+    }
+
+    /**
+     * The name of the Processor that should handle the {@link #op}.  Defaults to the standard processor if
+     * not specified.
+     */
+    public String getProcessor() {
+        return processor;
+    }
+
+    /**
+     * A {@link Map} of arguments that are supplied to the {@link #op}.  Each {@link #op} accepts different argument,
+     * so consult the documentation for a particular one to understand what is expected.
+     */
+    public Map<String, Object> getArgs() {
+        return args;
+    }
+
+    public <T> Optional<T> optionalArgs(final String key) {
+        final Object o = args.get(key);
+        return o == null ? Optional.empty() : Optional.of((T) o);
+    }
+
+    public <T> T getArg(final String key) {
+        return (T) args.get(key);
+    }
+
+    public <T> T getArgOrDefault(final String key, final T def) {
+        return (T) optionalArgs(key).orElse(def);
+    }
+
+    public static Builder from(final RequestMessage msg) {
+        final Builder builder = build(msg.op)
+                .overrideRequestId(msg.requestId)
+                .processor(msg.processor);
+        msg.args.forEach(builder::addArg);
+        return builder;
+    }
+
+    public static Builder build(final String op) {
+        return new Builder(op);
+    }
+
+    /**
+     * Builder class for {@link RequestMessage}.
+     */
+    public static final class Builder {
+        public static final String OP_PROCESSOR_NAME = "";
+        private UUID requestId;
+        private String op;
+        private String processor = OP_PROCESSOR_NAME;
+        private Map<String, Object> args = new HashMap<>();
+
+        private Builder(final String op) {
+            this.op = op;
+        }
+
+        /**
+         * If this value is not set in the builder then the {@link RequestMessage#processor} defaults to
+         * the standard op processor (empty string).
+         *
+         * @param processor the name of the processor
+         */
+        public Builder processor(final String processor) {
+            this.processor = processor;
+            return this;
+        }
+
+        /**
+         * Override the request identifier with a specified one, otherwise the {@link Builder} will randomly generate
+         * a {@link UUID}.
+         */
+        public Builder overrideRequestId(final UUID requestId) {
+            this.requestId = requestId;
+            return this;
+        }
+
+        public Builder addArg(final String key, final Object val) {
+            args.put(key, val);
+            return this;
+        }
+
+        public Builder add(final Object... keyValues) {
+            args.putAll(ElementHelper.asMap(keyValues));
+            return this;
+        }
+
+        /**
+         * Create the request message given the settings provided to the {@link Builder}.
+         */
+        public RequestMessage create() {
+            return new RequestMessage(null == requestId ? UUID.randomUUID() : requestId, op, processor, args);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "RequestMessage{" +
+                ", requestId=" + requestId +
+                ", op='" + op + '\'' +
+                ", processor='" + processor + '\'' +
+                ", args=" + args +
+                '}';
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseMessage.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseMessage.java
new file mode 100644
index 0000000..b0dbf0b
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseMessage.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.message;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class ResponseMessage {
+
+    /**
+     * The current request that generated this response.
+     */
+    private final UUID requestId;
+    private final ResponseStatus responseStatus;
+    private final ResponseResult responseResult;
+
+    private ResponseMessage(final UUID requestId, final ResponseStatus responseStatus,
+                            final ResponseResult responseResult) {
+        this.requestId = requestId;
+        this.responseResult = responseResult;
+        this.responseStatus = responseStatus;
+    }
+
+    public UUID getRequestId() {
+        return requestId;
+    }
+
+    public ResponseStatus getStatus() {
+        return responseStatus;
+    }
+
+    public ResponseResult getResult() {
+        return responseResult;
+    }
+
+    @Override
+    public String toString() {
+        return "ResponseMessage{" +
+                "requestId=" + requestId +
+                ", status=" + responseStatus +
+                ", result=" + responseResult +
+                '}';
+    }
+
+    public static Builder build(final RequestMessage requestMessage) {
+        return new Builder(requestMessage);
+    }
+
+    public static Builder build(final UUID requestId) {
+        return new Builder(requestId);
+    }
+
+    public final static class Builder {
+
+        private final UUID requestId;
+        private ResponseStatusCode code = ResponseStatusCode.SUCCESS;
+        private Object result = null;
+        private String statusMessage = "";
+        private Map<String, Object> attributes = Collections.emptyMap();
+        private Map<String, Object> metaData = Collections.emptyMap();
+
+        private Builder(final RequestMessage requestMessage) {
+            this.requestId = requestMessage.getRequestId();
+        }
+
+        private Builder(final UUID requestId) {
+            this.requestId = requestId;
+        }
+
+        public Builder code(final ResponseStatusCode code) {
+            this.code = code;
+            return this;
+        }
+
+        public Builder statusMessage(final String message) {
+            this.statusMessage = message;
+            return this;
+        }
+
+        public Builder statusAttributes(final Map<String, Object> attributes) {
+            this.attributes = attributes;
+            return this;
+        }
+
+        public Builder statusAttributeException(final Throwable ex) {
+            statusAttribute(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS, IteratorUtils.asList(
+                    IteratorUtils.map(ExceptionUtils.getThrowableList(ex), t -> t.getClass().getName())));
+            statusAttribute(Tokens.STATUS_ATTRIBUTE_STACK_TRACE, ExceptionUtils.getStackTrace(ex));
+            return this;
+        }
+
+        public Builder statusAttribute(final String key, final Object value) {
+            if (this.attributes == Collections.EMPTY_MAP)
+                attributes = new HashMap<>();
+            attributes.put(key, value);
+            return this;
+        }
+
+        public Builder result(final Object result) {
+            this.result = result;
+            return this;
+        }
+
+        public Builder responseMetaData(final Map<String, Object> metaData) {
+            this.metaData = metaData;
+            return this;
+        }
+
+        public ResponseMessage create() {
+            final ResponseResult responseResult = new ResponseResult(result, metaData);
+            final ResponseStatus responseStatus = new ResponseStatus(code, statusMessage, attributes);
+            return new ResponseMessage(requestId, responseStatus, responseResult);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseResult.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseResult.java
new file mode 100644
index 0000000..9cf5a6c
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseResult.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.message;
+
+import java.util.Map;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class ResponseResult {
+    private final Object data;
+    private final Map<String, Object> meta;
+
+    public ResponseResult(final Object data, final Map<String, Object> meta) {
+        this.data = data;
+        this.meta = meta;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public Map<String, Object> getMeta() {
+        return meta;
+    }
+
+    @Override
+    public String toString() {
+        return "ResponseResult{" +
+                "data=" + data +
+                ", meta=" + meta +
+                '}';
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatus.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatus.java
new file mode 100644
index 0000000..dbc2995
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatus.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.message;
+
+import java.util.Map;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class ResponseStatus {
+    private final ResponseStatusCode code;
+    private final String message;
+    private final Map<String, Object> attributes;
+
+    public ResponseStatus(final ResponseStatusCode code, final String message, final Map<String, Object> attributes) {
+        this.code = code;
+        this.message = message;
+        this.attributes = attributes;
+    }
+
+    /**
+     * Gets the {@link ResponseStatusCode} that describes how the server responded to the request.
+     */
+    public ResponseStatusCode getCode() {
+        return code;
+    }
+
+    /**
+     * Gets the message associated with the code.
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Gets the meta-data related to the response.  If meta-data is returned it is to be considered specific to the
+     * "op" that is executed.  Not all "op" implementations will return meta-data.
+     */
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    @Override
+    public String toString() {
+        return "ResponseStatus{" +
+                "code=" + code +
+                ", message='" + message + '\'' +
+                ", attributes=" + attributes +
+                '}';
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCode.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCode.java
new file mode 100644
index 0000000..98c727e
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCode.java
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.message;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Failure;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.stream.Stream;
+
+/**
+ * Response status codes for Gremlin Server responses. Result codes tend to map to
+ * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html">HTTP status codes</a>.  It is not a one-to-one
+ * mapping and there are mapper status codes to be considered.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public enum ResponseStatusCode {
+
+    /**
+     * Code 200: The server successfully processed a request to completion - there are no messages remaining in this
+     * stream.
+     *
+     * @since 3.0.0-incubating
+     */
+    SUCCESS(200),
+
+    /**
+     * Code 204: The server processed the request but there is no result to return (e.g. an {@link Iterator} with no
+     * elements).
+     *
+     * @since 3.0.0-incubating
+     */
+    NO_CONTENT(204),
+
+    /**
+     * Code 206: The server successfully returned some content, but there is more in the stream to arrive - wait for a
+     * {@link #SUCCESS} to signify the end of the stream.
+     *
+     * @since 3.0.0-incubating
+     */
+    PARTIAL_CONTENT(206),
+
+    /**
+     * Code 401: The server could not authenticate the request or the client requested a resource it did not have
+     * access to.
+     *
+     * @since 3.0.0-incubating
+     */
+    UNAUTHORIZED(401),
+
+    /**
+     * Code 403: The server could authenticate the request, but will not fulfill it.  This is a general purpose code
+     * that would typically be returned if the request is authenticated but not authorized to do what it is doing.
+     *
+     * @since 3.0.1-incubating
+     */
+    FORBIDDEN(403),
+
+    /**
+     * Code 407: A challenge from the server for the client to authenticate its request.
+     *
+     * @since 3.0.1-incubating
+     */
+    AUTHENTICATE(407),
+
+    /**
+     * Code 429: Indicates that too many requests have been sent in a given amount of time.
+     *
+     * @since 3.5.0
+     */
+    TOO_MANY_REQUESTS(429),
+
+    /**
+     * Code 497: The request message contains objects that were not serializable on the client side.
+     *
+     * @since 3.3.6
+     */
+    REQUEST_ERROR_SERIALIZATION(497),
+
+    /**
+     * Code 498: The request message was not properly formatted which means it could not be parsed at all or the "op"
+     * code was not recognized such that Gremlin Server could properly route it for processing.  Check the message
+     * format and retry the request.
+     *
+     * @since 3.0.0-incubating
+     */
+    REQUEST_ERROR_MALFORMED_REQUEST(498),
+
+    /**
+     * Code 499: The request message was parseable, but the arguments supplied in the message were in conflict or
+     * incomplete. Check the message format and retry the request.
+     *
+     * @since 3.0.0-incubating
+     */
+    REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS(499),
+
+    /**
+     * Code 500: A general server error occurred that prevented the request from being processed.
+     *
+     * @since 3.0.0-incubating
+     */
+    SERVER_ERROR(500),
+
+    /**
+     * Code 595: A server error that is produced when the {@link GraphTraversal#fail()} step is triggered. The
+     * returned exception will include information consistent with the {@link Failure} interface.
+     *
+     * @since 3.6.0
+     */
+    SERVER_ERROR_FAIL_STEP(595),
+
+    /**
+     * Code 596: A server error that indicates that the client should retry the request. A graph will typically return
+     * this error when a transaction fails due to a locking exception or some other sort of concurrent modification.
+     * In other words, the request was likely valid but the state of the server at the particular time the request
+     * arrived could not be processed to success, but could be at a later moment.
+     *
+     * @since 3.4.11
+     */
+    SERVER_ERROR_TEMPORARY(596),
+
+    /**
+     * Code 597: The request submitted for processing evaluated by the server with errors and could not be processed.
+     * Check the script or remote traversal submitted for errors or other problems and then resubmit.
+     *
+     * @since 3.0.0-incubating
+     */
+    SERVER_ERROR_EVALUATION(597),
+
+    /**
+     * Code 598: The server exceeded one of the timeout settings for the request and could therefore only partially
+     * responded or did not respond at all.
+     *
+     * @since 3.0.0-incubating
+     */
+    SERVER_ERROR_TIMEOUT(598),
+
+    /**
+     * Code 599: The server was not capable of serializing an object that was returned from the script supplied on the
+     * request. Either transform the object into something Gremlin Server can process within the script or install
+     * mapper serialization classes to Gremlin Server.
+     *
+     * @since 3.0.0-incubating
+     */
+    SERVER_ERROR_SERIALIZATION(599);
+
+    private final int value;
+    private final static Map<Integer, ResponseStatusCode> codeValueMap = new HashMap<>();
+
+    static {
+        Stream.of(ResponseStatusCode.values()).forEach(code -> codeValueMap.put(code.getValue(), code));
+    }
+
+    public static ResponseStatusCode getFromValue(final int codeValue) {
+        return codeValueMap.get(codeValue);
+    }
+
+    ResponseStatusCode(final int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public boolean isSuccess() {
+        return String.valueOf(this.value).startsWith("2");
+    }
+
+    /**
+     * Indicates whether the status code can only be used in the last response for a particular request.
+     */
+    public boolean isFinalResponse() {
+        return this != PARTIAL_CONTENT && this != AUTHENTICATE;
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1.java
new file mode 100644
index 0000000..66fe869
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1.java
@@ -0,0 +1,229 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.ReferenceCountUtil;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.type.TypeReference;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractGraphSONMessageSerializerV1 extends AbstractMessageSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV1.class);
+
+    protected ObjectMapper mapper;
+
+    protected final TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {
+    };
+
+    public AbstractGraphSONMessageSerializerV1() {
+        final GraphSONMapper.Builder builder = configureBuilder(initBuilder(null));
+        mapper = builder.create().createMapper();
+    }
+
+    public AbstractGraphSONMessageSerializerV1(final GraphSONMapper mapper) {
+        this.mapper = mapper.createMapper();
+    }
+
+    abstract byte[] obtainHeader();
+
+    abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
+
+    @Override
+    public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
+        final GraphSONMapper.Builder initialBuilder = initBuilder(null);
+        addIoRegistries(config, initialBuilder);
+        applyMaxTokenLimits(initialBuilder, config);
+        mapper = configureBuilder(initialBuilder).create().createMapper();
+    }
+
+    @Override
+    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        ByteBuf encodedMessage = null;
+        try {
+            final byte[] payload = mapper.writeValueAsBytes(responseMessage);
+            encodedMessage = allocator.buffer(payload.length);
+            encodedMessage.writeBytes(payload);
+
+            return encodedMessage;
+        } catch (Exception ex) {
+            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        ByteBuf encodedMessage = null;
+        try {
+            final byte[] header = obtainHeader();
+            final byte[] payload = mapper.writeValueAsBytes(requestMessage);
+
+            encodedMessage = allocator.buffer(header.length + payload.length);
+            encodedMessage.writeBytes(header);
+            encodedMessage.writeBytes(payload);
+
+            return encodedMessage;
+        } catch (Exception ex) {
+            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
+        try {
+            final byte[] payload = new byte[msg.readableBytes()];
+            msg.readBytes(payload);
+            return mapper.readValue(payload, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
+        try {
+            final byte[] payload = new byte[msg.readableBytes()];
+            msg.readBytes(payload);
+            final Map<String, Object> responseData = mapper.readValue(payload, mapTypeReference);
+            final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
+            final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
+            return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
+                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
+                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
+                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
+                    .result(result.get(SerTokens.TOKEN_DATA))
+                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
+                    .create();
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    private GraphSONMapper.Builder initBuilder(final GraphSONMapper.Builder builder) {
+        final GraphSONMapper.Builder b = null == builder ? GraphSONMapper.build() : builder;
+        return b.addCustomModule(new AbstractGraphSONMessageSerializerV1.GremlinServerModule())
+                .version(GraphSONVersion.V1_0);
+    }
+
+    private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder builder, final Map<String, Object> config) {
+        if(config != null) {
+            if(config.containsKey("maxNumberLength")) {
+                builder.maxNumberLength((int)config.get("maxNumberLength"));
+            }
+            if(config.containsKey("maxStringLength")) {
+                builder.maxStringLength((int)config.get("maxStringLength"));
+            }
+            if(config.containsKey("maxNestingDepth")) {
+                builder.maxNestingDepth((int)config.get("maxNestingDepth"));
+            }
+        }
+        return builder;
+    }
+
+    @Override
+    public ObjectMapper getMapper() {
+        return this.mapper;
+    }
+
+    public final static class GremlinServerModule extends SimpleModule {
+        public GremlinServerModule() {
+            super("graphson-gremlin-server");
+            addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
+        }
+    }
+
+    public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
+        public ResponseMessageSerializer() {
+            super(ResponseMessage.class);
+        }
+
+        @Override
+        public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            ser(responseMessage, jsonGenerator, serializerProvider, null);
+        }
+
+        @Override
+        public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider,
+                                      final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+            ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
+        }
+
+        public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+                        final SerializerProvider serializerProvider,
+                        final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+            jsonGenerator.writeStartObject();
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+
+            jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
+            jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_STATUS);
+
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
+            jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
+            jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
+            jsonGenerator.writeEndObject();
+
+            jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_RESULT);
+            if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+            if (null == responseMessage.getResult().getData())
+                jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
+            else
+                GraphSONUtil.writeWithType(SerTokens.TOKEN_DATA, responseMessage.getResult().getData(), jsonGenerator, serializerProvider, typeSerializer);
+            jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
+            jsonGenerator.writeEndObject();
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2.java
new file mode 100644
index 0000000..87f8230
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2.java
@@ -0,0 +1,306 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.ReferenceCountUtil;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractGraphSONMessageSerializerV2 extends AbstractMessageSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV2.class);
+
+    protected ObjectMapper mapper;
+
+    public AbstractGraphSONMessageSerializerV2() {
+        final GraphSONMapper.Builder builder = configureBuilder(initBuilder(null));
+        mapper = builder.create().createMapper();
+    }
+
+    @Deprecated
+    public AbstractGraphSONMessageSerializerV2(final GraphSONMapper mapper) {
+        this.mapper = mapper.createMapper();
+    }
+
+    public AbstractGraphSONMessageSerializerV2(final GraphSONMapper.Builder mapperBuilder) {
+        this.mapper = configureBuilder(mapperBuilder).create().createMapper();
+    }
+
+    abstract byte[] obtainHeader();
+
+    abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
+
+    @Override
+    public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
+        final GraphSONMapper.Builder initialBuilder = initBuilder(null);
+        addIoRegistries(config, initialBuilder);
+        applyMaxTokenLimits(initialBuilder, config);
+        mapper = configureBuilder(initialBuilder).create().createMapper();
+    }
+
+    @Override
+    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        ByteBuf encodedMessage = null;
+        try {
+            final byte[] payload = mapper.writeValueAsBytes(responseMessage);
+            encodedMessage = allocator.buffer(payload.length);
+            encodedMessage.writeBytes(payload);
+
+            return encodedMessage;
+        } catch (Exception ex) {
+            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+            logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        ByteBuf encodedMessage = null;
+        try {
+            final byte[] header = obtainHeader();
+            final byte[] payload = mapper.writeValueAsBytes(requestMessage);
+
+            encodedMessage = allocator.buffer(header.length + payload.length);
+            encodedMessage.writeBytes(header);
+            encodedMessage.writeBytes(payload);
+
+            return encodedMessage;
+        } catch (Exception ex) {
+            if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+            logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
+        try {
+            final byte[] payload = new byte[msg.readableBytes()];
+            msg.readBytes(payload);
+            return mapper.readValue(payload, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
+        try {
+            final byte[] payload = new byte[msg.readableBytes()];
+            msg.readBytes(payload);
+            return mapper.readValue(payload, ResponseMessage.class);
+        } catch (Exception ex) {
+            logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, AbstractGraphSONMessageSerializerV2.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+
+    private GraphSONMapper.Builder initBuilder(final GraphSONMapper.Builder builder) {
+        final GraphSONMapper.Builder b = null == builder ? GraphSONMapper.build() : builder;
+        return b.addCustomModule(GraphSONXModuleV2.build())
+                .version(GraphSONVersion.V2_0);
+    }
+
+    private GraphSONMapper.Builder applyMaxTokenLimits(final GraphSONMapper.Builder builder, final Map<String, Object> config) {
+        if(config != null) {
+            if(config.containsKey("maxNumberLength")) {
+                builder.maxNumberLength((int)config.get("maxNumberLength"));
+            }
+            if(config.containsKey("maxStringLength")) {
+                builder.maxStringLength((int)config.get("maxStringLength"));
+            }
+            if(config.containsKey("maxNestingDepth")) {
+                builder.maxNestingDepth((int)config.get("maxNestingDepth"));
+            }
+        }
+        return builder;
+    }
+
+    @Override
+    public ObjectMapper getMapper() {
+        return this.mapper;
+    }
+
+    public final static class GremlinServerModule extends SimpleModule {
+        public GremlinServerModule() {
+            super("graphson-gremlin-server");
+
+            // SERIALIZERS
+            addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
+            addSerializer(RequestMessage.class, new RequestMessageSerializer());
+
+            //DESERIALIZERS
+            addDeserializer(ResponseMessage.class, new ResponseMessageDeserializer());
+            addDeserializer(RequestMessage.class, new RequestMessageDeserializer());
+        }
+    }
+
+    public final static class RequestMessageSerializer extends StdSerializer<RequestMessage> {
+        public RequestMessageSerializer() {
+            super(RequestMessage.class);
+        }
+
+        @Override
+        public void serialize(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            ser(requestMessage, jsonGenerator, serializerProvider, null);
+        }
+
+        @Override
+        public void serializeWithType(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider,
+                                      final TypeSerializer typeSerializer) throws IOException {
+            ser(requestMessage, jsonGenerator, serializerProvider, typeSerializer);
+        }
+
+        public void ser(final RequestMessage requestMessage, final JsonGenerator jsonGenerator,
+                        final SerializerProvider serializerProvider,
+                        final TypeSerializer typeSerializer) throws IOException {
+            GraphSONUtil.writeStartObject(requestMessage, jsonGenerator, typeSerializer);
+
+            jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, requestMessage.getRequestId().toString());
+            jsonGenerator.writeStringField(SerTokens.TOKEN_OP, requestMessage.getOp());
+            jsonGenerator.writeStringField(SerTokens.TOKEN_PROCESSOR, requestMessage.getProcessor());
+            jsonGenerator.writeObjectField(SerTokens.TOKEN_ARGS, requestMessage.getArgs());
+
+            GraphSONUtil.writeEndObject(requestMessage, jsonGenerator, typeSerializer);
+        }
+    }
+
+    public final static class RequestMessageDeserializer extends AbstractObjectDeserializer<RequestMessage> {
+        protected RequestMessageDeserializer() {
+            super(RequestMessage.class);
+        }
+
+        @Override
+        public RequestMessage createObject(final Map<String, Object> data) {
+            final Map<String, Object> args = (Map<String, Object>) data.get(SerTokens.TOKEN_ARGS);
+            RequestMessage.Builder builder = RequestMessage.build(data.get(SerTokens.TOKEN_OP).toString())
+                    .overrideRequestId(UUID.fromString(data.get(SerTokens.TOKEN_REQUEST).toString()));
+
+            if (data.containsKey(SerTokens.TOKEN_PROCESSOR))
+                builder = builder.processor(data.get(SerTokens.TOKEN_PROCESSOR).toString());
+
+            if (args != null) {
+                for (Map.Entry<String, Object> kv : args.entrySet()) {
+                    builder = builder.addArg(kv.getKey(), kv.getValue());
+                }
+            }
+
+            return builder.create();
+        }
+    }
+
+    public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
+        public ResponseMessageSerializer() {
+            super(ResponseMessage.class);
+        }
+
+        @Override
+        public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            ser(responseMessage, jsonGenerator, serializerProvider, null);
+        }
+
+        @Override
+        public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider,
+                                      final TypeSerializer typeSerializer) throws IOException {
+            ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
+        }
+
+        public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+                        final SerializerProvider serializerProvider,
+                        final TypeSerializer typeSerializer) throws IOException {
+            GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+
+            jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
+            jsonGenerator.writeFieldName(SerTokens.TOKEN_STATUS);
+
+            GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+            jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
+            jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
+            jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
+            GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+
+            jsonGenerator.writeFieldName(SerTokens.TOKEN_RESULT);
+
+            GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+
+            if (null == responseMessage.getResult().getData()){
+                jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
+            } else {
+                jsonGenerator.writeFieldName(SerTokens.TOKEN_DATA);
+                final Object result = responseMessage.getResult().getData();
+                serializerProvider.findTypedValueSerializer(result.getClass(), true, null).serialize(result, jsonGenerator, serializerProvider);
+            }
+
+            jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
+            GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+
+            GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+        }
+    }
+    
+    public final static class ResponseMessageDeserializer extends AbstractObjectDeserializer<ResponseMessage> {
+        protected ResponseMessageDeserializer() {
+            super(ResponseMessage.class);
+        }
+        
+        @Override
+        public ResponseMessage createObject(final Map<String, Object> data) {
+            final Map<String, Object> status = (Map<String, Object>) data.get(SerTokens.TOKEN_STATUS);
+            final Map<String, Object> result = (Map<String, Object>) data.get(SerTokens.TOKEN_RESULT);
+            return ResponseMessage.build(UUID.fromString(data.get(SerTokens.TOKEN_REQUEST).toString()))
+                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
+                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
+                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
+                    .result(result.get(SerTokens.TOKEN_DATA))
+                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
+                    .create();
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractMessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractMessageSerializer.java
new file mode 100644
index 0000000..74ecc18
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/AbstractMessageSerializer.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.Mapper;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Base {@link MessageSerializer} that serializers can implement to get some helper methods around configuring a
+ * {@link Mapper.Builder}.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractMessageSerializer<M> implements MessageSerializer<M> {
+    public static final String TOKEN_IO_REGISTRIES = "ioRegistries";
+
+    /**
+     * Reads a list of fully qualified class names from the value of the {@link #TOKEN_IO_REGISTRIES} configuration
+     * key. These classes should equate to {@link IoRegistry} implementations that will be assigned to the
+     * {@link Mapper.Builder}.  The assumption is that the {@link IoRegistry} either has a static {@code instance()}
+     * method or has a zero-arg constructor from which it can be instantiated.
+     */
+    protected void addIoRegistries(final Map<String, Object> config, final Mapper.Builder builder) {
+        final List<String> classNameList = getListStringFromConfig(TOKEN_IO_REGISTRIES, config);
+
+        classNameList.stream().forEach(className -> {
+            try {
+                final Class<?> clazz = Class.forName(className);
+                try {
+                    // try instance() first and then getInstance() which was deprecated in 3.2.4
+                    final Method instanceMethod = tryInstanceMethod(clazz);
+                    if (IoRegistry.class.isAssignableFrom(instanceMethod.getReturnType()))
+                        builder.addRegistry((IoRegistry) instanceMethod.invoke(null));
+                    else
+                        throw new Exception();
+                } catch (Exception methodex) {
+                    // tried instance() and that failed so try newInstance() no-arg constructor
+                    builder.addRegistry((IoRegistry) clazz.newInstance());
+                }
+            } catch (Exception ex) {
+                throw new IllegalStateException(ex);
+            }
+        });
+    }
+
+    protected Method tryInstanceMethod(final Class clazz) {
+        Method instanceMethod;
+        try {
+            instanceMethod = clazz.getDeclaredMethod("instance");
+        } catch (Exception methodex) {
+            instanceMethod = null;
+        }
+
+        if (null == instanceMethod) {
+            try {
+                instanceMethod = clazz.getDeclaredMethod("getInstance");
+            } catch (Exception methodex) {
+                instanceMethod = null;
+            }
+        }
+
+        return instanceMethod;
+    }
+
+    /**
+     * Gets a {@link List} of strings from the configuration object.
+     */
+    protected List<String> getListStringFromConfig(final String token, final Map<String, Object> config) {
+        final List<String> classNameList;
+        try {
+            classNameList = (List<String>) config.getOrDefault(token, Collections.emptyList());
+        } catch (Exception ex) {
+            throw new IllegalStateException(String.format("Invalid configuration value of [%s] for [%s] setting on %s serialization configuration",
+                    config.getOrDefault(token, ""), token, this.getClass().getName()), ex);
+        }
+
+        return classNameList;
+    }
+}
\ No newline at end of file
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java
new file mode 100644
index 0000000..fe4b051
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphBinaryMessageSerializerV1.java
@@ -0,0 +1,276 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryIo;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryMapper;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.util.ser.binary.RequestMessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.binary.ResponseMessageSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.javatuples.Pair;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+public class GraphBinaryMessageSerializerV1 extends AbstractMessageSerializer<GraphBinaryMapper> implements MessageTextSerializer<GraphBinaryMapper> {
+
+    public static final String TOKEN_CUSTOM = "custom";
+    public static final String TOKEN_BUILDER = "builder";
+    public static final String TOKEN_SERIALIZE_RESULT_TO_STRING = "serializeResultToString";
+
+    private static final String MIME_TYPE = SerTokens.MIME_GRAPHBINARY_V1;
+    private static final String MIME_TYPE_STRINGD = SerTokens.MIME_GRAPHBINARY_V1 + "-stringd";
+
+    private static final Base64.Encoder base64Encoder = Base64.getEncoder();
+    private static final Base64.Decoder base64Decoder = Base64.getDecoder();
+
+    private byte[] header = MIME_TYPE.getBytes(UTF_8);
+    private boolean serializeToString = false;
+    private GraphBinaryReader reader;
+    private GraphBinaryWriter writer;
+    private RequestMessageSerializer requestSerializer;
+    private ResponseMessageSerializer responseSerializer;
+    private GraphBinaryMapper mapper;
+
+    /**
+     * Creates a new instance of the message serializer using the default type serializers.
+     */
+    public GraphBinaryMessageSerializerV1() {
+        this(TypeSerializerRegistry.INSTANCE);
+    }
+
+    public GraphBinaryMessageSerializerV1(final TypeSerializerRegistry registry) {
+        reader = new GraphBinaryReader(registry);
+        writer = new GraphBinaryWriter(registry);
+        mapper = new GraphBinaryMapper(writer, reader);
+
+        requestSerializer = new RequestMessageSerializer();
+        responseSerializer = new ResponseMessageSerializer();
+    }
+
+    public GraphBinaryMessageSerializerV1(final TypeSerializerRegistry.Builder builder) {
+        this(builder.create());
+    }
+
+    @Override
+    public GraphBinaryMapper getMapper() {
+        return mapper;
+    }
+
+    @Override
+    public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
+        final String builderClassName = (String) config.get(TOKEN_BUILDER);
+        final TypeSerializerRegistry.Builder builder;
+
+        if (builderClassName != null) {
+            try {
+                final Class<?> clazz = Class.forName(builderClassName);
+                final Constructor<?> ctor = clazz.getConstructor();
+                builder = (TypeSerializerRegistry.Builder) ctor.newInstance();
+            } catch (Exception ex) {
+                throw new IllegalStateException(ex);
+            }
+        } else {
+            builder = TypeSerializerRegistry.build();
+        }
+
+        final List<String> classNameList = getListStringFromConfig(TOKEN_IO_REGISTRIES, config);
+        classNameList.forEach(className -> {
+            try {
+                final Class<?> clazz = Class.forName(className);
+                try {
+                    final Method instanceMethod = tryInstanceMethod(clazz);
+                    final IoRegistry ioreg = (IoRegistry) instanceMethod.invoke(null);
+                    final List<Pair<Class, CustomTypeSerializer>> classSerializers = ioreg.find(GraphBinaryIo.class, CustomTypeSerializer.class);
+                    for (Pair<Class,CustomTypeSerializer> cs : classSerializers) {
+                        builder.addCustomType(cs.getValue0(), cs.getValue1());
+                    }
+                } catch (Exception methodex) {
+                    throw new IllegalStateException(String.format("Could not instantiate IoRegistry from an instance() method on %s", className), methodex);
+                }
+            } catch (Exception ex) {
+                throw new IllegalStateException(ex);
+            }
+        });
+
+        addCustomClasses(config, builder);
+
+        this.serializeToString = Boolean.parseBoolean(config.getOrDefault(TOKEN_SERIALIZE_RESULT_TO_STRING, "false").toString());
+        this.header = this.serializeToString ? MIME_TYPE_STRINGD.getBytes(UTF_8) : MIME_TYPE.getBytes(UTF_8);
+
+        final TypeSerializerRegistry registry = builder.create();
+        reader = new GraphBinaryReader(registry);
+        writer = new GraphBinaryWriter(registry);
+
+        requestSerializer = new RequestMessageSerializer();
+        responseSerializer = new ResponseMessageSerializer();
+    }
+
+    @Override
+    public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        final ByteBuf buffer = allocator.buffer();
+
+        try {
+            final ResponseMessage msgToWrite = !serializeToString ? responseMessage :
+                    ResponseMessage.build(responseMessage.getRequestId())
+                            .code(responseMessage.getStatus().getCode())
+                            .statusAttributes(responseMessage.getStatus().getAttributes())
+                            .responseMetaData(responseMessage.getResult().getMeta())
+                            .result(serializeResultToString(responseMessage))
+                            .statusMessage(responseMessage.getStatus().getMessage()).create();
+
+            responseSerializer.writeValue(msgToWrite, buffer, writer);
+        } catch (Exception ex) {
+            buffer.release();
+            throw ex;
+        }
+
+        return buffer;
+    }
+
+    @Override
+    public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        final ByteBuf buffer = allocator.buffer().writeByte(header.length).writeBytes(header);
+
+        try {
+            requestSerializer.writeValue(requestMessage, buffer, writer);
+        } catch (Exception ex) {
+            buffer.release();
+            throw ex;
+        }
+
+        return buffer;
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
+        return requestSerializer.readValue(msg, reader);
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
+        return responseSerializer.readValue(msg, reader);
+    }
+
+    @Override
+    public String[] mimeTypesSupported() {
+        return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
+    }
+
+    @Override
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        final ByteBuf bb = serializeResponseAsBinary(responseMessage, allocator);
+        return base64Encoder.encodeToString(convertToBytes(bb));
+    }
+
+    @Override
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        final ByteBuf bb = allocator.buffer();
+
+        try {
+            requestSerializer.writeValue(requestMessage, bb, writer);
+        } catch (Exception ex) {
+            bb.release();
+            throw ex;
+        }
+
+        return base64Encoder.encodeToString(convertToBytes(bb));
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+        return deserializeRequest(convertToByteBuf(msg));
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+        return deserializeResponse(convertToByteBuf(msg));
+    }
+
+    private byte[] convertToBytes(final ByteBuf bb) {
+        byte[] bytes = new byte[bb.readableBytes()];
+        bb.getBytes(bb.readerIndex(), bytes);
+        return bytes;
+    }
+
+    private ByteBuf convertToByteBuf(final String msg) {
+        final byte[] b = base64Decoder.decode(msg);
+        final ByteBuf bb = Unpooled.buffer(b.length);
+        bb.writeBytes(b);
+        return bb;
+    }
+
+    private void addCustomClasses(final Map<String, Object> config, final TypeSerializerRegistry.Builder builder) {
+        final List<String> classNameList = getListStringFromConfig(TOKEN_CUSTOM, config);
+
+        classNameList.forEach(serializerDefinition -> {
+            final String className;
+            final String serializerName;
+            if (serializerDefinition.contains(";")) {
+                final String[] split = serializerDefinition.split(";");
+                if (split.length != 2)
+                    throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
+
+                className = split[0];
+                serializerName = split[1];
+            } else {
+                throw new IllegalStateException(String.format("Invalid format for serializer definition [%s] - expected <class>;<serializer-class>", serializerDefinition));
+            }
+
+            try {
+                final Class clazz = Class.forName(className);
+                final Class serializerClazz = Class.forName(serializerName);
+                final CustomTypeSerializer serializer = (CustomTypeSerializer) serializerClazz.newInstance();
+                builder.addCustomType(clazz, serializer);
+            } catch (Exception ex) {
+                throw new IllegalStateException("CustomTypeSerializer could not be instantiated", ex);
+            }
+        });
+    }
+
+    private Object serializeResultToString(final ResponseMessage msg) {
+        if (msg.getResult() == null) return "null";
+        if (msg.getResult().getData() == null) return "null";
+
+        // the IteratorHandler should return a collection so keep it as such
+        final Object o = msg.getResult().getData();
+        if (o instanceof Collection) {
+            return ((Collection) o).stream().map(d -> null == d ? "null" : d.toString()).collect(Collectors.toList());
+        } else {
+            return o.toString();
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1.java
new file mode 100644
index 0000000..8b2b781
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Serialize results to JSON with version 1.0.x schema.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONMessageSerializerV1 extends AbstractGraphSONMessageSerializerV1 implements MessageTextSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV1.class);
+    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1;
+
+    private static byte[] header;
+
+    static {
+        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+        buffer.put((byte) MIME_TYPE.length());
+        buffer.put(MIME_TYPE.getBytes());
+        header = buffer.array();
+    }
+
+    public GraphSONMessageSerializerV1() {
+        super();
+    }
+
+    public GraphSONMessageSerializerV1(final GraphSONMapper mapper) {
+        super(mapper);
+    }
+
+    @Override
+    public String[] mimeTypesSupported() {
+        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+    }
+
+    @Override
+    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+        return builder.addCustomModule(new GremlinServerModule())
+                .typeInfo(TypeInfo.PARTIAL_TYPES);
+    }
+
+    @Override
+    byte[] obtainHeader() {
+        return header;
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+        try {
+            final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
+            final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
+            final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
+            return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
+                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
+                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
+                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
+                    .result(result.get(SerTokens.TOKEN_DATA))
+                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
+                    .create();
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(responseMessage);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(requestMessage);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2.java
new file mode 100644
index 0000000..fadd112
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Serialize results to JSON with version 2.0.x schema and the extended module.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONMessageSerializerV2 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV2.class);
+    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V2;
+
+    private static byte[] header;
+
+    static {
+        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+        buffer.put((byte) MIME_TYPE.length());
+        buffer.put(MIME_TYPE.getBytes());
+        header = buffer.array();
+    }
+
+    /**
+     * Creates a default GraphSONMessageSerializer. By default this will internally instantiate a {@link GraphSONMapper}
+     * and register a {@link GremlinServerModule} and {@link GraphSONXModuleV2} to the mapper.
+     *
+     * @see #GraphSONMessageSerializerV2(GraphSONMapper.Builder)
+     */
+    public GraphSONMessageSerializerV2() {
+        super();
+    }
+
+    /**
+     * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
+     * {@link #GraphSONMessageSerializerV2(GraphSONMapper.Builder)} instead.
+     */
+    @Deprecated
+    public GraphSONMessageSerializerV2(final GraphSONMapper mapper) {
+        super(mapper);
+    }
+
+    /**
+     * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
+     *
+     * Note that to make this mapper usable in the context of request messages and responses,
+     * this method will automatically register a {@link GremlinServerModule} to the provided
+     * mapper.
+     */
+    public GraphSONMessageSerializerV2(final GraphSONMapper.Builder mapperBuilder) {
+        super(mapperBuilder);
+    }
+
+    @Override
+    public String[] mimeTypesSupported() {
+        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+    }
+
+    @Override
+    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+        // already set to 2.0 in AbstractGraphSONMessageSerializerV2
+        return builder.typeInfo(TypeInfo.PARTIAL_TYPES).addCustomModule(new GremlinServerModule());
+    }
+
+    @Override
+    byte[] obtainHeader() {
+        return header;
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, ResponseMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(responseMessage);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(requestMessage);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3.java
new file mode 100644
index 0000000..e4d2380
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Serialize results to JSON with version 3.0.x schema and the extended module.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONMessageSerializerV3 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV3.class);
+    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V3;
+
+    private static byte[] header;
+
+    static {
+        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+        buffer.put((byte) MIME_TYPE.length());
+        buffer.put(MIME_TYPE.getBytes());
+        header = buffer.array();
+    }
+
+    /**
+     * Creates a default GraphSONMessageSerializer.
+     * <p>
+     * By default this will internally instantiate a {@link GraphSONMapper} and register
+     * a {@link GremlinServerModule} and {@link GraphSONXModuleV3} to the mapper.
+     *
+     * @see #GraphSONMessageSerializerV3(GraphSONMapper.Builder)
+     */
+    public GraphSONMessageSerializerV3() {
+        super();
+    }
+
+    /**
+     * Create a GraphSONMessageSerializer from a {@link GraphSONMapper}. Deprecated, use
+     * {@link #GraphSONMessageSerializerV3(GraphSONMapper.Builder)} instead.
+     */
+    @Deprecated
+    public GraphSONMessageSerializerV3(final GraphSONMapper mapper) {
+        super(mapper);
+    }
+
+    /**
+     * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
+     *
+     * Note that to make this mapper usable in the context of request messages and responses,
+     * this method will automatically register a {@link GremlinServerModule} to the provided
+     * mapper.
+     */
+    public GraphSONMessageSerializerV3(final GraphSONMapper.Builder mapperBuilder) {
+        super(mapperBuilder);
+    }
+
+    @Override
+    public String[] mimeTypesSupported() {
+        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+    }
+
+    @Override
+    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+        // override the 2.0 in AbstractGraphSONMessageSerializerV2
+        return builder.version(GraphSONVersion.V3_0).addCustomModule(new GremlinServerModule());
+    }
+
+    @Override
+    byte[] obtainHeader() {
+        return header;
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, ResponseMessage.class);
+        } catch (Exception ex) {
+            logger.warn(String.format("Response [%s] could not be deserialized by %s.", msg, GraphSONMessageSerializerV3.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(responseMessage);
+        } catch (Exception ex) {
+            logger.warn(String.format("Response [%s] could not be serialized by %s.", responseMessage.toString(), GraphSONMessageSerializerV3.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn(String.format("Request [%s] could not be deserialized by %s.", msg, GraphSONMessageSerializerV3.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(requestMessage);
+        } catch (Exception ex) {
+            logger.warn(String.format("Request [%s] could not be serialized by %s.", requestMessage.toString(), GraphSONMessageSerializerV3.class.getName()), ex);
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1.java
new file mode 100644
index 0000000..520111b
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Serialize results to JSON with version 1.0.x schema and serialization which does not embed types.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONUntypedMessageSerializerV1 extends AbstractGraphSONMessageSerializerV1 implements MessageTextSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV1.class);
+    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1_UNTYPED;
+
+    private static byte[] header;
+
+    static {
+        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+        buffer.put((byte) MIME_TYPE.length());
+        buffer.put(MIME_TYPE.getBytes());
+        header = buffer.array();
+    }
+
+    public GraphSONUntypedMessageSerializerV1() {
+        super();
+    }
+
+    public GraphSONUntypedMessageSerializerV1(final GraphSONMapper mapper) {
+        super(mapper);
+    }
+
+    @Override
+    public String[] mimeTypesSupported() {
+        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+    }
+
+    @Override
+    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+        // already set to 1.0 in AbstractGraphSONMessageSerializerV1
+        return builder.addCustomModule(new GremlinServerModule())
+                .typeInfo(TypeInfo.NO_TYPES);
+    }
+
+    @Override
+    byte[] obtainHeader() {
+        return header;
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+        try {
+            final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
+            final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
+            final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
+            return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
+                    .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
+                    .statusMessage(String.valueOf(status.get(SerTokens.TOKEN_MESSAGE)))
+                    .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
+                    .result(result.get(SerTokens.TOKEN_DATA))
+                    .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
+                    .create();
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(responseMessage);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(requestMessage);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV1.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2.java
new file mode 100644
index 0000000..eae64c4
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Serialize results to JSON with version 2.0.x schema and the extended module without embedded types.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONUntypedMessageSerializerV2 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV2.class);
+    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V2_UNTYPED;
+
+    private static byte[] header;
+
+    static {
+        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+        buffer.put((byte) MIME_TYPE.length());
+        buffer.put(MIME_TYPE.getBytes());
+        header = buffer.array();
+    }
+
+    /**
+     * Creates a default GraphSONMessageSerializer.
+     *
+     * By default this will internally instantiate a {@link GraphSONMapper} and register
+     * a {@link GremlinServerModule} and {@link GraphSONXModuleV2} to the mapper.
+     *
+     * @see #GraphSONUntypedMessageSerializerV2(GraphSONMapper.Builder)
+     */
+    public GraphSONUntypedMessageSerializerV2() {
+        super();
+    }
+
+    /**
+     * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
+     *
+     * Note that to make this mapper usable in the context of request messages and responses,
+     * this method will automatically register a {@link GremlinServerModule} to the provided
+     * mapper.
+     */
+    public GraphSONUntypedMessageSerializerV2(final GraphSONMapper.Builder mapperBuilder) {
+        super(mapperBuilder);
+    }
+
+    @Override
+    public String[] mimeTypesSupported() {
+        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+    }
+
+    @Override
+    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+        // already set to 2.0 in AbstractGraphSONMessageSerializerV2
+        return builder.typeInfo(TypeInfo.NO_TYPES).addCustomModule(new GremlinServerModule());
+    }
+
+    @Override
+    byte[] obtainHeader() {
+        return header;
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, ResponseMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(responseMessage);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(requestMessage);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3.java
new file mode 100644
index 0000000..9dffa21
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Serialize results to JSON with version 3.0.x schema and the extended module without embedded types.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONUntypedMessageSerializerV3 extends AbstractGraphSONMessageSerializerV2 implements MessageTextSerializer<ObjectMapper> {
+    private static final Logger logger = LoggerFactory.getLogger(GraphSONUntypedMessageSerializerV3.class);
+    private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V3_UNTYPED;
+
+    private static byte[] header;
+
+    static {
+        final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+        buffer.put((byte) MIME_TYPE.length());
+        buffer.put(MIME_TYPE.getBytes());
+        header = buffer.array();
+    }
+
+    /**
+     * Creates a default GraphSONMessageSerializer.
+     *
+     * By default this will internally instantiate a {@link GraphSONMapper} and register
+     * a {@link GremlinServerModule} and {@link GraphSONXModuleV2} to the mapper.
+     *
+     * @see #GraphSONUntypedMessageSerializerV3(GraphSONMapper.Builder)
+     */
+    public GraphSONUntypedMessageSerializerV3() {
+        super();
+    }
+
+    /**
+     * Create a GraphSONMessageSerializer with a provided {@link GraphSONMapper.Builder}.
+     *
+     * Note that to make this mapper usable in the context of request messages and responses,
+     * this method will automatically register a {@link GremlinServerModule} to the provided
+     * mapper.
+     */
+    public GraphSONUntypedMessageSerializerV3(final GraphSONMapper.Builder mapperBuilder) {
+        super(mapperBuilder);
+    }
+
+    @Override
+    public String[] mimeTypesSupported() {
+        return new String[]{MIME_TYPE, SerTokens.MIME_JSON};
+    }
+
+    @Override
+    GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+        return builder.typeInfo(TypeInfo.NO_TYPES).addCustomModule(new GremlinServerModule());
+    }
+
+    @Override
+    byte[] obtainHeader() {
+        return header;
+    }
+
+    @Override
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, ResponseMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(responseMessage);
+        } catch (Exception ex) {
+            logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+        try {
+            return mapper.readValue(msg, RequestMessage.class);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+
+    @Override
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+        try {
+            return mapper.writeValueAsString(requestMessage);
+        } catch (Exception ex) {
+            logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2.class.getName());
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializer.java
new file mode 100644
index 0000000..7d46aab
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/MessageTextSerializer.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+
+/**
+ * An extension to the MessageSerializer interface that allows a format to be compatible with text-based
+ * websocket messages.  This interface is for internal purposes only.  Implementers who have mapper serialization
+ * needs should NOT implement this interface as it will not be used.  Gremlin Server only supports plain JSON
+ * for text-based requests.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public interface MessageTextSerializer<M> extends MessageSerializer<M> {
+    public String serializeResponseAsString(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException;
+
+    public String serializeRequestAsString(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException;
+
+    public RequestMessage deserializeRequest(final String msg) throws SerializationException;
+
+    public ResponseMessage deserializeResponse(final String msg) throws SerializationException;
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/NettyBuffer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/NettyBuffer.java
new file mode 100644
index 0000000..3310313
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/NettyBuffer.java
@@ -0,0 +1,267 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * Represents a {@link Buffer} backed by Netty's {@link ByteBuf}.
+ */
+final class NettyBuffer implements Buffer {
+    private final ByteBuf buffer;
+
+    /**
+     * Creates a new instance.
+     * @param buffer The buffer to wrap.
+     */
+    NettyBuffer(ByteBuf buffer) {
+        if (buffer == null) {
+            throw new IllegalArgumentException("buffer can't be null");
+        }
+
+        this.buffer = buffer;
+    }
+
+    @Override
+    public int readableBytes() {
+        return this.buffer.readableBytes();
+    }
+
+    @Override
+    public int readerIndex() {
+        return this.buffer.readerIndex();
+    }
+
+    @Override
+    public Buffer readerIndex(final int readerIndex) {
+        this.buffer.readerIndex(readerIndex);
+        return this;
+    }
+
+    @Override
+    public int writerIndex() {
+        return this.buffer.writerIndex();
+    }
+
+    @Override
+    public Buffer writerIndex(final int writerIndex) {
+        this.buffer.writerIndex(writerIndex);
+        return this;
+    }
+
+    @Override
+    public Buffer markWriterIndex() {
+        this.buffer.markWriterIndex();
+        return this;
+    }
+
+    @Override
+    public Buffer resetWriterIndex() {
+        this.buffer.resetWriterIndex();
+        return this;
+    }
+
+    @Override
+    public int capacity() {
+        return this.buffer.capacity();
+    }
+
+    @Override
+    public boolean isDirect() {
+        return this.buffer.isDirect();
+    }
+
+    @Override
+    public boolean readBoolean() {
+        return this.buffer.readBoolean();
+    }
+
+    @Override
+    public byte readByte() {
+        return this.buffer.readByte();
+    }
+
+    @Override
+    public short readShort() {
+        return this.buffer.readShort();
+    }
+
+    @Override
+    public int readInt() {
+        return this.buffer.readInt();
+    }
+
+    @Override
+    public long readLong() {
+        return this.buffer.readLong();
+    }
+
+    @Override
+    public float readFloat() {
+        return this.buffer.readFloat();
+    }
+
+    @Override
+    public double readDouble() {
+        return this.buffer.readDouble();
+    }
+
+    @Override
+    public Buffer readBytes(final byte[] destination) {
+        this.buffer.readBytes(destination);
+        return this;
+    }
+
+    @Override
+    public Buffer readBytes(final byte[] destination, final int dstIndex, final int length) {
+        this.buffer.readBytes(destination, dstIndex, length);
+        return this;
+    }
+
+    @Override
+    public Buffer readBytes(final ByteBuffer dst) {
+        this.buffer.readBytes(dst);
+        return this;
+    }
+
+    @Override
+    public Buffer readBytes(final OutputStream out, final int length) throws IOException {
+        this.buffer.readBytes(out, length);
+        return this;
+    }
+
+    @Override
+    public Buffer writeBoolean(final boolean value) {
+        this.buffer.writeBoolean(value);
+        return this;
+    }
+
+    @Override
+    public Buffer writeByte(final int value) {
+        this.buffer.writeByte(value);
+        return this;
+    }
+
+    @Override
+    public Buffer writeShort(final int value) {
+        this.buffer.writeShort(value);
+        return this;
+    }
+
+    @Override
+    public Buffer writeInt(final int value) {
+        this.buffer.writeInt(value);
+        return this;
+    }
+
+    @Override
+    public Buffer writeLong(final long value) {
+        this.buffer.writeLong(value);
+        return this;
+    }
+
+    @Override
+    public Buffer writeFloat(final float value) {
+        this.buffer.writeFloat(value);
+        return this;
+    }
+
+    @Override
+    public Buffer writeDouble(final double value) {
+        this.buffer.writeDouble(value);
+        return this;
+    }
+
+    @Override
+    public Buffer writeBytes(final byte[] src) {
+        this.buffer.writeBytes(src);
+        return this;
+    }
+
+    @Override
+    public Buffer writeBytes(final ByteBuffer src) {
+        this.buffer.writeBytes(src);
+        return this;
+    }
+
+    @Override
+    public Buffer writeBytes(byte[] src, final int srcIndex, final int length) {
+        this.buffer.writeBytes(src, srcIndex, length);
+        return this;
+    }
+
+    @Override
+    public boolean release() {
+        return this.buffer.release();
+    }
+
+    @Override
+    public Buffer retain() {
+        this.buffer.retain();
+        return this;
+    }
+
+    @Override
+    public int referenceCount() {
+        return this.buffer.refCnt();
+    }
+
+    @Override
+    public ByteBuffer[] nioBuffers() {
+        return this.buffer.nioBuffers();
+    }
+
+    @Override
+    public ByteBuffer nioBuffer() {
+        return this.buffer.nioBuffer();
+    }
+
+    @Override
+    public ByteBuffer nioBuffer(final int index, final int length) {
+        return this.buffer.nioBuffer(index, length);
+    }
+
+    @Override
+    public ByteBuffer[] nioBuffers(final int index, final int length) {
+        return this.buffer.nioBuffers(index, length);
+    }
+
+    @Override
+    public int nioBufferCount() {
+        return this.buffer.nioBufferCount();
+    }
+
+    @Override
+    public Buffer getBytes(final int index, final byte[] dst) {
+        this.buffer.getBytes(index, dst);
+        return this;
+    }
+
+    /**
+     * Returns the underlying buffer.
+     */
+    public ByteBuf getUnderlyingBuffer() {
+        return this.buffer;
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/NettyBufferFactory.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/NettyBufferFactory.java
new file mode 100644
index 0000000..5626f4c
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/NettyBufferFactory.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.BufferFactory;
+
+import java.nio.ByteBuffer;
+import java.util.function.Consumer;
+
+/**
+ * Represents a factory to create {@link Buffer} instances from wrapped {@link ByteBuf} instances.
+ */
+public class NettyBufferFactory implements BufferFactory<ByteBuf> {
+    @Override
+    public Buffer create(final ByteBuf value) {
+        return new NettyBuffer(value);
+    }
+
+    @Override
+    public Buffer wrap(final ByteBuffer value) {
+        return create(Unpooled.wrappedBuffer(value));
+    }
+
+    private static ByteBuf getFromIndex(final Buffer buffer, final int index) {
+        if (buffer.nioBufferCount() == 1) {
+            // Heap and direct buffers usually take a single buffer
+            // It will create a new ByteBuf using the same backing byte array
+            return Unpooled.wrappedBuffer(buffer.nioBuffer(index, buffer.capacity() - index));
+        }
+
+        // Use a wrapper or composite buffer
+        return Unpooled.wrappedBuffer(buffer.nioBuffers(index, buffer.capacity() - index));
+    }
+
+    /**
+     * Utility method to allow reading from the underlying bytes using a Netty {@link ByteBuf} instance for
+     * interoperability, advancing the reader index of the {@link Buffer} after the consumer is called.
+     *
+     * Note that the {@link ByteBuf} used by the consumer should not be released by the caller.
+     * In case the provided {@link Buffer} instance is not a {@link NettyBuffer}, it will create a {@link ByteBuf}
+     * wrapper for the consumer to use, releasing it after use.
+     */
+    public static void readRaw(final Buffer buffer, final Consumer<ByteBuf> consumer) {
+        if (buffer instanceof NettyBuffer) {
+            consumer.accept(((NettyBuffer)buffer).getUnderlyingBuffer());
+            return;
+        }
+
+        // Create a new ByteBuf as a wrapper
+        final int initialIndex = buffer.readerIndex();
+        final ByteBuf newBuffer = getFromIndex(buffer, initialIndex);
+
+        try {
+            // Invoke the consumer to read from the ByteBuf
+            consumer.accept(newBuffer);
+
+            // Advance the reader index of the Buffer implementation
+            buffer.readerIndex(initialIndex + newBuffer.readerIndex());
+        } finally {
+            newBuffer.release();
+        }
+    }
+
+    /**
+     * Allows writing from the underlying bytes using a Netty {@link ByteBuf} instance for interoperability,
+     * advancing the writer index of the {@link Buffer} after the consumer is called.
+     *
+     * Note that the {@link ByteBuf} used by the consumer should not be released by the caller.
+     * In case the provided {@link Buffer} instance is not a {@link NettyBuffer}, it will create a {@link ByteBuf}
+     * wrapper for the consumer to use, releasing it after use.
+     */
+    public static void writeRaw(final Buffer buffer, final Consumer<ByteBuf> consumer) {
+        if (buffer instanceof NettyBuffer) {
+            consumer.accept(((NettyBuffer)buffer).getUnderlyingBuffer());
+            return;
+        }
+
+        // Create a new ByteBuf as a wrapper
+        final int initialIndex = buffer.writerIndex();
+        final ByteBuf newBuffer = getFromIndex(buffer, initialIndex);
+
+        // Set writer index to 0
+        newBuffer.writerIndex(0);
+
+        try {
+            // Invoke the consumer to read from the ByteBuf
+            consumer.accept(newBuffer);
+
+            // Advance the reader index of the Buffer implementation
+            buffer.writerIndex(initialIndex + newBuffer.writerIndex());
+        } finally {
+            newBuffer.release();
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/RequestMessageGryoSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/RequestMessageGryoSerializer.java
new file mode 100644
index 0000000..8b0c30b
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/RequestMessageGryoSerializer.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class RequestMessageGryoSerializer implements SerializerShim<RequestMessage> {
+    @Override
+    public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final RequestMessage requestMessage) {
+        kryo.writeObject(output, requestMessage.getRequestId());
+        output.writeString(requestMessage.getProcessor());
+        output.writeString(requestMessage.getOp());
+        kryo.writeObject(output, requestMessage.getArgs());
+    }
+
+    @Override
+    public <I extends InputShim> RequestMessage read(final KryoShim<I, ?> kryo, final I input, final Class<RequestMessage> aClass) {
+        final UUID id = kryo.readObject(input, UUID.class);
+        final String processor = input.readString();
+        final String op = input.readString();
+
+        final RequestMessage.Builder builder = RequestMessage.build(op)
+                .overrideRequestId(id)
+                .processor(processor);
+
+        final Map<String, Object> args = kryo.readObject(input, HashMap.class);
+        args.forEach(builder::addArg);
+        return builder.create();
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java
new file mode 100644
index 0000000..84392a9
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/ResponseMessageGryoSerializer.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
+
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class ResponseMessageGryoSerializer implements SerializerShim<ResponseMessage> {
+    @Override
+    public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final ResponseMessage responseMessage) {
+        kryo.writeObjectOrNull(output, responseMessage.getRequestId() != null ? responseMessage.getRequestId() : null, UUID.class);
+
+        // status
+        output.writeShort((short) responseMessage.getStatus().getCode().getValue());
+        output.writeString(responseMessage.getStatus().getMessage());
+        kryo.writeClassAndObject(output, responseMessage.getStatus().getAttributes());
+
+        // result
+        kryo.writeClassAndObject(output, responseMessage.getResult().getData());
+        kryo.writeClassAndObject(output, responseMessage.getResult().getMeta());
+
+    }
+
+    @Override
+    public <I extends InputShim> ResponseMessage read(final KryoShim<I, ?> kryo, final I input, final Class<ResponseMessage> clazz) {
+        final UUID requestId = kryo.readObjectOrNull(input, UUID.class);
+        final int status = input.readShort();
+        final String statusMsg = input.readString();
+        final Map<String,Object> statusAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
+        final Object result = kryo.readClassAndObject(input);
+        final Map<String,Object> metaAttributes = (Map<String,Object>) kryo.readClassAndObject(input);
+
+        return ResponseMessage.build(requestId)
+                .code(ResponseStatusCode.getFromValue(status))
+                .statusMessage(statusMsg)
+                .statusAttributes(statusAttributes)
+                .result(result)
+                .responseMetaData(metaAttributes)
+                .create();
+    }
+}
\ No newline at end of file
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerTokens.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerTokens.java
new file mode 100644
index 0000000..8be6d74
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerTokens.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class SerTokens {
+    private SerTokens() {}
+
+    public static final String TOKEN_ATTRIBUTES = "attributes";
+    public static final String TOKEN_RESULT = "result";
+    public static final String TOKEN_STATUS = "status";
+    public static final String TOKEN_DATA = "data";
+    public static final String TOKEN_META = "meta";
+    public static final String TOKEN_CODE = "code";
+    public static final String TOKEN_REQUEST = "requestId";
+    public static final String TOKEN_MESSAGE = "message";
+    public static final String TOKEN_PROCESSOR = "processor";
+    public static final String TOKEN_OP = "op";
+    public static final String TOKEN_ARGS = "args";
+
+    public static final String MIME_JSON = "application/json";
+    public static final String MIME_GRAPHSON_V1 = "application/vnd.gremlin-v1.0+json";
+    public static final String MIME_GRAPHSON_V1_UNTYPED = "application/vnd.gremlin-v1.0+json;types=false";
+    public static final String MIME_GRAPHSON_V2 = "application/vnd.gremlin-v2.0+json";
+    public static final String MIME_GRAPHSON_V2_UNTYPED = "application/vnd.gremlin-v2.0+json;types=false";
+    public static final String MIME_GRAPHSON_V3 = "application/vnd.gremlin-v3.0+json";
+    public static final String MIME_GRAPHSON_V3_UNTYPED = "application/vnd.gremlin-v3.0+json;types=false";
+    public static final String MIME_GRAPHBINARY_V1 = "application/vnd.graphbinary-v1.0";
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerializationException.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerializationException.java
new file mode 100644
index 0000000..1b5bb6f
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/SerializationException.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import java.io.IOException;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class SerializationException extends IOException {
+    public SerializationException(final String msg) {
+        super(msg);
+    }
+
+    public SerializationException(final Throwable t) {
+        super(t);
+    }
+
+    public SerializationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/Serializers.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/Serializers.java
new file mode 100644
index 0000000..3aad5e3
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/Serializers.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+
+/**
+ * An enum of the default serializers.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public enum Serializers {
+
+    /**
+     * GraphSON 3.0.
+     */
+    GRAPHSON(SerTokens.MIME_JSON),
+
+    /**
+     * GraphSON 1.0 with types.
+     */
+    GRAPHSON_V1(SerTokens.MIME_GRAPHSON_V1),
+
+    /**
+     * GraphSON 1.0 without types.
+     */
+    GRAPHSON_V1_UNTYPED(SerTokens.MIME_GRAPHSON_V1_UNTYPED),
+
+    /**
+     * GraphSON 2.0 with types.
+     */
+    GRAPHSON_V2(SerTokens.MIME_GRAPHSON_V2),
+
+    /**
+     * GraphSON 2.0 without types.
+     */
+    GRAPHSON_V2_UNTYPED(SerTokens.MIME_GRAPHSON_V2_UNTYPED),
+
+    /**
+     * GraphSON 3.0 with types.
+     */
+    GRAPHSON_V3(SerTokens.MIME_GRAPHSON_V3),
+
+    /**
+     * GraphSON 3.0 without types.
+     */
+    GRAPHSON_V3_UNTYPED(SerTokens.MIME_GRAPHSON_V3_UNTYPED),
+
+    /**
+     * GraphBinary 1.0.
+     */
+    GRAPHBINARY_V1(SerTokens.MIME_GRAPHBINARY_V1);
+
+    private String value;
+
+    Serializers(final String mimeType) {
+        this.value = mimeType;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public MessageSerializer<?> simpleInstance() {
+        switch (value) {
+            case SerTokens.MIME_JSON:
+            case SerTokens.MIME_GRAPHSON_V3:
+                return new GraphSONMessageSerializerV3();
+            case SerTokens.MIME_GRAPHSON_V1:
+                return new GraphSONMessageSerializerV1();
+            case SerTokens.MIME_GRAPHSON_V1_UNTYPED:
+                return new GraphSONUntypedMessageSerializerV1();
+            case SerTokens.MIME_GRAPHSON_V2:
+                return new GraphSONMessageSerializerV2();
+            case SerTokens.MIME_GRAPHSON_V2_UNTYPED:
+                return new GraphSONUntypedMessageSerializerV2();
+            case SerTokens.MIME_GRAPHSON_V3_UNTYPED:
+                return new GraphSONUntypedMessageSerializerV3();
+            case SerTokens.MIME_GRAPHBINARY_V1:
+                return new GraphBinaryMessageSerializerV1();
+            default:
+                throw new RuntimeException("Could not create a simple MessageSerializer instance of " + value);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java
new file mode 100644
index 0000000..9fecfc3
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/RequestMessageSerializer.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.UUID;
+
+public class RequestMessageSerializer {
+    private static NettyBufferFactory bufferFactory = new NettyBufferFactory();
+
+    public RequestMessage readValue(final ByteBuf byteBuf, final GraphBinaryReader context) throws SerializationException {
+        // Wrap netty's buffer
+        final Buffer buffer = bufferFactory.create(byteBuf);
+
+        final int version = buffer.readByte() & 0xff;
+
+        if (version >>> 7 != 1) {
+            // This is an indication that the request buffer was incorrectly built
+            // Or the buffer offsets are wrong
+            throw new SerializationException("The most significant bit should be set according to the format");
+        }
+
+        try {
+            final UUID id = context.readValue(buffer, UUID.class, false);
+            final String op = context.readValue(buffer, String.class, false);
+            final String processor = context.readValue(buffer, String.class, false);
+
+            final RequestMessage.Builder builder = RequestMessage.build(op).overrideRequestId(id).processor(processor);
+
+            final Map<String, Object> args = context.readValue(buffer, Map.class, false);
+            args.forEach(builder::addArg);
+
+            return builder.create();
+        } catch (IOException ex) {
+            throw new SerializationException(ex);
+        }
+    }
+
+    public void writeValue(final RequestMessage value, final ByteBuf byteBuf, final GraphBinaryWriter context) throws SerializationException {
+        // Wrap netty's buffer
+        final Buffer buffer = bufferFactory.create(byteBuf);
+
+        try {
+            // Version
+            buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
+            // RequestId
+            context.writeValue(value.getRequestId(), buffer, false);
+            // Op
+            context.writeValue(value.getOp(), buffer, false);
+            // Processor
+            context.writeValue(value.getProcessor(), buffer, false);
+            // Args
+            context.writeValue(value.getArgs(), buffer, false);
+        } catch (IOException ex) {
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/ResponseMessageSerializer.java b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/ResponseMessageSerializer.java
new file mode 100644
index 0000000..f6cc304
--- /dev/null
+++ b/gremlin-util/src/main/java/org/apache/tinkerpop/gremlin/util/ser/binary/ResponseMessageSerializer.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseResult;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatus;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.UUID;
+
+public class ResponseMessageSerializer {
+    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
+
+    public ResponseMessage readValue(final ByteBuf byteBuf, final GraphBinaryReader context) throws SerializationException {
+        // Wrap netty's buffer
+        final Buffer buffer = bufferFactory.create(byteBuf);
+        final int version = buffer.readByte() & 0xff;
+
+        if (version >>> 7 != 1) {
+            // This is an indication that the response buffer was incorrectly built
+            // Or the buffer offsets are wrong
+            throw new SerializationException("The most significant bit should be set according to the format");
+        }
+
+        try {
+            return ResponseMessage.build(context.readValue(buffer, UUID.class, true))
+                    .code(ResponseStatusCode.getFromValue(context.readValue(buffer, Integer.class, false)))
+                    .statusMessage(context.readValue(buffer, String.class, true))
+                    .statusAttributes(context.readValue(buffer, Map.class, false))
+                    .responseMetaData(context.readValue(buffer, Map.class, false))
+                    .result(context.read(buffer))
+                    .create();
+        } catch (IOException ex) {
+            throw new SerializationException(ex);
+        }
+    }
+
+    public void writeValue(final ResponseMessage value, final ByteBuf byteBuf, final GraphBinaryWriter context) throws SerializationException {
+        // Wrap netty's buffer
+        final Buffer buffer = bufferFactory.create(byteBuf);
+
+        final ResponseResult result = value.getResult();
+        final ResponseStatus status = value.getStatus();
+
+        try {
+            // Version
+            buffer.writeByte(GraphBinaryWriter.VERSION_BYTE);
+            // Nullable request id
+            context.writeValue(value.getRequestId(), buffer, true);
+            // Status code
+            context.writeValue(status.getCode().getValue(), buffer, false);
+            // Nullable status message
+            context.writeValue(status.getMessage(), buffer, true);
+            // Status attributes
+            context.writeValue(status.getAttributes(), buffer, false);
+            // Result meta
+            context.writeValue(result.getMeta(), buffer, false);
+            // Fully-qualified value
+            context.write(result.getData(), buffer);
+        } catch (IOException ex) {
+            throw new SerializationException(ex);
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
new file mode 100644
index 0000000..f080d6b
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.TestSupport;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeThat;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractCompatibilityTest {
+    protected static final File root = TestSupport.getRootOfBuildDirectory(Model.class);
+    protected final Model model = Model.instance();
+
+    public static void resetDirectory(final String pathToDelete) {
+        final File f = new File(pathToDelete);
+        if (f.exists()) {
+            try {
+                FileUtils.deleteDirectory(f);
+            } catch (IOException ioe) {
+                throw new RuntimeException(String.format(
+                        "Manually delete the %s directory - it could not be done automatically", pathToDelete), ioe);
+            }
+        }
+        f.mkdirs();
+    }
+
+    public abstract <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception;
+
+    public abstract byte[] write(final Object o, final Class<?> clazz, final String entryName) throws Exception;
+
+    protected abstract byte[] readFromResource(final String resource) throws IOException;
+
+    protected abstract String getCompatibility();
+
+    protected <T> T findModelEntryObject(final String resourceName) {
+        return model.find(resourceName).orElseThrow(() -> new IllegalStateException("Could not find requested model entry")).getObject();
+    }
+
+    protected void assertVertex(final Vertex expected, final Vertex actual) {
+        assertEquals(expected.id(), actual.id());
+        assertEquals(expected.label(), actual.label());
+
+        assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
+        for (String k : expected.keys()) {
+            final Iterator<VertexProperty<Object>> expectedVps = expected.properties(k);
+            final List<VertexProperty<Object>> actualVps = IteratorUtils.list(actual.properties(k));
+            while (expectedVps.hasNext()) {
+                final VertexProperty expectedVp = expectedVps.next();
+                final VertexProperty<Object> found = actualVps.stream()
+                        .filter(vp -> vp.id().equals(expectedVp.id()))
+                        .findFirst()
+                        .orElseThrow(() -> new RuntimeException("Could not find VertexProperty for " + expectedVp.id()));
+                assertVertexProperty(expectedVp, found);
+            }
+        }
+    }
+
+    protected void assertEdge(final Edge expected, final Edge actual) {
+        assertEquals(expected.id(), actual.id());
+        assertEquals(expected.label(), actual.label());
+        assertEquals(expected.inVertex().id(), actual.inVertex().id());
+        assertEquals(expected.outVertex().id(), actual.outVertex().id());
+        assertEquals(expected.inVertex().label(), actual.inVertex().label());
+        assertEquals(expected.outVertex().label(), actual.outVertex().label());
+        assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
+        final Iterator<Property<Object>> itty = expected.properties();
+        while(itty.hasNext()) {
+            final Property p = itty.next();
+            assertProperty(p, actual.property(p.key()));
+        }
+    }
+
+    protected void assertVertexProperty(final VertexProperty expected, final VertexProperty actual) {
+        assertEquals(expected.id(), actual.id());
+        assertEquals(expected.label(), actual.label());
+        assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
+        final Iterator<Property> itty = expected.properties();
+        while (itty.hasNext()) {
+            final Property p = itty.next();
+            assertProperty(p, actual.property(p.key()));
+        }
+    }
+
+    protected void assertProperty(final Property expected, final Property actual) {
+        assertEquals(expected.key(), actual.key());
+        assertEquals(expected.value(), actual.value());
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
new file mode 100644
index 0000000..d0264c4
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -0,0 +1,1007 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphbinary.GraphBinaryCompatibilityTest;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTypedCompatibilityTest;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.sql.Timestamp;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assume.assumeThat;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibilityTest {
+
+    @Test
+    public void shouldReadWriteAuthenticationChallenge() throws Exception {
+        final String resourceName = "authenticationchallenge";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final ResponseMessage resource = findModelEntryObject(resourceName);
+        final ResponseMessage fromStatic = read(readFromResource(resourceName), ResponseMessage.class);
+        final ResponseMessage recycled = read(write(fromStatic, ResponseMessage.class, resourceName), ResponseMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertResponseMessage(resource, fromStatic, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteAuthenticationResponse() throws Exception {
+        final String resourceName = "authenticationresponse";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
+        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertRequestMessage(resource, fromStatic, recycled);
+        assertEquals(resource.getArgs().get("saslMechanism"), recycled.getArgs().get("saslMechanism"));
+        assertEquals(resource.getArgs().get("sasl"), recycled.getArgs().get("sasl"));
+        assertEquals(resource.getArgs().get("saslMechanism"), fromStatic.getArgs().get("saslMechanism"));
+        assertEquals(resource.getArgs().get("sasl"), fromStatic.getArgs().get("sasl"));
+    }
+
+    @Test
+    public void shouldReadWriteBarrier() throws Exception {
+        final String resourceName = "barrier";
+
+        final SackFunctions.Barrier resource = findModelEntryObject(resourceName);
+        final SackFunctions.Barrier fromStatic = read(readFromResource(resourceName), SackFunctions.Barrier.class);
+        final SackFunctions.Barrier recycled = read(write(fromStatic, SackFunctions.Barrier.class, resourceName), SackFunctions.Barrier.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteBigDecimal() throws Exception {
+        final String resourceName = "bigdecimal";
+
+        final BigDecimal resource = findModelEntryObject(resourceName);
+        final BigDecimal fromStatic = read(readFromResource(resourceName), BigDecimal.class);
+        final BigDecimal recycled = read(write(fromStatic, BigDecimal.class, resourceName), BigDecimal.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteBigInteger() throws Exception {
+        final String resourceName = "biginteger";
+
+        final BigInteger resource = findModelEntryObject(resourceName);
+        final BigInteger fromStatic = read(readFromResource(resourceName), BigInteger.class);
+        final BigInteger recycled = read(write(fromStatic, BigInteger.class, resourceName), BigInteger.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteBinding() throws Exception {
+        final String resourceName = "binding";
+
+        final Bytecode.Binding resource = findModelEntryObject(resourceName);
+        final Bytecode.Binding fromStatic = read(readFromResource(resourceName), Bytecode.Binding.class);
+        final Bytecode.Binding recycled = read(write(fromStatic, Bytecode.Binding.class, resourceName), Bytecode.Binding.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteByte() throws Exception {
+        final String resourceName = "byte";
+
+        final Byte resource = findModelEntryObject(resourceName);
+        final Byte fromStatic = read(readFromResource(resourceName), Byte.class);
+        final Byte recycled = read(write(fromStatic, Byte.class, resourceName), Byte.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteByteBuffer() throws Exception {
+        final String resourceName = "bytebuffer";
+
+        final ByteBuffer resource = findModelEntryObject(resourceName);
+        final ByteBuffer fromStatic = read(readFromResource(resourceName), ByteBuffer.class);
+        // have to re-read because once the bytebuffer is flushed to array it will be emptied
+        final ByteBuffer recycled = read(write(read(readFromResource(resourceName), ByteBuffer.class), ByteBuffer.class, resourceName), ByteBuffer.class);
+        assertNotSame(fromStatic, recycled);
+        final byte[] resourceArray = resource.array();
+        final byte[] fromStaticArray = fromStatic.array();
+        final byte[] recycledArray = recycled.array();
+        assertThat(Arrays.equals(fromStaticArray, recycledArray), is(true));
+        assertThat(Arrays.equals(resourceArray, fromStaticArray), is(true));
+        assertThat(Arrays.equals(resourceArray, recycledArray), is(true));
+    }
+
+    @Test
+    public void shouldReadWriteBytecode() throws Exception {
+        final String resourceName = "bytecode";
+
+        final Bytecode fromStatic = read(readFromResource(resourceName), Bytecode.class);
+        final Bytecode recycled = read(write(fromStatic, Bytecode.class, resourceName), Bytecode.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        // can't reasonably assert the bytecode against the original model as changes to strategies over time might
+        // alter the bytecode form and then break the test. the assertions as they are ensure that the core of
+        // serialization is correct by ensuring the contents of bytecode (whether they are valid for a specific version
+        // or not). it seems beyond the scope of these tests to validate that bytecode itself is unchanging and fully
+        // backward compatible (at least for now).
+    }
+
+    @Test
+    public void shouldReadWriteCardinality() throws Exception {
+        final String resourceName = "cardinality";
+
+        final VertexProperty.Cardinality resource = findModelEntryObject(resourceName);
+        final VertexProperty.Cardinality fromStatic = read(readFromResource(resourceName), VertexProperty.Cardinality.class);
+        final VertexProperty.Cardinality recycled = read(write(fromStatic, VertexProperty.Cardinality.class, resourceName), VertexProperty.Cardinality.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteChar() throws Exception {
+        final String resourceName = "char";
+
+        final Character resource = findModelEntryObject(resourceName);
+        final Character fromStatic = read(readFromResource(resourceName), Character.class);
+        final Character recycled = read(write(fromStatic, Character.class, resourceName), Character.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteClass() throws Exception {
+        final String resourceName = "class";
+
+        final Class resource = findModelEntryObject(resourceName);
+        final Class fromStatic = read(readFromResource(resourceName), Class.class);
+        final Class recycled = read(write(fromStatic, Class.class, resourceName), Class.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteColumn() throws Exception {
+        final String resourceName = "column";
+
+        final Column resource = findModelEntryObject(resourceName);
+        final Column fromStatic = read(readFromResource(resourceName), Column.class);
+        final Column recycled = read(write(fromStatic, Column.class, resourceName), Column.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteDate() throws Exception {
+        final String resourceName = "date";
+
+        final Date resource = findModelEntryObject(resourceName);
+        final Date fromStatic = read(readFromResource(resourceName), Date.class);
+        final Date recycled = read(write(fromStatic, Date.class, resourceName), Date.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteDirection() throws Exception {
+        final String resourceName = "direction";
+
+        final Direction resource = findModelEntryObject(resourceName);
+        final Direction fromStatic = read(readFromResource(resourceName), Direction.class);
+        final Direction recycled = read(write(fromStatic, Direction.class, resourceName), Direction.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteDouble() throws Exception {
+        final String resourceName = "double";
+
+        final Double resource = findModelEntryObject(resourceName);
+        final Double fromStatic = read(readFromResource(resourceName), Double.class);
+        final Double recycled = read(write(fromStatic, Double.class, resourceName), Double.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteDuration() throws Exception {
+        final String resourceName = "duration";
+
+        final Duration resource = findModelEntryObject(resourceName);
+        final Duration fromStatic = read(readFromResource(resourceName), Duration.class);
+        final Duration recycled = read(write(fromStatic, Duration.class, resourceName), Duration.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteEdge() throws Exception {
+        final String resourceName = "edge";
+
+        final Edge resource = findModelEntryObject(resourceName);
+        final Edge fromStatic = read(readFromResource(resourceName), Edge.class);
+        final Edge recycled = read(write(fromStatic, Edge.class, resourceName), Edge.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+        assertEdge(resource, fromStatic);
+        assertEdge(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteFloat() throws Exception {
+        final String resourceName = "float";
+
+        final Float resource = findModelEntryObject(resourceName);
+        final Float fromStatic = read(readFromResource(resourceName), Float.class);
+        final Float recycled = read(write(fromStatic, Float.class, resourceName), Float.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteINetAddress() throws Exception {
+        final String resourceName = "inetaddress";
+
+        final InetAddress resource = findModelEntryObject(resourceName);
+        final InetAddress fromStatic = read(readFromResource(resourceName), InetAddress.class);
+        final InetAddress recycled = read(write(fromStatic, Float.class, resourceName), InetAddress.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteInstant() throws Exception {
+        final String resourceName = "instant";
+
+        final Instant resource = findModelEntryObject(resourceName);
+        final Instant fromStatic = read(readFromResource(resourceName), Instant.class);
+        final Instant recycled = read(write(fromStatic, Instant.class, resourceName), Instant.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteInteger() throws Exception {
+        final String resourceName = "integer";
+
+        final Integer resource = findModelEntryObject(resourceName);
+        final Integer fromStatic = read(readFromResource(resourceName), Integer.class);
+        final Integer recycled = read(write(fromStatic, Integer.class, resourceName), Integer.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteLambda() throws Exception {
+        final String resourceName = "lambda";
+
+        final Lambda resource = findModelEntryObject(resourceName);
+        final Lambda fromStatic = read(readFromResource(resourceName), Lambda.class);
+        final Lambda recycled = read(write(fromStatic, Lambda.class, resourceName), Lambda.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteLocalDate() throws Exception {
+        final String resourceName = "localdate";
+
+        final LocalDate resource = findModelEntryObject(resourceName);
+        final LocalDate fromStatic = read(readFromResource(resourceName), LocalDate.class);
+        final LocalDate recycled = read(write(fromStatic, LocalDate.class, resourceName), LocalDate.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteLocalDateTime() throws Exception {
+        final String resourceName = "localdatetime";
+
+        final LocalDateTime resource = findModelEntryObject(resourceName);
+        final LocalDateTime fromStatic = read(readFromResource(resourceName), LocalDateTime.class);
+        final LocalDateTime recycled = read(write(fromStatic, LocalDateTime.class, resourceName), LocalDateTime.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteLocalTime() throws Exception {
+        final String resourceName = "localtime";
+
+        final LocalTime resource = findModelEntryObject(resourceName);
+        final LocalTime fromStatic = read(readFromResource(resourceName), LocalTime.class);
+        final LocalTime recycled = read(write(fromStatic, LocalTime.class, resourceName), LocalTime.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteLong() throws Exception {
+        final String resourceName = "long";
+
+        final Long resource = findModelEntryObject(resourceName);
+        final Long fromStatic = read(readFromResource(resourceName), Long.class);
+        final Long recycled = read(write(fromStatic, Long.class, resourceName), Long.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteList() throws Exception {
+        final String resourceName = "list";
+
+        assumeThat("GraphSON v2 didn't explicitly have List as a type",
+                is(this.getClass().equals(GraphSONTypedCompatibilityTest.class) && getCompatibility().equals("v2")));
+
+        final List resource = findModelEntryObject(resourceName);
+        final List fromStatic = read(readFromResource(resourceName), List.class);
+        final List recycled = read(write(fromStatic, List.class, resourceName), List.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteMap() throws Exception {
+        final String resourceName = "map";
+
+        assumeThat("GraphSON v2 didn't explicitly have Map as a type",
+                is(this.getClass().equals(GraphSONTypedCompatibilityTest.class) && getCompatibility().equals("v2")));
+
+        final Map resource = findModelEntryObject(resourceName);
+        final Map fromStatic = read(readFromResource(resourceName), Map.class);
+        final Map recycled = read(write(fromStatic, Map.class, resourceName), Map.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteMetrics() throws Exception {
+        final String resourceName = "metrics";
+
+        final Metrics fromStatic = read(readFromResource(resourceName), Metrics.class);
+        final Metrics recycled = read(write(fromStatic, Metrics.class, resourceName), Metrics.class);
+        assertNotSame(fromStatic, recycled);
+        // have to do compares on the object read from resources because it has statically calculated values. the
+        // "new" one from Model is generated dynamically from a traversal and thus has variations in properties that
+        // are based on time
+        assertEquals(fromStatic.getAnnotations(), recycled.getAnnotations());
+        assertEquals(fromStatic.getCounts(), recycled.getCounts());
+        assertEquals(fromStatic.getDuration(TimeUnit.MILLISECONDS), recycled.getDuration(TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void shouldReadWriteMonthDay() throws Exception {
+        final String resourceName = "monthday";
+
+        final MonthDay resource = findModelEntryObject(resourceName);
+        final MonthDay fromStatic = read(readFromResource(resourceName), MonthDay.class);
+        final MonthDay recycled = read(write(fromStatic, MonthDay.class, resourceName), MonthDay.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteOffsetDateTime() throws Exception {
+        final String resourceName = "offsetdatetime";
+
+        final OffsetDateTime resource = findModelEntryObject(resourceName);
+        final OffsetDateTime fromStatic = read(readFromResource(resourceName), OffsetDateTime.class);
+        final OffsetDateTime recycled = read(write(fromStatic, OffsetDateTime.class, resourceName), OffsetDateTime.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteOffsetTime() throws Exception {
+        final String resourceName = "offsettime";
+
+        final OffsetTime resource = findModelEntryObject(resourceName);
+        final OffsetTime fromStatic = read(readFromResource(resourceName), OffsetTime.class);
+        final OffsetTime recycled = read(write(fromStatic, OffsetTime.class, resourceName), OffsetTime.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteOperator() throws Exception {
+        final String resourceName = "operator";
+
+        final Operator resource = findModelEntryObject(resourceName);
+        final Operator fromStatic = read(readFromResource(resourceName), Operator.class);
+        final Operator recycled = read(write(fromStatic, Operator.class, resourceName), Operator.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteOrder() throws Exception {
+        final String resourceName = "order";
+
+        final Order resource = findModelEntryObject(resourceName);
+        final Order fromStatic = read(readFromResource(resourceName), Order.class);
+        final Order recycled = read(write(fromStatic, Order.class, resourceName), Order.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteP() throws Exception {
+        final String resourceName = "p";
+
+        final P resource = findModelEntryObject(resourceName);
+        final P fromStatic = read(readFromResource(resourceName), P.class);
+        final P recycled = read(write(fromStatic, P.class, resourceName), P.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWritePAnd() throws Exception {
+        final String resourceName = "pand";
+
+        final P resource = findModelEntryObject(resourceName);
+        final P fromStatic = read(readFromResource(resourceName), P.class);
+        final P recycled = read(write(fromStatic, P.class, resourceName), P.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWritePath() throws Exception {
+        final String resourceName = "path";
+
+        final Path resource = findModelEntryObject(resourceName);
+        final Path fromStatic = read(readFromResource(resourceName), Path.class);
+        final Path recycled = read(write(fromStatic, Path.class, resourceName), Path.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWritePeriod() throws Exception {
+        final String resourceName = "period";
+
+        final Period resource = findModelEntryObject(resourceName);
+        final Period fromStatic = read(readFromResource(resourceName), Period.class);
+        final Period recycled = read(write(fromStatic, Period.class, resourceName), Period.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWritePop() throws Exception {
+        final String resourceName = "pop";
+
+        final Pop resource = findModelEntryObject(resourceName);
+        final Pop fromStatic = read(readFromResource(resourceName), Pop.class);
+        final Pop recycled = read(write(fromStatic, Pop.class, resourceName), Pop.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWritePOr() throws Exception {
+        final String resourceName = "por";
+
+        final P resource = findModelEntryObject(resourceName);
+        final P fromStatic = read(readFromResource(resourceName), P.class);
+        final P recycled = read(write(fromStatic, P.class, resourceName), P.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteProperty() throws Exception {
+        final String resourceName = "property";
+
+        final Property resource = findModelEntryObject(resourceName);
+        final Property fromStatic = read(readFromResource(resourceName), Property.class);
+        final Property recycled = read(write(fromStatic, Property.class, resourceName), Property.class);
+        assertNotSame(fromStatic, recycled);
+        assertProperty(resource, fromStatic);
+        assertProperty(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteScope() throws Exception {
+        final String resourceName = "scope";
+
+        final Scope resource = findModelEntryObject(resourceName);
+        final Scope fromStatic = read(readFromResource(resourceName), Scope.class);
+        final Scope recycled = read(write(fromStatic, Scope.class, resourceName), Scope.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteSessionClose() throws Exception {
+        final String resourceName = "sessionclose";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
+        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertRequestMessage(resource, fromStatic, recycled);
+        assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
+        assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionEval() throws Exception {
+        final String resourceName = "sessioneval";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
+        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertRequestMessage(resource, fromStatic, recycled);
+        assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
+        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
+        assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
+        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionEvalAliased() throws Exception {
+        final String resourceName = "sessionevalaliased";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
+        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertRequestMessage(resource, fromStatic, recycled);
+        assertEquals(resource.getArgs().get("session"), recycled.getArgs().get("session"));
+        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) recycled.getArgs().get("aliases")).get("g"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
+        assertEquals(resource.getArgs().get("session"), fromStatic.getArgs().get("session"));
+        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) fromStatic.getArgs().get("aliases")).get("g"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionlessEval() throws Exception {
+        final String resourceName = "sessionlesseval";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
+        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertRequestMessage(resource, fromStatic, recycled);
+        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
+        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionlessEvalAliased() throws Exception {
+        final String resourceName = "sessionlessevalaliased";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final RequestMessage fromStatic = read(readFromResource(resourceName), RequestMessage.class);
+        final RequestMessage recycled = read(write(fromStatic, RequestMessage.class, resourceName), RequestMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertRequestMessage(resource, fromStatic, recycled);
+        assertEquals(resource.getArgs().get("language"), recycled.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), recycled.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) recycled.getArgs().get("aliases")).get("g"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) recycled.getArgs().get("bindings")).get("x"));
+        assertEquals(resource.getArgs().get("language"), fromStatic.getArgs().get("language"));
+        assertEquals(resource.getArgs().get("gremlin"), fromStatic.getArgs().get("gremlin"));
+        assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) fromStatic.getArgs().get("aliases")).get("g"));
+        assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) fromStatic.getArgs().get("bindings")).get("x"));
+    }
+
+    @Test
+    public void shouldReadWriteSet() throws Exception {
+        final String resourceName = "set";
+
+        assumeThat("GraphSON v2 didn't explicitly have Set as a type",
+                is(this.getClass().equals(GraphSONTypedCompatibilityTest.class) && getCompatibility().equals("v2")));
+
+        final Set resource = findModelEntryObject(resourceName);
+        final Set fromStatic = read(readFromResource(resourceName), Set.class);
+        final Set recycled = read(write(fromStatic, Set.class, resourceName), Set.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteShort() throws Exception {
+        final String resourceName = "short";
+
+        final Short resource = findModelEntryObject(resourceName);
+        final Short fromStatic = read(readFromResource(resourceName), Short.class);
+        final Short recycled = read(write(fromStatic, Short.class, resourceName), Short.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteStandardResult() throws Exception {
+        final String resourceName = "standardresult";
+
+        assumeThat("GraphBinary does not test this because Request/ResponseMessage are not actual GraphBinary types",
+                is(this.getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final ResponseMessage resource = findModelEntryObject(resourceName);
+        final ResponseMessage fromStatic = read(readFromResource(resourceName), ResponseMessage.class);
+        final ResponseMessage recycled = read(write(fromStatic, HashMap.class, resourceName), ResponseMessage.class);
+        assertNotSame(fromStatic, recycled);
+        assertResponseMessage(resource, fromStatic, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteT() throws Exception {
+        final String resourceName = "t";
+
+        final T resource = findModelEntryObject(resourceName);
+        final T fromStatic = read(readFromResource(resourceName), T.class);
+        final T recycled = read(write(fromStatic, T.class, resourceName), T.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteTextP() throws Exception {
+        final String resourceName = "textp";
+
+        final TextP resource = findModelEntryObject(resourceName);
+        final TextP fromStatic = read(readFromResource(resourceName), TextP.class);
+        final TextP recycled = read(write(fromStatic, TextP.class, resourceName), TextP.class);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteTimestamp() throws Exception {
+        final String resourceName = "timestamp";
+
+        final Timestamp resource = findModelEntryObject(resourceName);
+        final Timestamp fromStatic = read(readFromResource(resourceName), Timestamp.class);
+        final Timestamp recycled = read(write(fromStatic, Timestamp.class, resourceName), Timestamp.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteTinkerGraph() throws Exception {
+        final String resourceName = "tinkergraph";
+
+        final TinkerGraph fromStatic = read(readFromResource(resourceName), TinkerGraph.class);
+        final TinkerGraph recycled = read(write(fromStatic, TinkerGraph.class, resourceName), TinkerGraph.class);
+        assertNotSame(fromStatic, recycled);
+
+        IoTest.assertCrewGraph(fromStatic, false);
+        IoTest.assertCrewGraph(recycled, false);
+    }
+
+    @Test
+    public void shouldReadWriteTraversalMetrics() throws Exception {
+        final String resourceName = "traversalmetrics";
+
+        final TraversalMetrics resource = findModelEntryObject(resourceName);
+        final TraversalMetrics fromStatic = read(readFromResource(resourceName), TraversalMetrics.class);
+        final TraversalMetrics recycled = read(write(fromStatic, TraversalMetrics.class, resourceName), TraversalMetrics.class);
+        assertNotSame(fromStatic, recycled);
+
+        // need to assert against each other since the model version can change between test runs as it is dynamically
+        // generated
+        assertEquals(recycled.getDuration(TimeUnit.MILLISECONDS), fromStatic.getDuration(TimeUnit.MILLISECONDS));
+        final Collection<? extends Metrics> resourceMetrics = resource.getMetrics();
+        resourceMetrics.forEach(m -> {
+            assertEquals(recycled.getMetrics(m.getId()).getAnnotations(), fromStatic.getMetrics(m.getId()).getAnnotations());
+            assertEquals(recycled.getMetrics(m.getId()).getName(), fromStatic.getMetrics(m.getId()).getName());
+            assertEquals(recycled.getMetrics(m.getId()).getCounts(), fromStatic.getMetrics(m.getId()).getCounts());
+        });
+    }
+
+    @Test
+    public void shouldReadWriteTraverser() throws Exception {
+        final String resourceName = "traverser";
+
+        final Traverser resource = findModelEntryObject(resourceName);
+        final Traverser fromStatic = read(readFromResource(resourceName), Traverser.class);
+        final Traverser recycled = read(write(fromStatic, Traverser.class, resourceName), Traverser.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(resource.bulk(), recycled.bulk());
+        assertEquals(resource.bulk(), fromStatic.bulk());
+        assertEquals(resource.get(), recycled.get());
+        assertEquals(resource.get(), fromStatic.get());
+        assertVertex((Vertex) resource.get(), (Vertex) recycled.get());
+        assertVertex((Vertex) resource.get(), (Vertex) fromStatic.get());
+    }
+
+    @Test
+    public void shouldReadWriteUUID() throws Exception {
+        final String resourceName = "uuid";
+
+        final UUID resource = findModelEntryObject(resourceName);
+        final UUID fromStatic = read(readFromResource(resourceName), UUID.class);
+        final UUID recycled = read(write(fromStatic, UUID.class, resourceName), UUID.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteVertex() throws Exception {
+        final String resourceName = "vertex";
+
+        final Vertex resource = findModelEntryObject(resourceName);
+        final Vertex fromStatic = read(readFromResource(resourceName), Vertex.class);
+        final Vertex recycled = read(write(fromStatic, Vertex.class, resourceName), Vertex.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+        assertVertex(resource, fromStatic);
+        assertVertex(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteVertexProperty() throws Exception {
+        final String resourceName = "vertexproperty";
+
+        final VertexProperty resource = findModelEntryObject(resourceName);
+        final VertexProperty fromStatic = read(readFromResource(resourceName), VertexProperty.class);
+        final VertexProperty recycled = read(write(fromStatic, VertexProperty.class, resourceName), VertexProperty.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+        assertVertexProperty(resource, recycled);
+        assertVertexProperty(resource, fromStatic);
+    }
+
+    @Test
+    public void shouldReadWriteYear() throws Exception {
+        final String resourceName = "year";
+
+        final Year resource = findModelEntryObject(resourceName);
+        final Year fromStatic = read(readFromResource(resourceName), Year.class);
+        final Year recycled = read(write(fromStatic, Year.class, resourceName), Year.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteYearMonth() throws Exception {
+        final String resourceName = "yearmonth";
+
+        final YearMonth resource = findModelEntryObject(resourceName);
+        final YearMonth fromStatic = read(readFromResource(resourceName), YearMonth.class);
+        final YearMonth recycled = read(write(fromStatic, YearMonth.class, resourceName), YearMonth.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteZoneDateTime() throws Exception {
+        final String resourceName = "zoneddatetime";
+
+        // seem to recall this was a known issue for GraphBinary. not going to fuss with it though since the
+        // longer term plan is to likely drop these jvm only types.
+        assumeThat("GraphBinary doesn't quite serialize ZoneDateTime for a perfect round trip",
+                is(getClass().equals(GraphBinaryCompatibilityTest.class)));
+
+        final ZonedDateTime resource = findModelEntryObject(resourceName);
+        final ZonedDateTime fromStatic = read(readFromResource(resourceName), ZonedDateTime.class);
+        final ZonedDateTime recycled = read(write(fromStatic, ZonedDateTime.class, resourceName), ZonedDateTime.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    @Test
+    public void shouldReadWriteZoneOffset() throws Exception {
+        final String resourceName = "zoneoffset";
+
+        final ZoneOffset resource = findModelEntryObject(resourceName);
+        final ZoneOffset fromStatic = read(readFromResource(resourceName), ZoneOffset.class);
+        final ZoneOffset recycled = read(write(fromStatic, ZoneOffset.class, resourceName), ZoneOffset.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource, fromStatic);
+        assertEquals(resource, recycled);
+    }
+
+    private static void assertResponseMessage(final ResponseMessage resource, final ResponseMessage fromStatic,
+                                              final ResponseMessage recycled) {
+        assertEquals(resource.getRequestId(), recycled.getRequestId());
+        assertEquals(resource.getStatus().getCode().getValue(), recycled.getStatus().getCode().getValue());
+        assertEquals(resource.getStatus().getMessage(), recycled.getStatus().getMessage());
+        assertEquals(resource.getStatus().getAttributes(), recycled.getStatus().getAttributes());
+        assertEquals(resource.getResult().getData(), recycled.getResult().getData());
+        assertEquals(resource.getResult().getMeta(), recycled.getResult().getMeta());
+        assertEquals(resource.getStatus().getMessage(), recycled.getStatus().getMessage());
+        assertEquals(resource.getRequestId(), fromStatic.getRequestId());
+        assertEquals(resource.getStatus().getCode().getValue(), fromStatic.getStatus().getCode().getValue());
+        assertEquals(resource.getStatus().getMessage(), fromStatic.getStatus().getMessage());
+        assertEquals(resource.getStatus().getAttributes(), fromStatic.getStatus().getAttributes());
+        assertEquals(resource.getResult().getData(), fromStatic.getResult().getData());
+        assertEquals(resource.getResult().getMeta(), fromStatic.getResult().getMeta());
+        assertEquals(resource.getStatus().getMessage(), fromStatic.getStatus().getMessage());
+    }
+
+    private static void assertRequestMessage(final RequestMessage resource, final RequestMessage fromStatic,
+                                             final RequestMessage recycled) {
+        assertEquals(resource.getRequestId(), recycled.getRequestId());
+        assertEquals(resource.getOp(), recycled.getOp());
+        assertEquals(resource.getProcessor(), recycled.getProcessor());
+        assertEquals(resource.getArgs(), recycled.getArgs());
+        assertEquals(resource.getRequestId(), fromStatic.getRequestId());
+        assertEquals(resource.getOp(), fromStatic.getOp());
+        assertEquals(resource.getProcessor(), fromStatic.getProcessor());
+        assertEquals(resource.getArgs(), fromStatic.getArgs());
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
new file mode 100644
index 0000000..a607d2a
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
@@ -0,0 +1,390 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractUntypedCompatibilityTest extends AbstractCompatibilityTest {
+
+    @Test
+    public void shouldReadWriteAuthenticationChallenge() throws Exception {
+        final String resourceName = "authenticationchallenge";
+
+        final ResponseMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, ResponseMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) fromStatic.get("status")).get("code"));
+        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
+        assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) recycled.get("status")).get("code"));
+    }
+
+    @Test
+    public void shouldReadWriteAuthenticationResponse() throws Exception {
+        final String resourceName = "authenticationresponse";
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, RequestMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(resource.getOp(), fromStatic.get("op"));
+        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+        assertEquals(resource.getArgs().get("saslMechanism"), ((Map) fromStatic.get("args")).get("saslMechanism"));
+        assertEquals(resource.getArgs().get("sasl"), ((Map) fromStatic.get("args")).get("sasl"));
+        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
+        assertEquals(resource.getOp(), recycled.get("op"));
+        assertEquals(resource.getProcessor(), recycled.get("processor"));
+        assertEquals(resource.getArgs().get("saslMechanism"), ((Map) recycled.get("args")).get("saslMechanism"));
+        assertEquals(resource.getArgs().get("sasl"), ((Map) recycled.get("args")).get("sasl"));
+    }
+
+    @Test
+    public void shouldReadWriteEdge() throws Exception {
+        final String resourceName = "edge";
+
+        final Edge resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, Edge.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(resource.id(), fromStatic.get("id"));
+        assertEquals(resource.label(), fromStatic.get("label"));
+        assertEquals(resource.id(), fromStatic.get("id"));
+        assertEquals(resource.inVertex().label(), fromStatic.get("inVLabel"));
+        assertEquals(resource.outVertex().label(), fromStatic.get("outVLabel"));
+        assertEquals(resource.inVertex().id(), fromStatic.get("inV"));
+        assertEquals(resource.outVertex().id(), fromStatic.get("outV"));
+        assertEquals(resource.id(), recycled.get("id"));
+        assertEquals(resource.label(), recycled.get("label"));
+        assertEquals(resource.id(), recycled.get("id"));
+        assertEquals(resource.inVertex().label(), recycled.get("inVLabel"));
+        assertEquals(resource.outVertex().label(), recycled.get("outVLabel"));
+        assertEquals(resource.inVertex().id(), recycled.get("inV"));
+        assertEquals(resource.outVertex().id(), recycled.get("outV"));
+
+        // deal with incompatibilities
+        if (getCompatibility().equals("v1-no-types") || getCompatibility().equals("v3-no-types")) {
+            assertEquals("edge", fromStatic.get("type"));
+            assertEquals(IteratorUtils.count(resource.properties()), ((Map) fromStatic.get("properties")).size());
+            assertEquals(resource.value("since"), ((Map) fromStatic.get("properties")).get("since"));
+            assertEquals("edge", recycled.get("type"));
+            assertEquals(IteratorUtils.count(resource.properties()), ((Map) recycled.get("properties")).size());
+            assertEquals(resource.value("since"), ((Map) recycled.get("properties")).get("since"));
+        } else if (getCompatibility().equals("v2-no-types")) {
+            assertEquals(IteratorUtils.count(resource.properties()), ((Map) fromStatic.get("properties")).size());
+            assertEquals(resource.keys().iterator().next(), ((Map) ((Map) fromStatic.get("properties")).get("since")).get("key"));
+            assertEquals(resource.value("since"), ((Map) ((Map) fromStatic.get("properties")).get("since")).get("value"));
+            assertEquals(IteratorUtils.count(resource.properties()), ((Map) recycled.get("properties")).size());
+            assertEquals(resource.keys().iterator().next(), ((Map) ((Map) recycled.get("properties")).get("since")).get("key"));
+            assertEquals(resource.value("since"), ((Map) ((Map) recycled.get("properties")).get("since")).get("value"));
+        }
+    }
+
+    @Test
+    public void shouldReadWritePath() throws Exception {
+        final String resourceName = "path";
+
+        final Path resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, Path.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(resource.labels().size(), ((List) fromStatic.get("labels")).size());
+        assertEquals(resource.labels().get(0).size(), ((List) ((List) fromStatic.get("labels")).get(0)).size());
+        assertEquals(resource.labels().get(1).size(), ((List) ((List) fromStatic.get("labels")).get(1)).size());
+        assertEquals(resource.labels().get(2).size(), ((List) ((List) fromStatic.get("labels")).get(2)).size());
+        assertEquals(resource.objects().size(), ((List) fromStatic.get("objects")).size());
+        assertEquals(((Vertex) resource.objects().get(0)).id(), ((Map) ((List) fromStatic.get("objects")).get(0)).get("id"));
+        assertEquals(((Vertex) resource.objects().get(0)).label(), ((Map) ((List) fromStatic.get("objects")).get(0)).get("label"));
+        assertEquals(((Vertex) resource.objects().get(1)).id(), ((Map) ((List) fromStatic.get("objects")).get(1)).get("id"));
+        assertEquals(((Vertex) resource.objects().get(1)).label(), ((Map) ((List) fromStatic.get("objects")).get(1)).get("label"));
+        assertEquals(((Vertex) resource.objects().get(2)).id(), ((Map) ((List) fromStatic.get("objects")).get(2)).get("id"));
+        assertEquals(((Vertex) resource.objects().get(2)).label(), ((Map) ((List) fromStatic.get("objects")).get(2)).get("label"));
+        assertEquals(resource.labels().size(), ((List) recycled.get("labels")).size());
+        assertEquals(resource.labels().get(0).size(), ((List) ((List) recycled.get("labels")).get(0)).size());
+        assertEquals(resource.labels().get(1).size(), ((List) ((List) recycled.get("labels")).get(1)).size());
+        assertEquals(resource.labels().get(2).size(), ((List) ((List) recycled.get("labels")).get(2)).size());
+        assertEquals(resource.objects().size(), ((List) recycled.get("objects")).size());
+        assertEquals(((Vertex) resource.objects().get(0)).id(), ((Map) ((List) recycled.get("objects")).get(0)).get("id"));
+        assertEquals(((Vertex) resource.objects().get(0)).label(), ((Map) ((List) recycled.get("objects")).get(0)).get("label"));
+        assertEquals(((Vertex) resource.objects().get(1)).id(), ((Map) ((List) recycled.get("objects")).get(1)).get("id"));
+        assertEquals(((Vertex) resource.objects().get(1)).label(), ((Map) ((List) recycled.get("objects")).get(1)).get("label"));
+        assertEquals(((Vertex) resource.objects().get(2)).id(), ((Map) ((List) recycled.get("objects")).get(2)).get("id"));
+        assertEquals(((Vertex) resource.objects().get(2)).label(), ((Map) ((List) recycled.get("objects")).get(2)).get("label"));
+    }
+
+    @Test
+    public void shouldReadWriteProperty() throws Exception {
+        final String resourceName = "property";
+
+        final Property resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, Property.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(2, fromStatic.size());
+        assertEquals(resource.key(), fromStatic.get("key"));
+        assertEquals(resource.value(), fromStatic.get("value"));
+        assertEquals(2, recycled.size());
+        assertEquals(resource.key(), recycled.get("key"));
+        assertEquals(resource.value(), recycled.get("value"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionClose() throws Exception {
+        final String resourceName = "sessionclose";
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, RequestMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(resource.getOp(), fromStatic.get("op"));
+        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
+        assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
+        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
+        assertEquals(resource.getOp(), recycled.get("op"));
+        assertEquals(resource.getProcessor(), recycled.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
+        assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionEval() throws Exception {
+        final String resourceName = "sessioneval";
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, RequestMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(resource.getOp(), fromStatic.get("op"));
+        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
+        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
+        assertEquals(resource.getOp(), recycled.get("op"));
+        assertEquals(resource.getProcessor(), recycled.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionEvalAliased() throws Exception {
+        final String resourceName = "sessionevalaliased";
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, RequestMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(resource.getOp(), fromStatic.get("op"));
+        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("session").toString(), ((Map) fromStatic.get("args")).get("session"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
+        assertEquals(resource.getArgs().get("aliased"), ((Map) fromStatic.get("args")).get("aliased"));
+        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
+        assertEquals(resource.getOp(), recycled.get("op"));
+        assertEquals(resource.getProcessor(), recycled.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("session").toString(), ((Map) recycled.get("args")).get("session"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
+        assertEquals(resource.getArgs().get("aliased"), ((Map) recycled.get("args")).get("aliased"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionlessEval() throws Exception {
+        final String resourceName = "sessionlesseval";
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, RequestMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(resource.getOp(), fromStatic.get("op"));
+        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
+        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
+        assertEquals(resource.getOp(), recycled.get("op"));
+        assertEquals(resource.getProcessor(), recycled.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
+    }
+
+    @Test
+    public void shouldReadWriteSessionlessEvalAliased() throws Exception {
+        final String resourceName = "sessionlessevalaliased";
+
+        final RequestMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, RequestMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(resource.getOp(), fromStatic.get("op"));
+        assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) fromStatic.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) fromStatic.get("args")).get("bindings"));
+        assertEquals(resource.getArgs().get("aliased"), ((Map) fromStatic.get("args")).get("aliased"));
+        assertEquals(resource.getRequestId().toString(), recycled.get("requestId"));
+        assertEquals(resource.getOp(), recycled.get("op"));
+        assertEquals(resource.getProcessor(), recycled.get("processor"));
+        assertEquals(resource.getArgs().size(), ((Map) recycled.get("args")).size());
+        assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+        assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+        assertEquals(resource.getArgs().get("bindings"), ((Map) recycled.get("args")).get("bindings"));
+        assertEquals(resource.getArgs().get("aliased"), ((Map) recycled.get("args")).get("aliased"));
+    }
+
+    @Test
+    public void shouldReadWriteStandardResult() throws Exception {
+        final String resourceName = "standardresult";
+
+        final ResponseMessage resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, ResponseMessage.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(fromStatic, recycled);
+        assertEquals(resource.getRequestId().toString(), fromStatic.get("requestId"));
+        assertEquals(resource.getStatus().getCode().getValue(), ((Map) fromStatic.get("status")).get("code"));
+        assertEquals(resource.getStatus().getMessage(), ((Map) fromStatic.get("status")).get("message"));
+        assertEquals(resource.getStatus().getAttributes(), ((Map) fromStatic.get("status")).get("attributes"));
+        assertEquals(resource.getResult().getMeta(), ((Map) fromStatic.get("result")).get("meta"));
+        assertEquals(((List) resource.getResult().getData()).size(), ((List) ((Map) fromStatic.get("result")).get("data")).size());
+    }
+
+    @Test
+    public void shouldReadWriteVertex() throws Exception {
+        final String resourceName = "vertex";
+
+        final Vertex resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, Vertex.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(resource.id(), fromStatic.get("id"));
+        assertEquals(resource.label(), fromStatic.get("label"));
+        assertEquals(resource.id(), fromStatic.get("id"));
+        assertEquals(resource.id(), recycled.get("id"));
+        assertEquals(resource.label(), recycled.get("label"));
+        assertEquals(resource.id(), recycled.get("id"));
+        assertEquals(IteratorUtils.count(resource.keys()), ((Map) fromStatic.get("properties")).size());
+        assertEquals(resource.value("name"), ((Map) ((List) ((Map) fromStatic.get("properties")).get("name")).get(0)).get("value"));
+        assertEquals(IteratorUtils.list(resource.values("location")).get(0), ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(0)).get("value"));
+        assertEquals(IteratorUtils.list(resource.values("location")).get(1), ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(1)).get("value"));
+        assertEquals(IteratorUtils.list(resource.values("location")).get(2), ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(2)).get("value"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(0)).get("properties")).get("startTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("endTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(0)).get("properties")).get("endTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(1)).get("properties")).get("startTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("endTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(1)).get("properties")).get("endTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(2)).get("properties")).get("startTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("endTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(2)).get("properties")).get("endTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(3)).value("startTime"), ((Map) ((Map) ((List) ((Map) fromStatic.get("properties")).get("location")).get(3)).get("properties")).get("startTime"));
+        assertEquals(IteratorUtils.count(resource.keys()), ((Map) recycled.get("properties")).size());
+        assertEquals(resource.value("name"), ((Map) ((List) ((Map) recycled.get("properties")).get("name")).get(0)).get("value"));
+        assertEquals(IteratorUtils.list(resource.values("location")).get(0), ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(0)).get("value"));
+        assertEquals(IteratorUtils.list(resource.values("location")).get(1), ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(1)).get("value"));
+        assertEquals(IteratorUtils.list(resource.values("location")).get(2), ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(2)).get("value"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(0)).get("properties")).get("startTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(0)).value("endTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(0)).get("properties")).get("endTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(1)).get("properties")).get("startTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(1)).value("endTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(1)).get("properties")).get("endTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(2)).get("properties")).get("startTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(2)).value("endTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(2)).get("properties")).get("endTime"));
+        assertEquals(((VertexProperty) IteratorUtils.list(resource.properties("location")).get(3)).value("startTime"), ((Map) ((Map) ((List) ((Map) recycled.get("properties")).get("location")).get(3)).get("properties")).get("startTime"));
+
+        // deal with incompatibilities
+        if (getCompatibility().equals("v1") || getCompatibility().equals("v3")) {
+            assertEquals("vertex", fromStatic.get("type"));
+        }
+    }
+
+    @Test
+    public void shouldReadWriteVertexProperty() throws Exception {
+        final String resourceName = "vertexproperty";
+
+        final VertexProperty resource = findModelEntryObject(resourceName);
+        final byte[] bytes = write(resource, VertexProperty.class, resourceName);
+        final HashMap fromStatic = read(readFromResource(resourceName), HashMap.class);
+        final HashMap recycled = read(bytes, HashMap.class);
+        assertNotSame(fromStatic, recycled);
+        assertEquals(3, fromStatic.size());
+        assertEquals(resource.id().toString(), fromStatic.get("id").toString());
+        assertEquals(resource.key(), fromStatic.get("label"));
+        assertEquals(resource.value(), fromStatic.get("value"));
+        assertEquals(3, recycled.size());
+        assertEquals(resource.id().toString(), fromStatic.get("id").toString());
+        assertEquals(resource.key(), recycled.get("label"));
+        assertEquals(resource.value(), recycled.get("value"));
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
new file mode 100644
index 0000000..19969f2
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -0,0 +1,353 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Pick;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * Defines the supported types for IO and the versions (and configurations) to which they apply and are tested.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class Model {
+
+    private static final Model model = new Model();
+
+    private final Map<String, List<Entry>> entries = new HashMap<>();
+    
+    private Model() {
+        final Configuration conf = new BaseConfiguration();
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
+        final TinkerGraph graph = TinkerGraph.open(conf);
+        TinkerFactory.generateTheCrew(graph);
+        final GraphTraversalSource g = graph.traversal();
+
+        // IMPORTANT - the "title" or name of the Entry needs to be unique
+
+        addCoreEntry(File.class, "Class", "");
+        addCoreEntry(new Date(1481750076295L), "Date");
+        addCoreEntry(100.00d, "Double");
+        addCoreEntry(100.00f, "Float", "");
+        addCoreEntry(100, "Integer");
+        addCoreEntry(Arrays.asList(1,"person", true), "List", "List is used to distinguish between different collection types as JSON is not explicit enough for all of Gremlin's requirements.");
+        addCoreEntry(100L, "Long", "");
+
+        final Map<Object,Object> map = new HashMap<>();
+        map.put("test", 123);
+        map.put(new Date(1481750076295L), "red");
+        map.put(Arrays.asList(1,2,3), new Date(1481750076295L));
+        addCoreEntry(map, "Map", "Map is redefined so that to provide the ability to allow for non-String keys, which is not possible in JSON.");
+
+        addCoreEntry(new HashSet<>(Arrays.asList(1,"person", true)), "Set", "Allows a JSON collection to behave as a Set.");
+        addCoreEntry(new java.sql.Timestamp(1481750076295L), "Timestamp", "");
+        addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID");
+
+        addGraphStructureEntry(graph.edges().next(), "Edge", "");
+        addGraphStructureEntry(g.V().out().out().path().next(), "Path", "");
+        addGraphStructureEntry(graph.edges().next().properties().next(), "Property", "");
+        addGraphStructureEntry(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
+        addGraphStructureEntry(graph.vertices().next(), "Vertex", "");
+        addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty", "");
+
+        addGraphProcessEntry(SackFunctions.Barrier.normSack, "Barrier", "");
+        addGraphProcessEntry(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.");
+
+        final BulkSet<String> bulkSet = new BulkSet<>();
+        bulkSet.add("marko", 1);
+        bulkSet.add("josh", 2);
+        addGraphProcessEntry(bulkSet, "BulkSet", "");
+
+        addGraphProcessEntry(g.V().hasLabel("person").out().in().tree().asAdmin().getBytecode(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.");
+        addGraphProcessEntry(VertexProperty.Cardinality.list, "Cardinality", "");
+        addGraphProcessEntry(Column.keys, "Column", "");
+        addGraphProcessEntry(Direction.OUT, "Direction", "");
+        addGraphProcessEntry(Operator.sum, "Operator", "");
+        addGraphProcessEntry(Order.shuffle, "Order", "");
+        addGraphProcessEntry(Pick.any, "Pick", "");
+        addGraphProcessEntry(Pop.all, "Pop", "");
+        addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "");
+        final TraversalMetrics tm = createStaticTraversalMetrics();
+        final MutableMetrics metrics = new MutableMetrics(tm.getMetrics("7.0.0()"));
+        metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")));
+        addGraphProcessEntry(metrics, "Metrics", "");
+        addGraphProcessEntry(P.gt(0), "P", "");
+        addGraphProcessEntry(P.within(1), "P within", "");
+        addGraphProcessEntry(P.without(1,2), "P without", "");
+        addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and", "");
+        addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or", "");
+        addGraphProcessEntry(Scope.local, "Scope", "");
+        addGraphProcessEntry(T.label, "T", "");
+        // TextP was only added at 3.4.0 and is not supported with untyped GraphSON of any sort
+        addGraphProcessEntry(TextP.containing("ark"), "TextP", "");
+        addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics", "");
+        addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser", "");
+
+        final Map<String,Object> requestBindings = new HashMap<>();
+        requestBindings.put("x", 1);
+
+        final Map<String,Object> requestAliases = new HashMap<>();
+        requestAliases.put("g", "social");
+
+        RequestMessage requestMessage;
+        requestMessage = RequestMessage.build("authentication").
+                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+                add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create();
+        addRequestMessageEntry(requestMessage, "Authentication Response", "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.");
+        requestMessage = RequestMessage.build("eval").processor("session").
+                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+                add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "session", "unique-session-identifier").create();
+        addRequestMessageEntry(requestMessage, "Session Eval", "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.");
+        requestMessage = RequestMessage.build("eval").processor("session").
+                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+                add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session","unique-session-identifier").create();
+        addRequestMessageEntry(requestMessage, "Session Eval Aliased", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
+        requestMessage = RequestMessage.build("close").processor("session").
+                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+                add("session", "unique-session-identifier").create();
+        addRequestMessageEntry(requestMessage, "Session Close", "The following `RequestMessage` is an example of a request to close a session.");
+        requestMessage = RequestMessage.build("eval").
+                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+                add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy").create();
+        addRequestMessageEntry(requestMessage, "Sessionless Eval", "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.");
+        requestMessage = RequestMessage.build("eval").
+                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+                add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases).create();
+        addRequestMessageEntry(requestMessage, "Sessionless Eval Aliased", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
+
+        ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+                code(org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode.AUTHENTICATE).create();
+        addResponseMessageEntry(responseMessage, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different depending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server).");
+        responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+                code(org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode.SUCCESS).
+                result(Collections.singletonList(graph.vertices().next())).create();
+        addResponseMessageEntry(responseMessage, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.");
+        
+        addExtendedEntry(new BigDecimal(new BigInteger("123456789987654321123456789987654321")), "BigDecimal", "");
+        addExtendedEntry(new BigInteger("123456789987654321123456789987654321"), "BigInteger", "");
+        addExtendedEntry(new Byte("1"), "Byte", "");
+        addEntry("Extended", () -> java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", "");
+        addExtendedEntry("x".charAt(0), "Char", "");
+        addExtendedEntry(Duration.ofDays(5), "Duration","The following example is a `Duration` of five days.");
+        try {
+            addEntry("Extended", InetAddress.getByName("localhost"), "InetAddress", "");
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+        addExtendedEntry(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", "");
+        addExtendedEntry(LocalDate.of(2016, 1, 1), "LocalDate", "");
+        addExtendedEntry(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", "");
+        addExtendedEntry(LocalTime.of(12, 30, 45), "LocalTime", "");
+        addExtendedEntry(MonthDay.of(1, 1), "MonthDay", "");
+        addExtendedEntry(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", "");
+        addExtendedEntry(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", "");
+        addExtendedEntry(Period.of(1, 6, 15), "Period", "The following example is a `Period` of one year, six months and fifteen days.");
+        addExtendedEntry(new Short("100"), "Short", "");
+        addExtendedEntry(Year.of(2016), "Year", "The following example is of the `Year` \"2016\".");
+        addExtendedEntry(YearMonth.of(2016, 6), "YearMonth", "The following example is a `YearMonth` of \"June 2016\"");
+        addExtendedEntry(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", "");
+        addExtendedEntry(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.");
+    }
+
+    private static DefaultTraversalMetrics createStaticTraversalMetrics() {
+        // based on g.V().hasLabel("person").out().out().tree().profile().next()
+        final List<MutableMetrics> traversalMutableMetrics = new ArrayList<>();
+        final MutableMetrics m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])");
+        m7.setDuration(100, TimeUnit.MILLISECONDS);
+        m7.setCount("traverserCount", 4);
+        m7.setCount("elementCount", 4);
+        m7.setAnnotation("percentDur", 25.0d);
+        traversalMutableMetrics.add(m7);
+
+        final MutableMetrics m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)");
+        m2.setDuration(100, TimeUnit.MILLISECONDS);
+        m2.setCount("traverserCount", 13);
+        m2.setCount("elementCount", 13);
+        m2.setAnnotation("percentDur", 25.0d);
+        traversalMutableMetrics.add(m2);
+
+        final MutableMetrics m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)");
+        m3.setDuration(100, TimeUnit.MILLISECONDS);
+        m3.setCount("traverserCount", 7);
+        m3.setCount("elementCount", 7);
+        m3.setAnnotation("percentDur", 25.0d);
+        traversalMutableMetrics.add(m3);
+
+        final MutableMetrics m4 = new MutableMetrics("4.0.0()", "TreeStep");
+        m4.setDuration(100, TimeUnit.MILLISECONDS);
+        m4.setCount("traverserCount", 1);
+        m4.setCount("elementCount", 1);
+        m4.setAnnotation("percentDur", 25.0d);
+        traversalMutableMetrics.add(m4);
+
+        return new DefaultTraversalMetrics(4000, traversalMutableMetrics);
+    }
+
+    public static Model instance() {
+        return model;
+    }
+
+    public Set<String> groups() {
+        return Collections.unmodifiableSet(entries.keySet());
+    }
+
+    public List<Entry> entries(final String key) {
+        return Collections.unmodifiableList(entries.get(key));
+    }
+
+    public List<Entry> entries() {
+        return Collections.unmodifiableList(entries.values().stream().flatMap(Collection::stream).collect(Collectors.toList()));
+    }
+
+    public Optional<Entry> find(final String resource) {
+        return entries.values().stream().flatMap(Collection::stream).filter(e -> e.getResourceName().equals(resource)).findFirst();
+    }
+
+    private void addCoreEntry(final Object obj, final String title) {
+        addEntry("Core", obj, title, "");
+    }
+
+    private void addCoreEntry(final Object obj, final String title, final String description) {
+        addEntry("Core", obj, title, description);
+    }
+
+    private void addGraphProcessEntry(final Object obj, final String title, final String description) {
+        addEntry("Graph Process", obj, title, description);
+    }
+
+    private void addRequestMessageEntry(final Object obj, final String title, final String description) {
+        addEntry("RequestMessage", obj, title, description);
+    }
+
+    private void addResponseMessageEntry(final Object obj, final String title, final String description) {
+        addEntry("ResponseMessage", obj, title, description);
+    }
+
+    private void addGraphStructureEntry(final Object obj, final String title, final String description) {
+        addEntry("Graph Structure", obj, title, description);
+    }
+
+    private void addEntry(final String group, final Supplier<?> maker, final String title, final String description) {
+        addEntry(group, null, title, description, maker);
+    }
+
+    private void addEntry(final String group, final Object obj, final String title, final String description,
+                          final Supplier<?> maker) {
+        if (!entries.containsKey(group))
+            entries.put(group, new ArrayList<>());
+
+        entries.get(group).add(new Entry(title, obj, description, maker));
+    }
+
+    private void addExtendedEntry(final Object obj, final String title, final String description) {
+        addEntry("Extended", obj, title, description);
+    }
+    
+    private void addEntry(final String group, final Object obj, final String title, final String description) {
+        addEntry(group, obj, title, description, null);
+    }
+
+    public static class Entry {
+
+        private final String title;
+        private final Object object;
+        private final String description;
+        private final Supplier<?> maker;
+
+        public Entry(final String title, final Object object, final String description,
+                     final Supplier<?> maker) {
+            this.title = title;
+            this.object = object;
+            this.description = description;
+            this.maker = maker;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public String getResourceName() {
+            return title.replace(" ", "").toLowerCase();
+        }
+
+        public <T> T getObject() {
+            return (T) ((null == object) ? maker.get() : object);
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
new file mode 100644
index 0000000..3943846
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphbinary;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class GraphBinaryCompatibilityTest extends AbstractTypedCompatibilityTest {
+
+    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+    private static final GraphBinaryWriter writerV1 = new GraphBinaryWriter();
+    private static final GraphBinaryReader readerV1 = new GraphBinaryReader();
+    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
+
+    private static final String testCaseDataPath = root.getPath() + File.separator + "test-case-data" + File.separator
+            + "io" + File.separator + "graphbinary";
+
+    static {
+        resetDirectory(testCaseDataPath);
+    }
+
+    @Parameterized.Parameters(name = "expect({0})")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"v1", readerV1, writerV1 },
+        });
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public String compatibility;
+
+    @Parameterized.Parameter(value = 1)
+    public GraphBinaryReader reader;
+
+    @Parameterized.Parameter(value = 2)
+    public GraphBinaryWriter writer;
+
+    @Override
+    protected String getCompatibility() {
+        return compatibility;
+    }
+
+    @Override
+    protected byte[] readFromResource(final String resource) throws IOException {
+        final String testResource = resource + "-" + compatibility + ".gbin";
+        return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+    }
+
+    @Override
+    public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
+        final Buffer buffer = bufferFactory.create(allocator.buffer());
+        buffer.writeBytes(bytes);
+        return reader.read(buffer);
+    }
+
+    @Override
+    public byte[] write(final Object o, final Class<?> clazz, final String entryName) throws Exception  {
+        final Buffer buffer = bufferFactory.create(allocator.buffer());
+        try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+            writer.write(o, buffer);
+            buffer.readerIndex(0);
+            buffer.readBytes(stream, buffer.readableBytes());
+
+            final byte[] bytes = stream.toByteArray();
+
+            // write out files for debugging purposes
+            final File f = new File(testCaseDataPath + File.separator + entryName + "-" + getCompatibility() + ".gbin");
+            if (f.exists()) f.delete();
+            try (FileOutputStream fileOuputStream = new FileOutputStream(f)) {
+                fileOuputStream.write(bytes);
+            }
+
+            return bytes;
+        }
+    }
+
+    @Override
+    public void shouldReadWriteAuthenticationChallenge() throws Exception {
+        super.shouldReadWriteAuthenticationChallenge();
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
new file mode 100644
index 0000000..15a0e68
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
+import org.apache.tinkerpop.gremlin.structure.io.Model;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
+import org.apache.tinkerpop.gremlin.util.TestSupport;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV2;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class GraphSONTypedCompatibilityTest extends AbstractTypedCompatibilityTest {
+
+    private static ObjectMapper mapperV2 = GraphSONMapper.build().
+            addRegistry(TinkerIoRegistryV2.instance()).
+            typeInfo(TypeInfo.PARTIAL_TYPES).
+            addCustomModule(GraphSONXModuleV2.build()).
+            addCustomModule(new AbstractGraphSONMessageSerializerV2.GremlinServerModule()).
+            version(GraphSONVersion.V2_0).create().createMapper();
+
+    private static ObjectMapper mapperV3 = GraphSONMapper.build().
+            addRegistry(TinkerIoRegistryV3.instance()).
+            addCustomModule(GraphSONXModuleV3.build()).
+            addCustomModule(new GraphSONMessageSerializerV3.GremlinServerModule()).
+            version(GraphSONVersion.V3_0).create().createMapper();
+
+    private static final String testCaseDataPath = root.getPath() + File.separator + "test-case-data" + File.separator
+        + "io" + File.separator + "graphson";
+
+    static {
+        resetDirectory(testCaseDataPath);
+    }
+
+    @Parameterized.Parameters(name = "expect({0})")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"v2", mapperV2 },
+                {"v3", mapperV3 },
+        });
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public String compatibility;
+
+    @Parameterized.Parameter(value = 1)
+    public ObjectMapper mapper;
+
+    @Override
+    protected String getCompatibility() {
+        return compatibility;
+    }
+
+    @Override
+    protected byte[] readFromResource(final String resource) throws IOException {
+        final String testResource = resource + "-" + compatibility + ".json";
+        return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+    }
+
+    @Override
+    public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
+        return mapper.readValue(bytes, clazz);
+    }
+
+    @Override
+    public byte[] write(final Object o, final Class<?> clazz, final String entryName) throws Exception  {
+        final byte[] bytes =  mapper.writeValueAsBytes(o);
+
+        // write out files for debugging purposes
+        final File f = new File(testCaseDataPath + File.separator + entryName + "-" + getCompatibility() + ".json");
+        if (f.exists()) f.delete();
+        try (FileOutputStream fileOuputStream = new FileOutputStream(f)) {
+            fileOuputStream.write(bytes);
+        }
+
+        return bytes;
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
new file mode 100644
index 0000000..fa02c89
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractUntypedCompatibilityTest;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractGraphSONMessageSerializerV2;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class GraphSONUntypedCompatibilityTest extends AbstractUntypedCompatibilityTest {
+
+    private static final ObjectMapper mapperV1 = GraphSONMapper.build().
+            addRegistry(TinkerIoRegistryV1.instance()).
+            typeInfo(TypeInfo.NO_TYPES).
+            addCustomModule(new AbstractGraphSONMessageSerializerV1.GremlinServerModule()).
+            version(GraphSONVersion.V1_0).create().createMapper();
+
+    private static final ObjectMapper mapperV2 = GraphSONMapper.build().
+                    addRegistry(TinkerIoRegistryV2.instance()).
+                    typeInfo(TypeInfo.NO_TYPES).
+                    addCustomModule(GraphSONXModuleV2.build()).
+                    addCustomModule(new AbstractGraphSONMessageSerializerV2.GremlinServerModule()).
+                    version(GraphSONVersion.V2_0).create().createMapper();
+
+    private static final ObjectMapper mapperV3 = GraphSONMapper.build().
+            addRegistry(TinkerIoRegistryV3.instance()).
+            typeInfo(TypeInfo.NO_TYPES).
+            addCustomModule(GraphSONXModuleV3.build()).
+            addCustomModule(new AbstractGraphSONMessageSerializerV2.GremlinServerModule()).
+            version(GraphSONVersion.V3_0).create().createMapper();
+
+    private static final String testCaseDataPath = root.getPath() + File.separator + "test-case-data" + File.separator
+            + "io" + File.separator + "graphson";
+
+    static {
+        resetDirectory(testCaseDataPath);
+    }
+
+    @Parameterized.Parameters(name = "expect({0})")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"v1-no-types", mapperV1 },
+                {"v2-no-types", mapperV2 },
+                {"v3-no-types", mapperV3 },
+        });
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public String compatibility;
+
+    @Parameterized.Parameter(value = 1)
+    public ObjectMapper mapper;
+
+    @Override
+    protected String getCompatibility() {
+        return compatibility;
+    }
+
+    @Override
+    protected byte[] readFromResource(final String resource) throws IOException {
+        final String testResource = resource + "-" + compatibility + ".json";
+        return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+    }
+
+    @Override
+    public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
+        return mapper.readValue(bytes, clazz);
+    }
+
+    @Override
+    public byte[] write(final Object o, final Class<?> clazz, final String entryName) throws Exception  {
+        final byte[] bytes =  mapper.writeValueAsBytes(o);
+
+        // write out files for debugging purposes
+        final File f = new File(testCaseDataPath + File.separator + entryName + "-" + getCompatibility() + ".json");
+        if (f.exists()) f.delete();
+        try (FileOutputStream fileOuputStream = new FileOutputStream(f)) {
+            fileOuputStream.write(bytes);
+        }
+
+        return bytes;
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/MockitoHamcrestMatcherAdapter.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/MockitoHamcrestMatcherAdapter.java
new file mode 100644
index 0000000..a99f4ab
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/MockitoHamcrestMatcherAdapter.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.mockito.ArgumentMatcher;
+import org.mockito.internal.matchers.apachecommons.ReflectionEquals;
+
+/**
+ * Adapts a Mockito {@code ArgumentMatcher} to a Hamcrest {@code Matcher} so that it can be used with the Hamcrest
+ * {@code assertThat}.
+ */
+public class MockitoHamcrestMatcherAdapter extends BaseMatcher {
+
+    private final ArgumentMatcher<Object> mockitoMatcher;
+
+    public MockitoHamcrestMatcherAdapter(final ArgumentMatcher<Object> mockitoMatcher) {
+        this.mockitoMatcher = mockitoMatcher;
+    }
+
+    public static MockitoHamcrestMatcherAdapter reflectionEquals(final Object wanted, final String... excludeFields) {
+        return new MockitoHamcrestMatcherAdapter(new ReflectionEquals(wanted, excludeFields));
+    }
+
+    @Override
+    public boolean matches(final Object o) {
+        return mockitoMatcher.matches(o);
+    }
+
+    @Override
+    public void describeTo(final Description description) {
+        description.appendValue(mockitoMatcher.toString());
+    }
+}
\ No newline at end of file
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCodeTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCodeTest.java
new file mode 100644
index 0000000..235eddd
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/message/ResponseStatusCodeTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.util.message;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ResponseStatusCodeTest {
+
+    @Test
+    public void shouldIndicateFinalMessagesStatusCodes() {
+        assertFalse(ResponseStatusCode.AUTHENTICATE.isFinalResponse());
+        assertFalse(ResponseStatusCode.PARTIAL_CONTENT.isFinalResponse());
+        assertTrue(ResponseStatusCode.SUCCESS.isFinalResponse());
+        assertTrue(ResponseStatusCode.SERVER_ERROR_TIMEOUT.isFinalResponse());
+    }
+}
\ No newline at end of file
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java
new file mode 100644
index 0000000..b62909a
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV1Test.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class AbstractGraphSONMessageSerializerV1Test {
+    @Test
+    public void shouldApplyMaxTokenLengthsOnConfigure() {
+        // Initialize bare-bones AbstractGraphSONMessageSerializerV1
+        final AbstractGraphSONMessageSerializerV1 serializer = new AbstractGraphSONMessageSerializerV1() {
+            @Override byte[] obtainHeader() { return new byte[0]; }
+            @Override GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) { return builder;}
+            @Override public String[] mimeTypesSupported() {return new String[0]; }
+        };
+
+        final Map<String, Object> config = new HashMap<>();
+        config.put("maxNumberLength", 999);
+        config.put("maxStringLength", 12345);
+        config.put("maxNestingDepth", 55);
+
+        serializer.configure(config, null);
+
+        final StreamReadConstraints constraints = serializer.getMapper().getFactory().streamReadConstraints();
+
+        assertEquals(999, constraints.getMaxNumberLength());
+        assertEquals(12345, constraints.getMaxStringLength());
+        assertEquals(55, constraints.getMaxNestingDepth());
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2Test.java
new file mode 100644
index 0000000..14232c5
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractGraphSONMessageSerializerV2Test.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.shaded.jackson.core.StreamReadConstraints;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class AbstractGraphSONMessageSerializerV2Test {
+    @Test
+    public void shouldApplyMaxTokenLengthsOnConfigure() {
+        // Initialize bare-bones AbstractGraphSONMessageSerializerV2
+        final AbstractGraphSONMessageSerializerV2 serializer = new AbstractGraphSONMessageSerializerV2() {
+            @Override byte[] obtainHeader() { return new byte[0]; }
+            @Override GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) { return builder;}
+            @Override public String[] mimeTypesSupported() {return new String[0]; }
+        };
+
+        final Map<String, Object> config = new HashMap<>();
+        config.put("maxNumberLength", 999);
+        config.put("maxStringLength", 12345);
+        config.put("maxNestingDepth", 55);
+
+        serializer.configure(config, null);
+
+        final StreamReadConstraints constraints = serializer.getMapper().getFactory().streamReadConstraints();
+
+        assertEquals(999, constraints.getMaxNumberLength());
+        assertEquals(12345, constraints.getMaxStringLength());
+        assertEquals(55, constraints.getMaxNestingDepth());
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractRoundTripTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractRoundTripTest.java
new file mode 100644
index 0000000..3f620f0
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/AbstractRoundTripTest.java
@@ -0,0 +1,301 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import org.apache.tinkerpop.gremlin.process.computer.Computer;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Pick;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.TextP;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.IoTest;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceProperty;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public abstract class AbstractRoundTripTest {
+
+    protected static final GraphTraversalSource g = TinkerFactory.createModern().traversal();
+    @Parameterized.Parameters(name = "Type{0}")
+    public static Collection input() throws Exception {
+        final Bytecode bytecode = new Bytecode();
+        bytecode.addStep("V");
+        bytecode.addStep("tail", 3);
+        bytecode.addSource(TraversalSource.Symbols.withComputer, "myComputer");
+
+        final Map<String, Integer> map = new HashMap<>();
+        map.put("one", 1);
+        map.put("two", 2);
+
+        final Map<String, Map<String, Integer>> nestedMap = new HashMap<>();
+        nestedMap.put("first", map);
+
+        final List<Object> list = new ArrayList<>();
+        list.add("string 1");
+        list.add("string 1");
+        list.add(200);
+        list.add("string 2");
+
+        final List<List<Object>> nestedList = new ArrayList<>();
+        nestedList.add(list);
+
+        final Set<Object> set = new HashSet<>();
+        set.add("one");
+        set.add(2);
+
+        final Set<Set<Object>> nestedSet = new HashSet<>();
+        nestedSet.add(set);
+
+        final BulkSet<String> bulkSet = new BulkSet<>();
+        bulkSet.add("marko", 1);
+        bulkSet.add("josh", 3);
+
+        final Tree<Vertex> tree = new Tree<>();
+        final Tree<Vertex> subTree = new Tree<>();
+        final Tree<Vertex> subSubTree = new Tree<>();
+        subSubTree.put(new ReferenceVertex(1, "animal"), new Tree<>());
+        subSubTree.put(new ReferenceVertex(2, "animal"), new Tree<>());
+        subTree.put(new ReferenceVertex(100, "animal"), subSubTree);
+        tree.put(new ReferenceVertex(1000, "animal"), subTree);
+
+        final MutableMetrics metrics = new MutableMetrics("id1", "name1");
+        metrics.setDuration(123, TimeUnit.MICROSECONDS);
+        metrics.setCount("c1", 20);
+        metrics.setAnnotation("a", "b");
+        metrics.addNested(new MutableMetrics("idNested", "nameNested"));
+
+        // can't use the existing 'metrics' because traversal metrics modifies its nested metrics
+        final MutableMetrics metrics1 = metrics.clone();
+
+        final MutableMetrics metrics2 = new MutableMetrics("id2", "name2");
+        metrics2.setDuration(456, TimeUnit.MICROSECONDS);
+        metrics2.setCount("c2", 40);
+        metrics2.setAnnotation("c", "d");
+        metrics2.addNested(new MutableMetrics("idNested2", "nameNested2"));
+
+        List<MutableMetrics> nestedMetrics = Arrays.asList(metrics1, metrics2);
+        final DefaultTraversalMetrics traversalMetrics = new DefaultTraversalMetrics(666, nestedMetrics);
+        final DefaultTraversalMetrics emptyTraversalMetrics = new DefaultTraversalMetrics(444, Collections.emptyList());
+
+        return Arrays.asList(
+                new Object[] {"String", "ABC", null},
+                new Object[] {"Char", '£', null},
+
+                // numerics
+                new Object[] {"Byte", 1, null},
+                new Object[] {"Integer", 1, null},
+                new Object[] {"Float", 2f, null},
+                new Object[] {"Double", 3.1d, null},
+                new Object[] {"Double", Double.NaN, null},
+                new Object[] {"Double", Double.POSITIVE_INFINITY, null},
+                new Object[] {"Double", Double.NEGATIVE_INFINITY, null},
+                new Object[] {"Long", 10122L, null},
+                new Object[] {"IntegerZero", 0, null},
+                new Object[] {"FloatZero", 0f, null},
+                new Object[] {"IntegerMin", Integer.MIN_VALUE, null},
+                new Object[] {"IntegerMax", Integer.MAX_VALUE, null},
+                new Object[] {"LongMax", Long.MAX_VALUE, null},
+                new Object[] {"BigIntegerPos", new BigInteger("1234567890987654321"), null},
+                new Object[] {"BigIntegerNeg", new BigInteger("-1234567890987654321"), null},
+                new Object[] {"BigDecimalPos", new BigDecimal("1234567890987654321.1232132"), null},
+                new Object[] {"BigDecimalNeg", new BigDecimal("-1234567890987654321.1232132"), null},
+
+                // date+time
+                new Object[] {"Date", DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US).parse("Jan 12, 1952"), null},
+                new Object[] {"Timestamp", Timestamp.valueOf("2016-01-15 12:01:02"), null},
+                new Object[] {"Duration", Duration.ofSeconds(213123213, 400), null},
+                new Object[] {"Instant", Instant.ofEpochSecond(213123213, 400), null},
+                new Object[] {"LocalDate", LocalDate.of(2016, 10, 21), null},
+                new Object[] {"LocalTime", LocalTime.of(12, 20, 30, 300), null},
+                new Object[] {"LocalDateTime", LocalDateTime.of(2016, 10, 21, 12, 20, 30, 300), null},
+                new Object[] {"MonthDay", MonthDay.of(12, 28), null},
+                new Object[] {"OffsetDateTime", OffsetDateTime.of(2017, 11, 15, 12, 30, 45, 300, ZoneOffset.ofTotalSeconds(400)), null},
+                new Object[] {"OffsetTime", OffsetTime.of(12, 30, 45, 300, ZoneOffset.ofTotalSeconds(400)), null},
+                new Object[] {"Period", Period.of(1, 6, 15), null},
+                new Object[] {"Year", Year.of(1996), null},
+                new Object[] {"YearMonth", YearMonth.of(2016, 11), null},
+                new Object[] {"ZonedDateTime", ZonedDateTime.of(2016, 11, 15, 12, 30, 45, 300, ZoneOffset.ofTotalSeconds(200)), null},
+                new Object[] {"ZoneOffset", ZoneOffset.ofTotalSeconds(100), null},
+
+                new Object[] {"UUID", UUID.randomUUID(), null},
+                new Object[] {"Bytecode", bytecode, null},
+                new Object[] {"Binding", new Bytecode.Binding<>("x", 123), null},
+                new Object[] {"Traverser", new DefaultRemoteTraverser<>("marko", 100), null},
+                new Object[] {"Class", Bytecode.class, null},
+                new Object[] {"ByteBuffer", ByteBuffer.wrap(new byte[]{ 1, 2, 3 }), null},
+                new Object[] {"InetAddressV4", InetAddress.getByName("localhost"), null},
+                new Object[] {"InetAddressV6", InetAddress.getByName("::1"), null},
+                new Object[] {"Lambda0", Lambda.supplier("return 1"), null},
+                new Object[] {"Lambda1", Lambda.consumer("it"), null},
+                new Object[] {"Lambda2", Lambda.biFunction("x,y -> x + y"), null},
+                new Object[] {"LambdaN", new Lambda.UnknownArgLambda("x,y,z -> x + y + z", "gremlin-groovy", 3), null},
+
+                // enums
+                new Object[] {"Barrier", SackFunctions.Barrier.normSack, null},
+                new Object[] {"Cardinality", VertexProperty.Cardinality.list, null},
+                new Object[] {"Columns", Column.values, null},
+                new Object[] {"Direction", Direction.BOTH, null},
+                new Object[] {"Operator", Operator.sum, null},
+                new Object[] {"Operator", Operator.div, null},
+                new Object[] {"Order", Order.desc, null},
+                new Object[] {"Pick", Pick.any, null},
+                new Object[] {"Pop", Pop.mixed, null},
+                new Object[] {"Scope", Scope.global, null},
+                new Object[] {"T", T.label, null},
+                new Object[] {"Pgt", P.gt(0), null},
+                new Object[] {"Pgte", P.gte(0), null},
+                new Object[] {"Pbetween", P.between(0,1), null},
+                new Object[] {"Pand", P.gt(1).and(P.lt(2)), null},
+                new Object[] {"Por", P.gt(1).or(P.lt(2)), null},
+                new Object[] {"Pnot", P.not(P.lte(1)), null},
+                new Object[] {"Pwithout", P.without(1,2,3,4,null), null},
+                new Object[] {"Pinside", P.inside(0.0d, 0.6d), null},
+                new Object[] {"TextPstartingWith", TextP.startingWith("mark"), null},
+                new Object[] {"TextPregex", TextP.regex("^meh"), null},
+                new Object[] {"TextPnotRegex", TextP.notRegex("^meh"), null},
+
+                // graph
+                new Object[] {"ReferenceEdge", new ReferenceEdge(123, "person", new ReferenceVertex(123, "person"), new ReferenceVertex(321, "person")), null},
+                new Object[] {"TinkerEdge", g.E().hasLabel("knows").next(), null},
+                new Object[] {"ReferenceProperty", new ReferenceProperty<>("name", "john"), (Consumer<ReferenceProperty>) referenceProperty -> {
+                    assertEquals("name", referenceProperty.key());
+                    assertEquals("john", referenceProperty.value());
+                }},
+                new Object[] {"ReferenceVertex", new ReferenceVertex(123, "person"), null},
+                new Object[] {"TinkerVertex", g.V().hasLabel("person").next(), null},
+                new Object[] {"ReferenceVertexProperty", new ReferenceVertexProperty<>(123, "name", "john"), (Consumer<ReferenceVertexProperty>) referenceProperty -> {
+                    assertEquals("name", referenceProperty.key());
+                    assertEquals("john", referenceProperty.value());
+                    assertEquals(123, referenceProperty.id());
+                }},
+                new Object[] {"PathLabelled", g.V().as("a", "b").out().as("c").path().next(), null},
+                new Object[] {"PathNotLabelled", g.V().out().inE().values().path().next(), null},
+                new Object[] {"Graph", g.E().subgraph("k").cap("k").next(), (Consumer<Graph>) graph -> {
+                    IoTest.assertModernGraph(graph, true, false);
+                }},
+                new Object[] {"TraversalStrategyVertexProgram", new VertexProgramStrategy(Computer.compute()), (Consumer<TraversalStrategyProxy>) strategy -> {
+                    assertEquals(VertexProgramStrategy.class, strategy.getStrategyClass());
+                    assertEquals("org.apache.tinkerpop.gremlin.process.computer.GraphComputer", strategy.getConfiguration().getProperty(VertexProgramStrategy.GRAPH_COMPUTER));
+                }},
+                new Object[] {"TraversalStrategySubgraph", SubgraphStrategy.build().vertices(hasLabel("person")).create(), (Consumer<TraversalStrategyProxy>) strategy -> {
+                    assertEquals(SubgraphStrategy.class, strategy.getStrategyClass());
+                    assertEquals(hasLabel("person").asAdmin().getBytecode(), strategy.getConfiguration().getProperty(SubgraphStrategy.VERTICES));
+                }},
+                new Object[] {"BulkSet", bulkSet, null},
+                new Object[] {"Tree", tree, null},
+                new Object[] {"EmptyMetrics", new MutableMetrics("idEmpty", "nameEmpty"), (Consumer<Metrics>) m -> {
+                    assertThat(m, reflectionEquals(new MutableMetrics("idEmpty", "nameEmpty")));
+                }},
+                new Object[] {"Metrics", metrics, (Consumer<Metrics>) m -> {
+                    assertThat(m, reflectionEquals(metrics, "nested", "counts"));
+                    assertEquals(new ArrayList(metrics.getCounts().values()), new ArrayList(m.getCounts().values()));
+                    assertThat(m.getNested(), reflectionEquals(metrics.getNested()));
+                }},
+                new Object[] {"EmptyTraversalMetrics", emptyTraversalMetrics, (Consumer<TraversalMetrics>) m -> {
+                    assertThat(m, reflectionEquals(emptyTraversalMetrics));
+                }},
+                new Object[] {"TraversalMetrics", traversalMetrics, (Consumer<TraversalMetrics>) m -> {
+                    assertEquals(m.toString(), traversalMetrics.toString());
+                    assertThat(m, reflectionEquals(traversalMetrics, "stepIndexedMetrics", "positionIndexedMetrics"));
+                }},
+
+                // collections
+                new Object[] {"ListSingle", list, null},
+                new Object[] {"ListNested", nestedList, null},
+                new Object[] {"Map", map, null},
+                new Object[] {"Map", nestedMap, null},
+                new Object[] {"Set", set, null},
+                new Object[] {"SetNested", nestedSet, null});
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public String name;
+
+    @Parameterized.Parameter(value = 1)
+    public Object value;
+
+    @Parameterized.Parameter(value = 2)
+    public Consumer<?> assertion;
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1Test.java
new file mode 100644
index 0000000..c43ba24
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV1Test.java
@@ -0,0 +1,335 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+/**
+ * Serializer tests that cover lossy serialization/deserialization methods.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONMessageSerializerV1Test {
+
+    private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+    private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+    private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+    public MessageSerializer<ObjectMapper> serializer = new GraphSONMessageSerializerV1();
+
+    @Test
+    public void shouldSerializeIterable() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(100);
+
+        final ResponseMessage response = convert(list);
+        assertCommon(response);
+
+        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+        assertEquals(2, deserializedFunList.size());
+        assertEquals(new Integer(1), deserializedFunList.get(0));
+        assertEquals(new Integer(100), deserializedFunList.get(1));
+    }
+
+    @Test
+    public void shouldSerializeIterableWithNull() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(null);
+        list.add(100);
+
+        final ResponseMessage response = convert(list);
+        assertCommon(response);
+
+        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+        assertEquals(3, deserializedFunList.size());
+        assertEquals(new Integer(1), deserializedFunList.get(0));
+        assertNull(deserializedFunList.get(1));
+        assertEquals(new Integer(100), deserializedFunList.get(2));
+    }
+
+    @Test
+    public void shouldSerializeMap() throws Exception {
+        final Map<String, Object> map = new HashMap<>();
+        final Map<String, String> innerMap = new HashMap<>();
+        innerMap.put("a", "b");
+
+        map.put("x", 1);
+        map.put("y", "some");
+        map.put("z", innerMap);
+
+        final ResponseMessage response = convert(map);
+        assertCommon(response);
+
+        final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
+        assertEquals(3, deserializedMap.size());
+        assertEquals(1, deserializedMap.get("x"));
+        assertEquals("some", deserializedMap.get("y"));
+
+        final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
+        assertEquals(1, deserializedInnerMap.size());
+        assertEquals("b", deserializedInnerMap.get("a"));
+    }
+
+    @Test
+    public void shouldSerializeMapEntries() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Date d = new Date();
+
+        final Map<Object, Object> map = new HashMap<>();
+        map.put("x", 1);
+        map.put(v1, 100);
+        map.put(d, "test");
+
+        final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
+        assertCommon(response);
+
+        final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
+        assertEquals(3, deserializedEntries.size());
+        deserializedEntries.forEach(e -> {
+            if (e.containsKey("x"))
+                assertEquals(1, e.get("x"));
+            else if (e.containsKey(v1.id().toString()))
+                assertEquals(100, e.get(v1.id().toString()));
+            else if (e.containsKey(StdDateFormat.instance.format(d)))
+                assertEquals("test", e.get(StdDateFormat.instance.format(d)));
+            else
+                fail("Map entries contains a key that is not part of what was serialized");
+        });
+    }
+
+    @Test
+    public void shouldSerializeEdge() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Vertex v2 = graph.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
+
+        final ResponseMessage response = convert(iterable);
+        assertCommon(response);
+
+        final List<Map<String, Object>> edgeList = (List<Map<String, Object>>) response.getResult().getData();
+        assertEquals(1, edgeList.size());
+
+        final Map<String, Object> deserializedEdge = edgeList.get(0);
+        assertEquals(e.id(), deserializedEdge.get(GraphSONTokens.ID));
+        assertEquals(v1.id(), deserializedEdge.get(GraphSONTokens.OUT));
+        assertEquals(v2.id(), deserializedEdge.get(GraphSONTokens.IN));
+        assertEquals(v1.label(), deserializedEdge.get(GraphSONTokens.OUT_LABEL));
+        assertEquals(v2.label(), deserializedEdge.get(GraphSONTokens.IN_LABEL));
+        assertEquals(e.label(), deserializedEdge.get(GraphSONTokens.LABEL));
+        assertEquals(GraphSONTokens.EDGE, deserializedEdge.get(GraphSONTokens.TYPE));
+
+        final Map<String, Object> properties = (Map<String, Object>) deserializedEdge.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals(123, properties.get("abc"));
+
+    }
+
+    @Test
+    public void shouldSerializeEdgeProperty() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Vertex v2 = graph.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+        final ResponseMessage response = convert(iterable);
+        assertCommon(response);
+
+        final List<Map<String, Object>> propertyList = (List<Map<String, Object>>) response.getResult().getData();
+        assertEquals(1, propertyList.size());
+        assertEquals(123, propertyList.get(0).get("value"));
+    }
+
+    @Test
+    public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v = graph.addVertex();
+        final Map<String, Object> map = new HashMap<>();
+        map.put("x", 500);
+        map.put("y", "some");
+
+        final ArrayList<Object> friends = new ArrayList<>();
+        friends.add("x");
+        friends.add(5);
+        friends.add(map);
+
+        v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+        final List list = IteratorUtils.list(graph.vertices());
+
+        final ResponseMessage response = convert(list);
+        assertCommon(response);
+
+        final List<Map<String, Object>> vertexList = (List<Map<String, Object>>) response.getResult().getData();
+        assertEquals(1, vertexList.size());
+
+        final Map<String, Object> deserializedVertex = vertexList.get(0);
+        assertEquals(v.id(), deserializedVertex.get(GraphSONTokens.ID));
+        assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.get(GraphSONTokens.LABEL));
+
+        final Map<String, Object> properties = ((Map<String, Object>) deserializedVertex.get(GraphSONTokens.PROPERTIES));
+        assertEquals(1, properties.size());
+
+        final List<Map<String,Object>> friendsProperties = (List<Map<String,Object>>) properties.get("friends");
+        assertEquals(1, friendsProperties.size());
+
+        final List<Object> deserializedInnerList = (List<Object>) friendsProperties.get(0).get(GraphSONTokens.VALUE);
+        assertEquals(3, deserializedInnerList.size());
+        assertEquals("x", deserializedInnerList.get(0));
+        assertEquals(5, deserializedInnerList.get(1));
+
+        final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
+        assertEquals(2, deserializedInnerInnerMap.size());
+        assertEquals(500, deserializedInnerInnerMap.get("x"));
+        assertEquals("some", deserializedInnerInnerMap.get("y"));
+    }
+
+    @Test
+    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Map<Vertex, Integer> map = new HashMap<>();
+        map.put(g.V().has("name", "marko").next(), 1000);
+
+        final ResponseMessage response = convert(map);
+        assertCommon(response);
+
+        final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
+        assertEquals(1, deserializedMap.size());
+
+        // with no embedded types the key (which is a vertex) simply serializes out to an id
+        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+        assertEquals(new Integer(1000), deserializedMap.get("1"));
+    }
+
+    @Test
+    public void shouldSerializeToTreeJson() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Map t = g.V(1).out().properties("name").tree().next();
+
+        final ResponseMessage response = convert(t);
+        assertCommon(response);
+
+        final Map<String, Map<String, Map>> deserializedMap = (Map<String, Map<String, Map>>) response.getResult().getData();
+
+        assertEquals(1, deserializedMap.size());
+
+        //check the first object and it's properties
+        final Map<String,Object> vertex = deserializedMap.get("1").get("key");
+        final Map<String,List<Map>> vertexProperties = (Map<String, List<Map>>)vertex.get("properties");
+        assertEquals(1, (int)vertex.get("id"));
+        assertEquals("marko", vertexProperties.get("name").get(0).get("value"));
+
+        //check objects tree structure
+        //check Vertex property
+        final Map<String, Map<String, Map>> subTreeMap =  deserializedMap.get("1").get("value");
+        final Map<String, Map<String, Map>> subTreeMap2 = subTreeMap.get("2").get("value");
+        final Map<String, String> vertexPropertiesDeep = subTreeMap2.get("2").get("key");
+        assertEquals("vadas", vertexPropertiesDeep.get("value"));
+        assertEquals("name", vertexPropertiesDeep.get("label"));
+
+        // check subitem
+        final Map<String,Object> vertex2 = subTreeMap.get("3").get("key");
+        final Map<String,List<Map>> vertexProperties2 = (Map<String, List<Map>>)vertex2.get("properties");
+
+        assertEquals("lop", vertexProperties2.get("name").get(0).get("value"));
+    }
+
+    @Test
+    public void shouldSerializeFullResponseMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", "this");
+        metaData.put("one", 1);
+
+        final Map<String, Object> attributes = new HashMap<>();
+        attributes.put("test", "that");
+        attributes.put("two", 2);
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SUCCESS)
+                .result("some-result")
+                .statusAttributes(attributes)
+                .statusMessage("worked")
+                .create();
+
+        final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(bb);
+
+        assertEquals(id, deserialized.getRequestId());
+        assertEquals("this", deserialized.getResult().getMeta().get("test"));
+        assertEquals(1, deserialized.getResult().getMeta().get("one"));
+        assertEquals("some-result", deserialized.getResult().getData());
+        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+        assertEquals("worked", deserialized.getStatus().getMessage());
+    }
+    
+    private void assertCommon(final ResponseMessage response) {
+        assertEquals(requestId, response.getRequestId());
+        assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
+    }
+
+    private ResponseMessage convert(final Object toSerialize) throws SerializationException {
+        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+        return serializer.deserializeResponse(bb);
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2Test.java
new file mode 100644
index 0000000..54ce7cd
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV2Test.java
@@ -0,0 +1,628 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Test;
+
+import java.awt.Color;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
+ * vertices, edges, annotated values, etc.) are handled in the IO packages.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@SuppressWarnings("unchecked")
+public class GraphSONMessageSerializerV2Test {
+
+    public static final GraphSONMessageSerializerV2 SERIALIZER = new GraphSONMessageSerializerV2();
+    private static final RequestMessage msg = RequestMessage.build("op")
+            .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
+    private static final ObjectMapper mapper = new ObjectMapper();
+
+    private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+    private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+    @Test
+    public void shouldConfigureIoRegistry() throws Exception {
+        final GraphSONMessageSerializerV2 serializer = new GraphSONMessageSerializerV2();
+        final Map<String, Object> config = new HashMap<String, Object>() {{
+            put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+        }};
+
+        serializer.configure(config, null);
+
+        final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
+                .result(Color.RED).create();
+        final String results = serializer.serializeResponseAsString(toSerialize, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUEPROP).booleanValue(), is(true));
+        assertEquals("java:color", json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).get(GraphSONTokens.VALUETYPE).textValue());
+    }
+
+    @Test
+    public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
+        final ResponseMessage message = ResponseMessage.build(msg).create();
+        final String results = SERIALIZER.serializeResponseAsString(message, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
+        assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterable() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterator() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorNullElement() throws Exception {
+
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(null);
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(3, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals(NullNode.getInstance(), converted.get(1));
+        assertEquals("y", converted.get(2).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMap() throws Exception {
+        final Map<String, Object> map = new HashMap<>();
+        final Map<String, String> innerMap = new HashMap<>();
+        innerMap.put("a", "b");
+
+        map.put("x", new FunObject("x"));
+        map.put("y", "some");
+        map.put("z", innerMap);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(jsonObject);
+        assertEquals("some", jsonObject.get("y").asText());
+        assertEquals("x", jsonObject.get("x").asText());
+
+        final JsonNode innerJsonObject = jsonObject.get("z");
+        assertNotNull(innerJsonObject);
+        assertEquals("b", innerJsonObject.get("a").asText());
+    }
+
+    @Test
+    public void shouldShouldSerializeMapEntries() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Date d = new Date();
+
+        final Map<Object, Object> map = new HashMap<>();
+        map.put("x", 1);
+        map.put(v1, 100);
+        map.put(d, "test");
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+        jsonObject.elements().forEachRemaining(e -> {
+            if (e.has("x"))
+                assertEquals(1, e.get("x").get(GraphSONTokens.VALUEPROP).asInt());
+            else if (e.has(v1.id().toString()))
+                assertEquals(100, e.get(v1.id().toString()).get(GraphSONTokens.VALUEPROP).asInt());
+            else if (e.has(StdDateFormat.instance.format(d)))
+                assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
+            else
+                fail("Map entries contains a key that is not part of what was serialized");
+        });
+    }
+
+    @Test
+    public void shouldSerializeEdge() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode edgeAsJson = converted.get(0).get(GraphSONTokens.VALUEPROP);
+        assertNotNull(edgeAsJson);
+
+        assertEquals(((Long) e.id()).longValue(), edgeAsJson.get(GraphSONTokens.ID).get(GraphSONTokens.VALUEPROP).asLong());
+        assertEquals(((Long) v1.id()).longValue(), edgeAsJson.get(GraphSONTokens.OUT).get(GraphSONTokens.VALUEPROP).asLong());
+        assertEquals(((Long) v2.id()).longValue(), edgeAsJson.get(GraphSONTokens.IN).get(GraphSONTokens.VALUEPROP).asLong());
+        assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
+
+        final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUEPROP).get("value").get(GraphSONTokens.VALUEPROP).asInt());
+    }
+
+    @Test
+    public void shouldSerializeEdgeProperty() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode propertyAsJson = converted.get(0);
+        assertNotNull(propertyAsJson);
+
+        assertEquals(123, propertyAsJson.get(GraphSONTokens.VALUEPROP).get("value").get(GraphSONTokens.VALUEPROP).asInt());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v = g.addVertex();
+        final Map<String, Object> map = new HashMap<>();
+        map.put("x", 500);
+        map.put("y", "some");
+
+        final ArrayList<Object> friends = new ArrayList<>();
+        friends.add("x");
+        friends.add(5);
+        friends.add(map);
+
+        v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+        final Iterable iterable = IteratorUtils.list(g.vertices());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode vertexAsJson = converted.get(0).get(GraphSONTokens.VALUEPROP);
+        assertNotNull(vertexAsJson);
+
+        final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals(1, properties.size());
+
+        final JsonNode friendProperties = properties.get("friends");
+        assertEquals(1, friendProperties.size());
+        final JsonNode friendsProperty = friendProperties.get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE);
+        assertNotNull(friendsProperty);
+        assertEquals(3, friendsProperty.size());
+
+        final String object1 = friendsProperty.get(0).asText();
+        assertEquals("x", object1);
+
+        final int object2 = friendsProperty.get(1).get(GraphSONTokens.VALUEPROP).asInt();
+        assertEquals(5, object2);
+
+        final JsonNode object3 = friendsProperty.get(2);
+        assertEquals(500, object3.get("x").get(GraphSONTokens.VALUEPROP).asInt());
+        assertEquals("some", object3.get("y").asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Map<Vertex, Integer> map = new HashMap<>();
+        map.put(g.V().has("name", "marko").next(), 1000);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+
+        // with no embedded types the key (which is a vertex) simply serializes out to an id
+        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+        assertEquals(1000, converted.get("1").get(GraphSONTokens.VALUEPROP).asInt());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals(0, m.getArgs().size());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals("y", m.getArgs().get("x"));
+    }
+
+    @Test(expected = SerializationException.class)
+    public void shouldDeserializeRequestParseMessage() throws Exception {
+        SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
+    }
+
+    @Test
+    public void shouldSerializeFullResponseMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", "this");
+        metaData.put("one", 1);
+
+        final Map<String, Object> attributes = new HashMap<>();
+        attributes.put("test", "that");
+        attributes.put("two", 2);
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SUCCESS)
+                .result("some-result")
+                .statusAttributes(attributes)
+                .statusMessage("worked")
+                .create();
+
+        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+
+        assertEquals(id, deserialized.getRequestId());
+        assertEquals("this", deserialized.getResult().getMeta().get("test"));
+        assertEquals(1, deserialized.getResult().getMeta().get("one"));
+        assertEquals("some-result", deserialized.getResult().getData());
+        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+        assertEquals("worked", deserialized.getStatus().getMessage());
+    }
+    
+    @Test
+    public void shouldSerializeToTreeJson() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Tree t = g.V(1).out().properties("name").tree().next();
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+        assertNotNull(converted);
+
+        //result is: tree{v1=>tree{vp['name'->'vadas']=>null, vp['name'->'lop']=>null, vp['name'->'josh']=>null}}
+        
+        //check the first object and it's properties
+        assertEquals(1, converted.get(GraphSONTokens.VALUEPROP)
+                .get(0)
+                .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
+                .get(GraphSONTokens.ID).get(GraphSONTokens.VALUEPROP).asInt());
+
+        assertEquals("marko", converted.get(GraphSONTokens.VALUEPROP)
+                .get(0)
+                .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
+                .get(GraphSONTokens.PROPERTIES)
+                .get("name")
+                .get(0)
+                .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
+
+        //check the leafs
+        Set expectedValues = new HashSet<String>() {{
+            add("vadas");
+            add("lop");
+            add("josh");
+        }};
+        
+        Set actualValues = new HashSet<String>();
+        for (int i = 0; i < 3; i++) {
+            actualValues.add(converted.get(GraphSONTokens.VALUEPROP)
+                .get(0)
+                .get(GraphSONTokens.VALUE).get(GraphSONTokens.VALUEPROP)
+                .get(i)
+                .get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
+                .get(GraphSONTokens.PROPERTIES)
+                .get("name")
+                .get(0)
+                .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
+        }
+
+        assertEquals(expectedValues, actualValues);
+    }
+
+    @Test
+    public void shouldToStringUnknownObjects() {
+        GraphSONMapper gm20 = GraphSONMapper.build().version(GraphSONVersion.V2_0).create();
+        GraphSONMapper gm10 = GraphSONMapper.build().version(GraphSONVersion.V1_0).create();
+
+        GraphWriter writer = GraphSONWriter.build().mapper(gm20).create();
+        // subsequent creations of GraphWriters and GraphSONMappers should not affect
+        // each other.
+        GraphWriter writer2 = GraphSONWriter.build().mapper(gm10).create();
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try {
+            writer.writeObject(baos, new FunObject("value"));
+            assertEquals(baos.toString(), "\"value\"");
+        } catch (Exception e) {
+            fail("should have succeeded serializing the unknown object to a string");
+        }
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeRequestMessageFromObjectMapper() throws IOException {
+        final ObjectMapper om = GraphSONMapper.build().version(GraphSONVersion.V2_0)
+                .addCustomModule(new GraphSONMessageSerializerV2.GremlinServerModule())
+                .create().createMapper();
+
+        final Map<String, Object> requestBindings = new HashMap<>();
+        requestBindings.put("x", 1);
+
+        final Map<String, Object> requestAliases = new HashMap<>();
+        requestAliases.put("g", "social");
+
+        final RequestMessage requestMessage = RequestMessage.build("eval").processor("session").
+                overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+                add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create();
+
+        final String json = om.writeValueAsString(requestMessage);
+        final RequestMessage readRequestMessage = om.readValue(json, RequestMessage.class);
+
+        assertEquals(requestMessage.getOp(), readRequestMessage.getOp());
+        assertEquals(requestMessage.getProcessor(), readRequestMessage.getProcessor());
+        assertEquals(requestMessage.getRequestId(), readRequestMessage.getRequestId());
+        assertEquals(requestMessage.getArgs(), readRequestMessage.getArgs());
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeResponseMessageFromObjectMapper() throws IOException {
+        final ObjectMapper om = GraphSONMapper.build().version(GraphSONVersion.V2_0)
+                .addCustomModule(new GraphSONMessageSerializerV2.GremlinServerModule())
+                .create().createMapper();
+        final Graph graph = TinkerFactory.createModern();
+
+        final ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+                code(org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode.SUCCESS).
+                result(Collections.singletonList(graph.vertices().next())).create();
+
+        final String respJson = om.writeValueAsString(responseMessage);
+        final ResponseMessage responseMessageRead = om.readValue(respJson, ResponseMessage.class);
+
+        assertEquals(responseMessage.getRequestId(), responseMessageRead.getRequestId());
+        assertEquals(responseMessage.getResult().getMeta(), responseMessageRead.getResult().getMeta());
+        assertEquals(responseMessage.getResult().getData(), responseMessageRead.getResult().getData());
+        assertEquals(responseMessage.getStatus().getAttributes(), responseMessageRead.getStatus().getAttributes());
+        assertEquals(responseMessage.getStatus().getCode().getValue(), responseMessageRead.getStatus().getCode().getValue());
+        assertEquals(responseMessage.getStatus().getCode().isSuccess(), responseMessageRead.getStatus().getCode().isSuccess());
+        assertEquals(responseMessage.getStatus().getMessage(), responseMessageRead.getStatus().getMessage());
+    }
+
+    @Test
+    public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws SerializationException {
+        GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV2.build());
+        GraphSONMessageSerializerV2 graphSONMessageSerializerV2 = new GraphSONMessageSerializerV2(builder);
+
+        ResponseMessage rm = convert("hello", graphSONMessageSerializerV2);
+        assertEquals(rm.getRequestId(), requestId);
+        assertEquals(rm.getResult().getData(), "hello");
+    }
+
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void shouldFailOnMessageSerializerWithMapperIfNoGremlinServerModule() {
+        final GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV2.build());
+        final GraphSONMessageSerializerV2 graphSONMessageSerializerV2 = new GraphSONMessageSerializerV2(builder.create());
+
+        try {
+            convert("hello", graphSONMessageSerializerV2);
+            fail("Serialization should have failed since no GremlinServerModule registered.");
+        } catch (SerializationException e) {
+            assertTrue(e.getMessage().contains("Could not find a type identifier for the class"));
+            assertTrue(e.getCause() instanceof JsonMappingException);
+            assertTrue(e.getCause().getCause() instanceof IllegalArgumentException);
+        }
+    }
+
+    private ResponseMessage convert(final Object toSerialize, MessageSerializer<?> serializer) throws SerializationException {
+        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+        return serializer.deserializeResponse(bb);
+    }
+
+    private class FunObject {
+        private String val;
+
+        public FunObject(String val) {
+            this.val = val;
+        }
+
+        public String toString() {
+            return this.val;
+        }
+    }
+
+    public static class ColorIoRegistry extends AbstractIoRegistry {
+        public ColorIoRegistry() {
+            register(GraphSONIo.class, null, new ColorSimpleModule());
+        }
+    }
+
+    public static class ColorSimpleModule extends TinkerPopJacksonModule {
+        public ColorSimpleModule() {
+            super("color-fun");
+            addSerializer(Color.class, new ColorSerializer());
+        }
+
+        @Override
+        public Map<Class, String> getTypeDefinitions() {
+            return new HashMap<Class, String>(){{
+                put(Color.class, "color");
+            }};
+        }
+
+        @Override
+        public String getTypeNamespace() {
+            return "java";
+        }
+    }
+
+    public static class ColorSerializer extends StdScalarSerializer<Color> {
+        public ColorSerializer() {
+            super(Color.class);
+        }
+
+        @Override
+        public void serialize(final Color color, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            jsonGenerator.writeBoolean(color.equals(Color.RED));
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3RoundTripTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3RoundTripTest.java
new file mode 100644
index 0000000..3d8cadb
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3RoundTripTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.assertEquals;
+
+public class GraphSONMessageSerializerV3RoundTripTest extends AbstractRoundTripTest {
+
+    private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+    private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+    public final GraphSONMessageSerializerV3 serializer = new GraphSONMessageSerializerV3();
+
+    private static final List<String> skippedTests
+            = Arrays.asList("ReferenceVertex", "ReferenceVertexProperty", "ReferenceProperty", "Graph");
+
+    @Test
+    public void shouldWriteAndRead() throws Exception {
+        // some tests are not valid for json
+        if (skippedTests.contains(name)) return;
+
+        for (int i = 0; i < 5; i++) {
+
+            final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(value).create(), allocator);
+            final Object result = serializer.deserializeResponse(bb).getResult().getData();
+
+            Optional.ofNullable(assertion).orElse((Consumer) r -> assertEquals(value, r)).accept(result);
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java
new file mode 100644
index 0000000..584af06
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONMessageSerializerV3Test.java
@@ -0,0 +1,419 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonMappingException;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Serializer tests that cover non-lossy serialization/deserialization methods.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@SuppressWarnings("unchecked")
+public class GraphSONMessageSerializerV3Test {
+
+    private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+    private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+    private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+    public final GraphSONMessageSerializerV3 serializer = new GraphSONMessageSerializerV3();
+
+    @Test
+    public void shouldSerializeIterable() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(100);
+
+        final ResponseMessage response = convert(list);
+        assertCommon(response);
+
+        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+        assertEquals(2, deserializedFunList.size());
+        assertEquals(Integer.valueOf(1), deserializedFunList.get(0));
+        assertEquals(Integer.valueOf(100), deserializedFunList.get(1));
+    }
+
+    @Test
+    public void shouldSerializeIterableWithNull() throws Exception {
+        final ArrayList<Integer> list = new ArrayList<>();
+        list.add(1);
+        list.add(null);
+        list.add(100);
+
+        final ResponseMessage response = convert(list);
+        assertCommon(response);
+
+        final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+        assertEquals(3, deserializedFunList.size());
+        assertEquals(Integer.valueOf(1), deserializedFunList.get(0));
+        assertNull(deserializedFunList.get(1));
+        assertEquals(Integer.valueOf(100), deserializedFunList.get(2));
+    }
+
+    @Test
+    public void shouldSerializeMap() throws Exception {
+        final Map<String, Object> map = new HashMap<>();
+        final Map<String, String> innerMap = new HashMap<>();
+        innerMap.put("a", "b");
+
+        map.put("w", true);
+        map.put("x", 1);
+        map.put("y", "some");
+        map.put("z", innerMap);
+
+        final ResponseMessage response = convert(map);
+        assertCommon(response);
+
+        final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
+        assertEquals(4, deserializedMap.size());
+        assertEquals(true, deserializedMap.get("w"));
+        assertEquals(1, deserializedMap.get("x"));
+        assertEquals("some", deserializedMap.get("y"));
+
+        final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
+        assertEquals(1, deserializedInnerMap.size());
+        assertEquals("b", deserializedInnerMap.get("a"));
+    }
+
+    @Test
+    public void shouldSerializeMapEntries() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Date d = new Date();
+
+        final Map<Object, Object> map = new HashMap<>();
+        map.put("x", 1);
+        map.put(v1, 100);
+        map.put(d, "test");
+
+        final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
+        assertCommon(response);
+
+        final List<Map<Object, Object>> deserializedEntries = (List<Map<Object, Object>>) response.getResult().getData();
+        assertEquals(3, deserializedEntries.size());
+        deserializedEntries.forEach(m -> {
+            final Map.Entry<Object,Object> e = m.entrySet().iterator().next();
+            if (e.getKey().equals("x"))
+                assertEquals(1, e.getValue());
+            else if (e.getKey() instanceof Vertex && e.getKey().equals(v1))
+                assertEquals(100, e.getValue());
+            else if (e.getKey() instanceof Date)
+                assertEquals("test", e.getValue());
+            else
+                fail("Map entries contains a key that is not part of what was serialized");
+        });
+    }
+
+    @Test
+    public void shouldSerializeEdge() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Vertex v2 = graph.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
+
+        final ResponseMessage response = convert(iterable);
+        assertCommon(response);
+
+        final List<Edge> edgeList = (List<Edge>) response.getResult().getData();
+        assertEquals(1, edgeList.size());
+
+        final Edge deserializedEdge = edgeList.get(0);
+        assertEquals(e.id(), deserializedEdge.id());
+        assertEquals(v1.id(), deserializedEdge.outVertex().id());
+        assertEquals(v2.id(), deserializedEdge.inVertex().id());
+        assertEquals(v1.label(), deserializedEdge.outVertex().label());
+        assertEquals(v2.label(), deserializedEdge.inVertex().label());
+        assertEquals(e.label(), deserializedEdge.label());
+
+        final List<Property> properties = new ArrayList<>();
+        deserializedEdge.properties().forEachRemaining(properties::add);
+        assertEquals(1, properties.size());
+
+        assertNotNull(properties);
+        assertEquals("abc", properties.get(0).key());
+        assertEquals(123, properties.get(0).value());
+
+    }
+
+    @Test
+    public void shouldSerializeEdgeProperty() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Vertex v2 = graph.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+        final ResponseMessage response = convert(iterable);
+        assertCommon(response);
+
+        final List<Property> propertyList = (List<Property>) response.getResult().getData();
+        assertEquals(1, propertyList.size());
+        assertEquals(123, propertyList.get(0).value());
+    }
+
+    @Test
+    public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v = graph.addVertex();
+        final Map<String, Object> map = new HashMap<>();
+        map.put("x", 500);
+        map.put("y", "some");
+
+        final ArrayList<Object> friends = new ArrayList<>();
+        friends.add("x");
+        friends.add(5);
+        friends.add(map);
+
+        v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+        final List<Vertex> list = IteratorUtils.list(graph.vertices());
+
+        final ResponseMessage response = convert(list);
+        assertCommon(response);
+
+        final List<Vertex> vertexList = (List<Vertex>) response.getResult().getData();
+        assertEquals(1, vertexList.size());
+
+        final Vertex deserializedVertex = vertexList.get(0);
+        assertEquals(v.id(), deserializedVertex.id());
+        assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
+
+        final List<VertexProperty> properties = new ArrayList<>();
+        deserializedVertex.properties().forEachRemaining(properties::add);
+        assertEquals(1, properties.size());
+
+        final VertexProperty friendsProperty = properties.get(0);
+        final List<Object> deserializedInnerList = (List<Object>) friendsProperty.value();
+
+        assertEquals(3, deserializedInnerList.size());
+        assertEquals("x", deserializedInnerList.get(0));
+        assertEquals(5, deserializedInnerList.get(1));
+
+        final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
+        assertEquals(2, deserializedInnerInnerMap.size());
+        assertEquals(500, deserializedInnerInnerMap.get("x"));
+        assertEquals("some", deserializedInnerInnerMap.get("y"));
+    }
+
+    @Test
+    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Map<Vertex, Integer> map = new HashMap<>();
+        final Vertex v1 = g.V().has("name", "marko").next();
+        map.put(v1, 1000);
+
+        final ResponseMessage response = convert(map);
+        assertCommon(response);
+
+        final Map<Vertex, Integer> deserializedMap = (Map<Vertex, Integer>) response.getResult().getData();
+        assertEquals(1, deserializedMap.size());
+        assertEquals(Integer.valueOf(1000), deserializedMap.get(v1));
+    }
+
+    @Test
+    public void shouldSerializeToTreeJson() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Tree t = g.V(1).out().properties("name").tree().next();
+
+        final ResponseMessage response = convert(t);
+        assertCommon(response);
+
+        final Tree deserializedTree = (Tree)response.getResult().getData();
+
+        //check the first object and its key's properties
+        assertEquals(1, deserializedTree.size());
+        final Vertex v = ((Vertex) deserializedTree.keySet().iterator().next());
+        assertEquals(1, v.id());
+        assertEquals("marko", v.property("name").value());
+
+        final Tree firstTree = (Tree)deserializedTree.get(v);
+        assertEquals(3, firstTree.size());
+        Iterator<Vertex> vertexKeys = firstTree.keySet().iterator();
+
+        Map expectedValues = new HashMap<Integer, String>() {{
+            put(2, "vadas");
+            put(4, "lop");
+            put(6, "josh");
+        }};
+        
+        Map actualValues = new HashMap<Integer, String>();
+        for (int i = 0; i < 3; i++) {
+            Tree t2 = (Tree)firstTree.get(vertexKeys.next());
+            VertexProperty vp = (VertexProperty)t2.keySet().iterator().next();
+            actualValues.put(vp.id(), vp.value());
+        }
+
+        assertEquals(expectedValues, actualValues);
+    }
+
+    @Test
+    public void shouldSerializeFullResponseMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", "this");
+        metaData.put("one", 1);
+
+        final Map<String, Object> attributes = new HashMap<>();
+        attributes.put("test", "that");
+        attributes.put("two", 2);
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SUCCESS)
+                .result("some-result")
+                .statusAttributes(attributes)
+                .statusMessage("worked")
+                .create();
+
+        final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(bb);
+
+        assertEquals(id, deserialized.getRequestId());
+        assertEquals("this", deserialized.getResult().getMeta().get("test"));
+        assertEquals(1, deserialized.getResult().getMeta().get("one"));
+        assertEquals("some-result", deserialized.getResult().getData());
+        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+        assertEquals("worked", deserialized.getStatus().getMessage());
+    }
+
+    @Test
+    public void shouldDeserializeNotPredicate() throws Exception {
+        final String requestMessageWithP = "{\"requestId\":{\"@type\":\"g:UUID\",\"@value\":\"0397b9c0-ffab-470e-a6a8-644fc80c01d6\"},\"op\":\"bytecode\",\"processor\":\"traversal\",\"args\":{\"gremlin\":{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"V\"],[\"hasLabel\",\"person\"],[\"has\",\"age\",{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"not\",\"value\":{\"@type\":\"g:P\",\"@value\":{\"predicate\":\"lte\",\"value\":{\"@type\":\"g:Int32\",\"@value\":10}}}}}]]}},\"aliases\":{\"g\":\"gmodern\"}}}";
+        final ByteBuf bb = allocator.buffer(requestMessageWithP.length());
+        bb.writeBytes(requestMessageWithP.getBytes());
+        final RequestMessage m = serializer.deserializeRequest(bb);
+        assertEquals("bytecode", m.getOp());
+        assertNotNull(m.getArgs());
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeRequest() throws Exception {
+        final GraphTraversalSource g = EmptyGraph.instance().traversal();
+        final Traversal.Admin t = g.V().hasLabel("person").out().asAdmin();
+
+        final Map<String, String> aliases = new HashMap<>();
+        aliases.put("g","g");
+
+        final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
+                .processor("traversal")
+                .overrideRequestId(UUID.randomUUID())
+                .addArg(Tokens.ARGS_GREMLIN, t.getBytecode())
+                .addArg(Tokens.ARGS_ALIASES, aliases)
+                .create();
+
+        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
+        final int mimeLen = buffer.readByte();
+        final byte[] bytes = new byte[mimeLen];
+        buffer.readBytes(bytes);
+        final String mimeType = new String(bytes, StandardCharsets.UTF_8);
+
+        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
+        assertThat(request, reflectionEquals(deserialized));
+        assertThat(serializer.mimeTypesSupported(), hasItemInArray(mimeType));
+    }
+
+    @Test
+    public void shouldRegisterGremlinServerModuleAutomaticallyWithMapper() throws SerializationException {
+        GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV3.build());
+        GraphSONMessageSerializerV3 graphSONMessageSerializerV3 = new GraphSONMessageSerializerV3(builder);
+
+        ResponseMessage rm = convert("hello", graphSONMessageSerializerV3);
+        assertEquals(rm.getRequestId(), requestId);
+        assertEquals(rm.getResult().getData(), "hello");
+    }
+
+    @Test
+    public void shouldFailOnMessageSerializerWithMapperIfNoGremlinServerModule() {
+        final GraphSONMapper.Builder builder = GraphSONMapper.build().addCustomModule(GraphSONXModuleV3.build());
+        final GraphSONMessageSerializerV3 graphSONMessageSerializerV3 = new GraphSONMessageSerializerV3(builder.create());
+
+        try {
+            convert("hello", graphSONMessageSerializerV3);
+            fail("Serialization should have failed since no GremlinServerModule registered.");
+        } catch (SerializationException e) {
+            assertTrue(e.getMessage().contains("Could not find a type identifier for the class"));
+            assertTrue(e.getCause() instanceof JsonMappingException);
+            assertTrue(e.getCause().getCause() instanceof IllegalArgumentException);
+        }
+    }
+
+    private void assertCommon(final ResponseMessage response) {
+        assertEquals(requestId, response.getRequestId());
+        assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
+    }
+
+    private ResponseMessage convert(final Object toSerialize, MessageSerializer<?> serializer) throws SerializationException {
+        final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+        return serializer.deserializeResponse(bb);
+    }
+
+    private ResponseMessage convert(final Object toSerialize) throws SerializationException {
+        return convert(toSerialize, this.serializer);
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1Test.java
new file mode 100644
index 0000000..023b471
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV1Test.java
@@ -0,0 +1,512 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+/**
+ * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
+ * vertices, edges, annotated values, etc.) are handled in the IO packages.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONUntypedMessageSerializerV1Test {
+
+    public static final GraphSONUntypedMessageSerializerV1 SERIALIZER = new GraphSONUntypedMessageSerializerV1();
+    private static final RequestMessage msg = RequestMessage.build("op")
+            .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
+    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+
+    @Test
+    public void shouldConfigureIoRegistry() throws Exception {
+        final GraphSONUntypedMessageSerializerV1 serializer = new GraphSONUntypedMessageSerializerV1();
+        final Map<String, Object> config = new HashMap<String, Object>() {{
+            put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+        }};
+
+        serializer.configure(config, null);
+
+        final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
+                .result(Color.RED).create();
+        final String results = serializer.serializeResponseAsString(toSerialize, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
+    }
+
+    @Test
+    public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
+        final ResponseMessage message = ResponseMessage.build(msg).create();
+        final String results = SERIALIZER.serializeResponseAsString(message, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
+        assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterable() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterator() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorNullElement() throws Exception {
+
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(null);
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(3, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals(NullNode.getInstance(), converted.get(1));
+        assertEquals("y", converted.get(2).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMap() throws Exception {
+        final Map<String, Object> map = new HashMap<>();
+        final Map<String, String> innerMap = new HashMap<>();
+        innerMap.put("a", "b");
+
+        map.put("x", new FunObject("x"));
+        map.put("y", "some");
+        map.put("z", innerMap);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(jsonObject);
+        assertEquals("some", jsonObject.get("y").asText());
+        assertEquals("x", jsonObject.get("x").asText());
+
+        final JsonNode innerJsonObject = jsonObject.get("z");
+        assertNotNull(innerJsonObject);
+        assertEquals("b", innerJsonObject.get("a").asText());
+    }
+
+    @Test
+    public void shouldShouldSerializeMapEntries() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Date d = new Date();
+
+        final Map<Object, Object> map = new HashMap<>();
+        map.put("x", 1);
+        map.put(v1, 100);
+        map.put(d, "test");
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+        jsonObject.elements().forEachRemaining(e -> {
+            if (e.has("x"))
+                assertEquals(1, e.get("x").asInt());
+            else if (e.has(v1.id().toString()))
+                assertEquals(100, e.get(v1.id().toString()).asInt());
+            else if (e.has(StdDateFormat.instance.format(d)))
+                assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
+            else
+                fail("Map entries contains a key that is not part of what was serialized");
+        });
+    }
+
+    @Test
+    public void shouldSerializeEdge() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode edgeAsJson = converted.get(0);
+        assertNotNull(edgeAsJson);
+
+        assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong());  // lossy
+        assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
+        assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
+        assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
+        assertEquals(GraphSONTokens.EDGE, edgeAsJson.get(GraphSONTokens.TYPE).asText());
+
+        final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals(123, properties.get("abc").asInt());
+    }
+
+    @Test
+    public void shouldSerializeEdgeProperty() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode propertyAsJson = converted.get(0);
+        assertNotNull(propertyAsJson);
+
+        assertEquals(123, propertyAsJson.get("value").asInt());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v = g.addVertex();
+        final Map<String, Object> map = new HashMap<>();
+        map.put("x", 500);
+        map.put("y", "some");
+
+        final ArrayList<Object> friends = new ArrayList<>();
+        friends.add("x");
+        friends.add(5);
+        friends.add(map);
+
+        v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+        final Iterable iterable = IteratorUtils.list(g.vertices());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode vertexAsJson = converted.get(0);
+        assertNotNull(vertexAsJson);
+
+        final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals(1, properties.size());
+
+        final JsonNode friendProperties = properties.get("friends");
+        assertEquals(1, friendProperties.size());
+        final JsonNode friendsProperty = friendProperties.get(0);
+        assertNotNull(friendsProperty);
+        assertEquals(3, friends.size());
+
+        final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
+        assertEquals("x", object1);
+
+        final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
+        assertEquals(5, object2);
+
+        final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
+        assertEquals(500, object3.get("x").asInt());
+        assertEquals("some", object3.get("y").asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Map<Vertex, Integer> map = new HashMap<>();
+        map.put(g.V().has("name", "marko").next(), 1000);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+
+        // with no embedded types the key (which is a vertex) simply serializes out to an id
+        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+        assertEquals(1000, converted.get("1").asInt());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals(0, m.getArgs().size());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals("y", m.getArgs().get("x"));
+    }
+
+    @Test(expected = SerializationException.class)
+    public void shouldDeserializeRequestParseMessage() throws Exception {
+        SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
+    }
+
+    @Test
+    public void shouldSerializeFullResponseMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", "this");
+        metaData.put("one", 1);
+
+        final Map<String, Object> attributes = new HashMap<>();
+        attributes.put("test", "that");
+        attributes.put("two", 2);
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SUCCESS)
+                .result("some-result")
+                .statusAttributes(attributes)
+                .statusMessage("worked")
+                .create();
+
+        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+
+        assertEquals(id, deserialized.getRequestId());
+        assertEquals("this", deserialized.getResult().getMeta().get("test"));
+        assertEquals(1, deserialized.getResult().getMeta().get("one"));
+        assertEquals("some-result", deserialized.getResult().getData());
+        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+        assertEquals("worked", deserialized.getStatus().getMessage());
+    }
+
+    @Test
+    public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", UUID.randomUUID().toString());
+        final Map<String, Object> attributes = Collections.emptyMap();
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SERVER_ERROR)
+                .result("some-result")
+                .statusAttributes(attributes)
+                // explicitly pass the null value
+                .statusMessage(null)
+                .create();
+
+        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+        Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
+                        + "with null message field", deserialized);
+    }
+
+    @Test
+    public void shouldSerializeToJsonTree() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Tree t = g.V(1).out().properties("name").tree().next();
+
+        
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+        assertNotNull(converted);
+        
+        //check the first object and it's properties
+        assertEquals(1, converted.get("1").get("key").get("id").asInt());
+        assertEquals("marko", converted.get("1").get("key").get("properties").get("name").get(0).get("value").asText());
+        
+        //check objects tree structure
+        //check Vertex property
+        assertEquals("vadas", converted.get("1")
+                                 .get("value")
+                                 .get("2")
+                                 .get("value")
+                                 .get("2").get("key").get("value").asText());
+        assertEquals("name", converted.get("1")
+                                 .get("value")
+                                 .get("2")
+                                 .get("value")
+                                 .get("2").get("key").get("label").asText());
+        
+        // check subitem
+        assertEquals("lop", converted.get("1")
+                                 .get("value")
+                                 .get("3")
+                                 .get("key")
+                                 .get("properties").get("name").get(0).get("value").asText());
+    }
+
+    private class FunObject {
+        private String val;
+
+        public FunObject(String val) {
+            this.val = val;
+        }
+
+        public String toString() {
+            return this.val;
+        }
+    }
+
+    public static class ColorIoRegistry extends AbstractIoRegistry {
+        public ColorIoRegistry() {
+            register(GraphSONIo.class, null, new ColorSimpleModule());
+        }
+    }
+
+    public static class ColorSimpleModule extends SimpleModule {
+        public ColorSimpleModule() {
+            super("color-fun");
+            addSerializer(Color.class, new ColorSerializer());
+
+        }
+    }
+
+    public static class ColorSerializer extends StdSerializer<Color> {
+        public ColorSerializer() {
+            super(Color.class);
+        }
+
+        @Override
+        public void serialize(final Color color, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            jsonGenerator.writeBoolean(color.equals(Color.RED));
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2Test.java
new file mode 100644
index 0000000..4eae80b
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV2Test.java
@@ -0,0 +1,479 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.awt.Color;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+/**
+ * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
+ * vertices, edges, annotated values, etc.) are handled in the IO packages.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONUntypedMessageSerializerV2Test {
+    public static final GraphSONUntypedMessageSerializerV2 SERIALIZER = new GraphSONUntypedMessageSerializerV2();
+    private static final RequestMessage msg = RequestMessage.build("op")
+            .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
+    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+
+    @Test
+    public void shouldConfigureIoRegistry() throws Exception {
+        final GraphSONUntypedMessageSerializerV2 serializer = new GraphSONUntypedMessageSerializerV2();
+        final Map<String, Object> config = new HashMap<String, Object>() {{
+            put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+        }};
+
+        serializer.configure(config, null);
+
+        final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
+                .result(Color.RED).create();
+        final String results = serializer.serializeResponseAsString(toSerialize, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
+    }
+
+    @Test
+    public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
+        final ResponseMessage message = ResponseMessage.build(msg).create();
+        final String results = SERIALIZER.serializeResponseAsString(message, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
+        assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterable() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterator() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorNullElement() throws Exception {
+
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(null);
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(3, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals(NullNode.getInstance(), converted.get(1));
+        assertEquals("y", converted.get(2).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMap() throws Exception {
+        final Map<String, Object> map = new HashMap<>();
+        final Map<String, String> innerMap = new HashMap<>();
+        innerMap.put("a", "b");
+
+        map.put("x", new FunObject("x"));
+        map.put("y", "some");
+        map.put("z", innerMap);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(jsonObject);
+        assertEquals("some", jsonObject.get("y").asText());
+        assertEquals("x", jsonObject.get("x").asText());
+
+        final JsonNode innerJsonObject = jsonObject.get("z");
+        assertNotNull(innerJsonObject);
+        assertEquals("b", innerJsonObject.get("a").asText());
+    }
+
+    @Test
+    public void shouldShouldSerializeMapEntries() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Date d = new Date();
+
+        final Map<Object, Object> map = new HashMap<>();
+        map.put("x", 1);
+        map.put(v1, 100);
+        map.put(d, "test");
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+        jsonObject.elements().forEachRemaining(e -> {
+            if (e.has("x"))
+                assertEquals(1, e.get("x").asInt());
+            else if (e.has(v1.id().toString()))
+                assertEquals(100, e.get(v1.id().toString()).asInt());
+            else if (e.has(StdDateFormat.instance.format(d)))
+                assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
+            else
+                fail("Map entries contains a key that is not part of what was serialized");
+        });
+    }
+
+    @Test
+    public void shouldSerializeEdge() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode edgeAsJson = converted.get(0);
+        assertNotNull(edgeAsJson);
+
+        assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong());  // lossy
+        assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
+        assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
+        assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
+        assertEquals(e.inVertex().label(), edgeAsJson.get(GraphSONTokens.IN_LABEL).asText());
+        assertEquals(e.outVertex().label(), edgeAsJson.get(GraphSONTokens.OUT_LABEL).asText());
+
+        final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals("abc", properties.get("abc").get(GraphSONTokens.KEY).textValue());
+        assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUE).intValue());
+    }
+
+    @Test
+    public void shouldSerializeEdgeProperty() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode propertyAsJson = converted.get(0);
+        assertNotNull(propertyAsJson);
+
+        assertEquals(123, propertyAsJson.get("value").asInt());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v = g.addVertex();
+        final Map<String, Object> map = new HashMap<>();
+        map.put("x", 500);
+        map.put("y", "some");
+
+        final ArrayList<Object> friends = new ArrayList<>();
+        friends.add("x");
+        friends.add(5);
+        friends.add(map);
+
+        v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+        final Iterable iterable = IteratorUtils.list(g.vertices());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode vertexAsJson = converted.get(0);
+        assertNotNull(vertexAsJson);
+
+        final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals(1, properties.size());
+
+        final JsonNode friendProperties = properties.get("friends");
+        assertEquals(1, friendProperties.size());
+        final JsonNode friendsProperty = friendProperties.get(0);
+        assertNotNull(friendsProperty);
+        assertEquals(3, friends.size());
+
+        final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
+        assertEquals("x", object1);
+
+        final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
+        assertEquals(5, object2);
+
+        final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
+        assertEquals(500, object3.get("x").asInt());
+        assertEquals("some", object3.get("y").asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Map<Vertex, Integer> map = new HashMap<>();
+        map.put(g.V().has("name", "marko").next(), 1000);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+
+        // with no embedded types the key (which is a vertex) simply serializes out to an id
+        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+        assertEquals(1000, converted.get("1").asInt());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals(0, m.getArgs().size());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals("y", m.getArgs().get("x"));
+    }
+
+    @Test(expected = SerializationException.class)
+    public void shouldDeserializeRequestParseMessage() throws Exception {
+        SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
+    }
+
+    @Test
+    public void shouldSerializeFullResponseMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", "this");
+        metaData.put("one", 1);
+
+        final Map<String, Object> attributes = new HashMap<>();
+        attributes.put("test", "that");
+        attributes.put("two", 2);
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SUCCESS)
+                .result("some-result")
+                .statusAttributes(attributes)
+                .statusMessage("worked")
+                .create();
+
+        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+
+        assertEquals(id, deserialized.getRequestId());
+        assertEquals("this", deserialized.getResult().getMeta().get("test"));
+        assertEquals(1, deserialized.getResult().getMeta().get("one"));
+        assertEquals("some-result", deserialized.getResult().getData());
+        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+        assertEquals("worked", deserialized.getStatus().getMessage());
+    }
+
+    @Test
+    public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", UUID.randomUUID().toString());
+        final Map<String, Object> attributes = Collections.emptyMap();
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SERVER_ERROR)
+                .result("some-result")
+                .statusAttributes(attributes)
+                // explicitly pass the null value
+                .statusMessage(null)
+                .create();
+
+        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+        Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
+                + "with null message field", deserialized);
+    }
+
+    private class FunObject {
+        private String val;
+
+        public FunObject(String val) {
+            this.val = val;
+        }
+
+        public String toString() {
+            return this.val;
+        }
+    }
+
+    public static class ColorIoRegistry extends AbstractIoRegistry {
+        public ColorIoRegistry() {
+            register(GraphSONIo.class, null, new GraphSONUntypedMessageSerializerV1Test.ColorSimpleModule());
+        }
+    }
+
+    public static class ColorSimpleModule extends SimpleModule {
+        public ColorSimpleModule() {
+            super("color-fun");
+            addSerializer(Color.class, new GraphSONUntypedMessageSerializerV1Test.ColorSerializer());
+
+        }
+    }
+
+    public static class ColorSerializer extends StdSerializer<Color> {
+        public ColorSerializer() {
+            super(Color.class);
+        }
+
+        @Override
+        public void serialize(final Color color, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            jsonGenerator.writeBoolean(color.equals(Color.RED));
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3Test.java
new file mode 100644
index 0000000..6534062
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/GraphSONUntypedMessageSerializerV3Test.java
@@ -0,0 +1,471 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+/**
+ * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
+ * vertices, edges, annotated values, etc.) are handled in the IO packages.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONUntypedMessageSerializerV3Test {
+    public static final GraphSONUntypedMessageSerializerV3 SERIALIZER = new GraphSONUntypedMessageSerializerV3();
+    private static final RequestMessage msg = RequestMessage.build("op")
+            .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
+    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+
+    @Test
+    public void shouldConfigureIoRegistry() throws Exception {
+        final GraphSONUntypedMessageSerializerV3 serializer = new GraphSONUntypedMessageSerializerV3();
+        final Map<String, Object> config = new HashMap<String, Object>() {{
+            put(AbstractMessageSerializer.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+        }};
+
+        serializer.configure(config, null);
+
+        final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
+                .result(Color.RED).create();
+        final String results = serializer.serializeResponseAsString(toSerialize, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
+    }
+
+    @Test
+    public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
+        final ResponseMessage message = ResponseMessage.build(msg).create();
+        final String results = SERIALIZER.serializeResponseAsString(message, allocator);
+        final JsonNode json = mapper.readTree(results);
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
+        assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterable() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIterator() throws Exception {
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(2, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals("y", converted.get(1).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorNullElement() throws Exception {
+
+        final ArrayList<FunObject> funList = new ArrayList<>();
+        funList.add(new FunObject("x"));
+        funList.add(null);
+        funList.add(new FunObject("y"));
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertEquals(3, converted.size());
+
+        assertEquals("x", converted.get(0).asText());
+        assertEquals(NullNode.getInstance(), converted.get(1));
+        assertEquals("y", converted.get(2).asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMap() throws Exception {
+        final Map<String, Object> map = new HashMap<>();
+        final Map<String, String> innerMap = new HashMap<>();
+        innerMap.put("a", "b");
+
+        map.put("x", new FunObject("x"));
+        map.put("y", "some");
+        map.put("z", innerMap);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(jsonObject);
+        assertEquals("some", jsonObject.get("y").asText());
+        assertEquals("x", jsonObject.get("x").asText());
+
+        final JsonNode innerJsonObject = jsonObject.get("z");
+        assertNotNull(innerJsonObject);
+        assertEquals("b", innerJsonObject.get("a").asText());
+    }
+
+    @Test
+    public void shouldShouldSerializeMapEntries() throws Exception {
+        final Graph graph = TinkerGraph.open();
+        final Vertex v1 = graph.addVertex();
+        final Date d = new Date();
+
+        final Map<Object, Object> map = new HashMap<>();
+        map.put("x", 1);
+        map.put(v1, 100);
+        map.put(d, "test");
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+        jsonObject.elements().forEachRemaining(e -> {
+            if (e.has("x"))
+                assertEquals(1, e.get("x").asInt());
+            else if (e.has(v1.id().toString()))
+                assertEquals(100, e.get(v1.id().toString()).asInt());
+            else if (e.has(StdDateFormat.instance.format(d)))
+                assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
+            else
+                fail("Map entries contains a key that is not part of what was serialized");
+        });
+    }
+
+    @Test
+    public void shouldSerializeEdge() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode edgeAsJson = converted.get(0);
+        assertNotNull(edgeAsJson);
+
+        assertEquals(((Long) e.id()).intValue(), edgeAsJson.get(GraphSONTokens.ID).asLong());  // lossy
+        assertEquals(((Long) v1.id()).intValue(), edgeAsJson.get(GraphSONTokens.OUT).asLong());// lossy
+        assertEquals(((Long) v2.id()).intValue(), edgeAsJson.get(GraphSONTokens.IN).asLong()); // lossy
+        assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
+        assertEquals(e.inVertex().label(), edgeAsJson.get(GraphSONTokens.IN_LABEL).asText());
+        assertEquals(e.outVertex().label(), edgeAsJson.get(GraphSONTokens.OUT_LABEL).asText());
+
+        final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals("abc", properties.get("abc").get(GraphSONTokens.KEY).textValue());
+        assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUE).intValue());
+    }
+
+    @Test
+    public void shouldSerializeEdgeProperty() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v1 = g.addVertex();
+        final Vertex v2 = g.addVertex();
+        final Edge e = v1.addEdge("test", v2);
+        e.property("abc", 123);
+
+        final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode propertyAsJson = converted.get(0);
+        assertNotNull(propertyAsJson);
+
+        assertEquals(123, propertyAsJson.get("value").asInt());
+    }
+
+    @Test
+    public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
+        final Graph g = TinkerGraph.open();
+        final Vertex v = g.addVertex();
+        final Map<String, Object> map = new HashMap<>();
+        map.put("x", 500);
+        map.put("y", "some");
+
+        final ArrayList<Object> friends = new ArrayList<>();
+        friends.add("x");
+        friends.add(5);
+        friends.add(map);
+
+        v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+        final Iterable iterable = IteratorUtils.list(g.vertices());
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+        assertEquals(1, converted.size());
+
+        final JsonNode vertexAsJson = converted.get(0);
+        assertNotNull(vertexAsJson);
+
+        final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
+        assertNotNull(properties);
+        assertEquals(1, properties.size());
+
+        final JsonNode friendProperties = properties.get("friends");
+        assertEquals(1, friendProperties.size());
+        final JsonNode friendsProperty = friendProperties.get(0);
+        assertNotNull(friendsProperty);
+        assertEquals(3, friends.size());
+
+        final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
+        assertEquals("x", object1);
+
+        final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
+        assertEquals(5, object2);
+
+        final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
+        assertEquals(500, object3.get("x").asInt());
+        assertEquals("some", object3.get("y").asText());
+    }
+
+    @Test
+    public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+        final TinkerGraph graph = TinkerFactory.createClassic();
+        final GraphTraversalSource g = graph.traversal();
+        final Map<Vertex, Integer> map = new HashMap<>();
+        map.put(g.V().has("name", "marko").next(), 1000);
+
+        final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create(), allocator);
+        final JsonNode json = mapper.readTree(results);
+
+        assertNotNull(json);
+        assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+        final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+        assertNotNull(converted);
+
+        // with no embedded types the key (which is a vertex) simply serializes out to an id
+        // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+        assertEquals(1000, converted.get("1").asInt());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals(0, m.getArgs().size());
+    }
+
+    @Test
+    public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
+        final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+        final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
+        assertEquals(request, m.getRequestId());
+        assertEquals("eval", m.getOp());
+        assertNotNull(m.getArgs());
+        assertEquals("y", m.getArgs().get("x"));
+    }
+
+    @Test(expected = SerializationException.class)
+    public void shouldDeserializeRequestParseMessage() throws Exception {
+        SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
+    }
+
+    @Test
+    public void shouldSerializeFullResponseMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", "this");
+        metaData.put("one", 1);
+
+        final Map<String, Object> attributes = new HashMap<>();
+        attributes.put("test", "that");
+        attributes.put("two", 2);
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SUCCESS)
+                .result("some-result")
+                .statusAttributes(attributes)
+                .statusMessage("worked")
+                .create();
+
+        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+
+        assertEquals(id, deserialized.getRequestId());
+        assertEquals("this", deserialized.getResult().getMeta().get("test"));
+        assertEquals(1, deserialized.getResult().getMeta().get("one"));
+        assertEquals("some-result", deserialized.getResult().getData());
+        assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+        assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+        assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+        assertEquals("worked", deserialized.getStatus().getMessage());
+    }
+
+    @Test
+    public void shouldDeserializeResponseMessageWithNullMessage() throws Exception {
+        final UUID id = UUID.randomUUID();
+
+        final Map<String, Object> metaData = new HashMap<>();
+        metaData.put("test", UUID.randomUUID().toString());
+        final Map<String, Object> attributes = Collections.emptyMap();
+
+        final ResponseMessage response = ResponseMessage.build(id)
+                .responseMetaData(metaData)
+                .code(ResponseStatusCode.SERVER_ERROR)
+                .result("some-result")
+                .statusAttributes(attributes)
+                // explicitly pass the null value
+                .statusMessage(null)
+                .create();
+
+        final String results = SERIALIZER.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+        Assert.assertNotNull(SERIALIZER.getClass().getSimpleName() + " should be able to deserialize ResponseMessage "
+                + "with null message field", deserialized);
+    }
+
+    private class FunObject {
+        private String val;
+
+        public FunObject(String val) {
+            this.val = val;
+        }
+
+        public String toString() {
+            return this.val;
+        }
+    }
+
+    public static class ColorIoRegistry extends AbstractIoRegistry {
+        public ColorIoRegistry() {
+            register(GraphSONIo.class, null, new GraphSONUntypedMessageSerializerV1Test.ColorSimpleModule());
+        }
+    }
+
+    public static class ColorSimpleModule extends SimpleModule {
+        public ColorSimpleModule() {
+            super("color-fun");
+            addSerializer(Color.class, new GraphSONUntypedMessageSerializerV1Test.ColorSerializer());
+
+        }
+    }
+
+    public static class ColorSerializer extends StdSerializer<Color> {
+        public ColorSerializer() {
+            super(Color.class);
+        }
+
+        @Override
+        public void serialize(final Color color, final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+            jsonGenerator.writeBoolean(color.equals(Color.RED));
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/NettyBufferFactoryTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/NettyBufferFactoryTest.java
new file mode 100644
index 0000000..9e2e1a1
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/NettyBufferFactoryTest.java
@@ -0,0 +1,384 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.util.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.util.ReferenceCounted;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+public class NettyBufferFactoryTest {
+    public static final NettyBufferFactory factory = new NettyBufferFactory();
+    private static final ByteBufAllocator allocator = new UnpooledByteBufAllocator(false);
+    private static final List<ByteBuf> rawInstances = new ArrayList<>();
+
+    @AfterClass
+    public static void tearDown() {
+        rawInstances.forEach(ReferenceCounted::release);
+    }
+
+    private static ByteBuf getRaw() {
+        final ByteBuf raw = allocator.buffer(256);
+        rawInstances.add(raw);
+        return raw;
+    }
+
+    @Test
+    public void shouldReturnAWrapper() {
+        final ByteBuf raw = getRaw();
+        final Buffer buffer = factory.create(raw);
+        assertEquals(raw.refCnt(), buffer.referenceCount());
+    }
+
+    @Test
+    public void shouldAdvanceWriterAndReaderIndex() {
+        final ByteBuf raw = getRaw();
+        final Buffer buffer = factory.create(raw);
+
+        final int intValue = 100;
+        final long longValue = 2019L;
+        final float floatValue = 10.9F;
+
+        assertEquals(0, buffer.writerIndex());
+        assertEquals(0, buffer.readerIndex());
+
+        buffer.writeBoolean(true);
+        buffer.writeInt(intValue);
+        buffer.writeLong(longValue);
+        buffer.writeFloat(floatValue);
+
+        assertEquals(17, buffer.writerIndex());
+        assertEquals(0, buffer.readerIndex());
+
+        assertTrue(buffer.readBoolean());
+        assertEquals(intValue, buffer.readInt());
+        assertEquals(longValue, buffer.readLong());
+        assertEquals(floatValue, buffer.readFloat(), 0f);
+
+        assertEquals(17, buffer.writerIndex());
+        assertEquals(17, buffer.readerIndex());
+    }
+
+    @Test
+    public void readRawShouldAdvanceReaderIndexAndReleaseIt() {
+        final int intValue = 5;
+        final FakeBuffer fakeBuffer = new FakeBuffer();
+        fakeBuffer.writeInt(intValue);
+        assertEquals(4, fakeBuffer.writerIndex());
+        assertEquals(0, fakeBuffer.readerIndex());
+        final ByteBuf[] captured = new ByteBuf[1];
+
+        NettyBufferFactory.readRaw(fakeBuffer, byteBuf -> {
+            assertEquals(intValue, byteBuf.readInt());
+            assertNotSame(byteBuf, fakeBuffer.getUnderlyingRaw());
+            assertEquals(1, byteBuf.refCnt());
+            captured[0] = byteBuf;
+        });
+
+        assertEquals(4, fakeBuffer.writerIndex());
+
+        // The reader index advanced
+        assertEquals(4, fakeBuffer.readerIndex());
+
+        // Should be released afterwards
+        assertEquals(0, captured[0].refCnt());
+    }
+
+    @Test
+    public void writeRawShouldAdvanceWriterIndexAndReleaseIt() {
+        final int intValue1 = 314;
+        final int intValue2 = 314;
+        final FakeBuffer fakeBuffer = new FakeBuffer();
+
+        fakeBuffer.writeInt(intValue1);
+        assertEquals(4, fakeBuffer.writerIndex());
+        assertEquals(0, fakeBuffer.readerIndex());
+        final ByteBuf[] captured = new ByteBuf[1];
+
+        NettyBufferFactory.writeRaw(fakeBuffer, byteBuf -> {
+            byteBuf.writeInt(intValue2);
+            assertNotSame(byteBuf, fakeBuffer.getUnderlyingRaw());
+            assertEquals(1, byteBuf.refCnt());
+            captured[0] = byteBuf;
+        });
+
+        // The writer index advanced
+        assertEquals(8, fakeBuffer.writerIndex());
+        assertEquals(0, fakeBuffer.readerIndex());
+
+        // Should have painted the underlying bytes
+        assertEquals(intValue1, fakeBuffer.readInt());
+        assertEquals(intValue2, fakeBuffer.readInt());
+
+        // Should be released afterwards
+        assertEquals(0, captured[0].refCnt());
+    }
+
+    @Test
+    public void readRawShouldUseTheSameBufferWhenNettyBuffer() {
+        final NettyBuffer wrapperBuffer = new NettyBuffer(allocator.buffer());
+
+        NettyBufferFactory.readRaw(wrapperBuffer, byteBuf -> {
+            assertSame(byteBuf, wrapperBuffer.getUnderlyingBuffer());
+            assertEquals(1, byteBuf.refCnt());
+        });
+
+        // It shouldn't have released it
+        assertEquals(1, wrapperBuffer.referenceCount());
+    }
+
+    @Test
+    public void writeRawShouldUseTheSameBufferWhenNettyBuffer() {
+        final NettyBuffer wrapperBuffer = new NettyBuffer(allocator.buffer());
+
+        NettyBufferFactory.writeRaw(wrapperBuffer, byteBuf -> {
+            assertSame(byteBuf, wrapperBuffer.getUnderlyingBuffer());
+            assertEquals(1, byteBuf.refCnt());
+        });
+
+        // It shouldn't have released it
+        assertEquals(1, wrapperBuffer.referenceCount());
+    }
+
+    /** An incomplete implementation that allows testing */
+    class FakeBuffer implements Buffer {
+        private final ByteBuf buffer = getRaw();
+
+        FakeBuffer() {
+
+        }
+
+        ByteBuf getUnderlyingRaw() {
+            return buffer;
+        }
+
+        @Override
+        public int readableBytes() {
+            return buffer.readableBytes();
+        }
+
+        @Override
+        public int readerIndex() {
+            return buffer.readerIndex();
+        }
+
+        @Override
+        public Buffer readerIndex(int readerIndex) {
+            buffer.readerIndex(readerIndex);
+            return this;
+        }
+
+        @Override
+        public int writerIndex() {
+            return buffer.writerIndex();
+        }
+
+        @Override
+        public Buffer writerIndex(int writerIndex) {
+            buffer.writerIndex(writerIndex);
+            return this;
+        }
+
+        @Override
+        public Buffer markWriterIndex() {
+            return null;
+        }
+
+        @Override
+        public Buffer resetWriterIndex() {
+            return null;
+        }
+
+        @Override
+        public int capacity() {
+            return buffer.capacity();
+        }
+
+        @Override
+        public boolean isDirect() {
+            return false;
+        }
+
+        @Override
+        public boolean readBoolean() {
+            return false;
+        }
+
+        @Override
+        public byte readByte() {
+            return 0;
+        }
+
+        @Override
+        public short readShort() {
+            return 0;
+        }
+
+        @Override
+        public int readInt() {
+            return buffer.readInt();
+        }
+
+        @Override
+        public long readLong() {
+            return 0;
+        }
+
+        @Override
+        public float readFloat() {
+            return 0;
+        }
+
+        @Override
+        public double readDouble() {
+            return 0;
+        }
+
+        @Override
+        public Buffer readBytes(byte[] destination) {
+            return null;
+        }
+
+        @Override
+        public Buffer readBytes(byte[] destination, int dstIndex, int length) {
+            return null;
+        }
+
+        @Override
+        public Buffer readBytes(ByteBuffer dst) {
+            return null;
+        }
+
+        @Override
+        public Buffer readBytes(OutputStream out, int length) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeBoolean(boolean value) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeByte(int value) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeShort(int value) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeInt(int value) {
+            buffer.writeInt(value);
+            return this;
+        }
+
+        @Override
+        public Buffer writeLong(long value) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeFloat(float value) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeDouble(double value) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeBytes(byte[] src) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeBytes(ByteBuffer src) {
+            return null;
+        }
+
+        @Override
+        public Buffer writeBytes(byte[] src, int srcIndex, int length) {
+            return null;
+        }
+
+        @Override
+        public boolean release() {
+            return buffer.release();
+        }
+
+        @Override
+        public Buffer retain() {
+            buffer.retain();
+            return this;
+        }
+
+        @Override
+        public int referenceCount() {
+            return buffer.refCnt();
+        }
+
+        @Override
+        public int nioBufferCount() {
+            return buffer.nioBufferCount();
+        }
+
+        @Override
+        public ByteBuffer[] nioBuffers() {
+            return buffer.nioBuffers();
+        }
+
+        @Override
+        public ByteBuffer[] nioBuffers(int index, int length) {
+            return buffer.nioBuffers(index, length);
+        }
+
+        @Override
+        public ByteBuffer nioBuffer() {
+            return buffer.nioBuffer();
+        }
+
+        @Override
+        public ByteBuffer nioBuffer(int index, int length) {
+            return buffer.nioBuffer(index, length);
+        }
+
+        @Override
+        public Buffer getBytes(int index, byte[] dst) {
+            return null;
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV1Test.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV1Test.java
new file mode 100644
index 0000000..09bc419
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryMessageSerializerV1Test.java
@@ -0,0 +1,279 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.util.Tokens;
+import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
+import static org.junit.Assert.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItemInArray;
+
+public class GraphBinaryMessageSerializerV1Test {
+    private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+    private final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+
+    @Test
+    public void shouldSerializeAndDeserializeRequest() throws SerializationException {
+        final GraphTraversalSource g = EmptyGraph.instance().traversal();
+        final Traversal.Admin t = g.V().hasLabel("person").out().asAdmin();
+
+        final Map<String, String> aliases = new HashMap<>();
+        aliases.put("g","g");
+
+        final RequestMessage request = RequestMessage.build(Tokens.OPS_BYTECODE)
+                .processor("traversal")
+                .overrideRequestId(UUID.randomUUID())
+                .addArg(Tokens.ARGS_GREMLIN, t.getBytecode())
+                .addArg(Tokens.ARGS_ALIASES, aliases)
+                .create();
+
+        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
+        final int mimeLen = buffer.readByte();
+        final byte[] bytes = new byte[mimeLen];
+        buffer.readBytes(bytes);
+        final String mimeType = new String(bytes, StandardCharsets.UTF_8);
+
+        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
+        assertThat(request, reflectionEquals(deserialized));
+        assertThat(serializer.mimeTypesSupported(), hasItemInArray(mimeType));
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeRequestOverText() throws SerializationException {
+        final RequestMessage request = RequestMessage.build("op1")
+                .processor("proc1")
+                .overrideRequestId(UUID.randomUUID())
+                .addArg("arg1", "value1")
+                .create();
+
+        final String base64 = serializer.serializeRequestAsString(request, allocator);
+        final RequestMessage deserialized = serializer.deserializeRequest(base64);
+        assertThat(request, reflectionEquals(deserialized));
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeRequestWithoutArgs() throws SerializationException {
+        final RequestMessage request = RequestMessage.build("op1")
+                .processor("proc1")
+                .overrideRequestId(UUID.randomUUID())
+                .create();
+
+        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
+        final int mimeLen = buffer.readByte();
+        buffer.readBytes(new byte[mimeLen]);
+        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
+        assertThat(request, reflectionEquals(deserialized));
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeRequestWithUnsetProcessor() throws SerializationException {
+        final RequestMessage request = RequestMessage.build("op1")
+                .overrideRequestId(UUID.randomUUID())
+                .addArg("k", 1)
+                .create();
+
+        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
+        final int mimeLen = buffer.readByte();
+        buffer.readBytes(new byte[mimeLen]);
+        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
+        assertThat(request, reflectionEquals(deserialized));
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeResponse() throws SerializationException {
+        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
+                .code(ResponseStatusCode.SUCCESS)
+                .statusMessage("Found")
+                .statusAttribute("k1", 1)
+                .result("This is a fine message with a string")
+                .create();
+
+        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
+        assertResponseEquals(response, deserialized);
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeResponseOverText() throws SerializationException {
+        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
+                .code(ResponseStatusCode.SUCCESS)
+                .statusMessage("Found")
+                .statusAttribute("k1", 1)
+                .result("This is a fine message with a string")
+                .create();
+
+        final String base64 = serializer.serializeResponseAsString(response, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(base64);
+        assertResponseEquals(response, deserialized);
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeResponseWithoutStatusMessage() throws SerializationException {
+        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
+                .code(ResponseStatusCode.SUCCESS)
+                .statusAttribute("k1", 1)
+                .result(123.3)
+                .create();
+
+        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
+        assertResponseEquals(response, deserialized);
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeResponseWithoutStatusAttributes() throws SerializationException {
+        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
+                .code(ResponseStatusCode.SUCCESS)
+                .result(123.3)
+                .create();
+
+        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
+        assertResponseEquals(response, deserialized);
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeResponseWithoutResult() throws SerializationException {
+        final ResponseMessage response = ResponseMessage.build(UUID.randomUUID())
+                .code(ResponseStatusCode.SERVER_ERROR)
+                .statusMessage("Something happened on the server")
+                .create();
+
+        final ByteBuf buffer = serializer.serializeResponseAsBinary(response, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
+        assertResponseEquals(response, deserialized);
+    }
+
+    @Test
+    public void shouldSupportConfigurationOfRegistryBuilder() {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+        final Map<String, Object> config = new HashMap<>();
+        int counter = SampleTypeSerializerRegistryBuilder.createCounter.get();
+
+        config.put(GraphBinaryMessageSerializerV1.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.util.ser.binary.GraphBinaryMessageSerializerV1Test$SampleTypeSerializerRegistryBuilder");
+        serializer.configure(config, null);
+
+        counter = SampleTypeSerializerRegistryBuilder.createCounter.get() - counter;
+        // There should be a call to `create()`
+        assertEquals(1, counter);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void shouldThrowWhenConfigurationOfRegistryBuilderFails() {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+        final Map<String, Object> config = new HashMap<>();
+        config.put(GraphBinaryMessageSerializerV1.TOKEN_BUILDER, "org.apache.tinkerpop.gremlin.util.ser.binary.NonExistentClass");
+
+        serializer.configure(config, null);
+    }
+
+    @Test
+    public void shouldToStringSerialize() throws SerializationException {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+        final Map<String,Object> conf = new HashMap<String,Object>() {{
+            put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
+        }};
+        serializer.configure(conf, Collections.emptyMap());
+
+        final ResponseMessage messageWithUnexpectedType = ResponseMessage.build(UUID.randomUUID()).
+                result(java.awt.Color.RED).create();
+        final ByteBuf buffer = serializer.serializeResponseAsBinary(messageWithUnexpectedType, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(buffer);
+
+        assertEquals(java.awt.Color.RED.toString(), deserialized.getResult().getData());
+    }
+
+    @Test
+    public void shouldToStringSerializeAsText() throws SerializationException {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+        final Map<String,Object> conf = new HashMap<String,Object>() {{
+            put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
+        }};
+        serializer.configure(conf, Collections.emptyMap());
+
+        final ResponseMessage messageWithUnexpectedType = ResponseMessage.build(UUID.randomUUID()).
+                result(java.awt.Color.RED).create();
+        final String base64 = serializer.serializeResponseAsString(messageWithUnexpectedType, allocator);
+        final ResponseMessage deserialized = serializer.deserializeResponse(base64);
+
+        assertEquals(java.awt.Color.RED.toString(), deserialized.getResult().getData());
+    }
+
+    @Test
+    public void shouldSerializeAndDeserializeRequestAsText() throws SerializationException {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+        final Map<String,Object> conf = new HashMap<String,Object>() {{
+            put(GraphBinaryMessageSerializerV1.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
+        }};
+        serializer.configure(conf, Collections.emptyMap());
+
+        final RequestMessage request = RequestMessage.build("op1")
+                .processor("proc1")
+                .overrideRequestId(UUID.randomUUID())
+                .addArg("arg1", "value1")
+                .create();
+
+        final ByteBuf buffer = serializer.serializeRequestAsBinary(request, allocator);
+        final int mimeLen = buffer.readByte();
+        buffer.readBytes(new byte[mimeLen]);
+        final RequestMessage deserialized = serializer.deserializeRequest(buffer);
+        assertThat(request, reflectionEquals(deserialized));
+    }
+
+    private static void assertResponseEquals(ResponseMessage expected, ResponseMessage actual) {
+        assertEquals(expected.getRequestId(), actual.getRequestId());
+        // Status
+        assertEquals(expected.getStatus().getCode(), actual.getStatus().getCode());
+        assertEquals(expected.getStatus().getMessage(), actual.getStatus().getMessage());
+        assertEquals(expected.getStatus().getAttributes(), actual.getStatus().getAttributes());
+        // Result
+        assertEquals(expected.getResult().getData(), actual.getResult().getData());
+        assertEquals(expected.getResult().getMeta(), actual.getResult().getMeta());
+    }
+
+    public static class SampleTypeSerializerRegistryBuilder extends TypeSerializerRegistry.Builder {
+        public static AtomicInteger createCounter = new AtomicInteger();
+
+        @Override
+        public TypeSerializerRegistry create() {
+            createCounter.incrementAndGet();
+            return super.create();
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryReaderWriterRoundTripTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
new file mode 100644
index 0000000..d63e986
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary;
+
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.ser.AbstractRoundTripTest;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.assertEquals;
+
+public class GraphBinaryReaderWriterRoundTripTest extends AbstractRoundTripTest {
+    private final GraphBinaryWriter writer = new GraphBinaryWriter();
+    private final GraphBinaryReader reader = new GraphBinaryReader();
+    private final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+    private static NettyBufferFactory bufferFactory = new NettyBufferFactory();
+
+    private static List<String> skippedTests
+            = Arrays.asList("ReferenceVertexProperty");
+
+    @Test
+    public void shouldWriteAndRead() throws Exception {
+        // some tests are not valid for graphbinary
+        if (skippedTests.contains(name)) return;
+
+        // Test it multiple times as the type registry might change its internal state
+        for (int i = 0; i < 5; i++) {
+            final Buffer buffer = bufferFactory.create(allocator.buffer());
+            writer.write(value, buffer);
+            buffer.readerIndex(0);
+            final Object result = reader.read(buffer);
+
+            Optional.ofNullable(assertion).orElse((Consumer) r -> assertEquals(value, r)).accept(result);
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerFailureTests.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerFailureTests.java
new file mode 100644
index 0000000..d41074e
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerFailureTests.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.util.ser.binary;
+
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferencePath;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
+import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+@RunWith(Parameterized.class)
+public class TypeSerializerFailureTests {
+
+    private final GraphBinaryWriter writer = new GraphBinaryWriter();
+    private final UnpooledByteBufAllocator allocator = new UnpooledByteBufAllocator(false);
+    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
+
+    @Parameterized.Parameters(name = "Value={0}")
+    public static Collection input() {
+        final Bytecode.Binding b = new Bytecode.Binding(null, "b");
+
+        final ReferenceVertex vertex = new ReferenceVertex("a vertex", null);
+
+        final Bytecode bytecode = new Bytecode();
+        bytecode.addStep(null);
+
+        final BulkSet<Object> bulkSet = new BulkSet<>();
+        bulkSet.add(vertex, 1L);
+
+        final MutableMetrics metrics = new MutableMetrics("a metric", null);
+
+        final Tree<Vertex> tree = new Tree<>();
+        tree.put(vertex, null);
+
+        // Provide instances that are malformed for serialization to fail
+        return Arrays.asList(
+                b,
+                vertex,
+                Collections.singletonMap("one", b),
+                bulkSet,
+                bytecode,
+                Collections.singletonList(vertex),
+                new ReferenceEdge("an edge", null, vertex, vertex),
+                Lambda.supplier(null),
+                metrics,
+                new DefaultTraversalMetrics(1L, Collections.singletonList(metrics)),
+                new DefaultRemoteTraverser<>(new Object(), 1L),
+                tree,
+                new ReferenceVertexProperty<>("a prop", null, "value"),
+                new InvalidPath()
+        );
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public Object value;
+
+    @Test
+    public void shouldReleaseMemoryWhenFails() {
+        final Buffer buffer = bufferFactory.create(allocator.buffer());
+        try {
+            writer.write(value, buffer);
+            fail("Should throw exception");
+        } catch (IOException | RuntimeException e) {
+            // We are the owner of the buffer, we should release it
+            buffer.release();
+        }
+
+        // Make sure all allocations where released
+        assertEquals(0, allocator.metric().usedHeapMemory());
+    }
+
+    public static class InvalidPath extends ReferencePath {
+        public InvalidPath() {
+            super(EmptyPath.instance());
+        }
+
+        @Override
+        public List<Object> objects() {
+            return Collections.singletonList(new Object());
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerRegistryTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerRegistryTest.java
new file mode 100644
index 0000000..fbdaa2e
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/TypeSerializerRegistryTest.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary;
+
+import org.apache.tinkerpop.gremlin.util.ser.binary.types.sample.SamplePerson;
+import org.apache.tinkerpop.gremlin.util.ser.binary.types.sample.SamplePersonSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.UUID;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertSame;
+
+public class TypeSerializerRegistryTest {
+
+    @Test
+    public void shouldResolveToUserProvidedForInterfaces_1() throws IOException {
+        final TypeSerializer<VertexProperty> expected = new TestVertexPropertySerializer();
+        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
+                .add(VertexProperty.class, expected).create();
+
+        assertSame(expected, registry.getSerializer(VertexProperty.class));
+        assertSame(expected, registry.getSerializer(DataType.VERTEXPROPERTY));
+    }
+
+    @Test
+    public void shouldResolveToUserProvidedForInterfaces_2() throws IOException {
+        final TypeSerializer<Property> expected = new TestPropertySerializer();
+        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
+                .add(Property.class, expected).create();
+
+        assertSame(expected, registry.getSerializer(Property.class));
+        assertSame(expected, registry.getSerializer(DataType.PROPERTY));
+    }
+
+    @Test
+    public void shouldResolveToUserProvidedForClasses() throws Exception {
+        final TypeSerializer<UUID> expected = new TestUUIDSerializer();
+        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
+                .add(UUID.class, expected).create();
+
+        assertSame(expected, registry.getSerializer(UUID.class));
+        assertSame(expected, registry.getSerializer(DataType.UUID));
+    }
+
+    @Test
+    public void shouldResolveToTheFirstSerializerForInterfaces() throws IOException {
+        final TypeSerializer<VertexProperty> expectedForVertexProperty = new TestVertexPropertySerializer();
+        final TypeSerializer<Property> expectedForProperty = new TestPropertySerializer();
+        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
+                .add(VertexProperty.class, expectedForVertexProperty)
+                .add(Property.class, expectedForProperty).create();
+
+        assertSame(expectedForVertexProperty, registry.getSerializer(VertexProperty.class));
+        assertSame(expectedForProperty, registry.getSerializer(Property.class));
+        assertSame(expectedForVertexProperty, registry.getSerializer(DataType.VERTEXPROPERTY));
+        assertSame(expectedForProperty, registry.getSerializer(DataType.PROPERTY));
+    }
+
+    @Test
+    public void shouldUseFallbackResolverWhenThereIsNoMatch() {
+        final int[] called = {0};
+        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
+                .withFallbackResolver(t -> {
+                    called[0]++;
+                    return null;
+                }).create();
+
+        String message = null;
+        try {
+            registry.getSerializer(SamplePerson.class);
+        } catch (IOException ex) {
+            message = ex.getMessage();
+        }
+
+        assertEquals("Serializer for type org.apache.tinkerpop.gremlin.util.ser.binary.types.sample.SamplePerson not found", message);
+        assertEquals(1, called[0]);
+    }
+
+    @Test
+    public void shouldUseFallbackResolverReturnValue() throws IOException {
+        TypeSerializer expected = new SamplePersonSerializer();
+        final int[] called = {0};
+        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
+                .withFallbackResolver(t -> {
+                    called[0]++;
+                    return expected;
+                }).create();
+
+        TypeSerializer<SamplePerson> serializer = registry.getSerializer(SamplePerson.class);
+        assertEquals(1, called[0]);
+        assertSame(expected, serializer);
+    }
+
+    private static class TestVertexPropertySerializer extends TestBaseTypeSerializer<VertexProperty> {
+
+        @Override
+        public DataType getDataType() {
+            return DataType.VERTEXPROPERTY;
+        }
+    }
+
+    private static class TestPropertySerializer extends TestBaseTypeSerializer<Property> {
+
+        @Override
+        public DataType getDataType() {
+            return DataType.PROPERTY;
+        }
+    }
+
+    private static class TestUUIDSerializer extends TestBaseTypeSerializer<UUID> {
+
+        @Override
+        public DataType getDataType() {
+            return DataType.UUID;
+        }
+    }
+
+    private static abstract class TestBaseTypeSerializer<T> implements TypeSerializer<T> {
+        @Override
+        public T read(Buffer buffer, GraphBinaryReader context) {
+            return null;
+        }
+
+        @Override
+        public T readValue(Buffer buffer, GraphBinaryReader context, boolean nullable) {
+            return null;
+        }
+
+        @Override
+        public void write(T value, Buffer buffer, GraphBinaryWriter context) {
+
+        }
+
+        @Override
+        public void writeValue(T value, Buffer buffer, GraphBinaryWriter context, boolean nullable) {
+
+        }
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/CharSerializerTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/CharSerializerTest.java
new file mode 100644
index 0000000..f5d6823
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/CharSerializerTest.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary.types;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.Unpooled;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Parameterized.class)
+public class CharSerializerTest {
+    private final ByteBufAllocator allocator = new UnpooledByteBufAllocator(false);
+    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
+
+    private static final GraphBinaryReader reader = new GraphBinaryReader();
+    private static final GraphBinaryWriter writer = new GraphBinaryWriter();
+
+    @Parameterized.Parameters(name = "Character={0}")
+    public static Collection input() {
+        return Arrays.asList(
+                new Object[] {'a', new byte[]{ 0x61 }},
+                new Object[] {'b', new byte[]{ 0x62 }},
+                new Object[] {'$', new byte[]{ 0x24 }},
+                new Object[] {'¢', new byte[]{ (byte)0xc2, (byte)0xa2 }},
+                new Object[] {'€', new byte[]{ (byte)0xe2, (byte)0x82, (byte)0xac }},
+                new Object[] {'ह', new byte[]{ (byte)0xe0, (byte)0xa4, (byte)0xb9 }});
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public char charValue;
+
+    @Parameterized.Parameter(value = 1)
+    public byte[] byteArray;
+
+    @Test
+    public void readValueTest() throws IOException {
+        final Character actual = reader.readValue(
+                bufferFactory.create(Unpooled.wrappedBuffer(byteArray)),Character.class, false);
+        assertEquals(charValue, actual.charValue());
+    }
+
+    @Test
+    public void writeValueTest() throws IOException {
+        final Buffer actual = bufferFactory.create(allocator.buffer());
+        writer.writeValue(charValue, actual, false);
+        final byte[] actualBytes = new byte[byteArray.length];
+        actual.readBytes(actualBytes);
+        assertTrue(Arrays.deepEquals(new byte[][]{byteArray}, new byte[][]{actualBytes}));
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePerson.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePerson.java
new file mode 100644
index 0000000..2970dce
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePerson.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary.types.sample;
+
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * A sample custom data type containing few properties.
+ */
+public class SamplePerson {
+    private final String name;
+    private final Date birthDate;
+
+    SamplePerson(final String name, final Date birthDate) {
+        Objects.requireNonNull(name);
+        Objects.requireNonNull(birthDate);
+
+        this.name = name;
+        this.birthDate = birthDate;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializer.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializer.java
new file mode 100644
index 0000000..2a76206
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializer.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary.types.sample;
+
+import org.apache.tinkerpop.gremlin.util.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.DataType;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.structure.io.binary.types.CustomTypeSerializer;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
+/**
+ * A sample custom type serializer.
+ */
+public final class SamplePersonSerializer implements CustomTypeSerializer<SamplePerson> {
+    private final byte[] typeInfoBuffer = new byte[] { 0, 0, 0, 0 };
+
+    @Override
+    public String getTypeName() {
+        return "sampleProvider.SamplePerson";
+    }
+
+    @Override
+    public DataType getDataType() {
+        return DataType.CUSTOM;
+    }
+
+    @Override
+    public SamplePerson read(final Buffer buffer, final GraphBinaryReader context) throws IOException {
+        // {custom type info}, {value_flag} and {value}
+        // No custom_type_info
+        if (buffer.readInt() != 0) {
+            throw new SerializationException("{custom_type_info} should not be provided for this custom type");
+        }
+
+        return readValue(buffer, context, true);
+    }
+
+    @Override
+    public SamplePerson readValue(final Buffer buffer, final GraphBinaryReader context, final boolean nullable) throws IOException {
+        if (nullable) {
+            final byte valueFlag = buffer.readByte();
+            if ((valueFlag & 1) == 1) {
+                return null;
+            }
+        }
+
+        // Read the byte length of the value bytes
+        final int valueLength = buffer.readInt();
+
+        if (valueLength <= 0) {
+            throw new SerializationException(String.format("Unexpected value length: %d", valueLength));
+        }
+
+        if (valueLength > buffer.readableBytes()) {
+            throw new SerializationException(
+                String.format("Not enough readable bytes: %d (expected %d)", valueLength, buffer.readableBytes()));
+        }
+
+        final String name = context.readValue(buffer, String.class, false);
+        final Date birthDate = context.readValue(buffer, Date.class, false);
+
+        return new SamplePerson(name, birthDate);
+    }
+
+    @Override
+    public void write(final SamplePerson value, final Buffer buffer, final GraphBinaryWriter context) throws IOException {
+        // Write {custom type info}, {value_flag} and {value}
+        buffer.writeBytes(typeInfoBuffer);
+
+        writeValue(value, buffer, context, true);
+    }
+
+    @Override
+    public void writeValue(final SamplePerson value, final Buffer buffer, final GraphBinaryWriter context, final boolean nullable) throws IOException {
+        if (value == null) {
+            if (!nullable) {
+                throw new SerializationException("Unexpected null value when nullable is false");
+            }
+
+            context.writeValueFlagNull(buffer);
+            return;
+        }
+
+        if (nullable) {
+            context.writeValueFlagNone(buffer);
+        }
+
+        final String name = value.getName();
+
+        // value_length = name_byte_length + name_bytes + long
+        buffer.writeInt(4 + name.getBytes(StandardCharsets.UTF_8).length + 8);
+
+        context.writeValue(name, buffer, false);
+        context.writeValue(value.getBirthDate(), buffer, false);
+    }
+}
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java
new file mode 100644
index 0000000..c17e976
--- /dev/null
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/util/ser/binary/types/sample/SamplePersonSerializerTest.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.util.ser.binary.types.sample;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.ser.NettyBufferFactory;
+import org.apache.tinkerpop.gremlin.util.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.Buffer;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryIo;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.structure.io.binary.TypeSerializerRegistry;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.apache.tinkerpop.gremlin.util.MockitoHamcrestMatcherAdapter.reflectionEquals;
+import static org.apache.tinkerpop.gremlin.util.ser.AbstractMessageSerializer.TOKEN_IO_REGISTRIES;
+import static org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1.TOKEN_CUSTOM;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class SamplePersonSerializerTest {
+
+    private static final ByteBufAllocator allocator = ByteBufAllocator.DEFAULT;
+    private static final NettyBufferFactory bufferFactory = new NettyBufferFactory();
+
+    @Test
+    public void shouldCustomSerializationWithPerson() throws IOException {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1(
+                TypeSerializerRegistry.build().addCustomType(SamplePerson.class, new SamplePersonSerializer()).create());
+        assertPerson(serializer);
+    }
+
+    @Test
+    public void shouldSerializePersonViaIoRegistry() throws IOException {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+        final Map<String,Object> config = new HashMap<>();
+        config.put(TOKEN_IO_REGISTRIES, Collections.singletonList(CustomIoRegistry.class.getName()));
+        serializer.configure(config, Collections.emptyMap());
+
+        assertPerson(serializer);
+    }
+
+    @Test
+    public void shouldSerializePersonViaCustom() throws IOException {
+        final GraphBinaryMessageSerializerV1 serializer = new GraphBinaryMessageSerializerV1();
+        final Map<String,Object> config = new HashMap<>();
+        config.put(TOKEN_CUSTOM, Collections.singletonList(String.format("%s;%s",
+                SamplePerson.class.getCanonicalName(), SamplePersonSerializer.class.getCanonicalName())));
+        serializer.configure(config, Collections.emptyMap());
+
+        assertPerson(serializer);
+    }
+
+    @Test
+    public void readValueAndWriteValueShouldBeSymmetric() throws IOException {
+        final TypeSerializerRegistry registry = TypeSerializerRegistry.build()
+                .addCustomType(SamplePerson.class, new SamplePersonSerializer()).create();
+        final GraphBinaryReader reader = new GraphBinaryReader(registry);
+        final GraphBinaryWriter writer = new GraphBinaryWriter(registry);
+
+        final SamplePerson person = new SamplePerson("Matias",
+                Date.from(LocalDateTime.of(2005, 8, 5, 1, 0).toInstant(ZoneOffset.UTC)));
+
+        for (boolean nullable: new boolean[] { true, false }) {
+            final Buffer buffer = bufferFactory.create(allocator.buffer());
+            writer.writeValue(person, buffer, nullable);
+            final SamplePerson actual = reader.readValue(buffer, SamplePerson.class, nullable);
+
+            assertThat(actual, reflectionEquals(person));
+            buffer.release();
+        }
+    }
+
+    private void assertPerson(final GraphBinaryMessageSerializerV1 serializer) throws IOException {
+        final Date birthDate = Date.from(LocalDateTime.of(2010, 4, 29, 5, 30).toInstant(ZoneOffset.UTC));
+        final SamplePerson person = new SamplePerson("Olivia", birthDate);
+
+        final ByteBuf serialized = serializer.serializeResponseAsBinary(
+                ResponseMessage.build(UUID.randomUUID()).result(person).create(), allocator);
+
+        final ResponseMessage deserialized = serializer.deserializeResponse(serialized);
+
+        final SamplePerson actual = (SamplePerson) deserialized.getResult().getData();
+        assertThat(actual, reflectionEquals(person));
+    }
+
+    public static class CustomIoRegistry extends AbstractIoRegistry {
+        private static final CustomIoRegistry ioreg = new CustomIoRegistry();
+
+        private CustomIoRegistry() {
+            register(GraphBinaryIo.class, SamplePerson.class, new SamplePersonSerializer());
+        }
+
+        public static CustomIoRegistry instance() {
+            return ioreg;
+        }
+    }
+}
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/barrier-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/barrier-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/barrier-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/barrier-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bigdecimal-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bigdecimal-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bigdecimal-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bigdecimal-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/biginteger-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/biginteger-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/biginteger-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/biginteger-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/binding-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/binding-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/binding-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/binding-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bulkset-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulkset-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bulkset-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bulkset-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/byte-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/byte-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/byte-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/byte-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bytebuffer-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytebuffer-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bytebuffer-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytebuffer-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bytecode-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytecode-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/bytecode-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/bytecode-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/cardinality-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/cardinality-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/cardinality-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/cardinality-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/char-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/char-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/char-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/char-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/class-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/class-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/class-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/class-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/column-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/column-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/column-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/column-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/date-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/date-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/date-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/date-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/direction-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/direction-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/direction-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/direction-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/double-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/double-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/double-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/double-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/duration-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/duration-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/duration-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/duration-v1.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-v1.gbin
new file mode 100644
index 0000000..f540442
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/edge-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/float-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/float-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/float-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/float-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/inetaddress-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/inetaddress-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/inetaddress-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/inetaddress-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/instant-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/instant-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/instant-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/instant-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/integer-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/integer-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/integer-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/integer-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/lambda-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/lambda-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/lambda-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/lambda-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/list-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/list-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/list-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/list-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/localdate-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdate-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/localdate-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdate-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/localdatetime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdatetime-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/localdatetime-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localdatetime-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/localtime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localtime-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/localtime-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/localtime-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/long-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/long-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/long-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/long-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/map-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/map-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/map-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/map-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/metrics-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/metrics-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/metrics-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/metrics-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/monthday-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/monthday-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/monthday-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/monthday-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/offsetdatetime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsetdatetime-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/offsetdatetime-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsetdatetime-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/offsettime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsettime-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/offsettime-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/offsettime-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/operator-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/operator-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/operator-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/operator-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/order-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/order-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/order-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/order-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/p-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/p-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/p-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/p-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pand-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pand-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pand-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pand-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/path-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/path-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/path-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/path-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/period-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/period-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/period-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/period-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pick-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pick-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pick-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pick-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pop-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pop-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pop-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pop-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/por-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/por-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/por-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/por-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/property-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/property-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/property-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/property-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pwithin-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithin-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pwithin-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithin-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pwithout-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithout-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/pwithout-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/pwithout-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/scope-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/scope-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/scope-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/scope-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/set-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/set-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/set-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/short-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/short-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/short-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/short-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/t-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/t-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/t-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/t-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/textp-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/textp-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/textp-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/textp-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/timestamp-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/timestamp-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/timestamp-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/timestamp-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/tinkergraph-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinkergraph-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/tinkergraph-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/tinkergraph-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/traversalmetrics-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversalmetrics-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/traversalmetrics-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traversalmetrics-v1.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traverser-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traverser-v1.gbin
new file mode 100644
index 0000000..2448b5c
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/traverser-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/uuid-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/uuid-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/uuid-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/uuid-v1.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-v1.gbin
new file mode 100644
index 0000000..4347734
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertex-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/vertexproperty-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertexproperty-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/vertexproperty-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/vertexproperty-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/year-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/year-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/year-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/year-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/yearmonth-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/yearmonth-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/yearmonth-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/yearmonth-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/zoneddatetime-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneddatetime-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/zoneddatetime-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneddatetime-v1.gbin
Binary files differ
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/zoneoffset-v1.gbin b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneoffset-v1.gbin
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_10/zoneoffset-v1.gbin
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/zoneoffset-v1.gbin
Binary files differ
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v1-no-types.json
new file mode 100644
index 0000000..dd75823
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":407,"attributes":{}},"result":{"data":null,"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2-no-types.json
new file mode 100644
index 0000000..dd75823
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":407,"attributes":{}},"result":{"data":null,"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v1d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationchallenge-v1d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3-no-types.json
new file mode 100644
index 0000000..dd75823
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":407,"attributes":{}},"result":{"data":null,"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationchallenge-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v1-no-types.json
new file mode 100644
index 0000000..35d5260
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"authentication","processor":"","args":{"saslMechanism":"PLAIN","sasl":"AHN0ZXBocGhlbgBwYXNzd29yZA=="}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2-no-types.json
new file mode 100644
index 0000000..35d5260
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"authentication","processor":"","args":{"saslMechanism":"PLAIN","sasl":"AHN0ZXBocGhlbgBwYXNzd29yZA=="}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v1d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/authenticationresponse-v1d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3-no-types.json
new file mode 100644
index 0000000..35d5260
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"authentication","processor":"","args":{"saslMechanism":"PLAIN","sasl":"AHN0ZXBocGhlbgBwYXNzd29yZA=="}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/authenticationresponse-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/barrier-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bigdecimal-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/biginteger-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/binding-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bulkset-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_1/bulkset-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bulkset-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/bulkset-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bulkset-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/byte-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytebuffer-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/bytecode-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/cardinality-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/char-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/class-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/column-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/date-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/direction-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/double-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/duration-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v1-no-types.json
new file mode 100644
index 0000000..ef37fc7
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v1-no-types.json
@@ -0,0 +1 @@
+{"id":13,"label":"develops","type":"edge","inVLabel":"software","outVLabel":"person","inV":10,"outV":1,"properties":{"since":2009}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2-no-types.json
new file mode 100644
index 0000000..2902a41
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2-no-types.json
@@ -0,0 +1 @@
+{"id":13,"label":"develops","inVLabel":"software","outVLabel":"person","inV":10,"outV":1,"properties":{"since":{"key":"since","value":2009}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3-no-types.json
new file mode 100644
index 0000000..ef37fc7
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3-no-types.json
@@ -0,0 +1 @@
+{"id":13,"label":"develops","type":"edge","inVLabel":"software","outVLabel":"person","inV":10,"outV":1,"properties":{"since":2009}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/edge-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/float-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/inetaddress-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/instant-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/integer-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/lambda-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/list-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/list-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/list-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/list-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdate-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localdatetime-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/localtime-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/long-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/map-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/map-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/map-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/map-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/metrics-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/monthday-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsetdatetime-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/offsettime-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/operator-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/order-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/p-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pand-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v1-no-types.json
new file mode 100644
index 0000000..bb7d52b
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v1-no-types.json
@@ -0,0 +1 @@
+{"labels":[[],[],[]],"objects":[{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}},{"id":10,"label":"software","type":"vertex","properties":{"name":[{"id":4,"value":"gremlin"}]}},{"id":11,"label":"software","type":"vertex","properties":{"name":[{"id":5,"value":"tinkergraph"}]}}]}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2-no-types.json
new file mode 100644
index 0000000..ca9e8a0
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2-no-types.json
@@ -0,0 +1 @@
+{"labels":[[],[],[]],"objects":[{"id":1,"label":"person"},{"id":10,"label":"software"},{"id":11,"label":"software"}]}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/path-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3-no-types.json
new file mode 100644
index 0000000..499fe4c
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3-no-types.json
@@ -0,0 +1 @@
+{"labels":[[],[],[]],"objects":[{"id":1,"label":"person","type":"vertex"},{"id":10,"label":"software","type":"vertex"},{"id":11,"label":"software","type":"vertex"}]}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/path-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/period-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pick-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pop-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/por-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/por-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v1-no-types.json
new file mode 100644
index 0000000..5d77645
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v1-no-types.json
@@ -0,0 +1 @@
+{"key":"since","value":2009}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2-no-types.json
new file mode 100644
index 0000000..5d77645
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2-no-types.json
@@ -0,0 +1 @@
+{"key":"since","value":2009}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3-no-types.json
new file mode 100644
index 0000000..5d77645
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3-no-types.json
@@ -0,0 +1 @@
+{"key":"since","value":2009}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/property-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithin-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithin-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithin-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithin-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithin-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithout-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/pwithout-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithout-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_10/pwithout-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/pwithout-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/scope-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v1-no-types.json
new file mode 100644
index 0000000..c8444e9
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"close","processor":"session","args":{"session":"unique-session-identifier"}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2-no-types.json
new file mode 100644
index 0000000..c8444e9
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"close","processor":"session","args":{"session":"unique-session-identifier"}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v1d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionclose-v1d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3-no-types.json
new file mode 100644
index 0000000..c8444e9
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"close","processor":"session","args":{"session":"unique-session-identifier"}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionclose-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v1-no-types.json
new file mode 100644
index 0000000..3ffc988
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2-no-types.json
new file mode 100644
index 0000000..3ffc988
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessioneval-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3-no-types.json
new file mode 100644
index 0000000..3ffc988
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessioneval-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v1-no-types.json
new file mode 100644
index 0000000..0a90cab
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2-no-types.json
new file mode 100644
index 0000000..0a90cab
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionevalaliased-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3-no-types.json
new file mode 100644
index 0000000..0a90cab
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"session","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"session":"unique-session-identifier","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionevalaliased-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v1-no-types.json
new file mode 100644
index 0000000..84517c4
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2-no-types.json
new file mode 100644
index 0000000..84517c4
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlesseval-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3-no-types.json
new file mode 100644
index 0000000..84517c4
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"g.V(x)","language":"gremlin-groovy","bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlesseval-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v1-no-types.json
new file mode 100644
index 0000000..44c113d
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2-no-types.json
new file mode 100644
index 0000000..44c113d
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/sessionlessevalaliased-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3-no-types.json
new file mode 100644
index 0000000..44c113d
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"cb682578-9d92-4499-9ebc-5c6aa73c5397","op":"eval","processor":"","args":{"gremlin":"social.V(x)","language":"gremlin-groovy","aliases":{"g":"social"},"bindings":{"x":1}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/sessionlessevalaliased-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/set-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/set-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/set-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/short-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v1-no-types.json
new file mode 100644
index 0000000..3faf642
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v1-no-types.json
@@ -0,0 +1 @@
+{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":200,"attributes":{}},"result":{"data":[{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}],"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2-no-types.json
new file mode 100644
index 0000000..9933ebb
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2-no-types.json
@@ -0,0 +1 @@
+{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":200,"attributes":{}},"result":{"data":[{"id":1,"label":"person","properties":{"name":[{"id":0,"value":"marko","label":"name"}],"location":[{"id":6,"value":"san diego","label":"location","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","label":"location","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","label":"location","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","label":"location","properties":{"startTime":2005}}]}}],"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_10/standardresult-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3-no-types.json
new file mode 100644
index 0000000..3faf642
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3-no-types.json
@@ -0,0 +1 @@
+{"requestId":"41d2e28a-20a4-4ab0-b379-d810dede3786","status":{"message":"","code":200,"attributes":{}},"result":{"data":[{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}],"meta":{}}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/standardresult-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/t-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/textp-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/textp-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/textp-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_4_0/textp-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/textp-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/timestamp-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkergraph-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v3.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traversalmetrics-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/traverser-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/uuid-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v1-no-types.json
new file mode 100644
index 0000000..dadbbf0
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v1-no-types.json
@@ -0,0 +1 @@
+{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2-no-types.json
new file mode 100644
index 0000000..c4a4dfd
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2-no-types.json
@@ -0,0 +1 @@
+{"id":1,"label":"person","properties":{"name":[{"id":0,"value":"marko","label":"name"}],"location":[{"id":6,"value":"san diego","label":"location","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","label":"location","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","label":"location","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","label":"location","properties":{"startTime":2005}}]}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3-no-types.json
new file mode 100644
index 0000000..dadbbf0
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3-no-types.json
@@ -0,0 +1 @@
+{"id":1,"label":"person","type":"vertex","properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertex-v3.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v1-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v1-no-types.json
new file mode 100644
index 0000000..5336b0f
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v1-no-types.json
@@ -0,0 +1 @@
+{"id":0,"value":"marko","label":"name"}
\ No newline at end of file
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2-no-types.json
new file mode 100644
index 0000000..5336b0f
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2-no-types.json
@@ -0,0 +1 @@
+{"id":0,"value":"marko","label":"name"}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v2.json
diff --git a/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3-no-types.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3-no-types.json
new file mode 100644
index 0000000..5336b0f
--- /dev/null
+++ b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3-no-types.json
@@ -0,0 +1 @@
+{"id":0,"value":"marko","label":"name"}
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/vertexproperty-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/year-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/yearmonth-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneddatetime-v3.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v2.json
similarity index 100%
rename from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json
rename to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v2.json
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json b/gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v3.json
similarity index 100%
copy from gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json
copy to gremlin-util/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/zoneoffset-v3.json
diff --git a/gremlint/package-lock.json b/gremlint/package-lock.json
index eebaaf5..51a4236 100644
--- a/gremlint/package-lock.json
+++ b/gremlint/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "gremlint",
-  "version": "3.6.8-alpha1",
+  "version": "3.7.3-alpha1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "gremlint",
-      "version": "3.6.8-alpha1",
+      "version": "3.7.3-alpha1",
       "license": "Apache-2.0",
       "devDependencies": {
         "@types/jest": "^27.5.0",
diff --git a/gremlint/package.json b/gremlint/package.json
index ff3f547..e14988a 100644
--- a/gremlint/package.json
+++ b/gremlint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gremlint",
-  "version": "3.6.8-alpha1",
+  "version": "3.7.3-alpha1",
   "description": "Linter/code formatter for Gremlin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/gremlint/pom.xml b/gremlint/pom.xml
index 3382936..f34ed95 100644
--- a/gremlint/pom.xml
+++ b/gremlint/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>gremlint</artifactId>
     <name>Apache TinkerPop :: Gremlint</name>
@@ -53,7 +53,7 @@
                 <artifactId>gmavenplus-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
+                        <groupId>org.apache.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
                         <version>${groovy.version}</version>
                         <type>pom</type>
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index fbff2c0..be8e954 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>hadoop-gremlin</artifactId>
     <name>Apache TinkerPop :: Hadoop Gremlin</name>
@@ -31,7 +31,7 @@
                 <!-- see: https://github.com/apache/hadoop/pull/84 -->
                 <groupId>io.netty</groupId>
                 <artifactId>netty</artifactId>
-                <version>3.7.1.Final</version>
+                <version>3.10.6.Final</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -140,21 +140,21 @@
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
         </dependency>
-        <!-- use jackson 2.12.3 to fit better with spark where Scala module 2.12.3 requires Jackson Databind version >= 2.12.0 and < 2.13.0 -->
+        <!-- use jackson 2.13.5 to fit better with spark where Scala module 2.13.4 requires Jackson Databind version >= 2.13.0 and < 2.14.0 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.12.7</version>
+            <version>2.13.5</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.12.7</version>
+            <version>2.13.5</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.7</version>
+            <version>2.13.5</version>
         </dependency>
         <!-- TEST -->
         <dependency>
@@ -204,13 +204,6 @@
                         <manifestEntries>
                             <Gremlin-Plugin-Dependencies>org.apache.hadoop:hadoop-client:${hadoop.version}
                             </Gremlin-Plugin-Dependencies>
-                            <!-- initialization failures for using jackson after 2.12.* and hadoop pulls these in -->
-                            <Gremlin-Plugin-Paths>
-                                jackson-annotations-2.13.2.jar=;jackson-databind-2.13.2.2.jar=;jackson-core-2.13.2.jar=
-                            </Gremlin-Plugin-Paths>
-                            <Gremlin-Lib-Paths>
-                                jackson-annotations-2.13.2.jar=;jackson-databind-2.13.2.2.jar=;jackson-core-2.13.2.jar=
-                            </Gremlin-Lib-Paths>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
index d80dd5a..f19942a 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONRecordWriter.java
@@ -29,8 +29,6 @@
 import org.apache.tinkerpop.gremlin.structure.io.Mapper;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3d0;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
 import org.apache.tinkerpop.gremlin.structure.io.util.IoRegistryHelper;
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2RecordReaderWriterTest.java
new file mode 100644
index 0000000..f5f9405
--- /dev/null
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2RecordReaderWriterTest.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
+
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapreduce.InputFormat;
+import org.apache.hadoop.mapreduce.OutputFormat;
+import org.apache.tinkerpop.gremlin.hadoop.Constants;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Daniel Kuppitz (http://gremlin.guru)
+ */
+public class GraphSONV2RecordReaderWriterTest extends RecordReaderWriterTest {
+
+    public GraphSONV2RecordReaderWriterTest() {
+        super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V2_0.name());
+    }
+
+    @Override
+    protected String getInputFilename() {
+        return "grateful-dead-typed-v2.json";
+    }
+
+    @Override
+    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
+        return GraphSONInputFormat.class;
+    }
+
+    @Override
+    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
+        return GraphSONOutputFormat.class;
+    }
+}
+
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java
deleted file mode 100644
index d3f9d5f..0000000
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV2d0RecordReaderWriterTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
-
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.Constants;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-public class GraphSONV2d0RecordReaderWriterTest extends RecordReaderWriterTest {
-
-    public GraphSONV2d0RecordReaderWriterTest() {
-        super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V2_0.name());
-    }
-
-    @Override
-    protected String getInputFilename() {
-        return "grateful-dead-typed-v2d0.json";
-    }
-
-    @Override
-    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
-        return GraphSONInputFormat.class;
-    }
-
-    @Override
-    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
-        return GraphSONOutputFormat.class;
-    }
-}
-
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3RecordReaderFilterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3RecordReaderFilterTest.java
new file mode 100644
index 0000000..37e4252
--- /dev/null
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3RecordReaderFilterTest.java
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapreduce.InputFormat;
+import org.apache.hadoop.mapreduce.OutputFormat;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
+
+import java.io.File;
+
+public class GraphSONV3RecordReaderFilterTest extends RecordReaderWriterTest {
+
+    @Override
+    protected String getInputFilename() {
+        return "grateful-dead-v3.json";
+    }
+
+    @Override
+    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
+        return GraphSONInputFormat.class;
+    }
+
+    @Override
+    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
+        return GraphSONOutputFormat.class;
+    }
+
+    protected Configuration configure(final File outputDirectory) {
+        Configuration config = super.configure(outputDirectory);
+        return configureWithFilter(config);
+    }
+}
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3RecordReaderWriterTest.java
new file mode 100644
index 0000000..aea53bb
--- /dev/null
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3RecordReaderWriterTest.java
@@ -0,0 +1,53 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
+
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapreduce.InputFormat;
+import org.apache.hadoop.mapreduce.OutputFormat;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public class GraphSONV3RecordReaderWriterTest extends RecordReaderWriterTest {
+
+    public GraphSONV3RecordReaderWriterTest() {
+        // should be default
+        // super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V3_0.name());
+    }
+
+    @Override
+    protected String getInputFilename() {
+        return "grateful-dead-v3.json";
+    }
+
+    @Override
+    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
+        return GraphSONInputFormat.class;
+    }
+
+    @Override
+    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
+        return GraphSONOutputFormat.class;
+    }
+}
+
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderFilterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderFilterTest.java
deleted file mode 100644
index 882821b..0000000
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderFilterTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
-
-import java.io.File;
-
-public class GraphSONV3d0RecordReaderFilterTest extends RecordReaderWriterTest {
-
-    @Override
-    protected String getInputFilename() {
-        return "grateful-dead-v3d0.json";
-    }
-
-    @Override
-    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
-        return GraphSONInputFormat.class;
-    }
-
-    @Override
-    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
-        return GraphSONOutputFormat.class;
-    }
-
-    protected Configuration configure(final File outputDirectory) {
-        Configuration config = super.configure(outputDirectory);
-        return configureWithFilter(config);
-    }
-}
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java
deleted file mode 100644
index 678b5fe..0000000
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONV3d0RecordReaderWriterTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
-
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class GraphSONV3d0RecordReaderWriterTest extends RecordReaderWriterTest {
-
-    public GraphSONV3d0RecordReaderWriterTest() {
-        // should be default
-        // super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V3_0.name());
-    }
-
-    @Override
-    protected String getInputFilename() {
-        return "grateful-dead-v3d0.json";
-    }
-
-    @Override
-    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
-        return GraphSONInputFormat.class;
-    }
-
-    @Override
-    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
-        return GraphSONOutputFormat.class;
-    }
-}
-
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV2RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV2RecordReaderWriterTest.java
new file mode 100644
index 0000000..47b4db6
--- /dev/null
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV2RecordReaderWriterTest.java
@@ -0,0 +1,49 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
+
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapreduce.InputFormat;
+import org.apache.hadoop.mapreduce.OutputFormat;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
+
+public class GraphSONXModuleV2RecordReaderWriterTest extends RecordReaderWriterTest {
+
+    public GraphSONXModuleV2RecordReaderWriterTest() {
+        // should be default
+        // super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V3_0.name());
+    }
+
+    @Override
+    protected String getInputFilename() {
+        return "tinkerpop-classic-byteid-typed-v2.json";
+    }
+
+    @Override
+    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
+        return GraphSONInputFormat.class;
+    }
+
+    @Override
+    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
+        return GraphSONOutputFormat.class;
+    }
+}
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV2d0RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV2d0RecordReaderWriterTest.java
deleted file mode 100644
index 8e89b10..0000000
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV2d0RecordReaderWriterTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
-
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.InputFormat;
-import org.apache.hadoop.mapreduce.OutputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
-
-public class GraphSONXModuleV2d0RecordReaderWriterTest extends RecordReaderWriterTest {
-
-    public GraphSONXModuleV2d0RecordReaderWriterTest() {
-        // should be default
-        // super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V3_0.name());
-    }
-
-    @Override
-    protected String getInputFilename() {
-        return "tinkerpop-classic-byteid-typed-v2d0.json";
-    }
-
-    @Override
-    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
-        return GraphSONInputFormat.class;
-    }
-
-    @Override
-    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
-        return GraphSONOutputFormat.class;
-    }
-}
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV3RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV3RecordReaderWriterTest.java
new file mode 100644
index 0000000..fa976c4
--- /dev/null
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV3RecordReaderWriterTest.java
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
+
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapreduce.*;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
+
+
+public class GraphSONXModuleV3RecordReaderWriterTest extends RecordReaderWriterTest {
+
+    public GraphSONXModuleV3RecordReaderWriterTest() {
+        // should be default
+        // super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V3_0.name());
+    }
+
+    @Override
+    protected String getInputFilename() {
+        return "tinkerpop-classic-byteid-v3.json";
+    }
+
+    @Override
+    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
+        return GraphSONInputFormat.class;
+    }
+
+    @Override
+    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
+        return GraphSONOutputFormat.class;
+    }
+}
+
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV3d0RecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV3d0RecordReaderWriterTest.java
deleted file mode 100644
index b9fa131..0000000
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/graphson/GraphSONXModuleV3d0RecordReaderWriterTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson;
-
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapreduce.*;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.RecordReaderWriterTest;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.VertexWritable;
-
-
-public class GraphSONXModuleV3d0RecordReaderWriterTest extends RecordReaderWriterTest {
-
-    public GraphSONXModuleV3d0RecordReaderWriterTest() {
-        // should be default
-        // super.configuration.set(Constants.GREMLIN_HADOOP_GRAPHSON_VERSION, GraphSONVersion.V3_0.name());
-    }
-
-    @Override
-    protected String getInputFilename() {
-        return "tinkerpop-classic-byteid-v3d0.json";
-    }
-
-    @Override
-    protected Class<? extends InputFormat<NullWritable, VertexWritable>> getInputFormat() {
-        return GraphSONInputFormat.class;
-    }
-
-    @Override
-    protected Class<? extends OutputFormat<NullWritable, VertexWritable>> getOutputFormat() {
-        return GraphSONOutputFormat.class;
-    }
-}
-
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderFilterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderFilterTest.java
index 7867031..91cdb86 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderFilterTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderFilterTest.java
@@ -32,7 +32,7 @@
 public class GryoRecordReaderFilterTest extends RecordReaderWriterTest {
     @Override
     protected String getInputFilename() {
-        return "grateful-dead-v3d0.kryo";
+        return "grateful-dead-v3.kryo";
     }
 
     @Override
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java
index 8923426..77e4a31 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/GryoRecordReaderWriterTest.java
@@ -32,7 +32,7 @@
 
     @Override
     protected String getInputFilename() {
-        return "grateful-dead-v3d0.kryo";
+        return "grateful-dead-v3.kryo";
     }
 
     @Override
diff --git a/licenses/chai b/licenses/chai
new file mode 100644
index 0000000..eedbe23
--- /dev/null
+++ b/licenses/chai
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Chai.js Assertion Library
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/licenses/wow b/licenses/wow
new file mode 100644
index 0000000..c7a091e
--- /dev/null
+++ b/licenses/wow
@@ -0,0 +1,7 @@
+Copyright (C) 2014; Matthieu Aussaguel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 96409a9..645ceb0 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>neo4j-gremlin</artifactId>
     <name>Apache TinkerPop :: Neo4j Gremlin</name>
@@ -207,7 +207,7 @@
                 <dependency>
                     <groupId>io.dropwizard.metrics</groupId>
                     <artifactId>metrics-core</artifactId>
-                    <version>4.2.11</version>
+                    <version>4.2.19</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java
index f1715c4..3d21772 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/LabelP.java
@@ -20,9 +20,9 @@
 
 import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.PBiPredicate;
 
 import java.io.Serializable;
-import java.util.function.BiPredicate;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -43,8 +43,7 @@
      * @deprecated See: https://tinkerpop.apache.org/docs/3.5.7/reference/#neo4j-gremlin
      */
     @Deprecated
-    public static final class LabelBiPredicate implements BiPredicate<String, String>, Serializable {
-
+    public static final class LabelBiPredicate implements PBiPredicate<String, String>, Serializable {
         private static final LabelBiPredicate INSTANCE = new LabelBiPredicate();
 
         private LabelBiPredicate() {
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
index 9a6ec65..328a27f 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
@@ -59,6 +59,10 @@
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_LIMITED_STANDARD)
 @Graph.OptIn("org.apache.tinkerpop.gremlin.neo4j.NativeNeo4jSuite")
+@Graph.OptOut(
+        test = "org.apache.tinkerpop.gremlin.structure.TransactionMultiThreadedTest",
+        method = "*",
+        reason = "Some scenarios are supported by Neo4jGraph")
 @Deprecated
 public final class Neo4jGraph implements Graph, WrappedGraph<Neo4jGraphAPI> {
 
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java
index 56a0387..02ccb55 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java
@@ -95,7 +95,7 @@
 
     @Override
     public <U> Iterator<Property<U>> properties(final String... propertyKeys) {
-        throw VertexProperty.Exceptions.metaPropertiesNotSupported();
+        return Collections.emptyIterator();
     }
 
     @Override
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java
index b560643..b02a9fb 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/Neo4jGraphFeatureTest.java
@@ -50,7 +50,7 @@
 
 @RunWith(Cucumber.class)
 @CucumberOptions(
-        tags = "not @RemoteOnly and not @MultiMetaProperties and not @GraphComputerOnly and not @AllowNullPropertyValues and not @UserSuppliedVertexPropertyIds and not @UserSuppliedEdgeIds and not @UserSuppliedVertexIds and not @TinkerServiceRegistry",
+        tags = "not @RemoteOnly and not @MultiProperties and not @MetaProperties and not @GraphComputerOnly and not @AllowNullPropertyValues and not @UserSuppliedVertexPropertyIds and not @UserSuppliedEdgeIds and not @UserSuppliedVertexIds and not @TinkerServiceRegistry",
         glue = { "org.apache.tinkerpop.gremlin.features" },
         objectFactory = GuiceFactory.class,
         features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
diff --git a/pom.xml b/pom.xml
index e1766fa..4e3071d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>21</version>
+        <version>27</version>
     </parent>
     <groupId>org.apache.tinkerpop</groupId>
     <artifactId>tinkerpop</artifactId>
-    <version>3.6.8-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache TinkerPop</name>
     <description>A Graph Computing Framework</description>
@@ -143,6 +143,7 @@
         <module>gremlin-archetype</module>
         <module>gremlin-tools</module>
         <module>gremlint</module>
+        <module>gremlin-util</module>
     </modules>
     <scm>
         <connection>scm:git:git@github.com:apache/tinkerpop.git</connection>
@@ -156,11 +157,11 @@
         <commons.configuration.version>2.9.0</commons.configuration.version>
         <commons.lang.version>2.6</commons.lang.version>
         <commons.io.version>2.8.0</commons.io.version>
-        <commons.lang3.version>3.11</commons.lang3.version>
+        <commons.lang3.version>3.12.0</commons.lang3.version>
         <commons.text.version>1.10.0</commons.text.version>
         <cucumber.version>6.11.0</cucumber.version>
         <exp4j.version>0.4.8</exp4j.version>
-        <groovy.version>2.5.22</groovy.version>
+        <groovy.version>4.0.9</groovy.version>
         <guice.version>4.2.3</guice.version>
         <hadoop.version>3.3.3</hadoop.version>
         <hamcrest.version>2.2</hamcrest.version>
@@ -172,12 +173,11 @@
         <kerby.version>2.0.1</kerby.version>
         <logback.version>1.2.11</logback.version>
         <metrics.version>3.0.2</metrics.version>
-        <mockito.version>3.3.3</mockito.version>
-        <netty.version>4.1.96.Final</netty.version>
+        <mockito.version>3.10.0</mockito.version>
+        <netty.version>4.1.101.Final</netty.version>
         <slf4j.version>1.7.25</slf4j.version>
         <snakeyaml.version>2.0</snakeyaml.version>
-        <spark.version>3.2.1</spark.version>
-        <powermock.version>2.0.9</powermock.version>
+        <spark.version>3.3.2</spark.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -197,6 +197,28 @@
         <log4j-silent.properties>file:target/test-classes/log4j-silent.properties</log4j-silent.properties>
 
         <muteTestLogs>false</muteTestLogs>
+
+        <!--
+        These options are necessary to run and pass the tests with JDK 17. There are some unexported APIs that we need
+        access to and we still rely on libraries that use deep reflection (notably Kryo). We can probably remove this
+        in the future when we don't need reflection and we turn this into a JPMS module.
+        -->
+        <jdk17JvmArgs>
+            -XX:+IgnoreUnrecognizedVMOptions
+            --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
+            --add-exports=java.base/sun.security.x509=ALL-UNNAMED
+            --add-exports=java.base/sun.security.action=ALL-UNNAMED
+            --add-opens=java.base/java.io=ALL-UNNAMED
+            --add-opens=java.base/java.nio=ALL-UNNAMED
+            --add-opens=java.base/sun.nio.cs=ALL-UNNAMED
+            --add-opens=java.base/java.lang=ALL-UNNAMED
+            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+            --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+            --add-opens=java.base/java.util=ALL-UNNAMED
+            --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+            --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
+            --add-opens=java.base/java.net=ALL-UNNAMED
+        </jdk17JvmArgs>
     </properties>
     <build>
         <directory>${basedir}/target</directory>
@@ -223,7 +245,7 @@
                             <rules>
                                 <DependencyConvergence/>
                                 <requireJavaVersion>
-                                    <version>[1.8,12)</version>
+                                    <version>[1.8,18)</version>
                                 </requireJavaVersion>
                                 <requireMavenVersion>
                                     <version>[3.5.3,)</version>
@@ -304,7 +326,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -384,11 +406,10 @@
                             <failIfNoMatch>false</failIfNoMatch>
                         </configuration>
                     </execution>
-<!--                    <execution>-->
-<!--                    Excluded as latest tag is currently only updated for the 3.7.x branch    -->
+                    <execution>
                         <!-- sets the docker.tags.latest property to "latest" unless a prerelease version was,
                             used. If a prerelease is used, an empty string is assigned instead. -->
-<!--                    <id>build-helper-regex-set-docker-latest-tag</id>
+                        <id>build-helper-regex-set-docker-latest-tag</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>regex-property</goal>
@@ -400,7 +421,7 @@
                             <replacement></replacement>
                             <failIfNoMatch>false</failIfNoMatch>
                         </configuration>
-                    </execution> -->
+                    </execution>
                     <execution>
                         <id>parse-version</id>
                         <goals>
@@ -417,6 +438,7 @@
                         <manifestEntries>
                             <version>${project.version}</version>
                             <hash>${buildNumber}</hash>
+                            <tinkerpop-version>${project.version}</tinkerpop-version>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -452,6 +474,7 @@
                         <exclude>data/*.txt</exclude>
                         <exclude>**/bin/gremlin.sh</exclude>
                         <exclude>docs/static/**</exclude>
+                        <exclude>docs/original/**</exclude>
                         <exclude>docs/site/home/css/**</exclude>
                         <exclude>docs/site/home/js/**</exclude>
                         <exclude>docs/gremlint/build/**</exclude>
@@ -490,12 +513,16 @@
                         <exclude>**/NuGet.Config</exclude>
                         <exclude>**/*.nuspec</exclude>
                         <exclude>**/BenchmarkDotNet.Artifacts/**</exclude>
+                        <exclude>**/.nvmrc</exclude>
+                        <exclude>**/.yarnrc.yml</exclude>
+                        <exclude>**/yarn.lock</exclude>
                         <exclude>**/node/**</exclude>
                         <exclude>**/node_modules/**</exclude>
                         <exclude>**/npm-debug.log</exclude>
                         <!-- javascript docs/lib -->
                         <exclude>**/doc/**</exclude>
                         <exclude>**/lib/**</exclude>
+                        <exclude>**/.env</exclude>
                         <exclude>**/.prettierrc</exclude>
                         <exclude>**/_site/**</exclude>
                         <exclude>**/.pytest_cache/**</exclude>
@@ -569,7 +596,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <!-- reverted surefire to 2.21.0 for performance reasons. 2.22.2 required forkCount=1 and
                      reuseForks=true which seemed to more the double the build time. there are only milestone
@@ -596,6 +623,7 @@
                             -Dlog4j.configuration=${log4j-test.properties}
                             -Dbuild.dir=${project.build.directory}
                             -Dis.testing=true -Djava.net.preferIPv4Stack=true ${suresafeArgs}
+                            ${jdk17JvmArgs}
                         </argLine>
                         <trimStackTrace>false</trimStackTrace>
                         <excludes>
@@ -624,6 +652,7 @@
                                     -Dhost=localhost -Dport=8182
                                     -Dbuild.dir=${project.build.directory} -Dis.testing=true
                                     -Djava.net.preferIPv4Stack=true ${suresafeArgs}
+                                    ${jdk17JvmArgs}
                                 </argLine>
                                 <forkCount>1</forkCount>
                                 <reuseForks>false</reuseForks>
@@ -647,7 +676,7 @@
                 <plugin>
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctor-maven-plugin</artifactId>
-                    <version>1.5.8</version>
+                    <version>2.2.4</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -669,7 +698,7 @@
                 <plugin>
                     <groupId>org.codehaus.gmavenplus</groupId>
                     <artifactId>gmavenplus-plugin</artifactId>
-                    <version>1.13.1</version>
+                    <version>2.1.0</version>
                     <configuration>
                         <targetBytecode>1.8</targetBytecode>
                     </configuration>
@@ -843,41 +872,7 @@
             <dependency>
                 <groupId>org.objenesis</groupId>
                 <artifactId>objenesis</artifactId>
-                <version>2.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-module-junit4</artifactId>
-                <version>${powermock.version}</version>
-                <scope>test</scope>
-                <exclusions>
-                    <!-- conflict with mockito - excluding from the mockito side doesn't work -->
-                    <exclusion>
-                        <groupId>net.bytebuddy</groupId>
-                        <artifactId>byte-buddy</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>net.bytebuddy</groupId>
-                        <artifactId>byte-buddy-agent</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito2</artifactId>
-                <version>${powermock.version}</version>
-                <scope>test</scope>
-                <exclusions>
-                    <!-- conflict with mockito - excluding from the mockito side doesn't work -->
-                    <exclusion>
-                        <groupId>net.bytebuddy</groupId>
-                        <artifactId>byte-buddy</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>net.bytebuddy</groupId>
-                        <artifactId>byte-buddy-agent</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>3.3</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
@@ -926,7 +921,7 @@
         <profile>
             <id>jdk11</id>
             <activation>
-                <jdk>11</jdk>
+                <jdk>[11,18)</jdk>
             </activation>
             <properties>
                 <suresafeArgs>--illegal-access=permit</suresafeArgs>
@@ -1071,6 +1066,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1096,6 +1093,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1121,6 +1120,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1146,6 +1147,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1171,6 +1174,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1196,6 +1201,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1221,6 +1228,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1246,6 +1255,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1269,6 +1280,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1293,6 +1306,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1317,6 +1332,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1340,6 +1357,8 @@
                                         <stylesheet>tinkerpop.css</stylesheet>
                                         <source-highlighter>coderay</source-highlighter>
                                         <basedir>${project.basedir}</basedir>
+                                        <docinfo>shared</docinfo>
+                                        <docinfodir>${project.basedir}/docs/src</docinfodir>
                                     </attributes>
                                 </configuration>
                             </execution>
@@ -1398,7 +1417,7 @@
                                     <overview>${basedir}/docs/javadoc/overview.html</overview>
                                     <quiet>true</quiet>
                                     <sourcepath>
-                                        gremlin-annotations/src/main/java:gremlin-language/target/generated-sources/antlr4:gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-groovy/src/main/java:gremlin-groovy/target/generated-sources/annotations:gremlin-groovy/target/generated-sources/groovy-stubs/main:gremlin-server/src/main/java:gremlin-test/src/main/java:tinkergraph-gremlin/src/main/java
+                                        gremlin-annotations/src/main/java:gremlin-language/target/generated-sources/antlr4:gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-groovy/src/main/java:gremlin-groovy/target/generated-sources/annotations:gremlin-groovy/target/generated-sources/groovy-stubs/main:gremlin-server/src/main/java:gremlin-test/src/main/java:tinkergraph-gremlin/src/main/java:gremlin-util/src/main/java
                                     </sourcepath>
                                     <dependencySourceIncludes>
                                         <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
@@ -1576,28 +1595,24 @@
                                             <version>${project.version}</version>
                                         </additionalDependency>
                                         <additionalDependency>
-                                            <groupId>org.codehaus.groovy</groupId>
+                                            <groupId>org.apache.groovy</groupId>
                                             <artifactId>groovy</artifactId>
                                             <version>${groovy.version}</version>
-                                            <classifier>indy</classifier>
                                         </additionalDependency>
                                         <additionalDependency>
-                                            <groupId>org.codehaus.groovy</groupId>
+                                            <groupId>org.apache.groovy</groupId>
                                             <artifactId>groovy-jsr223</artifactId>
                                             <version>${groovy.version}</version>
-                                            <classifier>indy</classifier>
                                         </additionalDependency>
                                         <additionalDependency>
-                                            <groupId>org.codehaus.groovy</groupId>
+                                            <groupId>org.apache.groovy</groupId>
                                             <artifactId>groovy-groovysh</artifactId>
                                             <version>${groovy.version}</version>
-                                            <classifier>indy</classifier>
                                         </additionalDependency>
                                         <additionalDependency>
-                                            <groupId>org.codehaus.groovy</groupId>
+                                            <groupId>org.apache.groovy</groupId>
                                             <artifactId>groovy-json</artifactId>
                                             <version>${groovy.version}</version>
-                                            <classifier>indy</classifier>
                                         </additionalDependency>
                                         <additionalDependency>
                                             <groupId>org.apache.commons</groupId>
@@ -1645,7 +1660,7 @@
                                     <overview>${basedir}/docs/javadoc/overview.html</overview>
                                     <quiet>true</quiet>
                                     <sourcepath>
-                                        gremlin-language/target/generated-sources/antlr4:gremlin-core/src/main/java:gremlin-driver/src/main/java
+                                        gremlin-language/target/generated-sources/antlr4:gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-util/src/main/java
                                     </sourcepath>
                                     <sourceFileIncludes>
                                         <!-- jsr223 -->
@@ -1716,6 +1731,9 @@
                                         <!-- driver -->
                                         <include>org/apache/tinkerpop/gremlin/driver/*.java
                                         </include>
+                                        <!-- util -->
+                                        <include>org/apache/tinkerpop/gremlin/util/*.java
+                                        </include>
                                     </sourceFileIncludes>
                                     <additionalDependencies>
                                         <additionalDependency>
@@ -1789,16 +1807,14 @@
                                             <version>${project.version}</version>
                                         </additionalDependency>
                                         <additionalDependency>
-                                            <groupId>org.codehaus.groovy</groupId>
+                                            <groupId>org.apache.groovy</groupId>
                                             <artifactId>groovy-groovysh</artifactId>
                                             <version>${groovy.version}</version>
-                                            <classifier>indy</classifier>
                                         </additionalDependency>
                                         <additionalDependency>
-                                            <groupId>org.codehaus.groovy</groupId>
+                                            <groupId>org.apache.groovy</groupId>
                                             <artifactId>groovy-json</artifactId>
                                             <version>${groovy.version}</version>
-                                            <classifier>indy</classifier>
                                         </additionalDependency>
                                         <additionalDependency>
                                             <groupId>org.apache.commons</groupId>
@@ -1909,6 +1925,7 @@
                                 -Dlog4j.configuration=${log4j-silent.properties}
                                 -Dbuild.dir=${project.build.directory} -Dis.testing=true
                                 -Djava.net.preferIPv4Stack=true ${suresafeArgs}
+                                ${jdk17JvmArgs}
                             </argLine>
                             <excludes>
                                 <exclude>**/*IntegrateTest.java</exclude>
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 64acefc..5642702 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>spark-gremlin</artifactId>
     <name>Apache TinkerPop :: Spark Gremlin</name>
@@ -74,6 +74,11 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
                 </exclusion>
+                <!-- Spark requires a specific range of jackson-databind. See dependency section below. -->
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-math3</artifactId>
@@ -156,6 +161,16 @@
                     <groupId>org.apache.ivy</groupId>
                     <artifactId>ivy</artifactId>
                 </exclusion>
+                <!-- Spark 3.3.2 includes self-conflicting versions of snappy -->
+                <exclusion>
+                    <groupId>org.xerial.snappy</groupId>
+                    <artifactId>snappy-java</artifactId>
+                </exclusion>
+                <!-- Excluding this log4j binding as it leads to NoSuchMethodErrors -->
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- resolve spark-gremlin conflicts -->
@@ -206,23 +221,23 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.12.10</version>
+            <version>2.12.15</version>
         </dependency>
-        <!-- use jackson 2.12.7 to fit better with spark where Scala module 2.12.3 requires Jackson Databind version >= 2.12.0 and < 2.13.0 -->
+        <!-- use jackson 2.13.5 to fit better with spark 2.3.3 where Scala module 2.13.4 requires Jackson Databind version >= 2.13.0 and < 2.14.0 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.12.7</version>
+            <version>2.13.5</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.12.7</version>
+            <version>2.13.5</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.7</version>
+            <version>2.13.5</version>
         </dependency>
         <!-- TEST -->
         <dependency>
@@ -260,6 +275,12 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Spark contains conflicting versions of snappy so it is excluded above. Include the newer version here. -->
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <version>1.1.8.4</version>
+        </dependency>
     </dependencies>
     <build>
         <directory>${basedir}/target</directory>
@@ -331,13 +352,6 @@
                             <Gremlin-Plugin-Dependencies>
                                 org.apache.hadoop:hadoop-client:${hadoop.version};org.apache.hadoop:hadoop-yarn-server-web-proxy:${hadoop.version};org.apache.spark:spark-yarn_2.12:${spark.version}
                             </Gremlin-Plugin-Dependencies>
-                            <!-- initialization failures for using jackson after 2.12.* and hadoop pulls these in -->
-                            <Gremlin-Plugin-Paths>
-                                jackson-annotations-2.13.2.jar=;jackson-databind-2.13.2.2.jar=;jackson-core-2.13.2.jar=
-                            </Gremlin-Plugin-Paths>
-                            <Gremlin-Lib-Paths>
-                                jackson-annotations-2.13.2.jar=;jackson-databind-2.13.2.2.jar=;jackson-core-2.13.2.jar=
-                            </Gremlin-Lib-Paths>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIOUtil.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIOUtil.java
index 1415b75..16dccf3 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIOUtil.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIOUtil.java
@@ -48,7 +48,7 @@
      *     Configuration sparkGraphConfiguration = new BaseConfiguration();
      *     sparkGraphConfiguration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
      *     sparkGraphConfiguration.setProperty(Constants.MAPREDUCE_INPUT_FILEINPUTFORMAT_INPUTDIR,
-     *         SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+     *         SparkHadoopGraphProvider.PATHS.get("tinkerpop-modern-v3.kryo"));
      *
      *     // load vertices
      *     JavaPairRDD verticesRDD = SparkIOUtil.loadVertices(sparkGraphConfiguration, sparkContext);
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java
index d0e46da..8e154c8 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoRegistrator.java
@@ -40,7 +40,7 @@
 import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoSerializersV1d0;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoSerializersV1;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.TypeRegistration;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.SerializerShim;
@@ -214,23 +214,23 @@
         m.put(VertexWritable.class, new UnshadedSerializerAdapter<>(new VertexWritableSerializer()));
         m.put(ObjectWritable.class, new UnshadedSerializerAdapter<>(new ObjectWritableSerializer<>()));
         //
-        m.put(HadoopVertex.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.VertexSerializer()));
-        m.put(HadoopVertexProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.VertexPropertySerializer()));
-        m.put(HadoopProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.PropertySerializer()));
-        m.put(HadoopEdge.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.EdgeSerializer()));
+        m.put(HadoopVertex.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.VertexSerializer()));
+        m.put(HadoopVertexProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.VertexPropertySerializer()));
+        m.put(HadoopProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.PropertySerializer()));
+        m.put(HadoopEdge.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.EdgeSerializer()));
         //
-        m.put(ComputerGraph.ComputerVertex.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.VertexSerializer()));
-        m.put(ComputerGraph.ComputerVertexProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.VertexPropertySerializer()));
-        m.put(ComputerGraph.ComputerProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.PropertySerializer()));
-        m.put(ComputerGraph.ComputerEdge.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.EdgeSerializer()));
+        m.put(ComputerGraph.ComputerVertex.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.VertexSerializer()));
+        m.put(ComputerGraph.ComputerVertexProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.VertexPropertySerializer()));
+        m.put(ComputerGraph.ComputerProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.PropertySerializer()));
+        m.put(ComputerGraph.ComputerEdge.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.EdgeSerializer()));
         //
-        m.put(StarGraph.StarEdge.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.EdgeSerializer()));
-        m.put(StarGraph.StarVertex.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.VertexSerializer()));
-        m.put(StarGraph.StarProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.PropertySerializer()));
-        m.put(StarGraph.StarVertexProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.VertexPropertySerializer()));
+        m.put(StarGraph.StarEdge.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.EdgeSerializer()));
+        m.put(StarGraph.StarVertex.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.VertexSerializer()));
+        m.put(StarGraph.StarProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.PropertySerializer()));
+        m.put(StarGraph.StarVertexProperty.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.VertexPropertySerializer()));
         //
-        m.put(MutablePath.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.PathSerializer()));
-        m.put(ImmutablePath.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1d0.PathSerializer()));
+        m.put(MutablePath.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.PathSerializer()));
+        m.put(ImmutablePath.class, new UnshadedSerializerAdapter<>(new GryoSerializersV1.PathSerializer()));
         //
         m.put(CompactBuffer[].class, null);
         // TODO: VoidSerializer is a default serializer and thus, may not be needed (if it is, you can't use FieldSerializer)
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/AbstractIoRegistryCheck.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/AbstractIoRegistryCheck.java
index 1500439..5da2524 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/AbstractIoRegistryCheck.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/AbstractIoRegistryCheck.java
@@ -63,7 +63,7 @@
 
     private static final int NUMBER_OF_VERTICES = 1000;
 
-    public void checkGryoV1d0IoRegistryCompliance(final HadoopGraph graph, final Class<? extends GraphComputer> graphComputerClass) throws Exception {
+    public void checkGryoV1IoRegistryCompliance(final HadoopGraph graph, final Class<? extends GraphComputer> graphComputerClass) throws Exception {
         final File input = TestHelper.generateTempFile(this.getClass(), "gryo-io-registry", ".kryo");
         graph.configuration().setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         graph.configuration().setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, GryoOutputFormat.class.getCanonicalName());
@@ -75,7 +75,7 @@
         input.deleteOnExit();
     }
 
-    public void checkGryoV3d0IoRegistryCompliance(final HadoopGraph graph, final Class<? extends GraphComputer> graphComputerClass) throws Exception {
+    public void checkGryoV3IoRegistryCompliance(final HadoopGraph graph, final Class<? extends GraphComputer> graphComputerClass) throws Exception {
         final File input = TestHelper.generateTempFile(this.getClass(), "gryo-io-registry", ".kryo");
         graph.configuration().setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         graph.configuration().setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, GryoOutputFormat.class.getCanonicalName());
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/SparkGraphFeatureIntegrateTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/SparkGraphFeatureIntegrateTest.java
index a2b1a3d..d3f9bed 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/SparkGraphFeatureIntegrateTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/SparkGraphFeatureIntegrateTest.java
@@ -57,7 +57,7 @@
 
 @RunWith(Cucumber.class)
 @CucumberOptions(
-        tags = "not @RemoteOnly and not @StepDrop and not @StepV and not @StepIndex and not @StepInject and " +
+        tags = "not @RemoteOnly and not @StepDrop and not @StepV and not @StepE and not @StepIndex and not @StepInject and " +
                "not @GraphComputerVerificationOneBulk and not @GraphComputerVerificationStrategyNotSupported and " +
                "not @GraphComputerVerificationMidVNotSupported and not @GraphComputerVerificationElementSupported and " +
                "not @GraphComputerVerificationInjectionNotSupported and " +
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
index f26d6b0..f0eb293 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/LocalPropertyTest.java
@@ -57,7 +57,7 @@
         configuration.setProperty("spark.master", "local[4]");
         configuration.setProperty("spark.serializer", GryoSerializer.class.getCanonicalName());
         configuration.setProperty(Graph.GRAPH, HadoopGraph.class.getName());
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, rddName);
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java
index 446b73c..c43cadd 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkInterceptorStrategyTest.java
@@ -62,7 +62,7 @@
     @Test
     public void shouldHandleSideEffectsCorrectly() throws Exception {
         final Configuration configuration = getBaseConfiguration();
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, TestHelper.makeTestDataDirectory(SparkSingleIterationStrategyTest.class, UUID.randomUUID().toString()));
@@ -92,7 +92,7 @@
     @Test
     public void shouldSuccessfullyEvaluateInterceptedTraversals() throws Exception {
         final Configuration configuration = getBaseConfiguration();
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, TestHelper.makeTestDataDirectory(SparkSingleIterationStrategyTest.class, UUID.randomUUID().toString()));
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java
index cbd8cd4..cb4c728 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/SparkSingleIterationStrategyTest.java
@@ -63,8 +63,8 @@
     @Parameterized.Parameters(name = "expect({0})")
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][]{
-                {"V1d0", GryoVersion.V1_0},
-                {"V3d0", GryoVersion.V3_0}});
+                {"V1", GryoVersion.V1_0},
+                {"V3", GryoVersion.V3_0}});
     }
 
     @Parameterized.Parameter(value = 0)
@@ -77,7 +77,7 @@
     public void shouldSuccessfullyEvaluateSingleIterationTraversals() throws Exception {
         final String outputLocation = TestHelper.makeTestDataDirectory(SparkSingleIterationStrategyTest.class, UUID.randomUUID().toString());
         Configuration configuration = getBaseConfiguration();
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, outputLocation);
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java
index 57857b3..2bd4c94 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/SparkTest.java
@@ -61,7 +61,7 @@
 
         configuration.setProperty("spark.serializer", GryoSerializer.class.getCanonicalName());
         configuration.setProperty(Graph.GRAPH, HadoopGraph.class.getName());
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_JARS_IN_DISTRIBUTED_CACHE, false);
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java
index b675615..cf7a175 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/OutputRDDTest.java
@@ -47,7 +47,7 @@
         configuration.setProperty("spark.master", "local[4]");
         configuration.setProperty("spark.serializer", GryoSerializer.class.getCanonicalName());
         configuration.setProperty(Graph.GRAPH, HadoopGraph.class.getName());
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, ExampleOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, TestHelper.makeTestDataDirectory(this.getClass(), "shouldWriteToArbitraryRDD"));
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/PersistedInputOutputRDDIntegrateTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/PersistedInputOutputRDDIntegrateTest.java
index ded8698..281920c 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/PersistedInputOutputRDDIntegrateTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/PersistedInputOutputRDDIntegrateTest.java
@@ -57,7 +57,7 @@
         Spark.create("local[4]");
         final String rddName = TestHelper.makeTestDataDirectory(PersistedInputOutputRDDIntegrateTest.class, UUID.randomUUID().toString());
         final Configuration configuration = super.getBaseConfiguration();
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, GryoOutputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, rddName);
@@ -85,7 +85,7 @@
             counter++;
             final String rddName = TestHelper.makeTestDataDirectory(PersistedInputOutputRDDIntegrateTest.class, UUID.randomUUID().toString());
             final Configuration configuration = super.getBaseConfiguration();
-            configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+            configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
             configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
             configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
             configuration.setProperty(Constants.GREMLIN_SPARK_PERSIST_STORAGE_LEVEL, storageLevel);
@@ -113,7 +113,7 @@
         Spark.create("local[4]");
         final String rddName = TestHelper.makeTestDataDirectory(PersistedInputOutputRDDIntegrateTest.class, UUID.randomUUID().toString());
         final Configuration configuration = super.getBaseConfiguration();
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, rddName);
@@ -139,7 +139,7 @@
         final String rddName = TestHelper.makeTestDataDirectory(PersistedInputOutputRDDIntegrateTest.class, UUID.randomUUID().toString());
         final String rddName2 = TestHelper.makeTestDataDirectory(PersistedInputOutputRDDIntegrateTest.class, UUID.randomUUID().toString());
         final Configuration configuration = super.getBaseConfiguration();
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, rddName);
@@ -212,7 +212,7 @@
         final String rddName2 = TestHelper.makeTestDataDirectory(PersistedInputOutputRDDIntegrateTest.class, "testComplexChain", "graphRDD2");
         final Configuration configuration = super.getBaseConfiguration();
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
-        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+        configuration.setProperty(Constants.GREMLIN_HADOOP_INPUT_LOCATION, TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
         configuration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_WRITER, PersistedOutputRDD.class.getCanonicalName());
         configuration.setProperty(Constants.GREMLIN_HADOOP_OUTPUT_LOCATION, rddName);
         configuration.setProperty(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, true);
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIoRegistryCheck.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIoRegistryCheck.java
index 11fac14..45af104 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIoRegistryCheck.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkIoRegistryCheck.java
@@ -53,13 +53,13 @@
     }
 
     @Test
-    public void shouldSupportGryoV1d0IoRegistry() throws Exception {
-        super.checkGryoV1d0IoRegistryCompliance((HadoopGraph) graph, SparkGraphComputer.class);
+    public void shouldSupportGryoV1IoRegistry() throws Exception {
+        super.checkGryoV1IoRegistryCompliance((HadoopGraph) graph, SparkGraphComputer.class);
     }
 
     @Test
-    public void shouldSupportGryoV3d0IoRegistry() throws Exception {
-        super.checkGryoV3d0IoRegistryCompliance((HadoopGraph) graph, SparkGraphComputer.class);
+    public void shouldSupportGryoV3IoRegistry() throws Exception {
+        super.checkGryoV3IoRegistryCompliance((HadoopGraph) graph, SparkGraphComputer.class);
     }
 
     @Test
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkRDDLoadTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkRDDLoadTest.java
index f7955aa..791ae3a 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkRDDLoadTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkRDDLoadTest.java
@@ -69,7 +69,7 @@
         final Configuration sparkGraphConfiguration = new BaseConfiguration();
         sparkGraphConfiguration.setProperty(Constants.GREMLIN_HADOOP_GRAPH_READER, GryoInputFormat.class.getCanonicalName());
         sparkGraphConfiguration.setProperty(Constants.MAPREDUCE_INPUT_FILEINPUTFORMAT_INPUTDIR,
-                TestFiles.PATHS.get("tinkerpop-modern-v3d0.kryo"));
+                TestFiles.PATHS.get("tinkerpop-modern-v3.kryo"));
 
         // load vertices
         JavaPairRDD<Object, VertexWritable> verticesRDD = SparkIOUtil.loadVertices(sparkGraphConfiguration, sparkContext);
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
index d167756..68663ed 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
@@ -61,7 +61,7 @@
             try {
                 final Graph graph = TinkerGraph.open();
                 final GraphReader reader = GryoReader.build().mapper(graph.io(GryoIo.build()).mapper().create()).create();
-                try (final InputStream stream = GryoResourceAccess.class.getResourceAsStream("grateful-dead-v3d0.kryo")) {
+                try (final InputStream stream = GryoResourceAccess.class.getResourceAsStream("grateful-dead-v3.kryo")) {
                     reader.readGraph(stream, graph);
                 }
                 vertices = IteratorUtils.list(IteratorUtils.map(graph.vertices(), VertexWritable::new));
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index 3edc2ca..49df1e9 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>sparql-gremlin</artifactId>
     <name>Apache TinkerPop :: SPARQL Gremlin</name>
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index 957c72e..f262d56 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.6.8-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
     </parent>
     <artifactId>tinkergraph-gremlin</artifactId>
     <name>Apache TinkerPop :: TinkerGraph Gremlin</name>
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java
index f71a1b2..8ff1707 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/jsr223/TinkerGraphGremlinPlugin.java
@@ -34,9 +34,9 @@
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraphVariables;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty;
@@ -54,9 +54,9 @@
                     TinkerGraph.class,
                     TinkerGraphVariables.class,
                     TinkerHelper.class,
-                    TinkerIoRegistryV1d0.class,
-                    TinkerIoRegistryV2d0.class,
-                    TinkerIoRegistryV3d0.class,
+                    TinkerIoRegistryV1.class,
+                    TinkerIoRegistryV2.class,
+                    TinkerIoRegistryV3.class,
                     TinkerProperty.class,
                     TinkerVertex.class,
                     TinkerVertexProperty.class,
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java
index f406847..ca76b0e 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java
@@ -36,6 +36,7 @@
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
 
@@ -67,7 +68,7 @@
     private Persist persist = null;
 
     private VertexProgram<?> vertexProgram;
-    private final TinkerGraph graph;
+    private final AbstractTinkerGraph graph;
     private TinkerMemory memory;
     private final TinkerMessageBoard messageBoard = new TinkerMessageBoard();
     private boolean executed = false;
@@ -83,7 +84,7 @@
      */
     private final ExecutorService computerService = Executors.newSingleThreadExecutor(threadFactoryBoss);
 
-    public TinkerGraphComputer(final TinkerGraph graph) {
+    public TinkerGraphComputer(final AbstractTinkerGraph graph) {
         this.graph = graph;
     }
 
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputerView.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputerView.java
index 40a497b..3b0629d 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputerView.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputerView.java
@@ -32,6 +32,7 @@
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex;
@@ -53,7 +54,7 @@
  */
 public final class TinkerGraphComputerView {
 
-    private final TinkerGraph graph;
+    private final AbstractTinkerGraph graph;
     protected final Map<String, VertexComputeKey> computeKeys;
     private Map<Element, Map<String, List<VertexProperty<?>>>> computeProperties;
     private final Set<Object> legalVertices = new HashSet<>();
@@ -61,7 +62,7 @@
     private final GraphFilter graphFilter;
     private final Set<String> retainVertexProperties;
 
-    public TinkerGraphComputerView(final TinkerGraph graph, final GraphFilter graphFilter, final Set<VertexComputeKey> computeKeys) {
+    public TinkerGraphComputerView(final AbstractTinkerGraph graph, final GraphFilter graphFilter, final Set<VertexComputeKey> computeKeys) {
         this.graph = graph;
         this.computeKeys = new HashMap<>();
         computeKeys.forEach(key -> this.computeKeys.put(key.getKey(), key));
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java
index 637b416..6ff24c3 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerWorkerPool.java
@@ -24,6 +24,7 @@
 import org.apache.tinkerpop.gremlin.process.computer.util.MapReducePool;
 import org.apache.tinkerpop.gremlin.process.computer.util.VertexProgramPool;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
 import org.apache.tinkerpop.gremlin.util.function.TriConsumer;
@@ -56,7 +57,7 @@
     private final Queue<TinkerWorkerMemory> workerMemoryPool = new ConcurrentLinkedQueue<>();
     private final List<List<Vertex>> workerVertices = new ArrayList<>();
 
-    public TinkerWorkerPool(final TinkerGraph graph, final TinkerMemory memory, final int numberOfWorkers) {
+    public TinkerWorkerPool(final AbstractTinkerGraph graph, final TinkerMemory memory, final int numberOfWorkers) {
         this.numberOfWorkers = numberOfWorkers;
         this.workerPool = Executors.newFixedThreadPool(numberOfWorkers, THREAD_FACTORY_WORKER);
         this.completionService = new ExecutorCompletionService<>(this.workerPool);
@@ -64,7 +65,7 @@
             this.workerMemoryPool.add(new TinkerWorkerMemory(memory));
             this.workerVertices.add(new ArrayList<>());
         }
-        int batchSize = TinkerHelper.getVertices(graph).size() / this.numberOfWorkers;
+        int batchSize = graph.getVerticesCount() / this.numberOfWorkers;
         if (0 == batchSize)
             batchSize = 1;
         int counter = 0;
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerCountGlobalStep.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerCountGlobalStep.java
index e0e7b80..786e09e 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerCountGlobalStep.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerCountGlobalStep.java
@@ -27,6 +27,7 @@
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
 
@@ -49,10 +50,10 @@
     protected Traverser.Admin<Long> processNextStart() throws NoSuchElementException {
         if (!this.done) {
             this.done = true;
-            final TinkerGraph graph = (TinkerGraph) this.getTraversal().getGraph().get();
+            final AbstractTinkerGraph graph = (AbstractTinkerGraph) this.getTraversal().getGraph().get();
             return this.getTraversal().getTraverserGenerator().generate(Vertex.class.isAssignableFrom(this.elementClass) ?
-                            (long) TinkerHelper.getVertices(graph).size() :
-                            (long) TinkerHelper.getEdges(graph).size(),
+                            (long) graph.getVerticesCount() :
+                            (long) graph.getEdgesCount(),
                     (Step) this, 1L);
         } else
             throw FastNoSuchElementException.instance();
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
index 80242dc..6a3e965 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
@@ -22,7 +22,6 @@
 import org.apache.tinkerpop.gremlin.process.traversal.GremlinTypeErrorException;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.step.HasContainerHolder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.BinaryReductionStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
@@ -32,9 +31,9 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraphIterator;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIndexHelper;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import java.util.ArrayList;
@@ -69,7 +68,7 @@
     }
 
     private Iterator<? extends Edge> edges() {
-        final TinkerGraph graph = (TinkerGraph) this.getTraversal().getGraph().get();
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) this.getTraversal().getGraph().get();
         final HasContainer indexedContainer = getIndexKey(Edge.class);
         Iterator<Edge> iterator;
         // ids are present, filter on them first
@@ -80,7 +79,7 @@
         else
             iterator = null == indexedContainer ?
                     this.iteratorList(graph.edges()) :
-                    TinkerHelper.queryEdgeIndex(graph, indexedContainer.getKey(), indexedContainer.getPredicate().getValue()).stream()
+                    TinkerIndexHelper.queryEdgeIndex(graph, indexedContainer.getKey(), indexedContainer.getPredicate().getValue()).stream()
                                 .filter(edge -> HasContainer.testAll(edge, this.hasContainers))
                                 .collect(Collectors.<Edge>toList()).iterator();
 
@@ -91,7 +90,7 @@
     }
 
     private Iterator<? extends Vertex> vertices() {
-        final TinkerGraph graph = (TinkerGraph) this.getTraversal().getGraph().get();
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) this.getTraversal().getGraph().get();
         final HasContainer indexedContainer = getIndexKey(Vertex.class);
         Iterator<? extends Vertex> iterator;
         // ids are present, filter on them first
@@ -102,7 +101,7 @@
         else
             iterator = (null == indexedContainer ?
                     this.iteratorList(graph.vertices()) :
-                    IteratorUtils.filter(TinkerHelper.queryVertexIndex(graph, indexedContainer.getKey(), indexedContainer.getPredicate().getValue()).iterator(),
+                    IteratorUtils.filter(TinkerIndexHelper.queryVertexIndex(graph, indexedContainer.getKey(), indexedContainer.getPredicate().getValue()).iterator(),
                                          vertex -> HasContainer.testAll(vertex, this.hasContainers)));
 
         iterators.add(iterator);
@@ -111,7 +110,7 @@
     }
 
     private HasContainer getIndexKey(final Class<? extends Element> indexedClass) {
-        final Set<String> indexedKeys = ((TinkerGraph) this.getTraversal().getGraph().get()).getIndexedKeys(indexedClass);
+        final Set<String> indexedKeys = ((AbstractTinkerGraph) this.getTraversal().getGraph().get()).getIndexedKeys(indexedClass);
 
         final Iterator<HasContainer> itty = IteratorUtils.filter(hasContainers.iterator(),
                 c -> c.getPredicate().getBiPredicate() == Compare.eq && indexedKeys.contains(c.getKey()));
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphCountStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphCountStrategy.java
index 8182e70..1002bb5 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphCountStrategy.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphCountStrategy.java
@@ -29,8 +29,6 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateGlobalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.CollectingBarrierStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.structure.Element;
@@ -41,8 +39,8 @@
 import java.util.Set;
 
 /**
- * This strategy will do a direct {@link org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper#getVertices}
- * size call if the traversal is a count of the vertices and edges of the graph or a one-to-one map chain thereof.
+ * This strategy will do a graph size call if the traversal is a count of the vertices and edges of the graph
+ * or a one-to-one map chain thereof.
  *
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  * @example <pre>
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerDegreeCentralityFactory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerDegreeCentralityFactory.java
index c0e0cae..1586f0d 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerDegreeCentralityFactory.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerDegreeCentralityFactory.java
@@ -24,7 +24,7 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.service.Service;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import java.util.Collections;
@@ -32,7 +32,7 @@
 import java.util.Set;
 import java.util.stream.LongStream;
 
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
 
 /**
  * Count the IN/OUT/BOTH edges for a set of vertices. Demonstrates a {@link Service.Type#Streaming} service.
@@ -52,7 +52,7 @@
         );
     }
 
-    public TinkerDegreeCentralityFactory(final TinkerGraph graph) {
+    public TinkerDegreeCentralityFactory(final AbstractTinkerGraph graph) {
         super(graph, NAME);
     }
 
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerServiceRegistry.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerServiceRegistry.java
index efc09b0..69afd29 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerServiceRegistry.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerServiceRegistry.java
@@ -24,13 +24,11 @@
 import org.apache.tinkerpop.gremlin.structure.service.Service;
 import org.apache.tinkerpop.gremlin.structure.service.ServiceRegistry;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.util.function.TriFunction;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -45,9 +43,9 @@
  */
 public class TinkerServiceRegistry extends ServiceRegistry {
 
-    private final TinkerGraph graph;
+    private final AbstractTinkerGraph graph;
 
-    public TinkerServiceRegistry(final TinkerGraph graph) {
+    public TinkerServiceRegistry(final AbstractTinkerGraph graph) {
         this.graph = graph;
     }
 
@@ -61,12 +59,12 @@
     }
 
     public abstract static class TinkerServiceFactory<I, R> implements ServiceFactory<I, R> {
-        protected final TinkerGraph graph;
+        protected final AbstractTinkerGraph graph;
         protected final String name;
         protected final Map describeParams = new LinkedHashMap();
         protected final Map<Type,Set<TraverserRequirement>> requirements = new LinkedHashMap<>();
 
-        protected TinkerServiceFactory(final TinkerGraph graph, final String name) {
+        protected TinkerServiceFactory(final AbstractTinkerGraph graph, final String name) {
             this.graph = graph;
             this.name = name;
         }
@@ -134,7 +132,7 @@
 
         private Map<Type, Service<I, R>> lambdas = new LinkedHashMap<>();
 
-        public LambdaServiceFactory(final TinkerGraph graph, final String name) {
+        public LambdaServiceFactory(final AbstractTinkerGraph graph, final String name) {
             super(graph, name);
         }
 
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerTextSearchFactory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerTextSearchFactory.java
index 8861a3a..9708591 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerTextSearchFactory.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/services/TinkerTextSearchFactory.java
@@ -24,7 +24,7 @@
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.service.Service;
 import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
 
 import java.util.Collections;
@@ -33,7 +33,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
 
 /**
  * Inefficient text search implementation (scan+filter), searches for {@link Property}s by token/regex.
@@ -79,7 +79,7 @@
         }
     }
 
-    public TinkerTextSearchFactory(final TinkerGraph graph) {
+    public TinkerTextSearchFactory(final AbstractTinkerGraph graph) {
         super(graph, NAME);
     }
 
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerGraph.java
new file mode 100644
index 0000000..4ce7e1a
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerGraph.java
@@ -0,0 +1,581 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.Io;
+import org.apache.tinkerpop.gremlin.structure.io.IoCore;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputerView;
+import org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerServiceRegistry;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
+
+/**
+ * Base class for {@link TinkerGraph} and {@link TinkerTransactionGraph}.
+ * Contains common methods, variables and constants, but leaves the work with elements and indices
+ * to concrete implementations.
+ *
+ * @author Valentyn Kahamlyk
+ */
+public abstract class AbstractTinkerGraph implements Graph {
+
+    public static final String GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER = "gremlin.tinkergraph.vertexIdManager";
+    public static final String GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER = "gremlin.tinkergraph.edgeIdManager";
+    public static final String GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER = "gremlin.tinkergraph.vertexPropertyIdManager";
+    public static final String GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY = "gremlin.tinkergraph.defaultVertexPropertyCardinality";
+    public static final String GREMLIN_TINKERGRAPH_GRAPH_LOCATION = "gremlin.tinkergraph.graphLocation";
+    public static final String GREMLIN_TINKERGRAPH_GRAPH_FORMAT = "gremlin.tinkergraph.graphFormat";
+    public static final String GREMLIN_TINKERGRAPH_ALLOW_NULL_PROPERTY_VALUES = "gremlin.tinkergraph.allowNullPropertyValues";
+    public static final String GREMLIN_TINKERGRAPH_SERVICE = "gremlin.tinkergraph.service";
+
+
+    protected AtomicLong currentId = new AtomicLong(-1L);
+
+    protected TinkerGraphVariables variables = null;
+    protected TinkerGraphComputerView graphComputerView = null;
+    protected AbstractTinkerIndex<TinkerVertex> vertexIndex = null;
+    protected AbstractTinkerIndex<TinkerEdge> edgeIndex = null;
+
+    protected IdManager<Vertex> vertexIdManager;
+    protected IdManager<Edge> edgeIdManager;
+    protected IdManager<VertexProperty> vertexPropertyIdManager;
+    protected VertexProperty.Cardinality defaultVertexPropertyCardinality;
+    protected boolean allowNullPropertyValues;
+
+    protected TinkerServiceRegistry serviceRegistry;
+
+    protected Configuration configuration;
+    protected String graphLocation;
+    protected String graphFormat;
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract Vertex addVertex(final Object... keyValues);
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract void removeVertex(final Object vertexId);
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract Edge addEdge(final TinkerVertex outVertex, final TinkerVertex inVertex, final String label, final Object... keyValues);
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract void removeEdge(final Object edgeId);
+
+    /**
+     * Mark {@link Vertex} as changed in transaction.
+     * If the graph does not support transactions, then does nothing.
+     * @param vertex
+     */
+    public void touch(final TinkerVertex vertex) {};
+
+    /**
+     * Mark {@link Edge} as changed in transaction.
+     * If the graph does not support transactions, then does nothing.
+     * @param edge
+     */
+    public void touch(final TinkerEdge edge) {};
+
+    /**
+     * Return {@link Vertex} by id.
+     * Does not create an iterator, so is the preferred method when only 1 element needs to be returned.
+     * @param vertexId
+     * @return Vertex
+     */
+    public abstract Vertex vertex(final Object vertexId);
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract Iterator<Vertex> vertices(final Object... vertexIds);
+
+    /**
+     * Return {@link Edge} by id.
+     * Does not create an iterator, so is the preferred method when only 1 element needs to be returned.
+     * @param edgeId
+     * @return Edge
+     */
+    public abstract Edge edge(final Object edgeId);
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract Iterator<Edge> edges(final Object... edgeIds);
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract Transaction tx();
+
+    /**
+     * Graph-specific implementation for number of vertices.
+     * @return count of vertices in Graph.
+     */
+    public abstract int getVerticesCount();
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract boolean hasVertex(final Object id);
+
+    /**
+     * Graph-specific implementation for number of vertices.
+     * @return count of vertices in Graph.
+     */
+    public abstract int getEdgesCount();
+
+    /**
+     * {@inheritDoc}
+     */
+    public abstract boolean hasEdge(final Object id);
+
+    protected void loadGraph() {
+        final File f = new File(graphLocation);
+        if (f.exists() && f.isFile()) {
+            try {
+                if (graphFormat.equals("graphml")) {
+                    io(IoCore.graphml()).readGraph(graphLocation);
+                } else if (graphFormat.equals("graphson")) {
+                    io(IoCore.graphson()).readGraph(graphLocation);
+                } else if (graphFormat.equals("gryo")) {
+                    io(IoCore.gryo()).readGraph(graphLocation);
+                } else {
+                    io(IoCore.createIoBuilder(graphFormat)).readGraph(graphLocation);
+                }
+            } catch (Exception ex) {
+                throw new RuntimeException(String.format("Could not load graph at %s with %s", graphLocation, graphFormat), ex);
+            }
+        }
+    }
+
+    protected void saveGraph() {
+        final File f = new File(graphLocation);
+        if (f.exists()) {
+            f.delete();
+        } else {
+            final File parent = f.getParentFile();
+
+            // the parent would be null in the case of an relative path if the graphLocation was simply: "f.gryo"
+            if (parent != null && !parent.exists()) {
+                parent.mkdirs();
+            }
+        }
+
+        try {
+            if (graphFormat.equals("graphml")) {
+                io(IoCore.graphml()).writeGraph(graphLocation);
+            } else if (graphFormat.equals("graphson")) {
+                io(IoCore.graphson()).writeGraph(graphLocation);
+            } else if (graphFormat.equals("gryo")) {
+                io(IoCore.gryo()).writeGraph(graphLocation);
+            } else {
+                io(IoCore.createIoBuilder(graphFormat)).writeGraph(graphLocation);
+            }
+        } catch (Exception ex) {
+            throw new RuntimeException(String.format("Could not save graph at %s with %s", graphLocation, graphFormat), ex);
+        }
+    }
+
+
+    @Override
+    public <I extends Io> I io(final Io.Builder<I> builder) {
+        if (builder.requiresVersion(GryoVersion.V1_0) || builder.requiresVersion(GraphSONVersion.V1_0))
+            return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV1.instance())).create();
+        else if (builder.requiresVersion(GraphSONVersion.V2_0))   // there is no gryo v2
+            return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV2.instance())).create();
+        else
+            return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV3.instance())).create();
+    }
+
+    ////////////// STRUCTURE API METHODS //////////////////
+    public <C extends GraphComputer> C compute(final Class<C> graphComputerClass) {
+        if (!graphComputerClass.equals(TinkerGraphComputer.class))
+            throw Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
+        return (C) new TinkerGraphComputer(this);
+    }
+
+    public GraphComputer compute() { return new TinkerGraphComputer(this); }
+
+    public Variables variables() {
+        if (null == this.variables)
+            this.variables = new TinkerGraphVariables();
+        return this.variables;
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.graphString(this, "vertices:" + this.getVerticesCount() + " edges:" + this.getEdgesCount());
+    }
+
+    /**
+     * Clear internal graph data
+     */
+    public void clear() {
+        this.variables = null;
+        this.currentId.set(-1L);
+        this.vertexIndex = null;
+        this.edgeIndex = null;
+        this.graphComputerView = null;
+    }
+
+    /**
+     * This method only has an effect if the {@link TinkerGraph#GREMLIN_TINKERGRAPH_GRAPH_LOCATION} is set, in which case the
+     * data in the graph is persisted to that location. This method may be called multiple times and does not release
+     * resources.
+     */
+    @Override
+    public void close() {
+        if (graphLocation != null) saveGraph();
+        // shutdown services
+        serviceRegistry.close();
+    }
+
+    @Override
+    public Configuration configuration() {
+        return configuration;
+    }
+
+    ///////////// Utility methods ///////////////
+    protected abstract void addOutEdge(final TinkerVertex vertex, final String label, final Edge edge);
+
+    protected abstract void addInEdge(final TinkerVertex vertex, final String label, final Edge edge);
+
+    protected TinkerVertex createTinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph) {
+        return new TinkerVertex(id, label, graph);
+    }
+
+    protected TinkerVertex createTinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph, final long currentVersion) {
+        return new TinkerVertex(id, label, graph, currentVersion);
+    }
+
+    protected TinkerEdge createTinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex) {
+        return new TinkerEdge(id, outVertex, label, inVertex);
+    }
+
+    protected TinkerEdge createTinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex, final long currentVersion) {
+        return new TinkerEdge(id, outVertex, label, inVertex, currentVersion);
+    }
+
+    ///////////// Features ///////////////
+
+    public class TinkerGraphVertexFeatures implements Features.VertexFeatures {
+
+        private final TinkerTransactionGraph.TinkerGraphVertexPropertyFeatures vertexPropertyFeatures = new TinkerTransactionGraph.TinkerGraphVertexPropertyFeatures();
+
+        protected TinkerGraphVertexFeatures() {
+        }
+
+        @Override
+        public boolean supportsNullPropertyValues() {
+            return allowNullPropertyValues;
+        }
+
+        @Override
+        public Features.VertexPropertyFeatures properties() {
+            return vertexPropertyFeatures;
+        }
+
+        @Override
+        public boolean supportsCustomIds() {
+            return false;
+        }
+
+        @Override
+        public boolean willAllowId(final Object id) {
+            return vertexIdManager.allow(id);
+        }
+
+        @Override
+        public VertexProperty.Cardinality getCardinality(final String key) {
+            return defaultVertexPropertyCardinality;
+        }
+    }
+
+    public class TinkerGraphEdgeFeatures implements Features.EdgeFeatures {
+
+        protected TinkerGraphEdgeFeatures() {
+        }
+
+        @Override
+        public boolean supportsNullPropertyValues() {
+            return allowNullPropertyValues;
+        }
+
+        @Override
+        public boolean supportsCustomIds() {
+            return false;
+        }
+
+        @Override
+        public boolean willAllowId(final Object id) {
+            return edgeIdManager.allow(id);
+        }
+    }
+
+    public class TinkerGraphVertexPropertyFeatures implements Features.VertexPropertyFeatures {
+
+        protected TinkerGraphVertexPropertyFeatures() {
+        }
+
+        @Override
+        public boolean supportsNullPropertyValues() {
+            return allowNullPropertyValues;
+        }
+
+        @Override
+        public boolean supportsCustomIds() {
+            return false;
+        }
+
+        @Override
+        public boolean willAllowId(final Object id) {
+            return vertexIdManager.allow(id);
+        }
+    }
+
+    ///////////// GRAPH SPECIFIC INDEXING METHODS ///////////////
+
+    /**
+     * Return all the keys currently being index for said element class  ({@link Vertex} or {@link Edge}).
+     *
+     * @param elementClass the element class to get the indexed keys for
+     * @param <E>          The type of the element class
+     * @return the set of keys currently being indexed
+     */
+    public <E extends Element> Set<String> getIndexedKeys(final Class<E> elementClass) {
+        if (Vertex.class.isAssignableFrom(elementClass)) {
+            return null == this.vertexIndex ? Collections.emptySet() : this.vertexIndex.getIndexedKeys();
+        } else if (Edge.class.isAssignableFrom(elementClass)) {
+            return null == this.edgeIndex ? Collections.emptySet() : this.edgeIndex.getIndexedKeys();
+        } else {
+            throw new IllegalArgumentException("Class is not indexable: " + elementClass);
+        }
+    }
+
+    ///////////// Id manager ///////////////
+    /**
+     * Construct an {@link IdManager} from the TinkerGraph {@code Configuration}.
+     */
+    protected static <T extends Element> IdManager<T> selectIdManager(final Configuration config, final String configKey, final Class<T> clazz) {
+        final String vertexIdManagerConfigValue = config.getString(configKey, DefaultIdManager.ANY.name());
+        try {
+            return DefaultIdManager.valueOf(vertexIdManagerConfigValue);
+        } catch (IllegalArgumentException iae) {
+            try {
+                return (IdManager) Class.forName(vertexIdManagerConfigValue).newInstance();
+            } catch (Exception ex) {
+                throw new IllegalStateException(String.format("Could not configure TinkerGraph %s id manager with %s", clazz.getSimpleName(), vertexIdManagerConfigValue));
+            }
+        }
+    }
+
+    /**
+     * TinkerGraph will use an implementation of this interface to generate identifiers when a user does not supply
+     * them and to handle identifier conversions when querying to provide better flexibility with respect to
+     * handling different data types that mean the same thing.  For example, the
+     * {@link DefaultIdManager#LONG} implementation will allow {@code g.vertices(1l, 2l)} and
+     * {@code g.vertices(1, 2)} to both return values.
+     *
+     * @param <T> the id type
+     */
+    public interface IdManager<T> {
+        /**
+         * Generate an identifier which should be unique to the {@link TinkerGraph} instance.
+         */
+        T getNextId(final AbstractTinkerGraph graph);
+
+        /**
+         * Convert an identifier to the type required by the manager.
+         */
+        T convert(final Object id);
+
+        /**
+         * Determine if an identifier is allowed by this manager given its type.
+         */
+        boolean allow(final Object id);
+    }
+
+    /**
+     * A default set of {@link IdManager} implementations for common identifier types.
+     */
+    public enum DefaultIdManager implements IdManager {
+        /**
+         * Manages identifiers of type {@code Long}. Will convert any class that extends from {@link Number} to a
+         * {@link Long} and will also attempt to convert {@code String} values
+         */
+        LONG {
+            @Override
+            public Long getNextId(final AbstractTinkerGraph graph) {
+                return Stream.generate(() -> (graph.currentId.incrementAndGet())).filter(id -> !graph.hasVertex(id) && !graph.hasEdge(id)).findAny().get();
+            }
+
+            @Override
+            public Object convert(final Object id) {
+                if (null == id)
+                    return null;
+                else if (id instanceof Long)
+                    return id;
+                else if (id instanceof Number)
+                    return ((Number) id).longValue();
+                else if (id instanceof String) {
+                    try {
+                        return Long.parseLong((String) id);
+                    } catch (NumberFormatException nfe) {
+                        throw new IllegalArgumentException(createErrorMessage(Long.class, id));
+                    }
+                }
+                else
+                    throw new IllegalArgumentException(createErrorMessage(Long.class, id));
+            }
+
+            @Override
+            public boolean allow(final Object id) {
+                return id instanceof Number || id instanceof String;
+            }
+        },
+
+        /**
+         * Manages identifiers of type {@code Integer}. Will convert any class that extends from {@link Number} to a
+         * {@link Integer} and will also attempt to convert {@code String} values
+         */
+        INTEGER {
+            @Override
+            public Integer getNextId(final AbstractTinkerGraph graph) {
+                return Stream.generate(() -> (graph.currentId.incrementAndGet())).map(Long::intValue).filter(id -> !graph.hasVertex(id) && !graph.hasEdge(id)).findAny().get();
+            }
+
+            @Override
+            public Object convert(final Object id) {
+                if (null == id)
+                    return null;
+                else if (id instanceof Integer)
+                    return id;
+                else if (id instanceof Number)
+                    return ((Number) id).intValue();
+                else if (id instanceof String) {
+                    try {
+                        return Integer.parseInt((String) id);
+                    } catch (NumberFormatException nfe) {
+                        throw new IllegalArgumentException(createErrorMessage(Integer.class, id));
+                    }
+                }
+                else
+                    throw new IllegalArgumentException(createErrorMessage(Integer.class, id));
+            }
+
+            @Override
+            public boolean allow(final Object id) {
+                return id instanceof Number || id instanceof String;
+            }
+        },
+
+        /**
+         * Manages identifiers of type {@code UUID}. Will convert {@code String} values to
+         * {@code UUID}.
+         */
+        UUID {
+            @Override
+            public java.util.UUID getNextId(final AbstractTinkerGraph graph) {
+                return java.util.UUID.randomUUID();
+            }
+
+            @Override
+            public Object convert(final Object id) {
+                if (null == id)
+                    return null;
+                else if (id instanceof java.util.UUID)
+                    return id;
+                else  if (id instanceof String) {
+                    try {
+                        return java.util.UUID.fromString((String) id);
+                    } catch (IllegalArgumentException iae) {
+                        throw new IllegalArgumentException(createErrorMessage(java.util.UUID.class, id));
+                    }
+                } else
+                    throw new IllegalArgumentException(createErrorMessage(java.util.UUID.class, id));
+            }
+
+            @Override
+            public boolean allow(final Object id) {
+                return id instanceof UUID || id instanceof String;
+            }
+        },
+
+        /**
+         * Manages identifiers of any type.  This represents the default way {@link TinkerGraph} has always worked.
+         * In other words, there is no identifier conversion so if the identifier of a vertex is a {@code Long}, then
+         * trying to request it with an {@code Integer} will have no effect. Also, like the original
+         * {@link TinkerGraph}, it will generate {@link Long} values for identifiers.
+         */
+        ANY {
+            @Override
+            public Long getNextId(final AbstractTinkerGraph graph) {
+                return Stream.generate(() -> (graph.currentId.incrementAndGet())).filter(id -> !graph.hasVertex(id) && !graph.hasEdge(id)).findAny().get();
+            }
+
+            @Override
+            public Object convert(final Object id) {
+                return id;
+            }
+
+            @Override
+            public boolean allow(final Object id) {
+                return true;
+            }
+        };
+
+        private static String createErrorMessage(final Class<?> expectedType, final Object id) {
+            return String.format("Expected an id that is convertible to %s but received %s - [%s]", expectedType, id.getClass(), id);
+        }
+    }
+
+    protected TinkerServiceRegistry.TinkerServiceFactory instantiate(final String className) {
+        try {
+            return (TinkerServiceRegistry.TinkerServiceFactory) Class.forName(className).getConstructor(AbstractTinkerGraph.class).newInstance(this);
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
+                 NoSuchMethodException | InvocationTargetException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerIndex.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerIndex.java
new file mode 100644
index 0000000..b65e90b
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/AbstractTinkerIndex.java
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.Element;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Storage for indexes that can be used by different implementations of {@link AbstractTinkerGraph}.
+ *
+ * @param <T> type of {@link Element} to be indexed
+ *
+ * @author Valentyn Kahamlyk
+ */
+public abstract class AbstractTinkerIndex<T extends Element> {
+
+    protected final Class<T> indexClass;
+    protected final AbstractTinkerGraph graph;
+    protected final Set<String> indexedKeys = new HashSet<>();
+
+    protected AbstractTinkerIndex(final AbstractTinkerGraph graph, final Class<T> indexClass) {
+        this.graph = graph;
+        this.indexClass = indexClass;
+    }
+
+    /**
+     * Get list of elements which have a property with the desired value.
+     * @param key property key
+     * @param value property value
+     * @return list of elements
+     */
+    public abstract List<T> get(final String key, final Object value);
+
+    /**
+     * Get count of elements which have a property with the desired value.
+     * @param key property key
+     * @param value property value
+     * @return count of elements
+     */
+    public abstract long count(final String key, final Object value);
+
+    /**
+     * Remove elements with some property from index.
+     * Convenient to use when removed only one property of an element.
+     * @param key property key
+     * @param value property value
+     * @param element changed element
+     */
+    public abstract void remove(final String key, final Object value, final T element);
+
+    /**
+     * Remove elements from all indexes.
+     * Can be used when element was deleted or has changed more than 1 property.
+     * @param element changed element
+     */
+    public abstract void removeElement(final T element);
+
+    /**
+     * Update index for single property of element.
+     * @param key property key
+     * @param newValue updated value of property
+     * @param oldValue optional value of property before update
+     * @param element changed element
+     */
+    public abstract void autoUpdate(final String key, final Object newValue, final Object oldValue, final T element);
+
+    /**
+     * Create new index
+     * @param key property key
+     */
+    public abstract void createKeyIndex(final String key);
+
+    /**
+     * Drop index
+     * @param key property key
+     */
+    public abstract void dropKeyIndex(final String key);
+
+    /**
+     * Get all index keys for Graph
+     * @return set of index keys
+     */
+    public Set<String> getIndexedKeys() {
+        return indexedKeys;
+    }
+
+    /**
+     * Provides a way for an index to have a {@code null} value as {@code ConcurrentHashMap} will not allow a
+     * {@code null} key.
+     */
+    public static Object indexable(final Object obj) {
+        return null == obj ? IndexedNull.instance() : obj;
+    }
+
+    public static final class IndexedNull {
+        private static final IndexedNull inst = new IndexedNull();
+
+        private IndexedNull() {}
+
+        static IndexedNull instance() {
+            return inst;
+        }
+
+        @Override
+        public int hashCode() {
+            return 751912123;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            return o instanceof IndexedNull;
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java
index 02f7ede..43fcc29 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerEdge.java
@@ -18,43 +18,67 @@
  */
 package org.apache.tinkerpop.gremlin.tinkergraph.structure;
 
-import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class TinkerEdge extends TinkerElement implements Edge {
+public class TinkerEdge extends TinkerElement implements Edge {
 
     protected Map<String, Property> properties;
-    protected final Vertex inVertex;
-    protected final Vertex outVertex;
+
+    protected Vertex inVertex = null;
+    protected Object inVertexId = null;
+    protected Vertex outVertex = null;
+    protected Object outVertexId= null;
+    private final AbstractTinkerGraph graph;
     private final boolean allowNullPropertyValues;
+    private final boolean isTxMode;
 
     protected TinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex) {
-        super(id, label);
-        this.outVertex = outVertex;
-        this.inVertex = inVertex;
-        this.allowNullPropertyValues = outVertex.graph().features().edge().supportsNullPropertyValues();
-        TinkerHelper.autoUpdateIndex(this, T.label.getAccessor(), this.label, null);
+       this(id, outVertex, label, inVertex, 0);
+    }
+
+    protected TinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex, final long currentVersion) {
+        this(id, (AbstractTinkerGraph) outVertex.graph(), outVertex.id(), label, inVertex.id(), currentVersion, false);
+        if (!isTxMode) {
+            this.inVertex = inVertex;
+            this.outVertex = outVertex;
+        }
+    }
+
+    private TinkerEdge(final Object id, AbstractTinkerGraph graph, final Object outVertexId, final String label, final Object inVertexId, final long currentVersion, final Boolean skipIndexUpdate) {
+        super(id, label, currentVersion);
+        isTxMode = graph instanceof TinkerTransactionGraph;
+        this.graph = graph;
+        if (isTxMode) {
+            this.outVertexId = outVertexId;
+            this.inVertexId = inVertexId;
+        }
+        this.allowNullPropertyValues = graph.features().edge().supportsNullPropertyValues();
+        if (!skipIndexUpdate)
+            TinkerIndexHelper.autoUpdateIndex(this, T.label.getAccessor(), this.label, null);
     }
 
     @Override
     public <V> Property<V> property(final String key, final V value) {
+        graph.touch(this);
+
         if (this.removed) throw elementAlreadyRemoved(Edge.class, id);
         ElementHelper.validateProperty(key, value);
 
@@ -65,11 +89,10 @@
 
         final Property oldProperty = super.property(key);
         final Property<V> newProperty = new TinkerProperty<>(this, key, value);
-        if (null == this.properties) this.properties = new HashMap<>();
+        if (null == this.properties) this.properties = new ConcurrentHashMap<>();
         this.properties.put(key, newProperty);
-        TinkerHelper.autoUpdateIndex(this, key, value, oldProperty.isPresent() ? oldProperty.value() : null);
+        TinkerIndexHelper.autoUpdateIndex(this, key, value, oldProperty.isPresent() ? oldProperty.value() : null);
         return newProperty;
-
     }
 
     @Override
@@ -84,22 +107,9 @@
 
     @Override
     public void remove() {
-        final TinkerVertex outVertex = (TinkerVertex) this.outVertex;
-        final TinkerVertex inVertex = (TinkerVertex) this.inVertex;
-
-        if (null != outVertex && null != outVertex.outEdges) {
-            final Set<Edge> edges = outVertex.outEdges.get(this.label());
-            if (null != edges)
-                edges.remove(this);
-        }
-        if (null != inVertex && null != inVertex.inEdges) {
-            final Set<Edge> edges = inVertex.inEdges.get(this.label());
-            if (null != edges)
-                edges.remove(this);
-        }
-
-        TinkerHelper.removeElementIndex(this);
-        ((TinkerGraph) this.graph()).edges.remove(this.id());
+        graph.touch(this);
+        TinkerIndexHelper.removeElementIndex(this);
+        graph.removeEdge(this.id());
         this.properties = null;
         this.removed = true;
     }
@@ -107,17 +117,37 @@
     @Override
     public String toString() {
         return StringFactory.edgeString(this);
+    }
 
+    @Override
+    public Object clone() {
+        if (!isTxMode) {
+            // shallow copy for non-tx mode
+            final TinkerEdge edge = new TinkerEdge(id, outVertex, label, inVertex, currentVersion);
+            edge.properties = properties;
+            return edge;
+        }
+
+        final TinkerEdge edge = new TinkerEdge(id, graph, outVertexId, label, inVertexId, currentVersion, true);
+
+        if (properties != null) {
+            final Map<String, Property> cloned = new ConcurrentHashMap<>(properties.size());
+            properties.entrySet().stream().forEach(p -> cloned.put(p.getKey(), ((TinkerProperty) p.getValue()).copy(edge)));
+
+            edge.properties = cloned;
+        }
+
+        return edge;
     }
 
     @Override
     public Vertex outVertex() {
-        return this.outVertex;
+        return isTxMode ? graph.vertex(outVertexId) : outVertex;
     }
 
     @Override
     public Vertex inVertex() {
-        return this.inVertex;
+        return isTxMode ? graph.vertex(inVertexId) : inVertex;
     }
 
     @Override
@@ -125,23 +155,25 @@
         if (removed) return Collections.emptyIterator();
         switch (direction) {
             case OUT:
-                return IteratorUtils.of(this.outVertex);
+                return IteratorUtils.of(this.outVertex());
             case IN:
-                return IteratorUtils.of(this.inVertex);
+                return IteratorUtils.of(this.inVertex());
             default:
-                return IteratorUtils.of(this.outVertex, this.inVertex);
+                return IteratorUtils.of(this.outVertex(), this.inVertex());
         }
     }
 
     @Override
     public Graph graph() {
-        return this.inVertex.graph();
+        return this.graph;
     }
 
     @Override
     public <V> Iterator<Property<V>> properties(final String... propertyKeys) {
         if (null == this.properties) return Collections.emptyIterator();
         if (propertyKeys.length == 1) {
+            if (null == propertyKeys[0])
+                return Collections.emptyIterator();
             final Property<V> property = this.properties.get(propertyKeys[0]);
             return null == property ? Collections.emptyIterator() : IteratorUtils.of(property);
         } else
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java
index a2ee75b..81dea31 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElement.java
@@ -29,10 +29,18 @@
     protected final Object id;
     protected final String label;
     protected boolean removed = false;
+    protected long currentVersion;
 
     protected TinkerElement(final Object id, final String label) {
         this.id = id;
         this.label = label;
+        currentVersion = -1;
+    }
+
+    protected TinkerElement(final Object id, final String label, final long currentVersion) {
+        this.id = id;
+        this.label = label;
+        this.currentVersion = currentVersion;
     }
 
     @Override
@@ -40,6 +48,8 @@
         return ElementHelper.hashCode(this);
     }
 
+    public abstract  Object clone();
+
     @Override
     public Object id() {
         return this.id;
@@ -56,6 +66,8 @@
         return ElementHelper.areEqual(this, object);
     }
 
+    public long version() { return this.currentVersion; }
+
     protected static IllegalStateException elementAlreadyRemoved(final Class<? extends Element> clazz, final Object id) {
         return new IllegalStateException(String.format("%s with id %s was removed.", clazz.getSimpleName(), id));
     }
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElementContainer.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElementContainer.java
new file mode 100644
index 0000000..a743379
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerElementContainer.java
@@ -0,0 +1,260 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Container to store the value of an element which can be specific to each transaction.
+ * Responsible for transactional operations for the element that stores.
+ * @param <T> type of element to store.
+ */
+final class TinkerElementContainer<T extends TinkerElement> {
+    /**
+     * Committed value of element.
+     */
+    private T element;
+    /**
+     * Id of element. Used if element is removed or set to {@code null}.
+     */
+    private Object elementId;
+    /**
+     * Used to separate deleted elements from {@code null} ones.
+     */
+    private boolean isDeleted = false;
+    /**
+     * Value of elements updated in current transaction.
+     */
+    private final ThreadLocal<T> transactionUpdatedValue = ThreadLocal.withInitial(() -> null);
+    /**
+     * Marker for element deleted in current transaction.
+     */
+    private final ThreadLocal<Boolean> isDeletedInTx = ThreadLocal.withInitial(() -> false);
+
+    /**
+     * Marker for element modified in current transaction.
+     */
+    private final ThreadLocal<Boolean> isModifiedInTx = ThreadLocal.withInitial(() -> false);
+
+    /**
+     * Marker for element read in current transaction.
+     */
+    private final ThreadLocal<Boolean> isReadInTx = ThreadLocal.withInitial(() -> false);
+
+    /**
+     * Count of usages of container in different transactions.
+     * Needed to understand whether this element is used in other transactions or it can be deleted during rollback.
+     */
+    private final AtomicInteger usesInTransactions = new AtomicInteger(0);
+
+    /**
+     * Used to protect container from simultaneous modification in different transactions.
+     */
+    private final ReentrantLock lock = new ReentrantLock();
+
+    /**
+     * Constructor only requires the element id to be stored.
+     * @param elementId id of element to store.
+     */
+    public TinkerElementContainer(final Object elementId) {
+        this.elementId = elementId;
+    }
+
+    /**
+     * Get transaction specific value of stored element.
+     */
+    public T get() {
+        if (isDeletedInTx.get()) return null;
+        if (transactionUpdatedValue.get() != null) return transactionUpdatedValue.get();
+        if (isDeleted) return null;
+        return element;
+    }
+
+    public T getWithClone(final TinkerTransaction tx) {
+        if (isDeletedInTx.get()) return null;
+        if (transactionUpdatedValue.get() != null) return transactionUpdatedValue.get();
+        if (isDeleted || null == element) return null;
+
+        final T cloned = (T) element.clone();
+        transactionUpdatedValue.set(cloned);
+
+        if (!isReadInTx.get()) {
+            isReadInTx.set(true);
+            usesInTransactions.incrementAndGet();
+            tx.markRead(this);
+        }
+
+        return cloned;
+    }
+
+    /**
+     * Get current committed value of stored element.
+     */
+    public T getUnmodified() {
+        return element;
+    }
+
+    /**
+     * Get modified in the current transaction value of stored element.
+     */
+    public T getModified() {
+        return transactionUpdatedValue.get();
+    }
+
+    /**
+     * Get id of stored element.
+     */
+    public Object getElementId() {
+        return elementId;
+    }
+
+    /**
+     * Needed to understand if the element has changed in the current transaction
+     */
+    public boolean isChanged() {
+        return isDeletedInTx.get() || isModifiedInTx.get() && transactionUpdatedValue.get() != null;
+    }
+
+    /**
+     * Used to understand if the element has deleted in the current transaction
+     */
+    public boolean isDeleted() { return isDeleted || isDeletedInTx.get(); }
+
+    /**
+     * Mark element as deleted in the current transaction.
+     */
+    public void markDeleted(final TinkerTransaction tx) {
+        if (!isDeletedInTx.get()) {
+            usesInTransactions.incrementAndGet();
+            isDeletedInTx.set(true);
+            tx.markChanged(this);
+        }
+    }
+
+    /**
+     * Mark element as changed in the current transaction.
+     * A copy of the element is made and set as a value in the transaction.
+     * @param transactionElement updated element
+     * @param tx current transaction
+     */
+    public void touch(final T transactionElement, final TinkerTransaction tx) {
+        if (transactionUpdatedValue.get() == transactionElement && isModifiedInTx.get()) return;
+
+        setDraft(transactionElement, tx);
+    }
+
+    /**
+     * Set element value specific to current transaction.
+     * @param transactionElement updated element
+     * @param tx current transaction
+     */
+    public void setDraft(final T transactionElement, final TinkerTransaction tx) {
+        elementId = transactionElement.id();
+        if (!isModifiedInTx.get()) {
+            usesInTransactions.incrementAndGet();
+            isModifiedInTx.set(true);
+        }
+        transactionUpdatedValue.set(transactionElement);
+        tx.markChanged(this);
+    }
+
+    /**
+     * Used to understand if elements was changed by other transaction.
+     */
+    public boolean updatedOutsideTransaction() {
+        // todo: do we need to check version on delete?
+        final T updatedValue = transactionUpdatedValue.get();
+        return isDeleted ||
+                element != null && updatedValue != null && updatedValue.version() != element.version();
+    }
+
+    /**
+     * Commit changes for the stored element.
+     * @param txVersion version of transaction
+     */
+    public void commit(final long txVersion) {
+        updateUsesCount();
+        if (isDeletedInTx.get()) {
+            // created and deleted in same tx
+            if (null != element)
+                element.removed = true;
+            element = null;
+            isDeleted = true;
+        } else {
+            element = transactionUpdatedValue.get();
+            element.currentVersion = txVersion;
+        }
+        reset();
+    }
+
+    /**
+     * Rollback changes for the stored element.
+     */
+    public void rollback() {
+        updateUsesCount();
+        reset();
+    }
+
+    /**
+     * After the transaction is completed, need to reduce the usage counters to be able to delete the container.
+     */
+    private void updateUsesCount() {
+        if (isDeletedInTx.get())
+            usesInTransactions.decrementAndGet();
+        if (isModifiedInTx.get())
+            usesInTransactions.decrementAndGet();
+        if (isReadInTx.get())
+            usesInTransactions.decrementAndGet();
+    }
+
+    /**
+     * Used to check if container can be removed or still used by another transaction.
+     * Should be used after commit or rollback.
+     */
+    public boolean canBeRemoved() {
+        return usesInTransactions.get() == 0 && (isDeleted || element == null);
+    }
+
+    /**
+     * Cleanup changes made in the current transaction.
+     */
+    public void reset() {
+        transactionUpdatedValue.remove();
+        isDeletedInTx.set(false);
+        isModifiedInTx.set(false);
+        isReadInTx.set(false);
+    }
+
+    /**
+     * Try to lock container to apply changes to stored element.
+     * @return True if lock was successful.
+     */
+    public boolean tryLock() {
+        return lock.tryLock();
+    }
+
+    /**
+     * Release lock after applying changes.
+     */
+    public void releaseLock() {
+        if (lock.isHeldByCurrentThread())
+            lock.unlock();
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
index a824603..9b6583b 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
@@ -25,15 +25,12 @@
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 
-import java.io.File;
 import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
 
 import static org.apache.tinkerpop.gremlin.structure.io.IoCore.gryo;
-import static org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.DefaultIdManager;
-import static org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.DefaultIdManager.INTEGER;
-import static org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.DefaultIdManager.LONG;
+import static org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph.DefaultIdManager;
+import static org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph.DefaultIdManager.INTEGER;
+import static org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph.DefaultIdManager.LONG;
 
 /**
  * Helps create a variety of different toy graphs for testing and learning purposes.
@@ -57,7 +54,7 @@
     /**
      * Generate the graph in {@link #createClassic()} into an existing graph.
      */
-    public static void generateClassic(final TinkerGraph g) {
+    public static void generateClassic(final AbstractTinkerGraph g) {
         final Vertex marko = g.addVertex(T.id, 1, "name", "marko", "age", 29);
         final Vertex vadas = g.addVertex(T.id, 2, "name", "vadas", "age", 27);
         final Vertex lop = g.addVertex(T.id, 3, "name", "lop", "lang", "java");
@@ -85,7 +82,7 @@
     /**
      * Generate the graph in {@link #createModern()} into an existing graph.
      */
-    public static void generateModern(final TinkerGraph g) {
+    public static void generateModern(final AbstractTinkerGraph g) {
         final Vertex marko = g.addVertex(T.id, 1, T.label, "person");
         marko.property("name", "marko", T.id, 0l);
         marko.property("age", 29, T.id, 1l);
@@ -128,7 +125,7 @@
     /**
      * Generate the graph in {@link #createTheCrew()} into an existing graph.
      */
-    public static void generateTheCrew(final TinkerGraph g) {
+    public static void generateTheCrew(final AbstractTinkerGraph g) {
         final Vertex marko = g.addVertex(T.id, 1, T.label, "person", "name", "marko");
         final Vertex stephen = g.addVertex(T.id, 7, T.label, "person", "name", "stephen");
         final Vertex matthias = g.addVertex(T.id, 8, T.label, "person", "name", "matthias");
@@ -191,7 +188,7 @@
     /**
      * Generate the graph in {@link #createKitchenSink()} into an existing graph.
      */
-    public static void generateKitchenSink(final TinkerGraph graph) {
+    public static void generateKitchenSink(final AbstractTinkerGraph graph) {
         final GraphTraversalSource g = graph.traversal();
         g.addV("loops").property(T.id, 1000).property("name", "loop").as("me").
           addE("self").to("me").property(T.id, 1001).
@@ -215,7 +212,7 @@
     /**
      * Generate the graph in {@link #createGratefulDead()} into an existing graph.
      */
-    public static void generateGratefulDead(final TinkerGraph graph) {
+    public static void generateGratefulDead(final AbstractTinkerGraph graph) {
         final InputStream stream = TinkerFactory.class.getResourceAsStream("grateful-dead.kryo");
         try {
             graph.io(gryo()).reader().create().readGraph(stream, graph);
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index 3a4651e..acf540a 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -20,7 +20,6 @@
 
 import org.apache.commons.configuration2.BaseConfiguration;
 import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Element;
@@ -28,35 +27,24 @@
 import org.apache.tinkerpop.gremlin.structure.Transaction;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.Io;
-import org.apache.tinkerpop.gremlin.structure.io.IoCore;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputerView;
 import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.strategy.optimization.TinkerGraphCountStrategy;
 import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.strategy.optimization.TinkerGraphStepStrategy;
 import org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerServiceRegistry;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Stream;
-
-import static org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerServiceRegistry.TinkerServiceFactory;
 
 /**
  * An in-memory (with optional persistence on calls to {@link #close()}), reference implementation of the property
@@ -71,7 +59,7 @@
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_COMPUTER)
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_LIMITED_STANDARD)
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_LIMITED_COMPUTER)
-public final class TinkerGraph implements Graph {
+public class TinkerGraph extends AbstractTinkerGraph {
 
     static {
         TraversalStrategies.GlobalCache.registerStrategies(TinkerGraph.class, TraversalStrategies.GlobalCache.getStrategies(Graph.class).clone().addStrategies(
@@ -83,42 +71,15 @@
         this.setProperty(Graph.GRAPH, TinkerGraph.class.getName());
     }};
 
-    public static final String GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER = "gremlin.tinkergraph.vertexIdManager";
-    public static final String GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER = "gremlin.tinkergraph.edgeIdManager";
-    public static final String GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER = "gremlin.tinkergraph.vertexPropertyIdManager";
-    public static final String GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY = "gremlin.tinkergraph.defaultVertexPropertyCardinality";
-    public static final String GREMLIN_TINKERGRAPH_GRAPH_LOCATION = "gremlin.tinkergraph.graphLocation";
-    public static final String GREMLIN_TINKERGRAPH_GRAPH_FORMAT = "gremlin.tinkergraph.graphFormat";
-    public static final String GREMLIN_TINKERGRAPH_ALLOW_NULL_PROPERTY_VALUES = "gremlin.tinkergraph.allowNullPropertyValues";
-    public static final String GREMLIN_TINKERGRAPH_SERVICE = "gremlin.tinkergraph.service";
-
     private final TinkerGraphFeatures features = new TinkerGraphFeatures();
 
-    protected AtomicLong currentId = new AtomicLong(-1L);
     protected Map<Object, Vertex> vertices = new ConcurrentHashMap<>();
     protected Map<Object, Edge> edges = new ConcurrentHashMap<>();
 
-    protected TinkerGraphVariables variables = null;
-    protected TinkerGraphComputerView graphComputerView = null;
-    protected TinkerIndex<TinkerVertex> vertexIndex = null;
-    protected TinkerIndex<TinkerEdge> edgeIndex = null;
-
-    protected final IdManager<?> vertexIdManager;
-    protected final IdManager<?> edgeIdManager;
-    protected final IdManager<?> vertexPropertyIdManager;
-    protected final VertexProperty.Cardinality defaultVertexPropertyCardinality;
-    protected final boolean allowNullPropertyValues;
-
-    protected final TinkerServiceRegistry serviceRegistry;
-
-    private final Configuration configuration;
-    private final String graphLocation;
-    private final String graphFormat;
-
     /**
      * An empty private constructor that initializes {@link TinkerGraph}.
      */
-    private TinkerGraph(final Configuration configuration) {
+    TinkerGraph(final Configuration configuration) {
         this.configuration = configuration;
         vertexIdManager = selectIdManager(configuration, GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, Vertex.class);
         edgeIdManager = selectIdManager(configuration, GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, Edge.class);
@@ -185,67 +146,70 @@
             idValue = vertexIdManager.getNextId(this);
         }
 
-        final Vertex vertex = new TinkerVertex(idValue, label, this);
+        final Vertex vertex = createTinkerVertex(idValue, label, this);
+        ElementHelper.attachProperties(vertex, VertexProperty.Cardinality.list, keyValues);
         this.vertices.put(vertex.id(), vertex);
 
-        ElementHelper.attachProperties(vertex, VertexProperty.Cardinality.list, keyValues);
         return vertex;
     }
 
     @Override
-    public <C extends GraphComputer> C compute(final Class<C> graphComputerClass) {
-        if (!graphComputerClass.equals(TinkerGraphComputer.class))
-            throw Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
-        return (C) new TinkerGraphComputer(this);
+    public void removeVertex(final Object vertexId)
+    {
+        this.vertices.remove(vertexId);
     }
 
     @Override
-    public GraphComputer compute() {
-        return new TinkerGraphComputer(this);
+    public Edge addEdge(final TinkerVertex outVertex, final TinkerVertex inVertex, final String label, final Object... keyValues) {
+        ElementHelper.validateLabel(label);
+        ElementHelper.legalPropertyKeyValueArray(keyValues);
+
+        Object idValue = edgeIdManager.convert(ElementHelper.getIdValue(keyValues).orElse(null));
+
+        final Edge edge;
+        if (null != idValue) {
+            if (edges.containsKey(idValue))
+                throw Graph.Exceptions.edgeWithIdAlreadyExists(idValue);
+        } else {
+            idValue = edgeIdManager.getNextId(this);
+        }
+
+        edge = new TinkerEdge(idValue, outVertex, label, inVertex);
+        ElementHelper.attachProperties(edge, keyValues);
+        edges.put(edge.id(), edge);
+        addOutEdge(outVertex, label, edge);
+        addInEdge(inVertex, label, edge);
+        return edge;
     }
 
     @Override
-    public Variables variables() {
-        if (null == this.variables)
-            this.variables = new TinkerGraphVariables();
-        return this.variables;
+    public void removeEdge(final Object edgeId) {
+        final Edge edge = edges.get(edgeId);
+        // already removed?
+        if (null == edge) return;
+
+        final TinkerVertex outVertex = (TinkerVertex) edge.outVertex();
+        final TinkerVertex inVertex = (TinkerVertex) edge.inVertex();
+
+        if (null != outVertex && null != outVertex.outEdges) {
+            final Set<Edge> edges = outVertex.outEdges.get(edge.label());
+            if (null != edges)
+                edges.removeIf(e -> e.id() == edgeId);
+        }
+        if (null != inVertex && null != inVertex.inEdges) {
+            final Set<Edge> edges = inVertex.inEdges.get(edge.label());
+            if (null != edges)
+                edges.removeIf(e -> e.id() == edgeId);
+        }
+
+        this.edges.remove(edgeId);
     }
 
     @Override
-    public <I extends Io> I io(final Io.Builder<I> builder) {
-        if (builder.requiresVersion(GryoVersion.V1_0) || builder.requiresVersion(GraphSONVersion.V1_0))
-            return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV1d0.instance())).create();
-        else if (builder.requiresVersion(GraphSONVersion.V2_0))   // there is no gryo v2
-            return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV2d0.instance())).create();
-        else
-            return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV3d0.instance())).create();
-    }
-
-    @Override
-    public String toString() {
-        return StringFactory.graphString(this, "vertices:" + this.vertices.size() + " edges:" + this.edges.size());
-    }
-
     public void clear() {
+        super.clear();
         this.vertices.clear();
         this.edges.clear();
-        this.variables = null;
-        this.currentId.set(-1L);
-        this.vertexIndex = null;
-        this.edgeIndex = null;
-        this.graphComputerView = null;
-    }
-
-    /**
-     * This method only has an effect if the {@link #GREMLIN_TINKERGRAPH_GRAPH_LOCATION} is set, in which case the
-     * data in the graph is persisted to that location. This method may be called multiple times and does not release
-     * resources.
-     */
-    @Override
-    public void close() {
-        if (graphLocation != null) saveGraph();
-        // shutdown services
-        serviceRegistry.close();
     }
 
     @Override
@@ -254,9 +218,16 @@
     }
 
     @Override
-    public Configuration configuration() {
-        return configuration;
-    }
+    public int getVerticesCount() { return vertices.size(); }
+
+    @Override
+    public boolean hasVertex(Object id) { return vertices.containsKey(id); }
+
+    @Override
+    public int getEdgesCount() {  return edges.size(); }
+
+    @Override
+    public boolean hasEdge(Object id) { return edges.containsKey(id); }
 
     @Override
     public TinkerServiceRegistry getServiceRegistry() {
@@ -264,6 +235,11 @@
     }
 
     @Override
+    public Vertex vertex(final Object vertexId) {
+        return vertices.get(vertexIdManager.convert(vertexId));
+    }
+
+    @Override
     public Iterator<Vertex> vertices(final Object... vertexIds) {
         return createElementIterator(Vertex.class, vertices, vertexIdManager, vertexIds);
     }
@@ -273,52 +249,11 @@
         return createElementIterator(Edge.class, edges, edgeIdManager, edgeIds);
     }
 
-    private void loadGraph() {
-        final File f = new File(graphLocation);
-        if (f.exists() && f.isFile()) {
-            try {
-                if (graphFormat.equals("graphml")) {
-                    io(IoCore.graphml()).readGraph(graphLocation);
-                } else if (graphFormat.equals("graphson")) {
-                    io(IoCore.graphson()).readGraph(graphLocation);
-                } else if (graphFormat.equals("gryo")) {
-                    io(IoCore.gryo()).readGraph(graphLocation);
-                } else {
-                    io(IoCore.createIoBuilder(graphFormat)).readGraph(graphLocation);
-                }
-            } catch (Exception ex) {
-                throw new RuntimeException(String.format("Could not load graph at %s with %s", graphLocation, graphFormat), ex);
-            }
-        }
+    @Override
+    public Edge edge(final Object edgeId) {
+        return edges.get(edgeIdManager.convert(edgeId));
     }
 
-    private void saveGraph() {
-        final File f = new File(graphLocation);
-        if (f.exists()) {
-            f.delete();
-        } else {
-            final File parent = f.getParentFile();
-
-            // the parent would be null in the case of an relative path if the graphLocation was simply: "f.gryo"
-            if (parent != null && !parent.exists()) {
-                parent.mkdirs();
-            }
-        }
-
-        try {
-            if (graphFormat.equals("graphml")) {
-                io(IoCore.graphml()).writeGraph(graphLocation);
-            } else if (graphFormat.equals("graphson")) {
-                io(IoCore.graphson()).writeGraph(graphLocation);
-            } else if (graphFormat.equals("gryo")) {
-                io(IoCore.gryo()).writeGraph(graphLocation);
-            } else {
-                io(IoCore.createIoBuilder(graphFormat)).writeGraph(graphLocation);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException(String.format("Could not save graph at %s with %s", graphLocation, graphFormat), ex);
-        }
-    }
 
     private <T extends Element> Iterator<T> createElementIterator(final Class<T> clazz, final Map<Object, T> elements,
                                                                   final IdManager idManager,
@@ -347,6 +282,28 @@
                 iterator;
     }
 
+    @Override
+    protected void addOutEdge(final TinkerVertex vertex, final String label, final Edge edge) {
+        if (null == vertex.outEdges) vertex.outEdges = new HashMap<>();
+        Set<Edge> edges = vertex.outEdges.get(label);
+        if (null == edges) {
+            edges = new HashSet<>();
+            vertex.outEdges.put(label, edges);
+        }
+        edges.add(edge);
+    }
+
+    @Override
+    protected void addInEdge(final TinkerVertex vertex, final String label, final Edge edge) {
+        if (null == vertex.inEdges) vertex.inEdges = new HashMap<>();
+        Set<Edge> edges = vertex.inEdges.get(label);
+        if (null == edges) {
+            edges = new HashSet<>();
+            vertex.inEdges.put(label, edges);
+        }
+        edges.add(edge);
+    }
+
     /**
      * Return TinkerGraph feature set.
      * <p/>
@@ -389,60 +346,6 @@
 
     }
 
-    public class TinkerGraphVertexFeatures implements Features.VertexFeatures {
-
-        private final TinkerGraphVertexPropertyFeatures vertexPropertyFeatures = new TinkerGraphVertexPropertyFeatures();
-
-        private TinkerGraphVertexFeatures() {
-        }
-
-        @Override
-        public boolean supportsNullPropertyValues() {
-            return allowNullPropertyValues;
-        }
-
-        @Override
-        public Features.VertexPropertyFeatures properties() {
-            return vertexPropertyFeatures;
-        }
-
-        @Override
-        public boolean supportsCustomIds() {
-            return false;
-        }
-
-        @Override
-        public boolean willAllowId(final Object id) {
-            return vertexIdManager.allow(id);
-        }
-
-        @Override
-        public VertexProperty.Cardinality getCardinality(final String key) {
-            return defaultVertexPropertyCardinality;
-        }
-    }
-
-    public class TinkerGraphEdgeFeatures implements Features.EdgeFeatures {
-
-        private TinkerGraphEdgeFeatures() {
-        }
-
-        @Override
-        public boolean supportsNullPropertyValues() {
-            return allowNullPropertyValues;
-        }
-
-        @Override
-        public boolean supportsCustomIds() {
-            return false;
-        }
-
-        @Override
-        public boolean willAllowId(final Object id) {
-            return edgeIdManager.allow(id);
-        }
-    }
-
     public class TinkerGraphGraphFeatures implements Features.GraphFeatures {
 
         private TinkerGraphGraphFeatures() {
@@ -470,26 +373,6 @@
 
     }
 
-    public class TinkerGraphVertexPropertyFeatures implements Features.VertexPropertyFeatures {
-
-        private TinkerGraphVertexPropertyFeatures() {
-        }
-
-        @Override
-        public boolean supportsNullPropertyValues() {
-            return allowNullPropertyValues;
-        }
-
-        @Override
-        public boolean supportsCustomIds() {
-            return false;
-        }
-
-        @Override
-        public boolean willAllowId(final Object id) {
-            return vertexIdManager.allow(id);
-        }
-    }
 
     ///////////// GRAPH SPECIFIC INDEXING METHODS ///////////////
 
@@ -530,206 +413,4 @@
             throw new IllegalArgumentException("Class is not indexable: " + elementClass);
         }
     }
-
-    /**
-     * Return all the keys currently being index for said element class  ({@link Vertex} or {@link Edge}).
-     *
-     * @param elementClass the element class to get the indexed keys for
-     * @param <E>          The type of the element class
-     * @return the set of keys currently being indexed
-     */
-    public <E extends Element> Set<String> getIndexedKeys(final Class<E> elementClass) {
-        if (Vertex.class.isAssignableFrom(elementClass)) {
-            return null == this.vertexIndex ? Collections.emptySet() : this.vertexIndex.getIndexedKeys();
-        } else if (Edge.class.isAssignableFrom(elementClass)) {
-            return null == this.edgeIndex ? Collections.emptySet() : this.edgeIndex.getIndexedKeys();
-        } else {
-            throw new IllegalArgumentException("Class is not indexable: " + elementClass);
-        }
-    }
-
-    /**
-     * Construct an {@link TinkerGraph.IdManager} from the TinkerGraph {@code Configuration}.
-     */
-    private static IdManager<?> selectIdManager(final Configuration config, final String configKey, final Class<? extends Element> clazz) {
-        final String vertexIdManagerConfigValue = config.getString(configKey, DefaultIdManager.ANY.name());
-        try {
-            return DefaultIdManager.valueOf(vertexIdManagerConfigValue);
-        } catch (IllegalArgumentException iae) {
-            try {
-                return (IdManager) Class.forName(vertexIdManagerConfigValue).newInstance();
-            } catch (Exception ex) {
-                throw new IllegalStateException(String.format("Could not configure TinkerGraph %s id manager with %s", clazz.getSimpleName(), vertexIdManagerConfigValue));
-            }
-        }
-    }
-
-    private TinkerServiceFactory instantiate(final String className) {
-        try {
-            return (TinkerServiceFactory) Class.forName(className).getConstructor(TinkerGraph.class).newInstance(this);
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
-                 NoSuchMethodException | InvocationTargetException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    /**
-     * TinkerGraph will use an implementation of this interface to generate identifiers when a user does not supply
-     * them and to handle identifier conversions when querying to provide better flexibility with respect to
-     * handling different data types that mean the same thing.  For example, the
-     * {@link DefaultIdManager#LONG} implementation will allow {@code g.vertices(1l, 2l)} and
-     * {@code g.vertices(1, 2)} to both return values.
-     *
-     * @param <T> the id type
-     */
-    public interface IdManager<T> {
-        /**
-         * Generate an identifier which should be unique to the {@link TinkerGraph} instance.
-         */
-        T getNextId(final TinkerGraph graph);
-
-        /**
-         * Convert an identifier to the type required by the manager.
-         */
-        T convert(final Object id);
-
-        /**
-         * Determine if an identifier is allowed by this manager given its type.
-         */
-        boolean allow(final Object id);
-    }
-
-    /**
-     * A default set of {@link IdManager} implementations for common identifier types.
-     */
-    public enum DefaultIdManager implements IdManager {
-        /**
-         * Manages identifiers of type {@code Long}. Will convert any class that extends from {@link Number} to a
-         * {@link Long} and will also attempt to convert {@code String} values
-         */
-        LONG {
-            @Override
-            public Long getNextId(final TinkerGraph graph) {
-                return Stream.generate(() -> (graph.currentId.incrementAndGet())).filter(id -> !graph.vertices.containsKey(id) && !graph.edges.containsKey(id)).findAny().get();
-            }
-
-            @Override
-            public Object convert(final Object id) {
-                if (null == id)
-                    return null;
-                else if (id instanceof Long)
-                    return id;
-                else if (id instanceof Number)
-                    return ((Number) id).longValue();
-                else if (id instanceof String) {
-                    try {
-                        return Long.parseLong((String) id);
-                    } catch (NumberFormatException nfe) {
-                        throw new IllegalArgumentException(createErrorMessage(Long.class, id));
-                    }
-                }
-                else
-                    throw new IllegalArgumentException(createErrorMessage(Long.class, id));
-            }
-
-            @Override
-            public boolean allow(final Object id) {
-                return id instanceof Number || id instanceof String;
-            }
-        },
-
-        /**
-         * Manages identifiers of type {@code Integer}. Will convert any class that extends from {@link Number} to a
-         * {@link Integer} and will also attempt to convert {@code String} values
-         */
-        INTEGER {
-            @Override
-            public Integer getNextId(final TinkerGraph graph) {
-                return Stream.generate(() -> (graph.currentId.incrementAndGet())).map(Long::intValue).filter(id -> !graph.vertices.containsKey(id) && !graph.edges.containsKey(id)).findAny().get();
-            }
-
-            @Override
-            public Object convert(final Object id) {
-                if (null == id)
-                    return null;
-                else if (id instanceof Integer)
-                    return id;
-                else if (id instanceof Number)
-                    return ((Number) id).intValue();
-                else if (id instanceof String) {
-                    try {
-                        return Integer.parseInt((String) id);
-                    } catch (NumberFormatException nfe) {
-                        throw new IllegalArgumentException(createErrorMessage(Integer.class, id));
-                    }
-                }
-                else
-                    throw new IllegalArgumentException(createErrorMessage(Integer.class, id));
-            }
-
-            @Override
-            public boolean allow(final Object id) {
-                return id instanceof Number || id instanceof String;
-            }
-        },
-
-        /**
-         * Manages identifiers of type {@code UUID}. Will convert {@code String} values to
-         * {@code UUID}.
-         */
-        UUID {
-            @Override
-            public UUID getNextId(final TinkerGraph graph) {
-                return java.util.UUID.randomUUID();
-            }
-
-            @Override
-            public Object convert(final Object id) {
-                if (null == id)
-                    return null;
-                else if (id instanceof java.util.UUID)
-                    return id;
-                else  if (id instanceof String) {
-                    try {
-                        return java.util.UUID.fromString((String) id);
-                    } catch (IllegalArgumentException iae) {
-                        throw new IllegalArgumentException(createErrorMessage(java.util.UUID.class, id));
-                    }
-                } else
-                    throw new IllegalArgumentException(createErrorMessage(java.util.UUID.class, id));
-            }
-
-            @Override
-            public boolean allow(final Object id) {
-                return id instanceof UUID || id instanceof String;
-            }
-        },
-
-        /**
-         * Manages identifiers of any type.  This represents the default way {@link TinkerGraph} has always worked.
-         * In other words, there is no identifier conversion so if the identifier of a vertex is a {@code Long}, then
-         * trying to request it with an {@code Integer} will have no effect. Also, like the original
-         * {@link TinkerGraph}, it will generate {@link Long} values for identifiers.
-         */
-        ANY {
-            @Override
-            public Long getNextId(final TinkerGraph graph) {
-                return Stream.generate(() -> (graph.currentId.incrementAndGet())).filter(id -> !graph.vertices.containsKey(id) && !graph.edges.containsKey(id)).findAny().get();
-            }
-
-            @Override
-            public Object convert(final Object id) {
-                return id;
-            }
-
-            @Override
-            public boolean allow(final Object id) {
-                return true;
-            }
-        };
-
-        private static String createErrorMessage(final Class<?> expectedType, final Object id) {
-            return String.format("Expected an id that is convertible to %s but received %s - [%s]", expectedType, id.getClass(), id);
-        }
-    }
 }
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
index b0056af..084977e 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
@@ -23,17 +23,14 @@
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputerView;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -53,111 +50,24 @@
     private TinkerHelper() {
     }
 
-    protected static Edge addEdge(final TinkerGraph graph, final TinkerVertex outVertex, final TinkerVertex inVertex, final String label, final Object... keyValues) {
-        ElementHelper.validateLabel(label);
-        ElementHelper.legalPropertyKeyValueArray(keyValues);
-
-        Object idValue = graph.edgeIdManager.convert(ElementHelper.getIdValue(keyValues).orElse(null));
-
-        final Edge edge;
-        if (null != idValue) {
-            if (graph.edges.containsKey(idValue))
-                throw Graph.Exceptions.edgeWithIdAlreadyExists(idValue);
-        } else {
-            idValue = graph.edgeIdManager.getNextId(graph);
-        }
-
-        edge = new TinkerEdge(idValue, outVertex, label, inVertex);
-        ElementHelper.attachProperties(edge, keyValues);
-        graph.edges.put(edge.id(), edge);
-        TinkerHelper.addOutEdge(outVertex, label, edge);
-        TinkerHelper.addInEdge(inVertex, label, edge);
-        return edge;
-
-    }
-
-    protected static void addOutEdge(final TinkerVertex vertex, final String label, final Edge edge) {
-        if (null == vertex.outEdges) vertex.outEdges = new HashMap<>();
-        Set<Edge> edges = vertex.outEdges.get(label);
-        if (null == edges) {
-            edges = new HashSet<>();
-            vertex.outEdges.put(label, edges);
-        }
-        edges.add(edge);
-    }
-
-    protected static void addInEdge(final TinkerVertex vertex, final String label, final Edge edge) {
-        if (null == vertex.inEdges) vertex.inEdges = new HashMap<>();
-        Set<Edge> edges = vertex.inEdges.get(label);
-        if (null == edges) {
-            edges = new HashSet<>();
-            vertex.inEdges.put(label, edges);
-        }
-        edges.add(edge);
-    }
-
-    public static List<TinkerVertex> queryVertexIndex(final TinkerGraph graph, final String key, final Object value) {
-        return null == graph.vertexIndex ? Collections.emptyList() : graph.vertexIndex.get(key, value);
-    }
-
-    public static List<TinkerEdge> queryEdgeIndex(final TinkerGraph graph, final String key, final Object value) {
-        return null == graph.edgeIndex ? Collections.emptyList() : graph.edgeIndex.get(key, value);
-    }
-
-    public static boolean inComputerMode(final TinkerGraph graph) {
-        return null != graph.graphComputerView;
-    }
-
-    public static TinkerGraphComputerView createGraphComputerView(final TinkerGraph graph, final GraphFilter graphFilter, final Set<VertexComputeKey> computeKeys) {
-        return graph.graphComputerView = new TinkerGraphComputerView(graph, graphFilter, computeKeys);
-    }
-
-    public static TinkerGraphComputerView getGraphComputerView(final TinkerGraph graph) {
-        return graph.graphComputerView;
-    }
-
-    public static void dropGraphComputerView(final TinkerGraph graph) {
-        graph.graphComputerView = null;
-    }
-
     public static Map<String, List<VertexProperty>> getProperties(final TinkerVertex vertex) {
         return null == vertex.properties ? Collections.emptyMap() : vertex.properties;
     }
 
-    public static void autoUpdateIndex(final TinkerEdge edge, final String key, final Object newValue, final Object oldValue) {
-        final TinkerGraph graph = (TinkerGraph) edge.graph();
-        if (graph.edgeIndex != null)
-            graph.edgeIndex.autoUpdate(key, newValue, oldValue, edge);
+    public static boolean inComputerMode(final AbstractTinkerGraph graph) {
+        return null != graph.graphComputerView;
     }
 
-    public static void autoUpdateIndex(final TinkerVertex vertex, final String key, final Object newValue, final Object oldValue) {
-        final TinkerGraph graph = (TinkerGraph) vertex.graph();
-        if (graph.vertexIndex != null)
-            graph.vertexIndex.autoUpdate(key, newValue, oldValue, vertex);
+    public static TinkerGraphComputerView createGraphComputerView(final AbstractTinkerGraph graph, final GraphFilter graphFilter, final Set<VertexComputeKey> computeKeys) {
+        return graph.graphComputerView = new TinkerGraphComputerView(graph, graphFilter, computeKeys);
     }
 
-    public static void removeElementIndex(final TinkerVertex vertex) {
-        final TinkerGraph graph = (TinkerGraph) vertex.graph();
-        if (graph.vertexIndex != null)
-            graph.vertexIndex.removeElement(vertex);
+    public static TinkerGraphComputerView getGraphComputerView(final AbstractTinkerGraph graph) {
+        return graph.graphComputerView;
     }
 
-    public static void removeElementIndex(final TinkerEdge edge) {
-        final TinkerGraph graph = (TinkerGraph) edge.graph();
-        if (graph.edgeIndex != null)
-            graph.edgeIndex.removeElement(edge);
-    }
-
-    public static void removeIndex(final TinkerVertex vertex, final String key, final Object value) {
-        final TinkerGraph graph = (TinkerGraph) vertex.graph();
-        if (graph.vertexIndex != null)
-            graph.vertexIndex.remove(key, value, vertex);
-    }
-
-    public static void removeIndex(final TinkerEdge edge, final String key, final Object value) {
-        final TinkerGraph graph = (TinkerGraph) edge.graph();
-        if (graph.edgeIndex != null)
-            graph.edgeIndex.remove(key, value, edge);
+    public static void dropGraphComputerView(final AbstractTinkerGraph graph) {
+        graph.graphComputerView = null;
     }
 
     public static Iterator<TinkerEdge> getEdges(final TinkerVertex vertex, final Direction direction, final String... edgeLabels) {
@@ -185,6 +95,39 @@
         return (Iterator) edges.iterator();
     }
 
+    public static Iterator<TinkerEdge> getEdgesTx(final TinkerVertex vertex, final Direction direction, final String... edgeLabels) {
+        final List<Object> outEdgeIds = new ArrayList<>();
+        if (direction.equals(Direction.OUT) || direction.equals(Direction.BOTH)) {
+            if (vertex.outEdgesId != null) {
+                if (edgeLabels.length == 0)
+                    vertex.outEdgesId.values().forEach(outEdgeIds::addAll);
+                else if (edgeLabels.length == 1)
+                    outEdgeIds.addAll(vertex.outEdgesId.getOrDefault(edgeLabels[0], Collections.emptySet()));
+                else
+                    Stream.of(edgeLabels).map(vertex.outEdgesId::get).filter(Objects::nonNull).forEach(outEdgeIds::addAll);
+            }
+        }
+
+        final List<Object> inEdgeIds = new ArrayList<>();
+        if (direction.equals(Direction.IN) || direction.equals(Direction.BOTH)) {
+            if (vertex.inEdgesId != null) {
+                if (edgeLabels.length == 0)
+                    vertex.inEdgesId.values().forEach(inEdgeIds::addAll);
+                else if (edgeLabels.length == 1)
+                    inEdgeIds.addAll(vertex.inEdgesId.getOrDefault(edgeLabels[0], Collections.emptySet()));
+                else
+                    Stream.of(edgeLabels).map(vertex.inEdgesId::get).filter(Objects::nonNull).forEach(inEdgeIds::addAll);
+            }
+        }
+
+        return outEdgeIds.size() == 0 && inEdgeIds.size() == 0
+                ? Collections.emptyIterator()
+                : Stream.concat(outEdgeIds.stream(), inEdgeIds.stream())
+                    .map(id -> ((AbstractTinkerGraph) vertex.graph()).edge(id))
+                    .filter(v -> v != null)
+                    .map(v -> (TinkerEdge) v).iterator();
+    }
+
     public static Iterator<TinkerVertex> getVertices(final TinkerVertex vertex, final Direction direction, final String... edgeLabels) {
         final List<Vertex> vertices = new ArrayList<>();
         if (direction.equals(Direction.OUT) || direction.equals(Direction.BOTH)) {
@@ -210,19 +153,61 @@
         return (Iterator) vertices.iterator();
     }
 
+    public static Iterator<TinkerVertex> getVerticesTx(final TinkerVertex vertex, final Direction direction, final String... edgeLabels) {
+        final Set<Object> inEdgesIds = new HashSet<>();
+        if (direction.equals(Direction.OUT) || direction.equals(Direction.BOTH)) {
+            if (vertex.outEdgesId != null) {
+                if (edgeLabels.length == 0)
+                    vertex.outEdgesId.values().forEach(set -> set.forEach(edge -> inEdgesIds.add(edge)));
+                else if (edgeLabels.length == 1)
+                    vertex.outEdgesId.getOrDefault(edgeLabels[0], Collections.emptySet()).forEach(edge -> inEdgesIds.add(edge));
+                else
+                    Stream.of(edgeLabels).map(vertex.outEdgesId::get).filter(Objects::nonNull).flatMap(Set::stream).forEach(edge -> inEdgesIds.add(edge));
+            }
+        }
+        final Set<Object> outEdgesIds = new HashSet<>();
+        if (direction.equals(Direction.IN) || direction.equals(Direction.BOTH)) {
+            if (vertex.inEdgesId != null) {
+                if (edgeLabels.length == 0)
+                    vertex.inEdgesId.values().forEach(set -> set.forEach(edge -> outEdgesIds.add(edge)));
+                else if (edgeLabels.length == 1)
+                    vertex.inEdgesId.getOrDefault(edgeLabels[0], Collections.emptySet()).forEach(edge -> outEdgesIds.add(edge));
+                else
+                    Stream.of(edgeLabels).map(vertex.inEdgesId::get).filter(Objects::nonNull).flatMap(Set::stream).forEach(edge -> outEdgesIds.add(edge));
+            }
+        }
+
+        final List<Vertex> vertices = new ArrayList<>();
+        if (inEdgesIds.size() != 0)
+            vertex.graph().edges(inEdgesIds.toArray()).forEachRemaining(edge -> vertices.add(edge.inVertex()));
+        if (outEdgesIds.size() != 0)
+            vertex.graph().edges(outEdgesIds.toArray()).forEachRemaining(edge -> vertices.add(edge.outVertex()));
+
+        return vertices.size() == 0
+                ? Collections.emptyIterator()
+                : vertices.stream().map(v -> (TinkerVertex) v).iterator();
+    }
+
+    /**
+     * Allows direct access to a TinkerGraph's storage which can be helpful for advanced use cases.
+     */
     public static Map<Object, Vertex> getVertices(final TinkerGraph graph) {
         return graph.vertices;
     }
 
+    /**
+     * Allows direct access to a TinkerGraph's storage which can be helpful for advanced use cases.
+     */
     public static Map<Object, Edge> getEdges(final TinkerGraph graph) {
         return graph.edges;
     }
 
+    // todo: move to SearchHelper?
     /**
      * Search for {@link Property}s attached to {@link Element}s of the supplied element type using the supplied
      * regex. This is a basic scan+filter operation, not a full text search against an index.
      */
-    public static <E extends Element> Iterator<Property> search(final TinkerGraph graph, final String regex,
+    public static <E extends Element> Iterator<Property> search(final AbstractTinkerGraph graph, final String regex,
                                                                 final Optional<Class<E>> type) {
 
         final Supplier<Iterator<Element>> vertices = () -> IteratorUtils.cast(graph.vertices());
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
index 75924da..58504ef 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
@@ -25,7 +25,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -34,16 +33,12 @@
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-final class TinkerIndex<T extends Element> {
+final class TinkerIndex<T extends Element> extends AbstractTinkerIndex<T> {
 
     protected Map<String, Map<Object, Set<T>>> index = new ConcurrentHashMap<>();
-    protected final Class<T> indexClass;
-    private final Set<String> indexedKeys = new HashSet<>();
-    private final TinkerGraph graph;
 
     public TinkerIndex(final TinkerGraph graph, final Class<T> indexClass) {
-        this.graph = graph;
-        this.indexClass = indexClass;
+        super(graph, indexClass);
     }
 
     protected void put(final String key, final Object value, final T element) {
@@ -52,14 +47,16 @@
             this.index.putIfAbsent(key, new ConcurrentHashMap<>());
             keyMap = this.index.get(key);
         }
-        Set<T> objects = keyMap.get(value);
+        final Object indexableValue = indexable(value);
+        Set<T> objects = keyMap.get(indexableValue);
         if (null == objects) {
-            keyMap.putIfAbsent(value, ConcurrentHashMap.newKeySet());
-            objects = keyMap.get(value);
+            keyMap.putIfAbsent(indexableValue, ConcurrentHashMap.newKeySet());
+            objects = keyMap.get(indexableValue);
         }
         objects.add(element);
     }
 
+    @Override
     public List<T> get(final String key, final Object value) {
         final Map<Object, Set<T>> keyMap = this.index.get(key);
         if (null == keyMap) {
@@ -73,6 +70,7 @@
         }
     }
 
+    @Override
     public long count(final String key, final Object value) {
         final Map<Object, Set<T>> keyMap = this.index.get(key);
         if (null == keyMap) {
@@ -86,6 +84,7 @@
         }
     }
 
+    @Override
     public void remove(final String key, final Object value, final T element) {
         final Map<Object, Set<T>> keyMap = this.index.get(key);
         if (null != keyMap) {
@@ -99,6 +98,7 @@
         }
     }
 
+    @Override
     public void removeElement(final T element) {
         if (this.indexClass.isAssignableFrom(element.getClass())) {
             for (Map<Object, Set<T>> map : index.values()) {
@@ -109,6 +109,7 @@
         }
     }
 
+    @Override
     public void autoUpdate(final String key, final Object newValue, final Object oldValue, final T element) {
         if (this.indexedKeys.contains(key)) {
             this.remove(key, oldValue, element);
@@ -116,6 +117,7 @@
         }
     }
 
+    @Override
     public void createKeyIndex(final String key) {
         if (null == key)
             throw Graph.Exceptions.argumentCanNotBeNull("key");
@@ -127,49 +129,19 @@
         this.indexedKeys.add(key);
 
         (Vertex.class.isAssignableFrom(this.indexClass) ?
-                this.graph.vertices.values().parallelStream() :
-                this.graph.edges.values().parallelStream())
+                // cleaner to use graph.vertices(), but graph.vertices is quicker
+                ((TinkerGraph)this.graph).vertices.values().parallelStream() :
+                ((TinkerGraph)this.graph).edges.values().parallelStream())
                 .map(e -> new Object[]{((T) e).property(key), e})
                 .filter(a -> ((Property) a[0]).isPresent())
                 .forEach(a -> this.put(key, ((Property) a[0]).value(), (T) a[1]));
     }
 
+    @Override
     public void dropKeyIndex(final String key) {
         if (this.index.containsKey(key))
             this.index.remove(key).clear();
 
         this.indexedKeys.remove(key);
     }
-
-    /**
-     * Provides a way for an index to have a {@code null} value as {@code ConcurrentHashMap} will not allow a
-     * {@code null} key.
-     */
-    public static Object indexable(final Object obj) {
-        return null == obj ? IndexedNull.instance() : obj;
-    }
-
-    public Set<String> getIndexedKeys() {
-        return this.indexedKeys;
-    }
-
-    public static final class IndexedNull {
-        private static final IndexedNull inst = new IndexedNull();
-
-        private IndexedNull() {}
-
-        static IndexedNull instance() {
-            return inst;
-        }
-
-        @Override
-        public int hashCode() {
-            return 751912123;
-        }
-
-        @Override
-        public boolean equals(final Object o) {
-            return o instanceof IndexedNull;
-        }
-    }
 }
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndexHelper.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndexHelper.java
new file mode 100644
index 0000000..7d9f225
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndexHelper.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import java.util.Collections;
+import java.util.List;
+
+public final class TinkerIndexHelper {
+
+    private TinkerIndexHelper() {
+    }
+
+    public static List<TinkerVertex> queryVertexIndex(final AbstractTinkerGraph graph, final String key, final Object value) {
+        return null == graph.vertexIndex ? Collections.emptyList() : graph.vertexIndex.get(key, value);
+    }
+
+    public static List<TinkerEdge> queryEdgeIndex(final AbstractTinkerGraph graph, final String key, final Object value) {
+        return null == graph.edgeIndex ? Collections.emptyList() : graph.edgeIndex.get(key, value);
+    }
+
+    public static void autoUpdateIndex(final TinkerEdge edge, final String key, final Object newValue, final Object oldValue) {
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) edge.graph();
+        if (graph.edgeIndex != null)
+            graph.edgeIndex.autoUpdate(key, newValue, oldValue, edge);
+    }
+
+    public static void autoUpdateIndex(final TinkerVertex vertex, final String key, final Object newValue, final Object oldValue) {
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) vertex.graph();
+        if (graph.vertexIndex != null)
+            graph.vertexIndex.autoUpdate(key, newValue, oldValue, vertex);
+    }
+
+    public static void removeElementIndex(final TinkerVertex vertex) {
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) vertex.graph();
+        if (graph.vertexIndex != null)
+            graph.vertexIndex.removeElement(vertex);
+    }
+
+    public static void removeElementIndex(final TinkerEdge edge) {
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) edge.graph();
+        if (graph.edgeIndex != null)
+            graph.edgeIndex.removeElement(edge);
+    }
+
+    public static void removeIndex(final TinkerVertex vertex, final String key, final Object value) {
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) vertex.graph();
+        if (graph.vertexIndex != null)
+            graph.vertexIndex.remove(key, value, vertex);
+    }
+
+    public static void removeIndex(final TinkerEdge edge, final String key, final Object value) {
+        final AbstractTinkerGraph graph = (AbstractTinkerGraph) edge.graph();
+        if (graph.edgeIndex != null)
+            graph.edgeIndex.remove(key, value, edge);
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1.java
new file mode 100644
index 0000000..ed0ae39
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1.java
@@ -0,0 +1,262 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
+ * implementation specific classes that might need to be serialized.  This registry allows a {@link TinkerGraph} to
+ * be serialized directly which is useful for moving small graphs around on the network.
+ * <p/>
+ * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
+ * wouldn't be practical to serialize in this fashion.  This is a bit of a special case for TinkerGraph given its
+ * in-memory status.  Typical implementations would create serializers for a complex vertex identifier or a
+ * custom data class like a "geographic point".
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class TinkerIoRegistryV1 extends AbstractIoRegistry {
+
+    private static final TinkerIoRegistryV1 INSTANCE = new TinkerIoRegistryV1();
+
+    private TinkerIoRegistryV1() {
+        register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
+        register(GraphSONIo.class, null, new TinkerModule());
+    }
+
+    public static TinkerIoRegistryV1 instance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo.  This is useful when
+     * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
+     */
+    final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
+        @Override
+        public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
+            try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+                GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
+                final byte[] bytes = stream.toByteArray();
+                output.writeInt(bytes.length);
+                output.write(bytes);
+            } catch (Exception io) {
+                throw new RuntimeException(io);
+            }
+        }
+
+        @Override
+        public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
+            final Configuration conf = new BaseConfiguration();
+            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+            final TinkerGraph graph = TinkerGraph.open(conf);
+            final int len = input.readInt();
+            final byte[] bytes = input.readBytes(len);
+            try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
+                GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
+            } catch (Exception io) {
+                throw new RuntimeException(io);
+            }
+
+            return graph;
+        }
+    }
+
+    /**
+     * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON.  This is useful when
+     * shipping small graphs around through Gremlin Server.
+     */
+    final static class TinkerModule extends SimpleModule {
+        public TinkerModule() {
+            super("tinkergraph-1.0");
+            addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
+            addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
+        }
+    }
+
+    /**
+     * Serializes the graph into an edge list format.  Edge list is a better choices than adjacency list (which is
+     * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
+     * the use case for this isn't around massive graphs.  The use case is for "small" subgraphs that are being
+     * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
+     * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
+     * list).
+     */
+    final static class TinkerGraphJacksonSerializer extends StdSerializer<TinkerGraph> {
+
+        public TinkerGraphJacksonSerializer() {
+            super(TinkerGraph.class);
+        }
+
+        @Override
+        public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+
+            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Vertex> vertices = graph.vertices();
+            while (vertices.hasNext()) {
+                serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
+            }
+
+            jsonGenerator.writeEndArray();
+
+            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Edge> edges = graph.edges();
+            while (edges.hasNext()) {
+                serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
+            }
+
+            jsonGenerator.writeEndArray();
+
+            jsonGenerator.writeEndObject();
+        }
+
+        @Override
+        public void serializeWithType(final TinkerGraph graph, final JsonGenerator jsonGenerator,
+                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField(GraphSONTokens.CLASS, TinkerGraph.class.getName());
+
+            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+            jsonGenerator.writeStartArray();
+            jsonGenerator.writeString(ArrayList.class.getName());
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Vertex> vertices = graph.vertices();
+            while (vertices.hasNext()) {
+                GraphSONUtil.writeWithType(vertices.next(), jsonGenerator, serializerProvider, typeSerializer);
+            }
+
+            jsonGenerator.writeEndArray();
+            jsonGenerator.writeEndArray();
+
+            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+            jsonGenerator.writeStartArray();
+            jsonGenerator.writeString(ArrayList.class.getName());
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Edge> edges = graph.edges();
+            while (edges.hasNext()) {
+                GraphSONUtil.writeWithType(edges.next(), jsonGenerator, serializerProvider, typeSerializer);
+            }
+
+            jsonGenerator.writeEndArray();
+            jsonGenerator.writeEndArray();
+
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    /**
+     * Deserializes the edge list format.
+     */
+    static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
+        public TinkerGraphJacksonDeserializer() {
+            super(TinkerGraph.class);
+        }
+
+        @Override
+        public TinkerGraph deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Configuration conf = new BaseConfiguration();
+            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+            final TinkerGraph graph = TinkerGraph.open(conf);
+
+            final List<Map<String, Object>> edges;
+            final List<Map<String, Object>> vertices;
+            if (!jsonParser.getCurrentToken().isStructStart()) {
+                if (!jsonParser.getCurrentName().equals(GraphSONTokens.VERTICES))
+                    throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.VERTICES));
+
+                jsonParser.nextToken();
+                vertices = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, ArrayList.class);
+                jsonParser.nextToken();
+
+                if (!jsonParser.getCurrentName().equals(GraphSONTokens.EDGES))
+                    throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.EDGES));
+
+                jsonParser.nextToken();
+                edges = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, ArrayList.class);
+            } else {
+                final Map<String, Object> graphData = deserializationContext.readValue(jsonParser, HashMap.class);
+                vertices = (List<Map<String,Object>>) graphData.get(GraphSONTokens.VERTICES);
+                edges = (List<Map<String,Object>>) graphData.get(GraphSONTokens.EDGES);
+            }
+
+            for (Map<String, Object> vertexData : vertices) {
+                final DetachedVertex detached = new DetachedVertex(vertexData.get(GraphSONTokens.ID),
+                        vertexData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) vertexData.get(GraphSONTokens.PROPERTIES));
+                detached.attach(Attachable.Method.getOrCreate(graph));
+            }
+
+            for (Map<String, Object> edgeData : edges) {
+                final DetachedEdge detached = new DetachedEdge(edgeData.get(GraphSONTokens.ID),
+                        edgeData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) edgeData.get(GraphSONTokens.PROPERTIES),
+                        edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString(),
+                        edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString());
+                detached.attach(Attachable.Method.getOrCreate(graph));
+            }
+
+            return graph;
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1d0.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1d0.java
deleted file mode 100644
index e2140b1..0000000
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1d0.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.commons.configuration2.BaseConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
-import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
-import org.apache.tinkerpop.gremlin.structure.util.Attachable;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
- * implementation specific classes that might need to be serialized.  This registry allows a {@link TinkerGraph} to
- * be serialized directly which is useful for moving small graphs around on the network.
- * <p/>
- * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
- * wouldn't be practical to serialize in this fashion.  This is a bit of a special case for TinkerGraph given its
- * in-memory status.  Typical implementations would create serializers for a complex vertex identifier or a
- * custom data class like a "geographic point".
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class TinkerIoRegistryV1d0 extends AbstractIoRegistry {
-
-    private static final TinkerIoRegistryV1d0 INSTANCE = new TinkerIoRegistryV1d0();
-
-    private TinkerIoRegistryV1d0() {
-        register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
-        register(GraphSONIo.class, null, new TinkerModule());
-    }
-
-    public static TinkerIoRegistryV1d0 instance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo.  This is useful when
-     * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
-     */
-    final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
-        @Override
-        public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
-            try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
-                GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
-                final byte[] bytes = stream.toByteArray();
-                output.writeInt(bytes.length);
-                output.write(bytes);
-            } catch (Exception io) {
-                throw new RuntimeException(io);
-            }
-        }
-
-        @Override
-        public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
-            final Configuration conf = new BaseConfiguration();
-            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
-            final TinkerGraph graph = TinkerGraph.open(conf);
-            final int len = input.readInt();
-            final byte[] bytes = input.readBytes(len);
-            try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
-                GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
-            } catch (Exception io) {
-                throw new RuntimeException(io);
-            }
-
-            return graph;
-        }
-    }
-
-    /**
-     * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON.  This is useful when
-     * shipping small graphs around through Gremlin Server.
-     */
-    final static class TinkerModule extends SimpleModule {
-        public TinkerModule() {
-            super("tinkergraph-1.0");
-            addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
-            addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
-        }
-    }
-
-    /**
-     * Serializes the graph into an edge list format.  Edge list is a better choices than adjacency list (which is
-     * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
-     * the use case for this isn't around massive graphs.  The use case is for "small" subgraphs that are being
-     * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
-     * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
-     * list).
-     */
-    final static class TinkerGraphJacksonSerializer extends StdSerializer<TinkerGraph> {
-
-        public TinkerGraphJacksonSerializer() {
-            super(TinkerGraph.class);
-        }
-
-        @Override
-        public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-
-            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Vertex> vertices = graph.vertices();
-            while (vertices.hasNext()) {
-                serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
-            }
-
-            jsonGenerator.writeEndArray();
-
-            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Edge> edges = graph.edges();
-            while (edges.hasNext()) {
-                serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
-            }
-
-            jsonGenerator.writeEndArray();
-
-            jsonGenerator.writeEndObject();
-        }
-
-        @Override
-        public void serializeWithType(final TinkerGraph graph, final JsonGenerator jsonGenerator,
-                                      final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeStringField(GraphSONTokens.CLASS, TinkerGraph.class.getName());
-
-            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
-            jsonGenerator.writeStartArray();
-            jsonGenerator.writeString(ArrayList.class.getName());
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Vertex> vertices = graph.vertices();
-            while (vertices.hasNext()) {
-                GraphSONUtil.writeWithType(vertices.next(), jsonGenerator, serializerProvider, typeSerializer);
-            }
-
-            jsonGenerator.writeEndArray();
-            jsonGenerator.writeEndArray();
-
-            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
-            jsonGenerator.writeStartArray();
-            jsonGenerator.writeString(ArrayList.class.getName());
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Edge> edges = graph.edges();
-            while (edges.hasNext()) {
-                GraphSONUtil.writeWithType(edges.next(), jsonGenerator, serializerProvider, typeSerializer);
-            }
-
-            jsonGenerator.writeEndArray();
-            jsonGenerator.writeEndArray();
-
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    /**
-     * Deserializes the edge list format.
-     */
-    static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
-        public TinkerGraphJacksonDeserializer() {
-            super(TinkerGraph.class);
-        }
-
-        @Override
-        public TinkerGraph deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Configuration conf = new BaseConfiguration();
-            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
-            final TinkerGraph graph = TinkerGraph.open(conf);
-
-            final List<Map<String, Object>> edges;
-            final List<Map<String, Object>> vertices;
-            if (!jsonParser.getCurrentToken().isStructStart()) {
-                if (!jsonParser.getCurrentName().equals(GraphSONTokens.VERTICES))
-                    throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.VERTICES));
-
-                jsonParser.nextToken();
-                vertices = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, ArrayList.class);
-                jsonParser.nextToken();
-
-                if (!jsonParser.getCurrentName().equals(GraphSONTokens.EDGES))
-                    throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.EDGES));
-
-                jsonParser.nextToken();
-                edges = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, ArrayList.class);
-            } else {
-                final Map<String, Object> graphData = deserializationContext.readValue(jsonParser, HashMap.class);
-                vertices = (List<Map<String,Object>>) graphData.get(GraphSONTokens.VERTICES);
-                edges = (List<Map<String,Object>>) graphData.get(GraphSONTokens.EDGES);
-            }
-
-            for (Map<String, Object> vertexData : vertices) {
-                final DetachedVertex detached = new DetachedVertex(vertexData.get(GraphSONTokens.ID),
-                        vertexData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) vertexData.get(GraphSONTokens.PROPERTIES));
-                detached.attach(Attachable.Method.getOrCreate(graph));
-            }
-
-            for (Map<String, Object> edgeData : edges) {
-                final DetachedEdge detached = new DetachedEdge(edgeData.get(GraphSONTokens.ID),
-                        edgeData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) edgeData.get(GraphSONTokens.PROPERTIES),
-                        edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString(),
-                        edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString());
-                detached.attach(Attachable.Method.getOrCreate(graph));
-            }
-
-            return graph;
-        }
-    }
-}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2.java
new file mode 100644
index 0000000..fc5ff8b
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2.java
@@ -0,0 +1,221 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
+ * implementation specific classes that might need to be serialized.  This registry allows a {@link TinkerGraph} to
+ * be serialized directly which is useful for moving small graphs around on the network.
+ * <p/>
+ * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
+ * wouldn't be practical to serialize in this fashion.  This is a bit of a special case for TinkerGraph given its
+ * in-memory status.  Typical implementations would create serializers for a complex vertex identifier or a
+ * custom data class like a "geographic point".
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class TinkerIoRegistryV2 extends AbstractIoRegistry {
+
+    private static final TinkerIoRegistryV2 INSTANCE = new TinkerIoRegistryV2();
+
+    private TinkerIoRegistryV2() {
+        register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
+        register(GraphSONIo.class, null, new TinkerModuleV2());
+    }
+
+    public static TinkerIoRegistryV2 instance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo.  This is useful when
+     * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
+     */
+    final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
+        @Override
+        public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
+            try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+                GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
+                final byte[] bytes = stream.toByteArray();
+                output.writeInt(bytes.length);
+                output.write(bytes);
+            } catch (Exception io) {
+                throw new RuntimeException(io);
+            }
+        }
+
+        @Override
+        public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
+            final Configuration conf = new BaseConfiguration();
+            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+            final TinkerGraph graph = TinkerGraph.open(conf);
+            final int len = input.readInt();
+            final byte[] bytes = input.readBytes(len);
+            try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
+                GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
+            } catch (Exception io) {
+                throw new RuntimeException(io);
+            }
+
+            return graph;
+        }
+    }
+
+    /**
+     * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON. This is useful when
+     * shipping small graphs around through Gremlin Server.
+     */
+    final static class TinkerModuleV2 extends TinkerPopJacksonModule {
+        public TinkerModuleV2() {
+            super("tinkergraph-2.0");
+            addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
+            addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
+        }
+
+        @Override
+        public Map<Class, String> getTypeDefinitions() {
+            return new HashMap<Class, String>(){{
+                put(TinkerGraph.class, "graph");
+            }};
+        }
+
+        @Override
+        public String getTypeNamespace() {
+            return "tinker";
+        }
+    }
+
+    /**
+     * Serializes the graph into an edge list format.  Edge list is a better choices than adjacency list (which is
+     * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
+     * the use case for this isn't around massive graphs.  The use case is for "small" subgraphs that are being
+     * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
+     * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
+     * list).
+     */
+    final static class TinkerGraphJacksonSerializer extends StdScalarSerializer<TinkerGraph> {
+
+        public TinkerGraphJacksonSerializer() {
+            super(TinkerGraph.class);
+        }
+
+        @Override
+        public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Vertex> vertices = graph.vertices();
+            while (vertices.hasNext()) {
+                serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
+            }
+
+            jsonGenerator.writeEndArray();
+            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Edge> edges = graph.edges();
+            while (edges.hasNext()) {
+                serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
+            }
+
+            jsonGenerator.writeEndArray();
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    /**
+     * Deserializes the edge list format.
+     */
+    static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
+        public TinkerGraphJacksonDeserializer() {
+            super(TinkerGraph.class);
+        }
+
+        @Override
+        public TinkerGraph deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Configuration conf = new BaseConfiguration();
+            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+            final TinkerGraph graph = TinkerGraph.open(conf);
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals("vertices")) {
+                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
+                            final DetachedVertex v = (DetachedVertex) deserializationContext.readValue(jsonParser, Vertex.class);
+                            v.attach(Attachable.Method.getOrCreate(graph));
+                        }
+                    }
+                } else if (jsonParser.getCurrentName().equals("edges")) {
+                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
+                            final DetachedEdge e = (DetachedEdge) deserializationContext.readValue(jsonParser, Edge.class);
+                            e.attach(Attachable.Method.getOrCreate(graph));
+                        }
+                    }
+                }
+            }
+
+            return graph;
+        }
+
+        @Override
+        public boolean isCachable() {
+            return true;
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
deleted file mode 100644
index e6f59c9..0000000
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.commons.configuration2.BaseConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
-import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
-import org.apache.tinkerpop.gremlin.structure.util.Attachable;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
- * implementation specific classes that might need to be serialized.  This registry allows a {@link TinkerGraph} to
- * be serialized directly which is useful for moving small graphs around on the network.
- * <p/>
- * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
- * wouldn't be practical to serialize in this fashion.  This is a bit of a special case for TinkerGraph given its
- * in-memory status.  Typical implementations would create serializers for a complex vertex identifier or a
- * custom data class like a "geographic point".
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class TinkerIoRegistryV2d0 extends AbstractIoRegistry {
-
-    private static final TinkerIoRegistryV2d0 INSTANCE = new TinkerIoRegistryV2d0();
-
-    private TinkerIoRegistryV2d0() {
-        register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
-        register(GraphSONIo.class, null, new TinkerModuleV2d0());
-    }
-
-    public static TinkerIoRegistryV2d0 instance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo.  This is useful when
-     * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
-     */
-    final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
-        @Override
-        public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
-            try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
-                GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
-                final byte[] bytes = stream.toByteArray();
-                output.writeInt(bytes.length);
-                output.write(bytes);
-            } catch (Exception io) {
-                throw new RuntimeException(io);
-            }
-        }
-
-        @Override
-        public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
-            final Configuration conf = new BaseConfiguration();
-            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
-            final TinkerGraph graph = TinkerGraph.open(conf);
-            final int len = input.readInt();
-            final byte[] bytes = input.readBytes(len);
-            try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
-                GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
-            } catch (Exception io) {
-                throw new RuntimeException(io);
-            }
-
-            return graph;
-        }
-    }
-
-    /**
-     * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON. This is useful when
-     * shipping small graphs around through Gremlin Server.
-     */
-    final static class TinkerModuleV2d0 extends TinkerPopJacksonModule {
-        public TinkerModuleV2d0() {
-            super("tinkergraph-2.0");
-            addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
-            addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
-        }
-
-        @Override
-        public Map<Class, String> getTypeDefinitions() {
-            return new HashMap<Class, String>(){{
-                put(TinkerGraph.class, "graph");
-            }};
-        }
-
-        @Override
-        public String getTypeNamespace() {
-            return "tinker";
-        }
-    }
-
-    /**
-     * Serializes the graph into an edge list format.  Edge list is a better choices than adjacency list (which is
-     * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
-     * the use case for this isn't around massive graphs.  The use case is for "small" subgraphs that are being
-     * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
-     * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
-     * list).
-     */
-    final static class TinkerGraphJacksonSerializer extends StdScalarSerializer<TinkerGraph> {
-
-        public TinkerGraphJacksonSerializer() {
-            super(TinkerGraph.class);
-        }
-
-        @Override
-        public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Vertex> vertices = graph.vertices();
-            while (vertices.hasNext()) {
-                serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
-            }
-
-            jsonGenerator.writeEndArray();
-            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Edge> edges = graph.edges();
-            while (edges.hasNext()) {
-                serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
-            }
-
-            jsonGenerator.writeEndArray();
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    /**
-     * Deserializes the edge list format.
-     */
-    static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
-        public TinkerGraphJacksonDeserializer() {
-            super(TinkerGraph.class);
-        }
-
-        @Override
-        public TinkerGraph deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Configuration conf = new BaseConfiguration();
-            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
-            final TinkerGraph graph = TinkerGraph.open(conf);
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals("vertices")) {
-                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
-                            final DetachedVertex v = (DetachedVertex) deserializationContext.readValue(jsonParser, Vertex.class);
-                            v.attach(Attachable.Method.getOrCreate(graph));
-                        }
-                    }
-                } else if (jsonParser.getCurrentName().equals("edges")) {
-                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
-                            final DetachedEdge e = (DetachedEdge) deserializationContext.readValue(jsonParser, Edge.class);
-                            e.attach(Attachable.Method.getOrCreate(graph));
-                        }
-                    }
-                }
-            }
-
-            return graph;
-        }
-
-        @Override
-        public boolean isCachable() {
-            return true;
-        }
-    }
-}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV3.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV3.java
new file mode 100644
index 0000000..393a9b4
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV3.java
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
+ * implementation specific classes that might need to be serialized.  This registry allows a {@link TinkerGraph} to
+ * be serialized directly which is useful for moving small graphs around on the network.
+ * <p/>
+ * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
+ * wouldn't be practical to serialize in this fashion.  This is a bit of a special case for TinkerGraph given its
+ * in-memory status.  Typical implementations would create serializers for a complex vertex identifier or a
+ * custom data class like a "geographic point".
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class TinkerIoRegistryV3 extends AbstractIoRegistry {
+
+    private static final TinkerIoRegistryV3 INSTANCE = new TinkerIoRegistryV3();
+
+    private TinkerIoRegistryV3() {
+        register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
+        register(GraphSONIo.class, null, new TinkerModuleV2());
+    }
+
+    public static TinkerIoRegistryV3 instance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo.  This is useful when
+     * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
+     */
+    final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
+        @Override
+        public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
+            try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+                GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
+                final byte[] bytes = stream.toByteArray();
+                output.writeInt(bytes.length);
+                output.write(bytes);
+            } catch (Exception io) {
+                throw new RuntimeException(io);
+            }
+        }
+
+        @Override
+        public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
+            final Configuration conf = new BaseConfiguration();
+            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+            final TinkerGraph graph = TinkerGraph.open(conf);
+            final int len = input.readInt();
+            final byte[] bytes = input.readBytes(len);
+            try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
+                GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
+            } catch (Exception io) {
+                throw new RuntimeException(io);
+            }
+
+            return graph;
+        }
+    }
+
+    /**
+     * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON. This is useful when
+     * shipping small graphs around through Gremlin Server.
+     */
+    final static class TinkerModuleV2 extends TinkerPopJacksonModule {
+        public TinkerModuleV2() {
+            super("tinkergraph-2.0");
+            addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
+            addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
+        }
+
+        @Override
+        public Map<Class, String> getTypeDefinitions() {
+            return new HashMap<Class, String>(){{
+                put(TinkerGraph.class, "graph");
+            }};
+        }
+
+        @Override
+        public String getTypeNamespace() {
+            return "tinker";
+        }
+    }
+
+    /**
+     * Serializes the graph into an edge list format.  Edge list is a better choices than adjacency list (which is
+     * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
+     * the use case for this isn't around massive graphs.  The use case is for "small" subgraphs that are being
+     * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
+     * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
+     * list).
+     */
+    final static class TinkerGraphJacksonSerializer extends StdScalarSerializer<TinkerGraph> {
+
+        public TinkerGraphJacksonSerializer() {
+            super(TinkerGraph.class);
+        }
+
+        @Override
+        public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+                throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Vertex> vertices = graph.vertices();
+            while (vertices.hasNext()) {
+                serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
+            }
+
+            jsonGenerator.writeEndArray();
+            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+            jsonGenerator.writeStartArray();
+
+            final Iterator<Edge> edges = graph.edges();
+            while (edges.hasNext()) {
+                serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
+            }
+
+            jsonGenerator.writeEndArray();
+            jsonGenerator.writeEndObject();
+        }
+    }
+
+    /**
+     * Deserializes the edge list format.
+     */
+    static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
+        public TinkerGraphJacksonDeserializer() {
+            super(TinkerGraph.class);
+        }
+
+        @Override
+        public TinkerGraph deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+            final Configuration conf = new BaseConfiguration();
+            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+            final TinkerGraph graph = TinkerGraph.open(conf);
+
+            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+                if (jsonParser.getCurrentName().equals("vertices")) {
+                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
+                            final DetachedVertex v = (DetachedVertex) deserializationContext.readValue(jsonParser, Vertex.class);
+                            v.attach(Attachable.Method.getOrCreate(graph));
+                        }
+                    }
+                } else if (jsonParser.getCurrentName().equals("edges")) {
+                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
+                            final DetachedEdge e = (DetachedEdge) deserializationContext.readValue(jsonParser, Edge.class);
+                            e.attach(Attachable.Method.getOrCreate(graph));
+                        }
+                    }
+                }
+            }
+
+            return graph;
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV3d0.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV3d0.java
deleted file mode 100644
index 6ee68ee..0000000
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV3d0.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.commons.configuration2.BaseConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
-import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
-import org.apache.tinkerpop.gremlin.structure.util.Attachable;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
- * implementation specific classes that might need to be serialized.  This registry allows a {@link TinkerGraph} to
- * be serialized directly which is useful for moving small graphs around on the network.
- * <p/>
- * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
- * wouldn't be practical to serialize in this fashion.  This is a bit of a special case for TinkerGraph given its
- * in-memory status.  Typical implementations would create serializers for a complex vertex identifier or a
- * custom data class like a "geographic point".
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class TinkerIoRegistryV3d0 extends AbstractIoRegistry {
-
-    private static final TinkerIoRegistryV3d0 INSTANCE = new TinkerIoRegistryV3d0();
-
-    private TinkerIoRegistryV3d0() {
-        register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
-        register(GraphSONIo.class, null, new TinkerModuleV2d0());
-    }
-
-    public static TinkerIoRegistryV3d0 instance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo.  This is useful when
-     * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
-     */
-    final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
-        @Override
-        public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
-            try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
-                GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
-                final byte[] bytes = stream.toByteArray();
-                output.writeInt(bytes.length);
-                output.write(bytes);
-            } catch (Exception io) {
-                throw new RuntimeException(io);
-            }
-        }
-
-        @Override
-        public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
-            final Configuration conf = new BaseConfiguration();
-            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
-            final TinkerGraph graph = TinkerGraph.open(conf);
-            final int len = input.readInt();
-            final byte[] bytes = input.readBytes(len);
-            try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
-                GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
-            } catch (Exception io) {
-                throw new RuntimeException(io);
-            }
-
-            return graph;
-        }
-    }
-
-    /**
-     * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON. This is useful when
-     * shipping small graphs around through Gremlin Server.
-     */
-    final static class TinkerModuleV2d0 extends TinkerPopJacksonModule {
-        public TinkerModuleV2d0() {
-            super("tinkergraph-2.0");
-            addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
-            addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
-        }
-
-        @Override
-        public Map<Class, String> getTypeDefinitions() {
-            return new HashMap<Class, String>(){{
-                put(TinkerGraph.class, "graph");
-            }};
-        }
-
-        @Override
-        public String getTypeNamespace() {
-            return "tinker";
-        }
-    }
-
-    /**
-     * Serializes the graph into an edge list format.  Edge list is a better choices than adjacency list (which is
-     * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
-     * the use case for this isn't around massive graphs.  The use case is for "small" subgraphs that are being
-     * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
-     * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
-     * list).
-     */
-    final static class TinkerGraphJacksonSerializer extends StdScalarSerializer<TinkerGraph> {
-
-        public TinkerGraphJacksonSerializer() {
-            super(TinkerGraph.class);
-        }
-
-        @Override
-        public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
-                throws IOException {
-            jsonGenerator.writeStartObject();
-            jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Vertex> vertices = graph.vertices();
-            while (vertices.hasNext()) {
-                serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
-            }
-
-            jsonGenerator.writeEndArray();
-            jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
-            jsonGenerator.writeStartArray();
-
-            final Iterator<Edge> edges = graph.edges();
-            while (edges.hasNext()) {
-                serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
-            }
-
-            jsonGenerator.writeEndArray();
-            jsonGenerator.writeEndObject();
-        }
-    }
-
-    /**
-     * Deserializes the edge list format.
-     */
-    static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
-        public TinkerGraphJacksonDeserializer() {
-            super(TinkerGraph.class);
-        }
-
-        @Override
-        public TinkerGraph deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-            final Configuration conf = new BaseConfiguration();
-            conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
-            final TinkerGraph graph = TinkerGraph.open(conf);
-
-            while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-                if (jsonParser.getCurrentName().equals("vertices")) {
-                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
-                            final DetachedVertex v = (DetachedVertex) deserializationContext.readValue(jsonParser, Vertex.class);
-                            v.attach(Attachable.Method.getOrCreate(graph));
-                        }
-                    }
-                } else if (jsonParser.getCurrentName().equals("edges")) {
-                    while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
-                        if (jsonParser.currentToken() == JsonToken.START_OBJECT) {
-                            final DetachedEdge e = (DetachedEdge) deserializationContext.readValue(jsonParser, Edge.class);
-                            e.attach(Attachable.Method.getOrCreate(graph));
-                        }
-                    }
-                }
-            }
-
-            return graph;
-        }
-    }
-}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java
index db40346..f80f4ff 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerProperty.java
@@ -80,10 +80,22 @@
     @Override
     public void remove() {
         if (this.element instanceof Edge) {
+            ((AbstractTinkerGraph) this.element.graph()).touch((TinkerEdge) this.element);
             ((TinkerEdge) this.element).properties.remove(this.key);
-            TinkerHelper.removeIndex((TinkerEdge) this.element, this.key, this.value);
+            TinkerIndexHelper.removeIndex((TinkerEdge) this.element, this.key, this.value);
         } else {
+            final TinkerVertex vertex = (TinkerVertex) ((TinkerVertexProperty) this.element).element();
+            ((AbstractTinkerGraph) vertex.graph()).touch(vertex);
             ((TinkerVertexProperty) this.element).properties.remove(this.key);
         }
     }
+
+    @Override
+    public Object clone() {
+        return new TinkerProperty(element, key, value);
+    }
+
+    public TinkerProperty copy(final Element newOwner) {
+        return new TinkerProperty(newOwner, key, value);
+    }
 }
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransaction.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransaction.java
new file mode 100644
index 0000000..077b6ad
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransaction.java
@@ -0,0 +1,258 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.AbstractThreadLocalTransaction;
+import org.apache.tinkerpop.gremlin.structure.util.TransactionException;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Implementation of {@link AbstractThreadLocalTransaction} for {@link TinkerTransactionGraph}
+ */
+final class TinkerTransaction extends AbstractThreadLocalTransaction {
+
+    private static final String TX_CONFLICT = "Conflict: element modified in another transaction";
+
+    /**
+     * Initial value of transaction number.
+     */
+    private static final long NOT_STARTED = -1;
+
+    /**
+     * Counter for opened transactions. Used to get unique id for each new transaction.
+     */
+    private static final AtomicLong openedTx;
+
+    /**
+     * Unique number of transaction for each thread.
+     */
+    private final ThreadLocal<Long> txNumber = ThreadLocal.withInitial(() -> NOT_STARTED);
+
+    /**
+     * Set of references to vertex containers changed in current transaction.
+     */
+    private final ThreadLocal<Set<TinkerElementContainer<TinkerVertex>>> txChangedVertices = new ThreadLocal<>();
+
+    /**
+     * Set of references to edge containers changed in current transaction.
+     */
+    private final ThreadLocal<Set<TinkerElementContainer<TinkerEdge>>> txChangedEdges = new ThreadLocal<>();
+
+    /**
+     * Set of references to element containers read in current transaction.
+     */
+    private final ThreadLocal<Set<TinkerElementContainer>> txReadElements = new ThreadLocal<>();
+
+    private final TinkerTransactionGraph graph;
+
+    static {
+        openedTx = new AtomicLong(0);
+    }
+
+    public TinkerTransaction(final TinkerTransactionGraph g) {
+        super(g);
+        graph = g;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return txNumber.get() != NOT_STARTED;
+    }
+
+    @Override
+    public <T extends TraversalSource> T begin() {
+        doOpen();
+        return super.begin();
+    }
+
+    @Override
+    protected void doOpen() {
+        txNumber.set(openedTx.getAndIncrement());
+    }
+
+    protected long getTxNumber() {
+        if (!isOpen()) txNumber.set(openedTx.getAndIncrement());
+        return txNumber.get();
+    }
+
+    /**
+     * Adds element to list of changes in current transaction.
+     */
+    protected <T extends TinkerElement> void markChanged(TinkerElementContainer<T> container) {
+        if (!isOpen()) txNumber.set(openedTx.getAndIncrement());
+
+        T element = container.getUnmodified();
+        if (null == element) element = container.getModified();
+        if (element instanceof TinkerVertex) {
+            if (null == txChangedVertices.get())
+                txChangedVertices.set(new HashSet<>());
+            txChangedVertices.get().add((TinkerElementContainer<TinkerVertex>) container);
+        } else {
+            if (null == txChangedEdges.get())
+                txChangedEdges.set(new HashSet<>());
+            txChangedEdges.get().add((TinkerElementContainer<TinkerEdge>) container);
+        }
+    }
+
+    /**
+     * Adds element to list of read in current transaction.
+     */
+    protected <T extends TinkerElement> void markRead(TinkerElementContainer container) {
+        if (!isOpen()) txNumber.set(openedTx.getAndIncrement());
+
+        if (null == txReadElements.get())
+            txReadElements.set(new HashSet<>());
+
+        txReadElements.get().add(container);
+    }
+
+    /**
+     * Try to commit all changes made in current transaction.
+     * Workflow:
+     * 1. collect all changes
+     * 2. verify if any elements already changed, throw {@link TransactionException} if any
+     * 3. try to lock all containers to prevent other tx from making changes
+     * 4. one more time verify elements versions
+     * 5. update indices
+     * 6. commit all changes
+     * On {@link TransactionException}:
+     *  rollback all changes
+     * Lastly:
+     *  cleanup transaction intermediate variables.
+     *
+     * @throws TransactionException
+     */
+    @Override
+    protected void doCommit() throws TransactionException {
+        final long txVersion = txNumber.get();
+
+        // collect all changes
+        Set<TinkerElementContainer<TinkerVertex>> changedVertices = txChangedVertices.get();
+        if (null == changedVertices) changedVertices = Collections.emptySet();
+        Set<TinkerElementContainer<TinkerEdge>> changedEdges = txChangedEdges.get();
+        if (null == changedEdges) changedEdges = Collections.emptySet();
+
+        try {
+            // Double-checked locking to reduce lock time
+            if (changedVertices.stream().anyMatch(v -> v.updatedOutsideTransaction()) ||
+                    changedEdges.stream().anyMatch(v -> v.updatedOutsideTransaction()))
+                throw new TransactionException(TX_CONFLICT);
+
+            // try to lock all element containers, throw exception if any element already locked by other tx
+            changedVertices.forEach(v -> {
+                if (!v.tryLock())
+                    throw new TransactionException(TX_CONFLICT);
+            });
+            changedEdges.forEach(e -> {
+                if (!e.tryLock())
+                    throw new TransactionException(TX_CONFLICT);
+            });
+
+            // verify versions of all elements to be sure no element changes during setting lock
+            if (changedVertices.stream().anyMatch(v -> v.updatedOutsideTransaction()) ||
+                    changedEdges.stream().anyMatch(e -> e.updatedOutsideTransaction()))
+                throw new TransactionException(TX_CONFLICT);
+
+            // update indices
+            final TinkerTransactionalIndex vertexIndex = (TinkerTransactionalIndex) graph.vertexIndex;
+            if (vertexIndex != null) vertexIndex.commit(changedVertices);
+            final TinkerTransactionalIndex edgeIndex = (TinkerTransactionalIndex) graph.edgeIndex;
+            if (edgeIndex != null) edgeIndex.commit(changedEdges);
+
+            // commit all changes
+            changedVertices.forEach(v -> v.commit(txVersion));
+            changedEdges.forEach(e -> e.commit(txVersion));
+        } catch (TransactionException ex) {
+            // rollback on error
+            changedVertices.forEach(v -> v.rollback());
+            changedEdges.forEach(e -> e.rollback());
+
+            // also revert indices update
+            final TinkerTransactionalIndex vertexIndex = (TinkerTransactionalIndex) graph.vertexIndex;
+            if (vertexIndex != null) vertexIndex.rollback();
+            final TinkerTransactionalIndex edgeIndex = (TinkerTransactionalIndex) graph.edgeIndex;
+            if (edgeIndex != null) edgeIndex.rollback();
+
+            throw ex;
+        } finally {
+            // remove elements from graph if not used in other tx's
+            changedVertices.stream().filter(v -> v.canBeRemoved()).forEach(v -> graph.getVertices().remove(v.getElementId()));
+            changedEdges.stream().filter(e -> e.canBeRemoved()).forEach(e -> graph.getEdges().remove(e.getElementId()));
+
+            final Set<TinkerElementContainer> readElements = txReadElements.get();
+            if (readElements != null)
+                readElements.stream().forEach(e -> e.reset());
+
+            txChangedVertices.remove();
+            txChangedEdges.remove();
+            txReadElements.remove();
+
+            changedVertices.forEach(v -> v.releaseLock());
+            changedEdges.forEach(e -> e.releaseLock());
+
+            txNumber.set(NOT_STARTED);
+        }
+    }
+
+    /**
+     * Rollback all changes made in current transaction.
+     * Workflow:
+     * 1. Rollback all changes. Lock is not needed here because only this thread have access to data.
+     * 2. Rollback indices changes, should be safe.
+     * 3. Cleanup transaction intermediate variables.
+     *
+     * @throws TransactionException
+     */
+    @Override
+    protected void doRollback() throws TransactionException {
+        // rollback for all changed elements
+        Set<TinkerElementContainer<TinkerVertex>> changedVertices = txChangedVertices.get();
+        if (null != changedVertices) changedVertices.forEach(v -> v.rollback());
+        Set<TinkerElementContainer<TinkerEdge>> changedEdges = txChangedEdges.get();
+        if (null != changedEdges) changedEdges.forEach(e -> e.rollback());
+
+        // rollback indices
+        final TinkerTransactionalIndex vertexIndex = (TinkerTransactionalIndex) graph.vertexIndex;
+        if (vertexIndex != null) vertexIndex.rollback();
+        final TinkerTransactionalIndex edgeIndex = (TinkerTransactionalIndex) graph.edgeIndex;
+        if (vertexIndex != null) edgeIndex.rollback();
+
+        // cleanup unused containers
+        if (null != changedVertices)
+            changedVertices.stream().filter(v -> v.canBeRemoved()).forEach(v -> graph.getVertices().remove(v.getElementId()));
+        if (null != changedEdges)
+            changedEdges.stream().filter(e -> e.canBeRemoved()).forEach(e -> graph.getEdges().remove(e.getElementId()));
+
+        final Set<TinkerElementContainer> readElements = txReadElements.get();
+        if (readElements != null)
+            readElements.stream().forEach(e -> e.reset());
+
+        txChangedVertices.remove();
+        txChangedEdges.remove();
+        txReadElements.remove();
+
+        txNumber.set(NOT_STARTED);
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraph.java
new file mode 100644
index 0000000..286688c
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraph.java
@@ -0,0 +1,498 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.strategy.optimization.TinkerGraphCountStrategy;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.strategy.optimization.TinkerGraphStepStrategy;
+import org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerServiceRegistry;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * An in-memory (with optional persistence on calls to {@link #close()}), reference implementation of the property
+ * graph interfaces with transaction support provided by TinkerPop.
+ *
+ * @author Valentyn Kahamlyk
+ */
+@Graph.OptIn(Graph.OptIn.SUITE_STRUCTURE_STANDARD)
+@Graph.OptIn(Graph.OptIn.SUITE_STRUCTURE_INTEGRATE)
+@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
+@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_COMPUTER)
+@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_LIMITED_STANDARD)
+@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_LIMITED_COMPUTER)
+public final class TinkerTransactionGraph extends AbstractTinkerGraph {
+
+    static {
+        TraversalStrategies.GlobalCache.registerStrategies(TinkerTransactionGraph.class, TraversalStrategies.GlobalCache.getStrategies(Graph.class).clone().addStrategies(
+                TinkerGraphStepStrategy.instance(),
+                TinkerGraphCountStrategy.instance()));
+    }
+
+    private static final Configuration EMPTY_CONFIGURATION = new BaseConfiguration() {{
+        this.setProperty(Graph.GRAPH, TinkerTransactionGraph.class.getName());
+    }};
+
+    private final TinkerGraphFeatures features = new TinkerGraphFeatures();
+
+    private final TinkerTransaction transaction = new TinkerTransaction(this);
+
+    private final Map<Object, TinkerElementContainer<TinkerVertex>> vertices = new ConcurrentHashMap<>();
+    private final Map<Object, TinkerElementContainer<TinkerEdge>> edges = new ConcurrentHashMap<>();
+
+    /**
+     * An empty private constructor that initializes {@link TinkerTransactionGraph}.
+     */
+    private TinkerTransactionGraph(final Configuration configuration) {
+        this.configuration = configuration;
+        vertexIdManager = selectIdManager(configuration, GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, Vertex.class);
+        edgeIdManager = selectIdManager(configuration, GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, Edge.class);
+        vertexPropertyIdManager = selectIdManager(configuration, GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, VertexProperty.class);
+        defaultVertexPropertyCardinality = VertexProperty.Cardinality.valueOf(
+                configuration.getString(GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.single.name()));
+        allowNullPropertyValues = configuration.getBoolean(GREMLIN_TINKERGRAPH_ALLOW_NULL_PROPERTY_VALUES, false);
+
+        graphLocation = configuration.getString(GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null);
+        graphFormat = configuration.getString(GREMLIN_TINKERGRAPH_GRAPH_FORMAT, null);
+
+        if ((graphLocation != null && null == graphFormat) || (null == graphLocation && graphFormat != null))
+            throw new IllegalStateException(String.format("The %s and %s must both be specified if either is present",
+                    GREMLIN_TINKERGRAPH_GRAPH_LOCATION, GREMLIN_TINKERGRAPH_GRAPH_FORMAT));
+
+        if (graphLocation != null) loadGraph();
+
+        serviceRegistry = new TinkerServiceRegistry(this);
+        configuration.getList(String.class, GREMLIN_TINKERGRAPH_SERVICE, Collections.emptyList()).forEach(serviceClass ->
+                serviceRegistry.registerService(instantiate(serviceClass)));
+    }
+
+    /**
+     * Open a new {@link TinkerTransactionGraph} instance.
+     * <p/>
+     * <b>Reference Implementation Help:</b> If a {@link Graph} implementation does not require a {@code Configuration}
+     * (or perhaps has a default configuration) it can choose to implement a zero argument
+     * {@code open()} method. This is an optional constructor method for TinkerGraph. It is not enforced by the Gremlin
+     * Test Suite.
+     */
+    public static TinkerTransactionGraph open() {
+        return open(EMPTY_CONFIGURATION);
+    }
+
+    /**
+     * Open a new {@code TinkerGraph} instance.
+     * <p/>
+     * <b>Reference Implementation Help:</b> This method is the one use by the {@link GraphFactory} to instantiate
+     * {@link Graph} instances.  This method must be overridden for the Structure Test Suite to pass. Implementers have
+     * latitude in terms of how exceptions are handled within this method.  Such exceptions will be considered
+     * implementation specific by the test suite as all test generate graph instances by way of
+     * {@link GraphFactory}. As such, the exceptions get generalized behind that facade and since
+     * {@link GraphFactory} is the preferred method to opening graphs it will be consistent at that level.
+     *
+     * @param configuration the configuration for the instance
+     * @return a newly opened {@link Graph}
+     */
+    public static TinkerTransactionGraph open(final Configuration configuration) {
+        return new TinkerTransactionGraph(configuration);
+    }
+
+    ////////////// STRUCTURE API METHODS //////////////////
+
+    @Override
+    public Vertex addVertex(final Object... keyValues) {
+        ElementHelper.legalPropertyKeyValueArray(keyValues);
+
+        Object idValue = vertexIdManager.convert(ElementHelper.getIdValue(keyValues).orElse(null));
+        if (null == idValue)
+            idValue = vertexIdManager.getNextId(this);
+        final String label = ElementHelper.getLabelValue(keyValues).orElse(Vertex.DEFAULT_LABEL);
+
+        this.tx().readWrite();
+        final long txNumber = transaction.getTxNumber();
+
+        final TinkerElementContainer<TinkerVertex> newContainer = new TinkerElementContainer<>(idValue);
+        // try to add new container or get existing
+        TinkerElementContainer<TinkerVertex> container = vertices.putIfAbsent(idValue, newContainer);
+
+        // is existing container contains Vertex?
+        if (container != null && container.get() != null)
+            throw Exceptions.vertexWithIdAlreadyExists(idValue);
+
+        // no existing container, let's use new one
+        if (container == null)
+            container = newContainer;
+
+        final TinkerVertex vertex = new TinkerVertex(idValue, label, this, txNumber);
+        ElementHelper.attachProperties(vertex, VertexProperty.Cardinality.list, keyValues);
+        container.setDraft(vertex, (TinkerTransaction) tx());
+
+        return vertex;
+    }
+
+    @Override
+    public void removeVertex(final Object vertexId) {
+        if (!vertices.containsKey(vertexId)) return;
+
+        // vertex can be deleted in other thread, so need to double-check
+        final TinkerElementContainer<?> container = vertices.get(vertexId);
+        if (null != container)
+            container.markDeleted((TinkerTransaction) tx());
+    }
+
+    @Override
+    public void touch(final TinkerVertex vertex) {
+        // already removed, so skip
+        if (null == vertex || !vertices.containsKey(vertex.id())) return;
+
+        final TinkerElementContainer<TinkerVertex> container = vertices.get(vertex.id());
+
+        if (null != container) {
+            this.tx().readWrite();
+            container.touch(vertex, (TinkerTransaction) tx());
+        }
+    }
+
+    @Override
+    public void touch(final TinkerEdge edge) {
+        // already removed, so skip
+        if (null == edge || !edges.containsKey(edge.id())) return;
+
+        final TinkerElementContainer<TinkerEdge> container = edges.get(edge.id());
+
+        if (null != container) {
+            this.tx().readWrite();
+            container.touch(edge, (TinkerTransaction) tx());
+        }
+    }
+
+    @Override
+    public Edge addEdge(final TinkerVertex outVertex, final TinkerVertex inVertex, final String label, final Object... keyValues) {
+        ElementHelper.validateLabel(label);
+        ElementHelper.legalPropertyKeyValueArray(keyValues);
+
+        Object idValue = edgeIdManager.convert(ElementHelper.getIdValue(keyValues).orElse(null));
+        if (null == idValue)
+            idValue = edgeIdManager.getNextId(this);
+
+        this.tx().readWrite();
+        final long txNumber = transaction.getTxNumber();
+
+        final TinkerElementContainer<TinkerEdge> newContainer = new TinkerElementContainer<>(idValue);
+        // try to add new container or get existing
+        TinkerElementContainer<TinkerEdge> container = edges.putIfAbsent(idValue, newContainer);
+
+        // is existing container contains Vertex?
+        if (container != null && container.get() != null)
+            throw Exceptions.vertexWithIdAlreadyExists(idValue);
+
+        // no existing container, let's use new one
+        if (container == null)
+            container = newContainer;
+
+        final TinkerEdge edge = new TinkerEdge(idValue, outVertex, label, inVertex, txNumber);
+        ElementHelper.attachProperties(edge, keyValues);
+        container.setDraft(edge, (TinkerTransaction) tx());
+
+        addOutEdge(outVertex, label, edge);
+        addInEdge(inVertex, label, edge);
+
+        return edge;
+    }
+
+    @Override
+    public void removeEdge(final Object edgeId) {
+        if (!edges.containsKey(edgeId)) return;
+
+        final TinkerElementContainer<TinkerEdge> container = edges.get(edgeId);
+
+        if (null == container || container.isDeleted()) return;
+
+        final TinkerEdge edge = container.get();
+
+        if (edge == null) return;
+
+        final TinkerVertex outVertex = (TinkerVertex) edge.outVertex();
+        touch(outVertex);
+        final TinkerVertex inVertex = (TinkerVertex) edge.inVertex();
+        touch(inVertex);
+
+        if (null != outVertex && null != outVertex.outEdgesId) {
+            final Set<Object> edges = outVertex.outEdgesId.get(edge.label());
+            if (null != edges) {
+                edges.removeIf(e -> e == edge.id());
+            }
+        }
+        if (null != inVertex && null != inVertex.inEdgesId) {
+            final Set<Object> edges = inVertex.inEdgesId.get(edge.label());
+            if (null != edges) {
+                edges.removeIf(e -> e == edge.id());
+            }
+        }
+
+        container.markDeleted((TinkerTransaction) tx());
+    }
+
+    @Override
+    public void clear() {
+        super.clear();
+        this.vertices.clear();
+        this.edges.clear();
+    }
+
+    @Override
+    public Transaction tx() {
+        return transaction;
+    }
+
+    @Override
+    public int getVerticesCount() {
+        return (int) vertices.entrySet().stream().filter(v -> v.getValue().get() != null).count();
+    }
+
+    @Override
+    public boolean hasVertex(Object id) {
+        return null != vertex(id);
+    }
+
+    Map<Object, TinkerElementContainer<TinkerVertex>> getVertices () { return vertices; }
+
+    @Override
+    public int getEdgesCount() {
+        return (int) edges.entrySet().stream().filter(v -> v.getValue().get() != null).count();
+    }
+
+    @Override
+    public boolean hasEdge(Object id) {
+        return null != edge(id);
+    }
+
+    Map<Object, TinkerElementContainer<TinkerEdge>> getEdges () { return edges; }
+
+    @Override
+    public TinkerServiceRegistry getServiceRegistry() {
+        return serviceRegistry;
+    }
+
+    @Override
+    public Vertex vertex(final Object vertexId) {
+        final TinkerElementContainer<TinkerVertex> container = vertices.get(vertexIdManager.convert(vertexId));
+        return container == null ? null : container.getWithClone((TinkerTransaction) tx());
+    }
+
+    @Override
+    public Iterator<Vertex> vertices(final Object... vertexIds) {
+        return createElementIterator(Vertex.class, vertices, vertexIdManager, vertexIds);
+    }
+
+    @Override
+    public Edge edge(final Object edgeId) {
+        final TinkerElementContainer<TinkerEdge> container = edges.get(edgeIdManager.convert(edgeId));
+        return container == null ? null : container.getWithClone((TinkerTransaction) tx());
+    }
+
+    @Override
+    public Iterator<Edge> edges(final Object... edgeIds) {
+        return createElementIterator(Edge.class, edges, edgeIdManager, edgeIds);
+    }
+
+    private <T extends Element, C extends TinkerElement> Iterator<T> createElementIterator(final Class<T> clazz,
+                                                                  final Map<Object, TinkerElementContainer<C>> elements,
+                                                                  final IdManager idManager,
+
+                                                                  final Object... ids) {
+        this.tx().readWrite();
+
+        final Iterator<T> iterator;
+        if (0 == ids.length) {
+            iterator = new TinkerGraphIterator<>(
+                    // todo: clone only if traversal contains mutating steps
+                    elements.values().stream().map(c -> (T) c.getWithClone((TinkerTransaction) tx())).filter(e -> e != null).iterator());
+        } else {
+            final List<Object> idList = Arrays.asList(ids);
+
+            // TinkerGraph can take a Vertex/Edge or any object as an "id". If it is an Element then we just cast
+            // to that type and pop off the identifier. there is no need to pass that through the IdManager since
+            // the assumption is that if it's already an Element, its identifier must be valid to the Graph and to
+            // its associated IdManager. All other objects are passed to the IdManager for conversion.
+            return new TinkerGraphIterator<>(IteratorUtils.filter(IteratorUtils.map(idList, id -> {
+                // ids cant be null so all of those filter out
+                if (null == id) return null;
+                final Object iid = clazz.isAssignableFrom(id.getClass()) ? clazz.cast(id).id() : idManager.convert(id);
+                final TinkerElementContainer<C> container = elements.get(iid);
+                return container == null ? null : (T) container.getWithClone((TinkerTransaction) tx());
+            }).iterator(), Objects::nonNull));
+        }
+        return TinkerHelper.inComputerMode(this) ?
+                (Iterator<T>) (clazz.equals(Vertex.class) ?
+                        IteratorUtils.filter((Iterator<Vertex>) iterator, t -> this.graphComputerView.legalVertex(t)) :
+                        IteratorUtils.filter((Iterator<Edge>) iterator, t -> this.graphComputerView.legalEdge(t.outVertex(), t))) :
+                iterator;
+    }
+    @Override
+    protected void addOutEdge(final TinkerVertex vertex, final String label, final Edge edge) {
+        touch(vertex);
+        if (null == vertex.outEdgesId) vertex.outEdgesId = new ConcurrentHashMap<>();
+        Set<Object> edges = vertex.outEdgesId.get(label);
+        if (null == edges) {
+            edges = ConcurrentHashMap.newKeySet();
+            vertex.outEdgesId.put(label, edges);
+        }
+        edges.add(edge.id());
+    }
+
+    @Override
+    protected void addInEdge(final TinkerVertex vertex, final String label, final Edge edge) {
+        touch(vertex);
+        if (null == vertex.inEdgesId) vertex.inEdgesId = new ConcurrentHashMap<>();
+        Set<Object> edges = vertex.inEdgesId.get(label);
+        if (null == edges) {
+            edges = ConcurrentHashMap.newKeySet();
+            vertex.inEdgesId.put(label, edges);
+        }
+        edges.add(edge.id());
+    }
+
+    /**
+     * Return TinkerGraph feature set.
+     * <p/>
+     * <b>Reference Implementation Help:</b> Implementers only need to implement features for which there are
+     * negative or instance configured features.  By default, all {@link Features} return true.
+     */
+    @Override
+    public Features features() {
+        return features;
+    }
+
+    public class TinkerGraphFeatures implements Features {
+
+        private final TinkerGraphGraphFeatures graphFeatures = new TinkerGraphGraphFeatures();
+        private final TinkerGraphEdgeFeatures edgeFeatures = new TinkerGraphEdgeFeatures();
+        private final TinkerGraphVertexFeatures vertexFeatures = new TinkerGraphVertexFeatures();
+
+        private TinkerGraphFeatures() {
+        }
+
+        @Override
+        public GraphFeatures graph() {
+            return graphFeatures;
+        }
+
+        @Override
+        public EdgeFeatures edge() {
+            return edgeFeatures;
+        }
+
+        @Override
+        public VertexFeatures vertex() {
+            return vertexFeatures;
+        }
+
+        @Override
+        public String toString() {
+            return StringFactory.featureString(this);
+        }
+
+    }
+
+    public class TinkerGraphGraphFeatures implements Features.GraphFeatures {
+
+        private TinkerGraphGraphFeatures() {
+        }
+
+        @Override
+        public boolean supportsConcurrentAccess() {
+            return false;
+        }
+
+        @Override
+        public boolean supportsThreadedTransactions() {
+            return false;
+        }
+
+        @Override
+        public boolean supportsTransactions() {
+            return true;
+        }
+
+        @Override
+        public boolean supportsServiceCall() {
+            return true;
+        }
+
+    }
+
+
+    /////////////// GRAPH SPECIFIC INDEXING METHODS ///////////////
+
+    /**
+     * Create an index for said element class ({@link Vertex} or {@link Edge}) and said property key.
+     * Whenever an element has the specified key mutated, the index is updated.
+     * When the index is created, all existing elements are indexed to ensure that they are captured by the index.
+     *
+     * @param key          the property key to index
+     * @param elementClass the element class to index
+     * @param <E>          The type of the element class
+     */
+    public <E extends Element> void createIndex(final String key, final Class<E> elementClass) {
+        if (Vertex.class.isAssignableFrom(elementClass)) {
+            if (null == this.vertexIndex) this.vertexIndex = new TinkerTransactionalIndex<>(this, TinkerVertex.class);
+            this.vertexIndex.createKeyIndex(key);
+        } else if (Edge.class.isAssignableFrom(elementClass)) {
+            if (null == this.edgeIndex) this.edgeIndex = new TinkerTransactionalIndex<>(this, TinkerEdge.class);
+            this.edgeIndex.createKeyIndex(key);
+        } else {
+            throw new IllegalArgumentException("Class is not indexable: " + elementClass);
+        }
+    }
+
+    /**
+     * Drop the index for the specified element class ({@link Vertex} or {@link Edge}) and key.
+     *
+     * @param key          the property key to stop indexing
+     * @param elementClass the element class of the index to drop
+     * @param <E>          The type of the element class
+     */
+    public <E extends Element> void dropIndex(final String key, final Class<E> elementClass) {
+        if (Vertex.class.isAssignableFrom(elementClass)) {
+            if (null != this.vertexIndex) this.vertexIndex.dropKeyIndex(key);
+        } else if (Edge.class.isAssignableFrom(elementClass)) {
+            if (null != this.edgeIndex) this.edgeIndex.dropKeyIndex(key);
+        } else {
+            throw new IllegalArgumentException("Class is not indexable: " + elementClass);
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionalIndex.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionalIndex.java
new file mode 100644
index 0000000..10dd3bd
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionalIndex.java
@@ -0,0 +1,239 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * @author Valentyn Kahamlyk
+ */
+final class TinkerTransactionalIndex<T extends TinkerElement> extends AbstractTinkerIndex<T> {
+
+    protected Map<String, Map<Object, Set<TinkerElementContainer<T>>>> index = new ConcurrentHashMap<>();
+    protected ThreadLocal<Map<String, Map<Object, Set<T>>>> txIndex =
+            ThreadLocal.withInitial(() -> new ConcurrentHashMap<>());
+
+    public TinkerTransactionalIndex(final TinkerTransactionGraph graph, final Class<T> indexClass) {
+        super(graph, indexClass);
+    }
+
+    private void putTxElement(final String key, final Object value, final T element) {
+        Map<String, Map<Object, Set<T>>> index = txIndex.get();
+        if (index == null) {
+            txIndex.set(new HashMap<>());
+            index = txIndex.get();
+        }
+
+        Map<Object, Set<T>> keyMap = index.get(key);
+        if (null == keyMap) {
+            index.putIfAbsent(key, new ConcurrentHashMap<>());
+            keyMap = index.get(key);
+        }
+        final Object indexableValue = indexable(value);
+        Set<T> objects = keyMap.get(indexableValue);
+        if (null == objects) {
+            keyMap.putIfAbsent(indexableValue, ConcurrentHashMap.newKeySet());
+            objects = keyMap.get(indexableValue);
+        }
+        objects.add(element);
+    }
+
+    private List<T> getNotModifiedElements(final String key, final Object value) {
+        final Map<Object, Set<TinkerElementContainer<T>>> keyMap = index.get(key);
+        if (null == keyMap)
+            return new ArrayList<>();
+
+        Set<TinkerElementContainer<T>> set = keyMap.get(indexable(value));
+        if (null == set)
+            return new ArrayList<>();
+
+        return set.stream().
+                filter(e -> !e.isChanged() && e.get() != null).
+                map(e -> e.get()).collect(Collectors.toList());
+    }
+
+    private Set<T> getModifiedElements(final String key, final Object value) {
+        final Map<String, Map<Object, Set<T>>> index = txIndex.get();
+        if (null == index)
+            return null;
+
+        final Map<Object, Set<T>> keyMap = index.get(key);
+        if (null == keyMap)
+            return null;
+
+        return keyMap.get(indexable(value));
+    }
+
+    @Override
+    public List<T> get(final String key, final Object value) {
+        final List<T> notModifiedElements = getNotModifiedElements(key, value);
+        final Set<T> modifiedElements = getModifiedElements(key, value);
+        if (modifiedElements != null)
+            modifiedElements.forEach(e -> {
+                if (!notModifiedElements.contains(e)) notModifiedElements.add(e);
+            });
+
+        return notModifiedElements;
+    }
+
+    @Override
+    public long count(final String key, final Object value) {
+        return get(key, value).size();
+    }
+
+    @Override
+    public void remove(final String key, final Object value, final T element) {
+        final Map<String, Map<Object, Set<T>>> index = txIndex.get();
+        if (null == index) return;
+
+        final Map<Object, Set<T>> keyMap = index.get(key);
+        if (null != keyMap) {
+            final Set<T> objects = keyMap.get(indexable(value));
+            if (null != objects) {
+                objects.remove(element);
+                if (objects.isEmpty())
+                    keyMap.remove(indexable(value));
+            }
+        }
+    }
+
+    @Override
+    public void removeElement(final T element) {
+        if (indexClass.isAssignableFrom(element.getClass())) {
+            element.properties().forEachRemaining(p -> {
+                        if (p.isPresent() && indexedKeys.contains(p.key())) {
+                            remove(p.key(), p.value(), element);
+                        }
+                    }
+            );
+        }
+    }
+
+    private void put(final String key, final Object value, final TinkerElementContainer<T> container) {
+        Map<Object, Set<TinkerElementContainer<T>>> keyMap = index.get(key);
+        if (null == keyMap) {
+            index.putIfAbsent(key, new ConcurrentHashMap<>());
+            keyMap = index.get(key);
+        }
+        final Object indexableValue = indexable(value);
+        Set<TinkerElementContainer<T>> objects = keyMap.get(indexableValue);
+        if (null == objects) {
+            keyMap.putIfAbsent(indexableValue, ConcurrentHashMap.newKeySet());
+            objects = keyMap.get(indexableValue);
+        }
+        objects.add(container);
+    }
+
+    private void addContainer(final TinkerElementContainer<T> container) {
+        final T element = container.get();
+        if (!indexClass.isAssignableFrom(element.getClass()) || !element.properties().hasNext())
+            return;
+
+        element.properties().forEachRemaining(p -> {
+                    if (p.isPresent() && indexedKeys.contains(p.key())) {
+                        put(p.key(), p.value(), container);
+                    }
+                }
+        );
+    }
+
+    @Override
+    public void autoUpdate(final String key, final Object newValue, final Object oldValue, final T element) {
+        if (indexedKeys.contains(key)) {
+            remove(key, oldValue, element);
+            putTxElement(key, newValue, element);
+        }
+    }
+
+    @Override
+    public void createKeyIndex(final String key) {
+        if (null == key)
+            throw Graph.Exceptions.argumentCanNotBeNull("key");
+        if (key.isEmpty())
+            throw new IllegalArgumentException("The key for the index cannot be an empty string");
+
+        if (indexedKeys.contains(key))
+            return;
+        indexedKeys.add(key);
+
+        final Map elements =
+                Vertex.class.isAssignableFrom(indexClass) ?
+                        ((TinkerTransactionGraph) graph).getVertices() :
+                        ((TinkerTransactionGraph) graph).getEdges();
+
+        for (Object element : elements.values()) {
+            addContainer((TinkerElementContainer<T>) element);
+        }
+    }
+
+    @Override
+    public void dropKeyIndex(final String key) {
+        if (index.containsKey(key))
+            index.remove(key).clear();
+
+        final Map<String, Map<Object, Set<T>>> index = txIndex.get();
+        if (index != null && index.containsKey(key))
+            index.remove(key).clear();
+
+        indexedKeys.remove(key);
+    }
+
+    private void removeContainer(TinkerElementContainer<T> container) {
+        final T element = container.getUnmodified();
+        if (element == null || !indexClass.isAssignableFrom(element.getClass()) || !element.properties().hasNext())
+            return;
+
+        element.properties().forEachRemaining(p -> {
+            final Map<Object, Set<TinkerElementContainer<T>>> keyMap = index.get(p.key());
+            final Object indexableValue = indexable(p.value());
+            if (null != keyMap) {
+                final Set<TinkerElementContainer<T>> objects = keyMap.get(indexableValue);
+                if (null != objects) {
+                    objects.remove(container);
+                    if (objects.isEmpty())
+                        keyMap.remove(indexableValue);
+                }
+            }
+        });
+    }
+
+    public void commit(final Set<TinkerElementContainer<T>> updatedElements) {
+        for (final TinkerElementContainer<T> element : updatedElements) {
+            removeContainer(element);
+            if (!element.isDeleted())
+                // todo: compare and update only changed properties
+                addContainer(element);
+        }
+
+        txIndex.remove();
+    }
+
+    public void rollback() {
+        txIndex.remove();
+    }
+}
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java
index 1765054..80a0f80 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertex.java
@@ -25,35 +25,83 @@
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.apache.tinkerpop.gremlin.util.CollectionUtil;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class TinkerVertex extends TinkerElement implements Vertex {
+public class TinkerVertex extends TinkerElement implements Vertex {
 
     protected Map<String, List<VertexProperty>> properties;
+    // Edges should be used by non-transaction Graph due to performance
     protected Map<String, Set<Edge>> outEdges;
     protected Map<String, Set<Edge>> inEdges;
-    private final TinkerGraph graph;
+    // Edge ids are for transactional Graph
+    protected Map<String, Set<Object>> outEdgesId;
+    protected Map<String, Set<Object>> inEdgesId;
+    protected final AbstractTinkerGraph graph;
     private boolean allowNullPropertyValues;
+    private final boolean isTxMode;
 
-    protected TinkerVertex(final Object id, final String label, final TinkerGraph graph) {
+    protected TinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph) {
         super(id, label);
         this.graph = graph;
+        this.isTxMode = graph instanceof TinkerTransactionGraph;
         this.allowNullPropertyValues = graph.features().vertex().supportsNullPropertyValues();
     }
 
+    protected TinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph, final long currentVersion) {
+        super(id, label, currentVersion);
+        this.graph = graph;
+        this.isTxMode = graph instanceof TinkerTransactionGraph;
+        this.allowNullPropertyValues = graph.features().vertex().supportsNullPropertyValues();
+    }
+
+    @Override
+    public Object clone() {
+        if (!isTxMode) {
+            final TinkerVertex vertex = new TinkerVertex(id, label, graph, currentVersion);
+            vertex.inEdgesId = inEdgesId;
+            vertex.outEdgesId = outEdgesId;
+            vertex.properties = properties;
+            return vertex;
+        }
+
+        final TinkerVertex vertex = new TinkerVertex(id, label, graph, currentVersion);
+        if (inEdgesId != null)
+            vertex.inEdgesId = CollectionUtil.clone((ConcurrentHashMap<String, Set<Object>>) inEdgesId);
+
+        if (outEdgesId != null)
+            vertex.outEdgesId = CollectionUtil.clone((ConcurrentHashMap<String, Set<Object>>) outEdgesId);
+
+        if (properties != null) {
+            final ConcurrentHashMap<String, List<VertexProperty>> result = new ConcurrentHashMap<>(properties.size());
+
+            // clone will not work because TinkerVertexProperty contains link to Vertex
+            for (Map.Entry<String, List<VertexProperty>> entry : properties.entrySet()) {
+                final List<VertexProperty> clonedValue = entry.getValue().stream()
+                        .map(vp ->((TinkerVertexProperty) vp).copy(vertex))
+                        .collect(Collectors.toList());
+
+                result.put(entry.getKey(), clonedValue);
+            }
+            vertex.properties = result;
+        }
+
+        return vertex;
+    }
+
     @Override
     public Graph graph() {
         return this.graph;
@@ -72,7 +120,7 @@
                 throw Vertex.Exceptions.multiplePropertiesExistForProvidedKey(key);
         } else {
             if (this.properties != null && this.properties.containsKey(key)) {
-                final List<VertexProperty> list = (List) this.properties.get(key);
+                final List<VertexProperty> list = this.properties.get(key);
                 if (list.size() > 1)
                     throw Vertex.Exceptions.multiplePropertiesExistForProvidedKey(key);
                 else
@@ -84,6 +132,8 @@
 
     @Override
     public <V> VertexProperty<V> property(final VertexProperty.Cardinality cardinality, final String key, final V value, final Object... keyValues) {
+        graph.touch(this);
+
         if (this.removed) throw elementAlreadyRemoved(Vertex.class, id);
         ElementHelper.legalPropertyKeyValueArray(keyValues);
         ElementHelper.validateProperty(key, value);
@@ -110,13 +160,13 @@
                     graph.vertexPropertyIdManager.convert(optionalId.get()) :
                     graph.vertexPropertyIdManager.getNextId(graph);
 
-            final VertexProperty<V> vertexProperty = new TinkerVertexProperty<V>(idValue, this, key, value);
+            final VertexProperty<V> vertexProperty = createTinkerVertexProperty(idValue, this, key, value);
 
-            if (null == this.properties) this.properties = new HashMap<>();
+            if (null == this.properties) this.properties = new ConcurrentHashMap<>();
             final List<VertexProperty> list = this.properties.getOrDefault(key, new ArrayList<>());
             list.add(vertexProperty);
             this.properties.put(key, list);
-            TinkerHelper.autoUpdateIndex(this, key, value, null);
+            TinkerIndexHelper.autoUpdateIndex(this, key, value, null);
             ElementHelper.attachProperties(vertexProperty, keyValues);
             return vertexProperty;
         }
@@ -125,7 +175,7 @@
     @Override
     public Set<String> keys() {
         if (null == this.properties) return Collections.emptySet();
-        return TinkerHelper.inComputerMode((TinkerGraph) graph()) ?
+        return TinkerHelper.inComputerMode((AbstractTinkerGraph) graph()) ?
                 Vertex.super.keys() :
                 this.properties.keySet();
     }
@@ -133,18 +183,21 @@
     @Override
     public Edge addEdge(final String label, final Vertex vertex, final Object... keyValues) {
         if (null == vertex) throw Graph.Exceptions.argumentCanNotBeNull("vertex");
-        if (this.removed) throw elementAlreadyRemoved(Vertex.class, this.id);
-        return TinkerHelper.addEdge(this.graph, this, (TinkerVertex) vertex, label, keyValues);
+        if (this.removed || ((TinkerVertex) vertex).removed) throw elementAlreadyRemoved(Vertex.class, this.id);
+
+        return graph.addEdge(this, (TinkerVertex) vertex, label, keyValues);
     }
 
     @Override
     public void remove() {
+        graph.touch(this);
+
         final List<Edge> edges = new ArrayList<>();
-        this.edges(Direction.BOTH).forEachRemaining(edges::add);
+        this.edges(Direction.BOTH).forEachRemaining(edge -> edges.add(edge));
         edges.stream().filter(edge -> !((TinkerEdge) edge).removed).forEach(Edge::remove);
+        TinkerIndexHelper.removeElementIndex(this);
         this.properties = null;
-        TinkerHelper.removeElementIndex(this);
-        this.graph.vertices.remove(this.id);
+        this.graph.removeVertex(this.id);
         this.removed = true;
     }
 
@@ -155,7 +208,9 @@
 
     @Override
     public Iterator<Edge> edges(final Direction direction, final String... edgeLabels) {
-        final Iterator<Edge> edgeIterator = (Iterator) TinkerHelper.getEdges(this, direction, edgeLabels);
+        final Iterator<Edge> edgeIterator = isTxMode
+                ? (Iterator) TinkerHelper.getEdgesTx(this, direction, edgeLabels)
+                : (Iterator) TinkerHelper.getEdges(this, direction, edgeLabels);
         return TinkerHelper.inComputerMode(this.graph) ?
                 IteratorUtils.filter(edgeIterator, edge -> this.graph.graphComputerView.legalEdge(this, edge)) :
                 edgeIterator;
@@ -163,23 +218,36 @@
 
     @Override
     public Iterator<Vertex> vertices(final Direction direction, final String... edgeLabels) {
-        return TinkerHelper.inComputerMode(this.graph) ?
-                direction.equals(Direction.BOTH) ?
-                        IteratorUtils.concat(
-                                IteratorUtils.map(this.edges(Direction.OUT, edgeLabels), Edge::inVertex),
-                                IteratorUtils.map(this.edges(Direction.IN, edgeLabels), Edge::outVertex)) :
-                        IteratorUtils.map(this.edges(direction, edgeLabels), edge -> edge.vertices(direction.opposite()).next()) :
-                (Iterator) TinkerHelper.getVertices(this, direction, edgeLabels);
+        if (TinkerHelper.inComputerMode(this.graph))
+            return direction.equals(Direction.BOTH) ?
+                    IteratorUtils.concat(
+                            IteratorUtils.map(this.edges(Direction.OUT, edgeLabels), Edge::inVertex),
+                            IteratorUtils.map(this.edges(Direction.IN, edgeLabels), Edge::outVertex)) :
+                    IteratorUtils.map(this.edges(direction, edgeLabels), edge -> edge.vertices(direction.opposite()).next());
+
+        return isTxMode
+                ? (Iterator) TinkerHelper.getVerticesTx(this, direction, edgeLabels)
+                : (Iterator) TinkerHelper.getVertices(this, direction, edgeLabels);
+    }
+
+    protected <V> TinkerVertexProperty<V> createTinkerVertexProperty(final TinkerVertex vertex, final String key, final V value, final Object... propertyKeyValues) {
+        return new TinkerVertexProperty<V>(vertex, key, value, propertyKeyValues);
+    }
+
+    protected <V> TinkerVertexProperty<V> createTinkerVertexProperty(final Object id, final TinkerVertex vertex, final String key, final V value, final Object... propertyKeyValues) {
+        return new TinkerVertexProperty<V>(id, vertex, key, value, propertyKeyValues);
     }
 
     @Override
     public <V> Iterator<VertexProperty<V>> properties(final String... propertyKeys) {
         if (this.removed) return Collections.emptyIterator();
-        if (TinkerHelper.inComputerMode((TinkerGraph) graph()))
-            return (Iterator) ((TinkerGraph) graph()).graphComputerView.getProperties(TinkerVertex.this).stream().filter(p -> ElementHelper.keyExists(p.key(), propertyKeys)).iterator();
+        if (TinkerHelper.inComputerMode((AbstractTinkerGraph) graph()))
+            return (Iterator) ((AbstractTinkerGraph) graph()).graphComputerView.getProperties(TinkerVertex.this).stream().filter(p -> ElementHelper.keyExists(p.key(), propertyKeys)).iterator();
         else {
             if (null == this.properties) return Collections.emptyIterator();
             if (propertyKeys.length == 1) {
+                if (null == propertyKeys[0])
+                    return Collections.emptyIterator();
                 final List<VertexProperty> properties = this.properties.getOrDefault(propertyKeys[0], Collections.emptyList());
                 if (properties.size() == 1) {
                     return IteratorUtils.of(properties.get(0));
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java
index f2635df..64a840f 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerVertexProperty.java
@@ -32,6 +32,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
@@ -52,7 +53,7 @@
      * with {@link TinkerGraphComputerView}.
      */
     public TinkerVertexProperty(final TinkerVertex vertex, final String key, final V value, final Object... propertyKeyValues) {
-        this(((TinkerGraph) vertex.graph()).vertexPropertyIdManager.getNextId((TinkerGraph) vertex.graph()), vertex, key, value, propertyKeyValues);
+        this(((AbstractTinkerGraph) vertex.graph()).vertexPropertyIdManager.getNextId((AbstractTinkerGraph) vertex.graph()), vertex, key, value, propertyKeyValues);
     }
 
     /**
@@ -93,6 +94,26 @@
     }
 
     @Override
+    public Object clone() {
+        final TinkerVertexProperty vp = new TinkerVertexProperty(id, vertex, key, value);
+        vp.properties = properties;
+        return vp;
+    }
+
+    public TinkerVertexProperty copy(final TinkerVertex newOwner) {
+        final TinkerVertexProperty vp = new TinkerVertexProperty(id, newOwner, key, value);
+
+        if (null != properties) {
+            final Map<String, Property> cloned = new ConcurrentHashMap<>(properties.size());
+            properties.entrySet().stream().forEach(p -> cloned.put(p.getKey(), ((TinkerProperty) p.getValue()).copy(vp)));
+
+            vp.properties = cloned;
+        }
+
+        return vp;
+    }
+
+    @Override
     public Object id() {
         return this.id;
     }
@@ -115,6 +136,9 @@
 
     @Override
     public <U> Property<U> property(final String key, final U value) {
+        // in most cases vertex should already be touched, but let's play safe
+        ((AbstractTinkerGraph)vertex.graph()).touch(vertex);
+
         if (this.removed) throw elementAlreadyRemoved(VertexProperty.class, id);
 
         if ((!allowNullPropertyValues && null == value)) {
@@ -136,10 +160,12 @@
     @Override
     public void remove() {
         if (null != this.vertex.properties && this.vertex.properties.containsKey(this.key)) {
+            ((AbstractTinkerGraph)vertex.graph()).touch(vertex);
+
             this.vertex.properties.get(this.key).remove(this);
             if (this.vertex.properties.get(this.key).size() == 0) {
                 this.vertex.properties.remove(this.key);
-                TinkerHelper.removeIndex(this.vertex, this.key, this.value);
+                TinkerIndexHelper.removeIndex(this.vertex, this.key, this.value);
             }
             final AtomicBoolean delete = new AtomicBoolean(true);
             this.vertex.properties(this.key).forEachRemaining(property -> {
@@ -147,7 +173,7 @@
                 if ((currentPropertyValue != null && currentPropertyValue.equals(this.value) || null == currentPropertyValue && null == this.value))
                     delete.set(false);
             });
-            if (delete.get()) TinkerHelper.removeIndex(this.vertex, this.key, this.value);
+            if (delete.get()) TinkerIndexHelper.removeIndex(this.vertex, this.key, this.value);
             this.properties = null;
             this.removed = true;
         }
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphAllowNullFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphAllowNullFeatureTest.java
index ed32a1c..4fddf7a 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphAllowNullFeatureTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphAllowNullFeatureTest.java
@@ -20,6 +20,7 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
+import com.google.inject.Provides;
 import com.google.inject.Stage;
 import io.cucumber.guice.CucumberModules;
 import io.cucumber.junit.Cucumber;
@@ -46,7 +47,12 @@
     public static final class ServiceModule extends AbstractModule {
         @Override
         protected void configure() {
-            bind(World.class).to(TinkerGraphWorld.NullWorld.class);
+            bind(World.class).to(TinkerWorld.NullWorld.class);
+        }
+
+        @Provides
+        static TinkerWorld.NullWorld provideNullWorld() {
+            return new TinkerWorld.NullWorld(new TinkerWorld.TinkerGraphWorld());
         }
     }
 }
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphComputerFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphComputerFeatureTest.java
index 8083e95..c519e1c 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphComputerFeatureTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphComputerFeatureTest.java
@@ -20,6 +20,7 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
+import com.google.inject.Provides;
 import com.google.inject.Stage;
 import io.cucumber.guice.CucumberModules;
 import io.cucumber.junit.Cucumber;
@@ -46,7 +47,12 @@
     public static final class ServiceModule extends AbstractModule {
         @Override
         protected void configure() {
-            bind(World.class).to(TinkerGraphWorld.ComputerWorld.class);
+            bind(World.class).to(TinkerWorld.ComputerWorld.class);
+        }
+
+        @Provides
+        static TinkerWorld.ComputerWorld provideComputerWorld() {
+            return new TinkerWorld.ComputerWorld(new TinkerWorld.TinkerGraphWorld());
         }
     }
 }
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java
index da655d5..8f03a7e 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphFeatureTest.java
@@ -46,7 +46,7 @@
     public static final class ServiceModule extends AbstractModule {
         @Override
         protected void configure() {
-            bind(World.class).to(TinkerGraphWorld.class);
+            bind(World.class).to(TinkerWorld.TinkerGraphWorld.class);
         }
     }
 }
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphWorld.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphWorld.java
deleted file mode 100644
index 5810b99..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphWorld.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph;
-
-import io.cucumber.java.Scenario;
-import org.apache.commons.configuration2.BaseConfiguration;
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.MapConfiguration;
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.features.World;
-import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-import org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerDegreeCentralityFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerTextSearchFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.AssumptionViolatedException;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-/**
- * The {@link World} implementation for TinkerGraph that provides the {@link GraphTraversalSource} instances required
- * by the Gherkin test suite.
- */
-public class TinkerGraphWorld implements World {
-    private static final TinkerGraph modern = registerTestServices(TinkerFactory.createModern());
-    private static final TinkerGraph classic = registerTestServices(TinkerFactory.createClassic());
-    private static final TinkerGraph crew = registerTestServices(TinkerFactory.createTheCrew());
-    private static final TinkerGraph sink = registerTestServices(TinkerFactory.createKitchenSink());
-    private static final TinkerGraph grateful = registerTestServices(TinkerFactory.createGratefulDead());
-
-    private static TinkerGraph registerTestServices(final TinkerGraph graph) {
-        graph.getServiceRegistry().registerService(new TinkerTextSearchFactory(graph));
-        graph.getServiceRegistry().registerService(new TinkerDegreeCentralityFactory(graph));
-        return graph;
-    }
-
-    @Override
-    public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
-        if (null == graphData)
-            return registerTestServices(TinkerGraph.open(getNumberIdManagerConfiguration())).traversal();
-        else if (graphData == LoadGraphWith.GraphData.CLASSIC)
-            return classic.traversal();
-        else if (graphData == LoadGraphWith.GraphData.CREW)
-            return crew.traversal();
-        else if (graphData == LoadGraphWith.GraphData.MODERN)
-            return modern.traversal();
-        else if (graphData == LoadGraphWith.GraphData.SINK)
-            return sink.traversal();
-        else if (graphData == LoadGraphWith.GraphData.GRATEFUL)
-            return grateful.traversal();
-        else
-            throw new UnsupportedOperationException("GraphData not supported: " + graphData.name());
-    }
-
-    @Override
-    public String changePathToDataFile(final String pathToFileFromGremlin) {
-        return ".." + File.separator + pathToFileFromGremlin;
-    }
-
-    private static Configuration getNumberIdManagerConfiguration() {
-        final Configuration conf = new BaseConfiguration();
-        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
-        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, TinkerGraph.DefaultIdManager.INTEGER.name());
-        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, TinkerGraph.DefaultIdManager.LONG.name());
-        return conf;
-    }
-
-    /**
-     * Enables the storing of {@code null} property values when testing.
-     */
-    public static class NullWorld extends TinkerGraphWorld {
-
-        @Override
-        public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
-            if (graphData != null)
-                throw new UnsupportedOperationException("GraphData not supported: " + graphData.name());
-
-            final Configuration conf = TinkerGraphWorld.getNumberIdManagerConfiguration();
-            conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_ALLOW_NULL_PROPERTY_VALUES, true);
-            return TinkerGraph.open(conf).traversal();
-        }
-    }
-
-    /**
-     * Turns on {@link GraphComputer} when testing.
-     */
-    public static class ComputerWorld extends TinkerGraphWorld {
-        private static final Random RANDOM = TestHelper.RANDOM;
-
-        private static final List<String> TAGS_TO_IGNORE = Arrays.asList(
-                "@StepDrop",
-                "@StepInject",
-                "@StepV",
-                "@GraphComputerVerificationOneBulk",
-                "@GraphComputerVerificationStrategyNotSupported",
-                "@GraphComputerVerificationMidVNotSupported",
-                "@GraphComputerVerificationInjectionNotSupported",
-                "@GraphComputerVerificationStarGraphExceeded",
-                "@GraphComputerVerificationReferenceOnly",
-                "@TinkerServiceRegistry");
-
-        @Override
-        public void beforeEachScenario(final Scenario scenario) {
-            final List<String> ignores = TAGS_TO_IGNORE.stream().filter(t -> scenario.getSourceTagNames().contains(t)).collect(Collectors.toList());
-            if (!ignores.isEmpty())
-                throw new AssumptionViolatedException(String.format("This scenario is not supported with GraphComputer: %s", ignores));
-        }
-
-        @Override
-        public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
-            if (null == graphData)
-                throw new AssumptionViolatedException("GraphComputer does not support mutation");
-
-            return super.getGraphTraversalSource(graphData).withStrategies(VertexProgramStrategy.create(new MapConfiguration(new HashMap<String, Object>() {{
-                put(VertexProgramStrategy.WORKERS, Runtime.getRuntime().availableProcessors());
-                put(VertexProgramStrategy.GRAPH_COMPUTER, RANDOM.nextBoolean() ?
-                        GraphComputer.class.getCanonicalName() :
-                        TinkerGraphComputer.class.getCanonicalName());
-            }})));
-        }
-    }
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerShuffleGraphFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerShuffleGraphFeatureTest.java
new file mode 100644
index 0000000..13637e1
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerShuffleGraphFeatureTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+        tags = "not @RemoteOnly and not @GraphComputerOnly and not @AllowNullPropertyValues and not @InsertionOrderingRequired",
+        glue = { "org.apache.tinkerpop.gremlin.features" },
+        objectFactory = TinkerShuffleGraphFeatureTest.TinkerShuffleGraphGuiceFactory.class,
+        features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+        plugin = {"progress", "junit:target/cucumber.xml"})
+public class TinkerShuffleGraphFeatureTest {
+
+    public static class TinkerShuffleGraphGuiceFactory extends AbstractGuiceFactory {
+        public TinkerShuffleGraphGuiceFactory() {
+            super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+        }
+    }
+
+    public static final class ServiceModule extends AbstractModule {
+        @Override
+        protected void configure() {
+            bind(World.class).to(TinkerWorld.TinkerShuffleGraphWorld.class);
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphAllowNullFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphAllowNullFeatureTest.java
new file mode 100644
index 0000000..feef942
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphAllowNullFeatureTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Provides;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+        tags = "@AllowNullPropertyValues",
+        glue = { "org.apache.tinkerpop.gremlin.features" },
+        objectFactory = TinkerTransactionGraphAllowNullFeatureTest.TinkerGraphGuiceFactory.class,
+        features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+        plugin = {"progress", "junit:target/cucumber.xml"})
+public class TinkerTransactionGraphAllowNullFeatureTest {
+    public static class TinkerGraphGuiceFactory extends AbstractGuiceFactory {
+        public TinkerGraphGuiceFactory() {
+            super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+        }
+    }
+
+    public static final class ServiceModule extends AbstractModule {
+        @Override
+        protected void configure() {
+            bind(World.class).to(TinkerWorld.NullWorld.class);
+        }
+
+        @Provides
+        static TinkerWorld.NullWorld provideNullWorld() {
+            return new TinkerWorld.NullWorld(new TinkerWorld.TinkerTransactionGraphWorld());
+        }
+    }
+}
\ No newline at end of file
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphComputerFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphComputerFeatureTest.java
new file mode 100644
index 0000000..e0efdb9
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphComputerFeatureTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Provides;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+        tags = "not @RemoteOnly and not @GraphComputerVerificationElementSupported",
+        glue = { "org.apache.tinkerpop.gremlin.features" },
+        objectFactory = TinkerTransactionGraphComputerFeatureTest.TinkerGraphGuiceFactory.class,
+        features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+        plugin = {"progress", "junit:target/cucumber.xml"})
+public class TinkerTransactionGraphComputerFeatureTest {
+    public static class TinkerGraphGuiceFactory extends AbstractGuiceFactory {
+        public TinkerGraphGuiceFactory() {
+            super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+        }
+    }
+
+    public static final class ServiceModule extends AbstractModule {
+        @Override
+        protected void configure() {
+            bind(World.class).to(TinkerWorld.ComputerWorld.class);
+        }
+
+        @Provides
+        static TinkerWorld.ComputerWorld provideComputerWorld() {
+            return new TinkerWorld.ComputerWorld(new TinkerWorld.TinkerTransactionGraphWorld());
+        }
+    }
+}
\ No newline at end of file
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphFeatureTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphFeatureTest.java
new file mode 100644
index 0000000..1c3dba0
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphFeatureTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Stage;
+import io.cucumber.guice.CucumberModules;
+import io.cucumber.junit.Cucumber;
+import io.cucumber.junit.CucumberOptions;
+import org.apache.tinkerpop.gremlin.features.AbstractGuiceFactory;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(
+        tags = "not @RemoteOnly and not @GraphComputerOnly and not @AllowNullPropertyValues",
+        glue = { "org.apache.tinkerpop.gremlin.features" },
+        objectFactory = TinkerTransactionGraphFeatureTest.TinkerGraphGuiceFactory.class,
+        features = { "classpath:/org/apache/tinkerpop/gremlin/test/features" },
+        plugin = {"progress", "junit:target/cucumber.xml"})
+public class TinkerTransactionGraphFeatureTest {
+
+    public static class TinkerGraphGuiceFactory extends AbstractGuiceFactory {
+        public TinkerGraphGuiceFactory() {
+            super(Guice.createInjector(Stage.PRODUCTION, CucumberModules.createScenarioModule(), new ServiceModule()));
+        }
+    }
+
+    public static final class ServiceModule extends AbstractModule {
+        @Override
+        protected void configure() {
+            bind(World.class).to(TinkerWorld.TinkerTransactionGraphWorld.class);
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphProvider.java
new file mode 100644
index 0000000..2fa1f2e
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerTransactionGraphProvider.java
@@ -0,0 +1,212 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph;
+
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.AbstractGraphProvider;
+import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.GraphTest;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.IoEdgeTest;
+import org.apache.tinkerpop.gremlin.structure.io.IoVertexTest;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedGraphTest;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphTest;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph.DefaultIdManager;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerEdge;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerElement;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraphVariables;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerTransactionGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class TinkerTransactionGraphProvider extends AbstractGraphProvider {
+
+    private static final Set<Class> IMPLEMENTATION = new HashSet<Class>() {{
+        add(TinkerEdge.class);
+        add(TinkerElement.class);
+        add(TinkerTransactionGraph.class);
+        add(TinkerGraphVariables.class);
+        add(TinkerProperty.class);
+        add(TinkerVertex.class);
+        add(TinkerVertexProperty.class);
+    }};
+
+    @Override
+    public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName,
+                                                    final LoadGraphWith.GraphData loadGraphWith) {
+        final DefaultIdManager idManager = selectIdMakerFromGraphData(loadGraphWith);
+        final String idMaker = (idManager.equals(DefaultIdManager.ANY) ? selectIdMakerFromTest(test, testMethodName) : idManager).name();
+        return new HashMap<String, Object>() {{
+            put(Graph.GRAPH, TinkerTransactionGraph.class.getName());
+            put(TinkerTransactionGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, idMaker);
+            put(TinkerTransactionGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, idMaker);
+            put(TinkerTransactionGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, idMaker);
+            if (requiresListCardinalityAsDefault(loadGraphWith, test, testMethodName))
+                put(TinkerTransactionGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
+            if (requiresPersistence(test, testMethodName)) {
+                put(TinkerTransactionGraph.GREMLIN_TINKERGRAPH_GRAPH_FORMAT, "gryo");
+                put(TinkerTransactionGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION,TestHelper.makeTestDataFile(test, "temp", testMethodName + ".kryo"));
+            }
+        }};
+    }
+
+    @Override
+    public void clear(final Graph graph, final Configuration configuration) throws Exception {
+        if (graph != null)
+            graph.close();
+
+        // in the even the graph is persisted we need to clean up
+        final String graphLocation = null != configuration ? configuration.getString(TinkerTransactionGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null) : null;
+        if (graphLocation != null) {
+            final File f = new File(graphLocation);
+            f.delete();
+        }
+    }
+
+    @Override
+    public Set<Class> getImplementations() {
+        return IMPLEMENTATION;
+    }
+
+    /**
+     * Determines if a test requires TinkerGraph persistence to be configured with graph location and format.
+     */
+    protected static boolean requiresPersistence(final Class<?> test, final String testMethodName) {
+        return test == GraphTest.class && testMethodName.equals("shouldPersistDataOnClose");
+    }
+
+    /**
+     * Determines if a test requires a different cardinality as the default or not.
+     */
+    protected static boolean requiresListCardinalityAsDefault(final LoadGraphWith.GraphData loadGraphWith,
+                                                            final Class<?> test, final String testMethodName) {
+        return loadGraphWith == LoadGraphWith.GraphData.CREW
+                || (test == StarGraphTest.class && testMethodName.equals("shouldAttachWithCreateMethod"))
+                || (test == DetachedGraphTest.class && testMethodName.equals("testAttachableCreateMethod"));
+    }
+
+    /**
+     * Some tests require special configuration for TinkerGraph to properly configure the id manager.
+     */
+    protected DefaultIdManager selectIdMakerFromTest(final Class<?> test, final String testMethodName) {
+        if (test.equals(GraphTest.class)) {
+            final Set<String> testsThatNeedLongIdManager = new HashSet<String>(){{
+                add("shouldIterateVerticesWithNumericIdSupportUsingDoubleRepresentation");
+                add("shouldIterateVerticesWithNumericIdSupportUsingDoubleRepresentations");
+                add("shouldIterateVerticesWithNumericIdSupportUsingIntegerRepresentation");
+                add("shouldIterateVerticesWithNumericIdSupportUsingIntegerRepresentations");
+                add("shouldIterateVerticesWithNumericIdSupportUsingFloatRepresentation");
+                add("shouldIterateVerticesWithNumericIdSupportUsingFloatRepresentations");
+                add("shouldIterateVerticesWithNumericIdSupportUsingStringRepresentation");
+                add("shouldIterateVerticesWithNumericIdSupportUsingStringRepresentations");
+                add("shouldIterateEdgesWithNumericIdSupportUsingDoubleRepresentation");
+                add("shouldIterateEdgesWithNumericIdSupportUsingDoubleRepresentations");
+                add("shouldIterateEdgesWithNumericIdSupportUsingIntegerRepresentation");
+                add("shouldIterateEdgesWithNumericIdSupportUsingIntegerRepresentations");
+                add("shouldIterateEdgesWithNumericIdSupportUsingFloatRepresentation");
+                add("shouldIterateEdgesWithNumericIdSupportUsingFloatRepresentations");
+                add("shouldIterateEdgesWithNumericIdSupportUsingStringRepresentation");
+                add("shouldIterateEdgesWithNumericIdSupportUsingStringRepresentations");
+            }};
+
+            final Set<String> testsThatNeedUuidIdManager = new HashSet<String>(){{
+                add("shouldIterateVerticesWithUuidIdSupportUsingStringRepresentation");
+                add("shouldIterateVerticesWithUuidIdSupportUsingStringRepresentations");
+                add("shouldIterateEdgesWithUuidIdSupportUsingStringRepresentation");
+                add("shouldIterateEdgesWithUuidIdSupportUsingStringRepresentations");
+            }};
+
+            if (testsThatNeedLongIdManager.contains(testMethodName))
+                return DefaultIdManager.LONG;
+            else if (testsThatNeedUuidIdManager.contains(testMethodName))
+                return DefaultIdManager.UUID;
+        }  else if (test.equals(IoEdgeTest.class)) {
+            final Set<String> testsThatNeedLongIdManager = new HashSet<String>(){{
+                add("shouldReadWriteEdge[graphson-v1]");
+                add("shouldReadWriteDetachedEdgeAsReference[graphson-v1]");
+                add("shouldReadWriteDetachedEdge[graphson-v1]");
+                add("shouldReadWriteEdge[graphson-v2]");
+                add("shouldReadWriteDetachedEdgeAsReference[graphson-v2]");
+                add("shouldReadWriteDetachedEdge[graphson-v2]");
+            }};
+
+            if (testsThatNeedLongIdManager.contains(testMethodName))
+                return DefaultIdManager.LONG;
+        } else if (test.equals(IoVertexTest.class)) {
+            final Set<String> testsThatNeedLongIdManager = new HashSet<String>(){{
+                add("shouldReadWriteVertexWithBOTHEdges[graphson-v1]");
+                add("shouldReadWriteVertexWithINEdges[graphson-v1]");
+                add("shouldReadWriteVertexWithOUTEdges[graphson-v1]");
+                add("shouldReadWriteVertexNoEdges[graphson-v1]");
+                add("shouldReadWriteDetachedVertexNoEdges[graphson-v1]");
+                add("shouldReadWriteDetachedVertexAsReferenceNoEdges[graphson-v1]");
+                add("shouldReadWriteVertexMultiPropsNoEdges[graphson-v1]");
+                add("shouldReadWriteVertexWithBOTHEdges[graphson-v2]");
+                add("shouldReadWriteVertexWithINEdges[graphson-v2]");
+                add("shouldReadWriteVertexWithOUTEdges[graphson-v2]");
+                add("shouldReadWriteVertexNoEdges[graphson-v2]");
+                add("shouldReadWriteDetachedVertexNoEdges[graphson-v2]");
+                add("shouldReadWriteDetachedVertexAsReferenceNoEdges[graphson-v2]");
+                add("shouldReadWriteVertexMultiPropsNoEdges[graphson-v2]");
+            }};
+
+            if (testsThatNeedLongIdManager.contains(testMethodName))
+                return DefaultIdManager.LONG;
+        }
+
+        return DefaultIdManager.ANY;
+    }
+
+    /**
+     * Test that load with specific graph data can be configured with a specific id manager as the data type to
+     * be used in the test for that graph is known.
+     */
+    protected DefaultIdManager selectIdMakerFromGraphData(final LoadGraphWith.GraphData loadGraphWith) {
+        if (null == loadGraphWith) return DefaultIdManager.ANY;
+        if (loadGraphWith.equals(LoadGraphWith.GraphData.CLASSIC))
+            return DefaultIdManager.INTEGER;
+        else if (loadGraphWith.equals(LoadGraphWith.GraphData.MODERN))
+            return DefaultIdManager.INTEGER;
+        else if (loadGraphWith.equals(LoadGraphWith.GraphData.CREW))
+            return DefaultIdManager.INTEGER;
+        else if (loadGraphWith.equals(LoadGraphWith.GraphData.GRATEFUL))
+            return DefaultIdManager.INTEGER;
+        else if (loadGraphWith.equals(LoadGraphWith.GraphData.SINK))
+            return DefaultIdManager.INTEGER;
+        else
+            throw new IllegalStateException(String.format("Need to define a new %s for %s", TinkerTransactionGraph.IdManager.class.getName(), loadGraphWith.name()));
+    }
+
+    @Override
+    protected void readIntoGraph(final Graph graph, final String path) throws IOException {
+        super.readIntoGraph(graph, path);
+
+        graph.tx().commit();
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java
new file mode 100644
index 0000000..329a07f
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerWorld.java
@@ -0,0 +1,337 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph;
+
+import io.cucumber.java.Scenario;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.features.World;
+import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
+import org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerDegreeCentralityFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerTextSearchFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.AbstractTinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerTransactionGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerShuffleGraph;
+import org.junit.AssumptionViolatedException;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Collectors;
+
+/**
+ * The abstract {@link World} implementation for AbstractTinkerGraph.
+ */
+public abstract class TinkerWorld implements World {
+    @Override
+    public String changePathToDataFile(final String pathToFileFromGremlin) {
+        return ".." + File.separator + pathToFileFromGremlin;
+    }
+
+    /**
+     * Get an instance of the underlying AbstractTinkerGraph with the provided configuration.
+     */
+    public abstract AbstractTinkerGraph open(final Configuration configuration);
+
+    protected static Configuration getNumberIdManagerConfiguration() {
+        final Configuration conf = new BaseConfiguration();
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, AbstractTinkerGraph.DefaultIdManager.INTEGER.name());
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, AbstractTinkerGraph.DefaultIdManager.INTEGER.name());
+        conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, AbstractTinkerGraph.DefaultIdManager.LONG.name());
+        return conf;
+    }
+
+    protected static AbstractTinkerGraph registerTestServices(final AbstractTinkerGraph graph) {
+        graph.getServiceRegistry().registerService(new TinkerTextSearchFactory(graph));
+        graph.getServiceRegistry().registerService(new TinkerDegreeCentralityFactory(graph));
+        return graph;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * The concrete {@link World} implementation for TinkerGraph that provides the {@link GraphTraversalSource}
+     * instances required by the Gherkin test suite.
+     */
+    public static class TinkerGraphWorld extends TinkerWorld {
+        private static final AbstractTinkerGraph modern = registerTestServices(TinkerFactory.createModern());
+        private static final AbstractTinkerGraph classic = registerTestServices(TinkerFactory.createClassic());
+        private static final AbstractTinkerGraph crew = registerTestServices(TinkerFactory.createTheCrew());
+        private static final AbstractTinkerGraph sink = registerTestServices(TinkerFactory.createKitchenSink());
+        private static final AbstractTinkerGraph grateful = registerTestServices(TinkerFactory.createGratefulDead());
+
+        @Override
+        public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+            if (null == graphData)
+                return registerTestServices(TinkerGraph.open(getNumberIdManagerConfiguration())).traversal();
+            else if (graphData == LoadGraphWith.GraphData.CLASSIC)
+                return classic.traversal();
+            else if (graphData == LoadGraphWith.GraphData.CREW)
+                return crew.traversal();
+            else if (graphData == LoadGraphWith.GraphData.MODERN)
+                return modern.traversal();
+            else if (graphData == LoadGraphWith.GraphData.SINK)
+                return sink.traversal();
+            else if (graphData == LoadGraphWith.GraphData.GRATEFUL)
+                return grateful.traversal();
+            else
+                throw new UnsupportedOperationException("GraphData not supported: " + graphData.name());
+        }
+
+        @Override
+        public AbstractTinkerGraph open(final Configuration configuration) {
+            return TinkerGraph.open(configuration);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * The {@link World} implementation for TinkerTransactionGraph that provides the {@link GraphTraversalSource}
+     * instances required by the Gherkin test suite.
+     */
+    public static class TinkerTransactionGraphWorld extends TinkerWorld {
+        private static final AbstractTinkerGraph modern;
+        private static final AbstractTinkerGraph classic;
+        private static final AbstractTinkerGraph crew;
+        private static final AbstractTinkerGraph sink;
+        private static final AbstractTinkerGraph grateful;
+
+        static {
+            modern = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateModern(modern);
+            modern.tx().commit();
+            registerTestServices(modern);
+
+            classic = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateClassic(classic);
+            classic.tx().commit();
+            registerTestServices(classic);
+
+            crew = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateTheCrew(crew);
+            crew.tx().commit();
+            registerTestServices(crew);
+
+            sink = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateKitchenSink(sink);
+            sink.tx().commit();
+            registerTestServices(sink);
+
+            grateful = TinkerTransactionGraph.open(getNumberIdManagerConfiguration());
+            TinkerFactory.generateGratefulDead(grateful);
+            grateful.tx().commit();
+            registerTestServices(grateful);
+        }
+
+        @Override
+        public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+            if (null == graphData)
+                return registerTestServices(TinkerTransactionGraph.open(getNumberIdManagerConfiguration())).traversal();
+            else if (graphData == LoadGraphWith.GraphData.CLASSIC)
+                return classic.traversal();
+            else if (graphData == LoadGraphWith.GraphData.CREW)
+                return crew.traversal();
+            else if (graphData == LoadGraphWith.GraphData.MODERN)
+                return modern.traversal();
+            else if (graphData == LoadGraphWith.GraphData.SINK)
+                return sink.traversal();
+            else if (graphData == LoadGraphWith.GraphData.GRATEFUL)
+                return grateful.traversal();
+            else
+                throw new UnsupportedOperationException("GraphData not supported: " + graphData.name());
+        }
+
+        @Override
+        public AbstractTinkerGraph open(final Configuration configuration) {
+            return TinkerTransactionGraph.open(configuration);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * The {@link World} implementation for TinkerShuffleGraph that provides the {@link GraphTraversalSource}
+     * instances required by the Gherkin test suite.
+     */
+    public static class TinkerShuffleGraphWorld extends TinkerWorld {
+        private static final TinkerGraph modern;
+        private static final TinkerGraph classic;
+        private static final TinkerGraph crew;
+        private static final TinkerGraph sink;
+        private static final TinkerGraph grateful;
+
+        static {
+            modern = TinkerShuffleGraph.open();
+            TinkerFactory.generateModern(modern);
+            registerTestServices(modern);
+            classic = TinkerShuffleGraph.open();
+            TinkerFactory.generateClassic(classic);
+            registerTestServices(classic);
+            crew = TinkerShuffleGraph.open();
+            TinkerFactory.generateTheCrew(crew);
+            registerTestServices(crew);
+            sink = TinkerShuffleGraph.open();
+            TinkerFactory.generateKitchenSink(sink);
+            registerTestServices(sink);
+            grateful = TinkerShuffleGraph.open();
+            TinkerFactory.generateGratefulDead(grateful);
+            registerTestServices(grateful);
+        }
+
+        @Override
+        public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+            if (null == graphData)
+                return registerTestServices(TinkerGraph.open(getNumberIdManagerConfiguration())).traversal();
+            else if (graphData == LoadGraphWith.GraphData.CLASSIC)
+                return classic.traversal();
+            else if (graphData == LoadGraphWith.GraphData.CREW)
+                return crew.traversal();
+            else if (graphData == LoadGraphWith.GraphData.MODERN)
+                return modern.traversal();
+            else if (graphData == LoadGraphWith.GraphData.SINK)
+                return sink.traversal();
+            else if (graphData == LoadGraphWith.GraphData.GRATEFUL)
+                return grateful.traversal();
+            else
+                throw new UnsupportedOperationException("GraphData not supported: " + graphData.name());
+        }
+
+        @Override
+        public AbstractTinkerGraph open(final Configuration configuration) {
+            return TinkerShuffleGraph.open(configuration);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Enables the storing of {@code null} property values when testing. This is a terminal decorator and shouldn't be
+     * used as an input into another decorator.
+     */
+    public static class NullWorld implements World {
+        private TinkerWorld world;
+
+        public NullWorld(TinkerWorld world) { this.world = world; }
+
+        @Override
+        public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+            if (graphData != null)
+                throw new UnsupportedOperationException("GraphData not supported: " + graphData.name());
+
+            final Configuration conf = getNumberIdManagerConfiguration();
+            conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_ALLOW_NULL_PROPERTY_VALUES, true);
+            return world.open(conf).traversal();
+        }
+
+        @Override
+        public void beforeEachScenario(final Scenario scenario) {
+            this.world.beforeEachScenario(scenario);
+        }
+
+        @Override
+        public void afterEachScenario() {
+            this.world.afterEachScenario();
+        }
+
+        @Override
+        public String changePathToDataFile(final String pathToFileFromGremlin) {
+            return this.world.changePathToDataFile(pathToFileFromGremlin);
+        }
+
+        @Override
+        public String convertIdToScript(final Object id, final Class<? extends Element> type) {
+            return this.world.convertIdToScript(id, type);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Enables testing of GraphComputer functionality.
+     */
+    public static class ComputerWorld implements World {
+        private static final Random RANDOM = TestHelper.RANDOM;
+
+        private static final List<String> TAGS_TO_IGNORE = Arrays.asList(
+                "@StepDrop",
+                "@StepInject",
+                "@StepV",
+                "@StepE",
+                "@GraphComputerVerificationOneBulk",
+                "@GraphComputerVerificationStrategyNotSupported",
+                "@GraphComputerVerificationMidVNotSupported",
+                "@GraphComputerVerificationInjectionNotSupported",
+                "@GraphComputerVerificationStarGraphExceeded",
+                "@GraphComputerVerificationReferenceOnly",
+                "@TinkerServiceRegistry");
+
+        private World world;
+
+        public ComputerWorld(World world) { this.world = world; }
+
+        @Override
+        public GraphTraversalSource getGraphTraversalSource(final LoadGraphWith.GraphData graphData) {
+            if (null == graphData)
+                throw new AssumptionViolatedException("GraphComputer does not support mutation");
+
+            return this.world.getGraphTraversalSource(graphData).withStrategies(VertexProgramStrategy.create(new MapConfiguration(new HashMap<String, Object>() {{
+                put(VertexProgramStrategy.WORKERS, Runtime.getRuntime().availableProcessors());
+                put(VertexProgramStrategy.GRAPH_COMPUTER, RANDOM.nextBoolean() ?
+                        GraphComputer.class.getCanonicalName() :
+                        TinkerGraphComputer.class.getCanonicalName());
+            }})));
+        }
+
+        @Override
+        public void beforeEachScenario(final Scenario scenario) {
+            final List<String> ignores = TAGS_TO_IGNORE.stream().filter(t -> scenario.getSourceTagNames().contains(t)).collect(Collectors.toList());
+            if (!ignores.isEmpty())
+                throw new AssumptionViolatedException(String.format("This scenario is not supported with GraphComputer: %s", ignores));
+
+            this.world.beforeEachScenario(scenario);
+        }
+
+        @Override
+        public void afterEachScenario() {
+            this.world.afterEachScenario();
+        }
+
+        @Override
+        public String changePathToDataFile(final String pathToFileFromGremlin) {
+            return this.world.changePathToDataFile(pathToFileFromGremlin);
+        }
+
+        @Override
+        public String convertIdToScript(final Object id, final Class<? extends Element> type) {
+            return this.world.convertIdToScript(id, type);
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index d62d7af..e624f28 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -67,8 +67,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphAsGryoV1d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v1d0.kryo"));
+    public void shouldWriteClassicGraphAsGryoV1() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v1.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, TinkerFactory.createClassic());
         os.close();
     }
@@ -77,8 +77,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphAsGryoV1d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v1d0.kryo"));
+    public void shouldWriteModernGraphAsGryoV1() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v1.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, TinkerFactory.createModern());
         os.close();
     }
@@ -87,8 +87,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteCrewGraphAsGryoV1d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v1d0.kryo"));
+    public void shouldWriteCrewGraphAsGryoV1() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v1.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
     }
@@ -97,8 +97,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteSinkGraphAsGryoV1d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v1d0.kryo"));
+    public void shouldWriteSinkGraphAsGryoV1() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v1.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
     }
@@ -107,8 +107,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphAsGryoV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v3d0.kryo"));
+    public void shouldWriteClassicGraphAsGryoV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v3.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createClassic());
         os.close();
     }
@@ -117,8 +117,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphAsGryoV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v3d0.kryo"));
+    public void shouldWriteModernGraphAsGryoV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v3.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createModern());
         os.close();
     }
@@ -127,8 +127,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteCrewGraphAsGryoV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v3d0.kryo"));
+    public void shouldWriteCrewGraphAsGryoV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v3.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
     }
@@ -137,8 +137,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteSinkGraphAsGryoV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v3d0.kryo"));
+    public void shouldWriteSinkGraphAsGryoV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v3.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
     }
@@ -147,7 +147,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTClassicGraphAsGryoV3d0() throws IOException {
+    public void shouldWriteDEFAULTClassicGraphAsGryoV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createClassic());
         os.close();
@@ -157,7 +157,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTModernGraphAsGryoV3d0() throws IOException {
+    public void shouldWriteDEFAULTModernGraphAsGryoV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createModern());
         os.close();
@@ -167,7 +167,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTCrewGraphAsGryoV3d0() throws IOException {
+    public void shouldWriteDEFAULTCrewGraphAsGryoV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
@@ -177,7 +177,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTSinkGraphAsGryoV3d0() throws IOException {
+    public void shouldWriteDEFAULTSinkGraphAsGryoV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
@@ -207,8 +207,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphAsGraphSONV1d0NoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v1d0.json"));
+    public void shouldWriteClassicGraphAsGraphSONV1NoTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createClassic());
         os.close();
     }
@@ -217,8 +217,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphAsGraphSONV1d0NoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v1d0.json"));
+    public void shouldWriteModernGraphAsGraphSONV1NoTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createModern());
         os.close();
     }
@@ -227,8 +227,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteCrewGraphAsGraphSONV1d0NoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v1d0.json"));
+    public void shouldWriteCrewGraphAsGraphSONV1NoTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
     }
@@ -238,7 +238,7 @@
      */
     @Test
     public void shouldWriteKitchenSinkAsGraphSONNoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v1d0.json"));
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
     }
@@ -247,8 +247,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphNormalizedAsGraphSONV1d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-normalized-v1d0.json"));
+    public void shouldWriteClassicGraphNormalizedAsGraphSONV1() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-normalized-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createClassic());
         os.close();
     }
@@ -257,8 +257,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphNormalizedAsGraphSONV1d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-normalized-v1d0.json"));
+    public void shouldWriteModernGraphNormalizedAsGraphSONV1() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-normalized-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os, TinkerFactory.createModern());
         os.close();
     }
@@ -267,8 +267,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphAsGraphSONV1d0WithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-typed-v1d0.json"));
+    public void shouldWriteClassicGraphAsGraphSONV1WithTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-typed-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create())
                 .create().writeGraph(os, TinkerFactory.createClassic());
         os.close();
@@ -278,8 +278,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphAsGraphSONV1d0WithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-typed-v1d0.json"));
+    public void shouldWriteModernGraphAsGraphSONV1WithTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-typed-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create())
                 .create().writeGraph(os, TinkerFactory.createModern());
         os.close();
@@ -289,8 +289,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteCrewGraphAsGraphSONV1d0WithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-typed-v1d0.json"));
+    public void shouldWriteCrewGraphAsGraphSONV1WithTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-typed-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create())
                 .create().writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
@@ -301,7 +301,7 @@
      */
     @Test
     public void shouldWriteKitchenSinkAsGraphSONWithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-typed-v1d0.json"));
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-typed-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create())
                 .create().writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
@@ -311,8 +311,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphAsGraphSONV2d0NoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v2d0.json"));
+    public void shouldWriteClassicGraphAsGraphSONV2NoTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.NO_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createClassic());
         os.close();
@@ -322,8 +322,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphAsGraphSOV2d0NNoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v2d0.json"));
+    public void shouldWriteModernGraphAsGraphSOV2NNoTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.NO_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createModern());
         os.close();
@@ -333,8 +333,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteCrewGraphAsGraphSONV2d0NoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v2d0.json"));
+    public void shouldWriteCrewGraphAsGraphSONV2NoTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.NO_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
@@ -344,8 +344,8 @@
      * No assertions. Just write out the graph for convenience
      */
     @Test
-    public void shouldWriteKitchenSinkAsGraphSONV2d0NoTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v2d0.json"));
+    public void shouldWriteKitchenSinkAsGraphSONV2NoTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.NO_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
@@ -355,8 +355,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphNormalizedAsGraphSONV2d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-normalized-v2d0.json"));
+    public void shouldWriteClassicGraphNormalizedAsGraphSONV2() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-normalized-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.NO_TYPES).normalize(true).create()).create()
                 .writeGraph(os, TinkerFactory.createClassic());
         os.close();
@@ -366,8 +366,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphNormalizedAsGraphSONV2d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-normalized-v2d0.json"));
+    public void shouldWriteModernGraphNormalizedAsGraphSONV2() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-normalized-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.NO_TYPES).normalize(true).create()).create()
                 .writeGraph(os, TinkerFactory.createModern());
         os.close();
@@ -377,8 +377,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphAsGraphSONV2d0WithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-typed-v2d0.json"));
+    public void shouldWriteClassicGraphAsGraphSONV2WithTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-typed-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createClassic());
         os.close();
@@ -388,8 +388,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphAsGraphSONV2d0WithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-typed-v2d0.json"));
+    public void shouldWriteModernGraphAsGraphSONV2WithTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-typed-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createModern());
         os.close();
@@ -399,8 +399,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteCrewGraphAsGraphSONV2d0WithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-typed-v2d0.json"));
+    public void shouldWriteCrewGraphAsGraphSONV2WithTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-typed-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
@@ -410,8 +410,8 @@
      * No assertions. Just write out the graph for convenience
      */
     @Test
-    public void shouldWriteKitchenSinkAsGraphSONV2d0WithTypes() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-typed-v2d0.json"));
+    public void shouldWriteKitchenSinkAsGraphSONV2WithTypes() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-typed-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()
                 .writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
@@ -421,8 +421,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphAsGraphSONV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v3d0.json"));
+    public void shouldWriteClassicGraphAsGraphSONV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-v3.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createClassic());
         os.close();
@@ -432,8 +432,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphAsGraphSONV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v3d0.json"));
+    public void shouldWriteModernGraphAsGraphSONV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-v3.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createModern());
         os.close();
@@ -443,8 +443,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteCrewGraphAsGraphSONV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v3d0.json"));
+    public void shouldWriteCrewGraphAsGraphSONV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew-v3.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createTheCrew());
         os.close();
@@ -454,8 +454,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteSinkGraphAsGraphSONV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v3d0.json"));
+    public void shouldWriteSinkGraphAsGraphSONV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink-v3.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createKitchenSink());
         os.close();
@@ -465,7 +465,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTClassicGraphAsGraphSONV3d0() throws IOException {
+    public void shouldWriteDEFAULTClassicGraphAsGraphSONV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createClassic());
@@ -476,7 +476,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTModernGraphAsGraphSONV3d0() throws IOException {
+    public void shouldWriteDEFAULTModernGraphAsGraphSONV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createModern());
@@ -487,7 +487,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTCrewGraphAsGraphSONV3d0() throws IOException {
+    public void shouldWriteDEFAULTCrewGraphAsGraphSONV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-crew.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createTheCrew());
@@ -498,7 +498,7 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteDEFAULTSinkGraphAsGraphSONV3d0() throws IOException {
+    public void shouldWriteDEFAULTSinkGraphAsGraphSONV3() throws IOException {
         final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-sink.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
                 .writeGraph(os, TinkerFactory.createKitchenSink());
@@ -509,8 +509,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteClassicGraphNormalizedAsGraphSONV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-normalized-v3d0.json"));
+    public void shouldWriteClassicGraphNormalizedAsGraphSONV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-classic-normalized-v3.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).normalize(true).create()).create()
                 .writeGraph(os, TinkerFactory.createClassic());
         os.close();
@@ -520,8 +520,8 @@
      * No assertions.  Just write out the graph for convenience.
      */
     @Test
-    public void shouldWriteModernGraphNormalizedAsGraphSONV3d0() throws IOException {
-        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-normalized-v3d0.json"));
+    public void shouldWriteModernGraphNormalizedAsGraphSONV3() throws IOException {
+        final OutputStream os = new FileOutputStream(new File(tempPath, "tinkerpop-modern-normalized-v3.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).normalize(true).create()).create()
                 .writeGraph(os, TinkerFactory.createModern());
         os.close();
@@ -553,7 +553,7 @@
 
         // read from a Gryo 3.0 file for now
         final GraphReader reader = GryoReader.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create();
-        try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3d0.kryo")) {
+        try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-v3.kryo")) {
             reader.readGraph(stream, g);
         }
 
@@ -592,11 +592,11 @@
 
         }).iterate();
 
-        final OutputStream os = new FileOutputStream(new File(tempPath, "grateful-dead-v1d0.kryo"));
+        final OutputStream os = new FileOutputStream(new File(tempPath, "grateful-dead-v1.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V1_0).create()).create().writeGraph(os, ng);
         os.close();
 
-        final OutputStream os8 = new FileOutputStream(new File(tempPath, "grateful-dead-v3d0.kryo"));
+        final OutputStream os8 = new FileOutputStream(new File(tempPath, "grateful-dead-v3.kryo"));
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os8, ng);
         os8.close();
 
@@ -605,11 +605,11 @@
         GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os9, ng);
         os9.close();
 
-        final OutputStream os2 = new FileOutputStream(new File(tempPath, "grateful-dead-v1d0.json"));
+        final OutputStream os2 = new FileOutputStream(new File(tempPath, "grateful-dead-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create()).create().writeGraph(os2, g);
         os2.close();
 
-        final OutputStream os3 = new FileOutputStream(new File(tempPath, "grateful-dead-v2d0.json"));
+        final OutputStream os3 = new FileOutputStream(new File(tempPath, "grateful-dead-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0)
                 .typeInfo(TypeInfo.NO_TYPES).create())
                 .create()
@@ -620,18 +620,18 @@
         GraphMLWriter.build().create().writeGraph(os4, g);
         os4.close();
 
-        final OutputStream os5 = new FileOutputStream(new File(tempPath, "grateful-dead-typed-v1d0.json"));
+        final OutputStream os5 = new FileOutputStream(new File(tempPath, "grateful-dead-typed-v1.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create().writeGraph(os5, g);
         os5.close();
 
-        final OutputStream os6 = new FileOutputStream(new File(tempPath, "grateful-dead-typed-v2d0.json"));
+        final OutputStream os6 = new FileOutputStream(new File(tempPath, "grateful-dead-typed-v2.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0)
                 .typeInfo(TypeInfo.PARTIAL_TYPES).create())
                 .create()
                 .writeGraph(os6, g);
         os6.close();
 
-        final OutputStream os7 = new FileOutputStream(new File(tempPath, "grateful-dead-v3d0.json"));
+        final OutputStream os7 = new FileOutputStream(new File(tempPath, "grateful-dead-v3.json"));
         GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0)
                 .typeInfo(TypeInfo.PARTIAL_TYPES).create())
                 .create()
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2Test.java
new file mode 100644
index 0000000..3622795
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2Test.java
@@ -0,0 +1,570 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.IoTest;
+import org.apache.tinkerpop.gremlin.structure.io.Mapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.Year;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+
+public class TinkerGraphGraphSONSerializerV2Test {
+
+    // As of TinkerPop 3.2.1 default for GraphSON 2.0 means types enabled.
+    private final Mapper defaultMapperV2 = GraphSONMapper.build()
+            .version(GraphSONVersion.V2_0)
+            .addCustomModule(GraphSONXModuleV2.build())
+            .addRegistry(TinkerIoRegistryV2.instance())
+            .create();
+
+    private final Mapper noTypesMapperV2 = GraphSONMapper.build()
+            .version(GraphSONVersion.V2_0)
+            .addCustomModule(GraphSONXModuleV2.build())
+            .typeInfo(TypeInfo.NO_TYPES)
+            .addRegistry(TinkerIoRegistryV2.instance())
+            .create();
+
+    /**
+     * Checks that the graph has been fully ser/deser with types.
+     */
+    @Test
+    public void shouldDeserializeGraphSONIntoTinkerGraphWithPartialTypes() throws IOException {
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+        final  TinkerGraph baseModern = TinkerFactory.createModern();
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeGraph(out, baseModern);
+            final String json = out.toString();
+            final TinkerGraph read = TinkerGraph.open();
+            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+            IoTest.assertModernGraph(read, true, false);
+        }
+    }
+
+    /**
+     * Checks that the graph has been fully ser/deser without types.
+     */
+    @Test
+    public void shouldDeserializeGraphSONIntoTinkerGraphWithoutTypes() throws IOException {
+        final GraphWriter writer = getWriter(noTypesMapperV2);
+        final GraphReader reader = getReader(noTypesMapperV2);
+        final TinkerGraph baseModern = TinkerFactory.createModern();
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeGraph(out, baseModern);
+            final String json = out.toString();
+            final TinkerGraph read = TinkerGraph.open();
+            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+            IoTest.assertModernGraph(read, true, false);
+        }
+    }
+
+    /**
+     * Thorough types verification for Vertex ids, Vertex props, Edge ids, Edge props
+     */
+    @Test
+    public void shouldDeserializeGraphSONIntoTinkerGraphKeepingTypes() throws IOException {
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        final Graph sampleGraph1 = TinkerFactory.createModern();
+        final Vertex v1 = sampleGraph1.addVertex(T.id, 100, "name", "kevin", "theUUID", UUID.randomUUID());
+        final Vertex v2 = sampleGraph1.addVertex(T.id, 101L, "name", "henri", "theUUID", UUID.randomUUID());
+        v1.addEdge("hello", v2, T.id, 101L,
+                "uuid", UUID.randomUUID());
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, sampleGraph1);
+            final String json = out.toString();
+
+            final TinkerGraph read = reader.readObject(new ByteArrayInputStream(json.getBytes()), TinkerGraph.class);
+            assertTrue(approximateGraphsCheck(sampleGraph1, read));
+        }
+    }
+
+    /**
+     * Asserts the approximateGraphsChecks function fails when expected. Vertex ids.
+     */
+    @Test
+    public void shouldLoseTypesWithGraphSONNoTypesForVertexIds() throws IOException {
+        final GraphWriter writer = getWriter(noTypesMapperV2);
+        final GraphReader reader = getReader(noTypesMapperV2);
+        final TinkerGraph sampleGraph1 = TinkerGraph.open();
+        TinkerFactory.generateModern(sampleGraph1);
+        sampleGraph1.addVertex(T.id, 100L, "name", "kevin");
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeGraph(out, sampleGraph1);
+            final String json = out.toString();
+            final TinkerGraph read = TinkerGraph.open();
+            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+            // Should fail on deserialized vertex Id.
+            assertFalse(approximateGraphsCheck(sampleGraph1, read));
+        }
+    }
+
+    /**
+     * Asserts the approximateGraphsChecks function fails when expected. Vertex props.
+     */
+    @Test
+    public void shouldLoseTypesWithGraphSONNoTypesForVertexProps() throws IOException {
+        final GraphWriter writer = getWriter(noTypesMapperV2);
+        final GraphReader reader = getReader(noTypesMapperV2);
+        final TinkerGraph sampleGraph1 = TinkerGraph.open();
+        TinkerFactory.generateModern(sampleGraph1);
+
+        sampleGraph1.addVertex(T.id, 100, "name", "kevin", "uuid", UUID.randomUUID());
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeGraph(out, sampleGraph1);
+            final String json = out.toString();
+            final TinkerGraph read = TinkerGraph.open();
+            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+            // Should fail on deserialized vertex prop.
+            assertFalse(approximateGraphsCheck(sampleGraph1, read));
+        }
+    }
+
+    /**
+     * Asserts the approximateGraphsChecks function fails when expected. Edge ids.
+     */
+    @Test
+    public void shouldLoseTypesWithGraphSONNoTypesForEdgeIds() throws IOException {
+        final GraphWriter writer = getWriter(noTypesMapperV2);
+        final GraphReader reader = getReader(noTypesMapperV2);
+        final TinkerGraph sampleGraph1 = TinkerGraph.open();
+        TinkerFactory.generateModern(sampleGraph1);
+        final  Vertex v1 = sampleGraph1.addVertex(T.id, 100, "name", "kevin");
+        v1.addEdge("hello", sampleGraph1.traversal().V().has("name", "marko").next(), T.id, 101L);
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeGraph(out, sampleGraph1);
+            final String json = out.toString();
+            final TinkerGraph read = TinkerGraph.open();
+            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+            // Should fail on deserialized edge Id.
+            assertFalse(approximateGraphsCheck(sampleGraph1, read));
+        }
+    }
+
+    /**
+     * Asserts the approximateGraphsChecks function fails when expected. Edge props.
+     */
+    @Test
+    public void shouldLoseTypesWithGraphSONNoTypesForEdgeProps() throws IOException {
+        final GraphWriter writer = getWriter(noTypesMapperV2);
+        final GraphReader reader = getReader(noTypesMapperV2);
+        final Graph sampleGraph1 = TinkerFactory.createModern();
+
+        final Vertex v1 = sampleGraph1.addVertex(T.id, 100, "name", "kevin");
+        v1.addEdge("hello", sampleGraph1.traversal().V().has("name", "marko").next(), T.id, 101,
+                "uuid", UUID.randomUUID());
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeGraph(out, sampleGraph1);
+            final String json = out.toString();
+            final TinkerGraph read = TinkerGraph.open();
+            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+            // Should fail on deserialized edge prop.
+            assertFalse(approximateGraphsCheck(sampleGraph1, read));
+        }
+    }
+
+    /**
+     * Those kinds of types are declared differently in the GraphSON type deserializer, check that all are handled
+     * properly.
+     */
+    @Test
+    public void shouldKeepTypesWhenDeserializingSerializedTinkerGraph() throws IOException {
+        final TinkerGraph tg = TinkerGraph.open();
+
+        final Vertex v = tg.addVertex("vertexTest");
+        final UUID uuidProp = UUID.randomUUID();
+        final Duration durationProp = Duration.ofHours(3);
+        final Long longProp = 2L;
+        final ByteBuffer byteBufferProp = ByteBuffer.wrap("testbb".getBytes());
+        final InetAddress inetAddressProp = InetAddress.getByName("10.10.10.10");
+
+        // One Java util type natively supported by Jackson
+        v.property("uuid", uuidProp);
+        // One custom time type added by the GraphSON module
+        v.property("duration", durationProp);
+        // One Java native type not handled by JSON natively
+        v.property("long", longProp);
+        // One Java util type added by GraphSON
+        v.property("bytebuffer", byteBufferProp);
+        v.property("inetaddress", inetAddressProp);
+
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeGraph(out, tg);
+            final String json = out.toString();
+            final TinkerGraph read = TinkerGraph.open();
+            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+            final Vertex vRead = read.traversal().V().hasLabel("vertexTest").next();
+            assertEquals(vRead.property("uuid").value(), uuidProp);
+            assertEquals(vRead.property("duration").value(), durationProp);
+            assertEquals(vRead.property("long").value(), longProp);
+            assertEquals(vRead.property("bytebuffer").value(), byteBufferProp);
+            assertEquals(vRead.property("inetaddress").value(), inetAddressProp);
+        }
+    }
+
+
+    @Test
+    public void deserializersTestsVertex() {
+        final TinkerGraph tg = TinkerGraph.open();
+
+        final Vertex v = tg.addVertex("vertexTest");
+        v.property("born", LocalDateTime.of(1971, 1, 2, 20, 50));
+        v.property("dead", LocalDateTime.of(1971, 1, 7, 20, 50));
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, v);
+            final String json = out.toString();
+
+            // Object works, because there's a type in the payload now
+            // Vertex.class would work as well
+            // Anything else would not because we check the type in param here with what's in the JSON, for safety.
+            final Vertex vRead = (Vertex)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            assertEquals(v, vRead);
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void deserializersTestsEdge() {
+        final TinkerGraph tg = TinkerGraph.open();
+
+        final Vertex v = tg.addVertex("vertexTest");
+        final Vertex v2 = tg.addVertex("vertexTest");
+
+        final Edge ed = v.addEdge("knows", v2, "time", LocalDateTime.now());
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, ed);
+            final String json = out.toString();
+
+            // Object works, because there's a type in the payload now
+            // Edge.class would work as well
+            // Anything else would not because we check the type in param here with what's in the JSON, for safety.
+            final Edge eRead = (Edge)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            assertEquals(ed, eRead);
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void deserializersTestsTinkerGraph() {
+        final TinkerGraph tg = TinkerGraph.open();
+
+        final Vertex v = tg.addVertex("vertexTest");
+        final Vertex v2 = tg.addVertex("vertexTest");
+
+        v.addEdge("knows", v2);
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, tg);
+            final String json = out.toString();
+
+            final Graph gRead = (Graph)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            assertTrue(approximateGraphsCheck(tg, gRead));
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void deserializersTestsProperty() {
+        final TinkerGraph tg = TinkerGraph.open();
+
+        final Vertex v = tg.addVertex("vertexTest");
+        final Vertex v2 = tg.addVertex("vertexTest");
+
+        final Edge ed = v.addEdge("knows", v2);
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        final Property prop = ed.property("since", Year.parse("1993"));
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, prop);
+            final String json = out.toString();
+
+            final Property pRead = (Property)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            //can't use equals here, because pRead is detached, its parent element has not been intentionally
+            //serialized and "equals()" checks that.
+            assertTrue(prop.key().equals(pRead.key()) && prop.value().equals(pRead.value()));
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void deserializersTestsVertexProperty() {
+        final TinkerGraph tg = TinkerGraph.open();
+
+        final Vertex v = tg.addVertex("vertexTest");
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        final VertexProperty prop = v.property("born", LocalDateTime.of(1971, 1, 2, 20, 50));
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, prop);
+            final String json = out.toString();
+
+            final VertexProperty vPropRead = (VertexProperty)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            //only classes and ids are checked, that's ok, full vertex property ser/de
+            //is checked elsewhere.
+            assertEquals(prop, vPropRead);
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void deserializersTestsPath() {
+        final TinkerGraph tg = TinkerFactory.createModern();
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        final Path p = tg.traversal().V(1).as("a").has("name").as("b").
+                out("knows").out("created").as("c").
+                has("name", "ripple").values("name").as("d").
+                identity().as("e").path().next();
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, p);
+            final String json = out.toString();
+
+            final Path pathRead = (Path)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+
+            for (int i = 0; i < p.objects().size(); i++) {
+                final Object o = p.objects().get(i);
+                final Object oRead = pathRead.objects().get(i);
+                assertEquals(o, oRead);
+            }
+            for (int i = 0; i < p.labels().size(); i++) {
+                final Set<String> o = p.labels().get(i);
+                final Set<String> oRead = pathRead.labels().get(i);
+                assertEquals(o, oRead);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void deserializersTestsMetrics() {
+        final TinkerGraph tg = TinkerFactory.createModern();
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        final TraversalMetrics tm = tg.traversal().V(1).as("a").has("name").as("b").
+                out("knows").out("created").as("c").
+                has("name", "ripple").values("name").as("d").
+                identity().as("e").profile().next();
+
+        final MutableMetrics m = new MutableMetrics(tm.getMetrics(0));
+        // making sure nested metrics are included in serde
+        m.addNested(new MutableMetrics(tm.getMetrics(1)));
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, m);
+            final String json = out.toString();
+
+            final Metrics metricsRead = (Metrics)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            // toString should be enough to compare Metrics
+            assertTrue(m.toString().equals(metricsRead.toString()));
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void deserializersTestsTraversalMetrics() {
+        final TinkerGraph tg = TinkerFactory.createModern();
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        final TraversalMetrics tm = tg.traversal().V(1).as("a").has("name").as("b").
+                out("knows").out("created").as("c").
+                has("name", "ripple").values("name").as("d").
+                identity().as("e").profile().next();
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, tm);
+            final String json = out.toString();
+
+            final TraversalMetrics traversalMetricsRead = (TraversalMetrics)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            // toString should be enough to compare TraversalMetrics
+            assertTrue(tm.toString().equals(traversalMetricsRead.toString()));
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    @Test
+    @org.junit.Ignore("https://issues.apache.org/jira/browse/TINKERPOP-1509")
+    public void deserializersTestsTree() {
+        final TinkerGraph tg = TinkerFactory.createModern();
+
+        final GraphWriter writer = getWriter(defaultMapperV2);
+        final GraphReader reader = getReader(defaultMapperV2);
+
+        final Tree t = tg.traversal().V().out().out().tree().next();
+
+        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            writer.writeObject(out, t);
+            final String json = out.toString();
+
+            final Tree treeRead = (Tree)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
+            //Map's equals should check each component of the tree recursively
+            //on each it will call "equals()" which for Vertices will compare ids, which
+            //is ok. Complete vertex deser is checked elsewhere.
+            assertEquals(t, treeRead);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("Should not have thrown exception: " + e.getMessage());
+        }
+    }
+
+    private GraphWriter getWriter(Mapper paramMapper) {
+        return GraphSONWriter.build().mapper(paramMapper).create();
+    }
+
+    private GraphReader getReader(Mapper paramMapper) {
+        return GraphSONReader.build().mapper(paramMapper).create();
+    }
+
+    /**
+     * Checks sequentially vertices and edges of both graphs. Will check sequentially Vertex IDs, Vertex Properties IDs
+     * and values and classes. Then same for edges. To use when serializing a Graph and deserializing the supposedly
+     * same Graph.
+     */
+    private boolean approximateGraphsCheck(Graph g1, Graph g2) {
+        final Iterator<Vertex> itV = g1.vertices();
+        final Iterator<Vertex> itVRead = g2.vertices();
+
+        while (itV.hasNext()) {
+            final Vertex v = itV.next();
+            final Vertex vRead = itVRead.next();
+
+            // Will only check IDs but that's 'good' enough.
+            if (!v.equals(vRead)) {
+                return false;
+            }
+
+            final Iterator itVP = v.properties();
+            final Iterator itVPRead = vRead.properties();
+            while (itVP.hasNext()) {
+                final VertexProperty vp = (VertexProperty) itVP.next();
+                final VertexProperty vpRead = (VertexProperty) itVPRead.next();
+                if (!vp.value().equals(vpRead.value())
+                        || !vp.equals(vpRead)) {
+                    return false;
+                }
+            }
+        }
+
+        final Iterator<Edge> itE = g1.edges();
+        final Iterator<Edge> itERead = g2.edges();
+
+        while (itE.hasNext()) {
+            final Edge e = itE.next();
+            final Edge eRead = itERead.next();
+            // Will only check IDs but that's good enough.
+            if (!e.equals(eRead)) {
+                return false;
+            }
+
+            final Iterator itEP = e.properties();
+            final Iterator itEPRead = eRead.properties();
+            while (itEP.hasNext()) {
+                final Property ep = (Property) itEP.next();
+                final Property epRead = (Property) itEPRead.next();
+                if (!ep.value().equals(epRead.value())
+                        || !ep.equals(epRead)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
deleted file mode 100644
index eac7db2..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
-import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
-import org.apache.tinkerpop.gremlin.structure.io.IoTest;
-import org.apache.tinkerpop.gremlin.structure.io.Mapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.junit.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.Year;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-
-public class TinkerGraphGraphSONSerializerV2d0Test {
-
-    // As of TinkerPop 3.2.1 default for GraphSON 2.0 means types enabled.
-    private final Mapper defaultMapperV2d0 = GraphSONMapper.build()
-            .version(GraphSONVersion.V2_0)
-            .addCustomModule(GraphSONXModuleV2d0.build().create(false))
-            .addRegistry(TinkerIoRegistryV2d0.instance())
-            .create();
-
-    private final Mapper noTypesMapperV2d0 = GraphSONMapper.build()
-            .version(GraphSONVersion.V2_0)
-            .addCustomModule(GraphSONXModuleV2d0.build().create(false))
-            .typeInfo(TypeInfo.NO_TYPES)
-            .addRegistry(TinkerIoRegistryV2d0.instance())
-            .create();
-
-    /**
-     * Checks that the graph has been fully ser/deser with types.
-     */
-    @Test
-    public void shouldDeserializeGraphSONIntoTinkerGraphWithPartialTypes() throws IOException {
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-        final  TinkerGraph baseModern = TinkerFactory.createModern();
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeGraph(out, baseModern);
-            final String json = out.toString();
-            final TinkerGraph read = TinkerGraph.open();
-            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
-            IoTest.assertModernGraph(read, true, false);
-        }
-    }
-
-    /**
-     * Checks that the graph has been fully ser/deser without types.
-     */
-    @Test
-    public void shouldDeserializeGraphSONIntoTinkerGraphWithoutTypes() throws IOException {
-        final GraphWriter writer = getWriter(noTypesMapperV2d0);
-        final GraphReader reader = getReader(noTypesMapperV2d0);
-        final TinkerGraph baseModern = TinkerFactory.createModern();
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeGraph(out, baseModern);
-            final String json = out.toString();
-            final TinkerGraph read = TinkerGraph.open();
-            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
-            IoTest.assertModernGraph(read, true, false);
-        }
-    }
-
-    /**
-     * Thorough types verification for Vertex ids, Vertex props, Edge ids, Edge props
-     */
-    @Test
-    public void shouldDeserializeGraphSONIntoTinkerGraphKeepingTypes() throws IOException {
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        final Graph sampleGraph1 = TinkerFactory.createModern();
-        final Vertex v1 = sampleGraph1.addVertex(T.id, 100, "name", "kevin", "theUUID", UUID.randomUUID());
-        final Vertex v2 = sampleGraph1.addVertex(T.id, 101L, "name", "henri", "theUUID", UUID.randomUUID());
-        v1.addEdge("hello", v2, T.id, 101L,
-                "uuid", UUID.randomUUID());
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, sampleGraph1);
-            final String json = out.toString();
-
-            final TinkerGraph read = reader.readObject(new ByteArrayInputStream(json.getBytes()), TinkerGraph.class);
-            assertTrue(approximateGraphsCheck(sampleGraph1, read));
-        }
-    }
-
-    /**
-     * Asserts the approximateGraphsChecks function fails when expected. Vertex ids.
-     */
-    @Test
-    public void shouldLoseTypesWithGraphSONNoTypesForVertexIds() throws IOException {
-        final GraphWriter writer = getWriter(noTypesMapperV2d0);
-        final GraphReader reader = getReader(noTypesMapperV2d0);
-        final TinkerGraph sampleGraph1 = TinkerGraph.open();
-        TinkerFactory.generateModern(sampleGraph1);
-        sampleGraph1.addVertex(T.id, 100L, "name", "kevin");
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeGraph(out, sampleGraph1);
-            final String json = out.toString();
-            final TinkerGraph read = TinkerGraph.open();
-            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
-            // Should fail on deserialized vertex Id.
-            assertFalse(approximateGraphsCheck(sampleGraph1, read));
-        }
-    }
-
-    /**
-     * Asserts the approximateGraphsChecks function fails when expected. Vertex props.
-     */
-    @Test
-    public void shouldLoseTypesWithGraphSONNoTypesForVertexProps() throws IOException {
-        final GraphWriter writer = getWriter(noTypesMapperV2d0);
-        final GraphReader reader = getReader(noTypesMapperV2d0);
-        final TinkerGraph sampleGraph1 = TinkerGraph.open();
-        TinkerFactory.generateModern(sampleGraph1);
-
-        sampleGraph1.addVertex(T.id, 100, "name", "kevin", "uuid", UUID.randomUUID());
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeGraph(out, sampleGraph1);
-            final String json = out.toString();
-            final TinkerGraph read = TinkerGraph.open();
-            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
-            // Should fail on deserialized vertex prop.
-            assertFalse(approximateGraphsCheck(sampleGraph1, read));
-        }
-    }
-
-    /**
-     * Asserts the approximateGraphsChecks function fails when expected. Edge ids.
-     */
-    @Test
-    public void shouldLoseTypesWithGraphSONNoTypesForEdgeIds() throws IOException {
-        final GraphWriter writer = getWriter(noTypesMapperV2d0);
-        final GraphReader reader = getReader(noTypesMapperV2d0);
-        final TinkerGraph sampleGraph1 = TinkerGraph.open();
-        TinkerFactory.generateModern(sampleGraph1);
-        final  Vertex v1 = sampleGraph1.addVertex(T.id, 100, "name", "kevin");
-        v1.addEdge("hello", sampleGraph1.traversal().V().has("name", "marko").next(), T.id, 101L);
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeGraph(out, sampleGraph1);
-            final String json = out.toString();
-            final TinkerGraph read = TinkerGraph.open();
-            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
-            // Should fail on deserialized edge Id.
-            assertFalse(approximateGraphsCheck(sampleGraph1, read));
-        }
-    }
-
-    /**
-     * Asserts the approximateGraphsChecks function fails when expected. Edge props.
-     */
-    @Test
-    public void shouldLoseTypesWithGraphSONNoTypesForEdgeProps() throws IOException {
-        final GraphWriter writer = getWriter(noTypesMapperV2d0);
-        final GraphReader reader = getReader(noTypesMapperV2d0);
-        final Graph sampleGraph1 = TinkerFactory.createModern();
-
-        final Vertex v1 = sampleGraph1.addVertex(T.id, 100, "name", "kevin");
-        v1.addEdge("hello", sampleGraph1.traversal().V().has("name", "marko").next(), T.id, 101,
-                "uuid", UUID.randomUUID());
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeGraph(out, sampleGraph1);
-            final String json = out.toString();
-            final TinkerGraph read = TinkerGraph.open();
-            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
-            // Should fail on deserialized edge prop.
-            assertFalse(approximateGraphsCheck(sampleGraph1, read));
-        }
-    }
-
-    /**
-     * Those kinds of types are declared differently in the GraphSON type deserializer, check that all are handled
-     * properly.
-     */
-    @Test
-    public void shouldKeepTypesWhenDeserializingSerializedTinkerGraph() throws IOException {
-        final TinkerGraph tg = TinkerGraph.open();
-
-        final Vertex v = tg.addVertex("vertexTest");
-        final UUID uuidProp = UUID.randomUUID();
-        final Duration durationProp = Duration.ofHours(3);
-        final Long longProp = 2L;
-        final ByteBuffer byteBufferProp = ByteBuffer.wrap("testbb".getBytes());
-        final InetAddress inetAddressProp = InetAddress.getByName("10.10.10.10");
-
-        // One Java util type natively supported by Jackson
-        v.property("uuid", uuidProp);
-        // One custom time type added by the GraphSON module
-        v.property("duration", durationProp);
-        // One Java native type not handled by JSON natively
-        v.property("long", longProp);
-        // One Java util type added by GraphSON
-        v.property("bytebuffer", byteBufferProp);
-        v.property("inetaddress", inetAddressProp);
-
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeGraph(out, tg);
-            final String json = out.toString();
-            final TinkerGraph read = TinkerGraph.open();
-            reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
-            final Vertex vRead = read.traversal().V().hasLabel("vertexTest").next();
-            assertEquals(vRead.property("uuid").value(), uuidProp);
-            assertEquals(vRead.property("duration").value(), durationProp);
-            assertEquals(vRead.property("long").value(), longProp);
-            assertEquals(vRead.property("bytebuffer").value(), byteBufferProp);
-            assertEquals(vRead.property("inetaddress").value(), inetAddressProp);
-        }
-    }
-
-
-    @Test
-    public void deserializersTestsVertex() {
-        final TinkerGraph tg = TinkerGraph.open();
-
-        final Vertex v = tg.addVertex("vertexTest");
-        v.property("born", LocalDateTime.of(1971, 1, 2, 20, 50));
-        v.property("dead", LocalDateTime.of(1971, 1, 7, 20, 50));
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, v);
-            final String json = out.toString();
-
-            // Object works, because there's a type in the payload now
-            // Vertex.class would work as well
-            // Anything else would not because we check the type in param here with what's in the JSON, for safety.
-            final Vertex vRead = (Vertex)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            assertEquals(v, vRead);
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void deserializersTestsEdge() {
-        final TinkerGraph tg = TinkerGraph.open();
-
-        final Vertex v = tg.addVertex("vertexTest");
-        final Vertex v2 = tg.addVertex("vertexTest");
-
-        final Edge ed = v.addEdge("knows", v2, "time", LocalDateTime.now());
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, ed);
-            final String json = out.toString();
-
-            // Object works, because there's a type in the payload now
-            // Edge.class would work as well
-            // Anything else would not because we check the type in param here with what's in the JSON, for safety.
-            final Edge eRead = (Edge)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            assertEquals(ed, eRead);
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void deserializersTestsTinkerGraph() {
-        final TinkerGraph tg = TinkerGraph.open();
-
-        final Vertex v = tg.addVertex("vertexTest");
-        final Vertex v2 = tg.addVertex("vertexTest");
-
-        v.addEdge("knows", v2);
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, tg);
-            final String json = out.toString();
-
-            final Graph gRead = (Graph)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            assertTrue(approximateGraphsCheck(tg, gRead));
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void deserializersTestsProperty() {
-        final TinkerGraph tg = TinkerGraph.open();
-
-        final Vertex v = tg.addVertex("vertexTest");
-        final Vertex v2 = tg.addVertex("vertexTest");
-
-        final Edge ed = v.addEdge("knows", v2);
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        final Property prop = ed.property("since", Year.parse("1993"));
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, prop);
-            final String json = out.toString();
-
-            final Property pRead = (Property)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            //can't use equals here, because pRead is detached, its parent element has not been intentionally
-            //serialized and "equals()" checks that.
-            assertTrue(prop.key().equals(pRead.key()) && prop.value().equals(pRead.value()));
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void deserializersTestsVertexProperty() {
-        final TinkerGraph tg = TinkerGraph.open();
-
-        final Vertex v = tg.addVertex("vertexTest");
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        final VertexProperty prop = v.property("born", LocalDateTime.of(1971, 1, 2, 20, 50));
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, prop);
-            final String json = out.toString();
-
-            final VertexProperty vPropRead = (VertexProperty)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            //only classes and ids are checked, that's ok, full vertex property ser/de
-            //is checked elsewhere.
-            assertEquals(prop, vPropRead);
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void deserializersTestsPath() {
-        final TinkerGraph tg = TinkerFactory.createModern();
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        final Path p = tg.traversal().V(1).as("a").has("name").as("b").
-                out("knows").out("created").as("c").
-                has("name", "ripple").values("name").as("d").
-                identity().as("e").path().next();
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, p);
-            final String json = out.toString();
-
-            final Path pathRead = (Path)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-
-            for (int i = 0; i < p.objects().size(); i++) {
-                final Object o = p.objects().get(i);
-                final Object oRead = pathRead.objects().get(i);
-                assertEquals(o, oRead);
-            }
-            for (int i = 0; i < p.labels().size(); i++) {
-                final Set<String> o = p.labels().get(i);
-                final Set<String> oRead = pathRead.labels().get(i);
-                assertEquals(o, oRead);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void deserializersTestsMetrics() {
-        final TinkerGraph tg = TinkerFactory.createModern();
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        final TraversalMetrics tm = tg.traversal().V(1).as("a").has("name").as("b").
-                out("knows").out("created").as("c").
-                has("name", "ripple").values("name").as("d").
-                identity().as("e").profile().next();
-
-        final MutableMetrics m = new MutableMetrics(tm.getMetrics(0));
-        // making sure nested metrics are included in serde
-        m.addNested(new MutableMetrics(tm.getMetrics(1)));
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, m);
-            final String json = out.toString();
-
-            final Metrics metricsRead = (Metrics)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            // toString should be enough to compare Metrics
-            assertTrue(m.toString().equals(metricsRead.toString()));
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    public void deserializersTestsTraversalMetrics() {
-        final TinkerGraph tg = TinkerFactory.createModern();
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        final TraversalMetrics tm = tg.traversal().V(1).as("a").has("name").as("b").
-                out("knows").out("created").as("c").
-                has("name", "ripple").values("name").as("d").
-                identity().as("e").profile().next();
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, tm);
-            final String json = out.toString();
-
-            final TraversalMetrics traversalMetricsRead = (TraversalMetrics)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            // toString should be enough to compare TraversalMetrics
-            assertTrue(tm.toString().equals(traversalMetricsRead.toString()));
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    @org.junit.Ignore("https://issues.apache.org/jira/browse/TINKERPOP-1509")
-    public void deserializersTestsTree() {
-        final TinkerGraph tg = TinkerFactory.createModern();
-
-        final GraphWriter writer = getWriter(defaultMapperV2d0);
-        final GraphReader reader = getReader(defaultMapperV2d0);
-
-        final Tree t = tg.traversal().V().out().out().tree().next();
-
-        try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            writer.writeObject(out, t);
-            final String json = out.toString();
-
-            final Tree treeRead = (Tree)reader.readObject(new ByteArrayInputStream(json.getBytes()), Object.class);
-            //Map's equals should check each component of the tree recursively
-            //on each it will call "equals()" which for Vertices will compare ids, which
-            //is ok. Complete vertex deser is checked elsewhere.
-            assertEquals(t, treeRead);
-
-        } catch (IOException e) {
-            e.printStackTrace();
-            fail("Should not have thrown exception: " + e.getMessage());
-        }
-    }
-
-    private GraphWriter getWriter(Mapper paramMapper) {
-        return GraphSONWriter.build().mapper(paramMapper).create();
-    }
-
-    private GraphReader getReader(Mapper paramMapper) {
-        return GraphSONReader.build().mapper(paramMapper).create();
-    }
-
-    /**
-     * Checks sequentially vertices and edges of both graphs. Will check sequentially Vertex IDs, Vertex Properties IDs
-     * and values and classes. Then same for edges. To use when serializing a Graph and deserializing the supposedly
-     * same Graph.
-     */
-    private boolean approximateGraphsCheck(Graph g1, Graph g2) {
-        final Iterator<Vertex> itV = g1.vertices();
-        final Iterator<Vertex> itVRead = g2.vertices();
-
-        while (itV.hasNext()) {
-            final Vertex v = itV.next();
-            final Vertex vRead = itVRead.next();
-
-            // Will only check IDs but that's 'good' enough.
-            if (!v.equals(vRead)) {
-                return false;
-            }
-
-            final Iterator itVP = v.properties();
-            final Iterator itVPRead = vRead.properties();
-            while (itVP.hasNext()) {
-                final VertexProperty vp = (VertexProperty) itVP.next();
-                final VertexProperty vpRead = (VertexProperty) itVPRead.next();
-                if (!vp.value().equals(vpRead.value())
-                        || !vp.equals(vpRead)) {
-                    return false;
-                }
-            }
-        }
-
-        final Iterator<Edge> itE = g1.edges();
-        final Iterator<Edge> itERead = g2.edges();
-
-        while (itE.hasNext()) {
-            final Edge e = itE.next();
-            final Edge eRead = itERead.next();
-            // Will only check IDs but that's good enough.
-            if (!e.equals(eRead)) {
-                return false;
-            }
-
-            final Iterator itEP = e.properties();
-            final Iterator itEPRead = eRead.properties();
-            while (itEP.hasNext()) {
-                final Property ep = (Property) itEP.next();
-                final Property epRead = (Property) itEPRead.next();
-                if (!ep.value().equals(epRead.value())
-                        || !ep.equals(epRead)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1Test.java
new file mode 100644
index 0000000..45f2ebf
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1Test.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Registration;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Arrays;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for {@link TinkerIoRegistryV1.TinkerGraphGryoSerializer}
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TinkerGraphGryoSerializerV1Test {
+
+    @Mock
+    private Kryo kryo;
+    @Mock
+    private Registration registration;
+    @Mock
+    private Output output;
+    @Mock
+    private Input input;
+
+    private TinkerGraph graph = TinkerGraph.open();
+    private TinkerIoRegistryV1.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV1.TinkerGraphGryoSerializer();
+
+    @Before
+    public void setUp() throws Exception {
+        when(kryo.getRegistration((Class) any())).thenReturn(registration);
+        when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
+    }
+
+    @Test
+    public void shouldVerifyKryoUsedForWrite() throws Exception {
+        serializer.write(kryo, output, graph);
+        verify(kryo, atLeastOnce()).getRegistration((Class) any());
+    }
+
+    @Test
+    public void shouldVerifyKryoUsedForRead() throws Exception {
+        // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
+        try {
+            serializer.read(kryo, input, TinkerGraph.class);
+        } catch (RuntimeException ex) {
+            verify(kryo, atLeastOnce()).readObject(any(), any());
+            verify(kryo, atLeastOnce()).readClassAndObject(any());
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1d0Test.java
deleted file mode 100644
index fff3be6..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1d0Test.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Registration;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import java.util.Arrays;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Unit tests for {@link TinkerIoRegistryV1d0.TinkerGraphGryoSerializer}
- */
-@RunWith(MockitoJUnitRunner.class)
-public class TinkerGraphGryoSerializerV1d0Test {
-
-    @Mock
-    private Kryo kryo;
-    @Mock
-    private Registration registration;
-    @Mock
-    private Output output;
-    @Mock
-    private Input input;
-
-    private TinkerGraph graph = TinkerGraph.open();
-    private TinkerIoRegistryV1d0.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV1d0.TinkerGraphGryoSerializer();
-
-    @Before
-    public void setUp() throws Exception {
-        when(kryo.getRegistration((Class) any())).thenReturn(registration);
-        when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
-    }
-
-    @Test
-    public void shouldVerifyKryoUsedForWrite() throws Exception {
-        serializer.write(kryo, output, graph);
-        verify(kryo, atLeastOnce()).getRegistration((Class) any());
-    }
-
-    @Test
-    public void shouldVerifyKryoUsedForRead() throws Exception {
-        // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
-        try {
-            serializer.read(kryo, input, TinkerGraph.class);
-        } catch (RuntimeException ex) {
-            verify(kryo, atLeastOnce()).readObject(any(), any());
-            verify(kryo, atLeastOnce()).readClassAndObject(any());
-        }
-    }
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2Test.java
new file mode 100644
index 0000000..2742de2
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2Test.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Registration;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Arrays;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for {@link TinkerIoRegistryV2.TinkerGraphGryoSerializer}.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TinkerGraphGryoSerializerV2Test {
+
+    @Mock
+    private Kryo kryo;
+    @Mock
+    private Registration registration;
+    @Mock
+    private Output output;
+    @Mock
+    private Input input;
+
+    private TinkerGraph graph = TinkerGraph.open();
+    private TinkerIoRegistryV2.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV2.TinkerGraphGryoSerializer();
+
+    @Before
+    public void setUp() throws Exception {
+        when(kryo.getRegistration((Class) any())).thenReturn(registration);
+        when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
+    }
+
+    @Test
+    public void shouldVerifyKryoUsedForWrite() throws Exception {
+        serializer.write(kryo, output, graph);
+        verify(kryo, atLeastOnce()).getRegistration((Class) any());
+    }
+
+    @Test
+    public void shouldVerifyKryoUsedForRead() throws Exception {
+        // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
+        try {
+            serializer.read(kryo, input, TinkerGraph.class);
+        } catch (RuntimeException ex) {
+            verify(kryo, atLeastOnce()).readObject(any(), any());
+            verify(kryo, atLeastOnce()).readClassAndObject(any());
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2d0Test.java
deleted file mode 100644
index 7551591..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2d0Test.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Registration;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import java.util.Arrays;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Unit tests for {@link TinkerIoRegistryV2d0.TinkerGraphGryoSerializer}.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class TinkerGraphGryoSerializerV2d0Test {
-
-    @Mock
-    private Kryo kryo;
-    @Mock
-    private Registration registration;
-    @Mock
-    private Output output;
-    @Mock
-    private Input input;
-
-    private TinkerGraph graph = TinkerGraph.open();
-    private TinkerIoRegistryV2d0.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV2d0.TinkerGraphGryoSerializer();
-
-    @Before
-    public void setUp() throws Exception {
-        when(kryo.getRegistration((Class) any())).thenReturn(registration);
-        when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
-    }
-
-    @Test
-    public void shouldVerifyKryoUsedForWrite() throws Exception {
-        serializer.write(kryo, output, graph);
-        verify(kryo, atLeastOnce()).getRegistration((Class) any());
-    }
-
-    @Test
-    public void shouldVerifyKryoUsedForRead() throws Exception {
-        // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
-        try {
-            serializer.read(kryo, input, TinkerGraph.class);
-        } catch (RuntimeException ex) {
-            verify(kryo, atLeastOnce()).readObject(any(), any());
-            verify(kryo, atLeastOnce()).readClassAndObject(any());
-        }
-    }
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV3Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV3Test.java
new file mode 100644
index 0000000..0e5d000
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV3Test.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Registration;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Arrays;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for {@link TinkerIoRegistryV3.TinkerGraphGryoSerializer}.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TinkerGraphGryoSerializerV3Test {
+
+    @Mock
+    private Kryo kryo;
+    @Mock
+    private Registration registration;
+    @Mock
+    private Output output;
+    @Mock
+    private Input input;
+
+    private TinkerGraph graph = TinkerGraph.open();
+    private TinkerIoRegistryV3.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV3.TinkerGraphGryoSerializer();
+
+    @Before
+    public void setUp() throws Exception {
+        when(kryo.getRegistration((Class) any())).thenReturn(registration);
+        when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
+    }
+
+    @Test
+    public void shouldVerifyKryoUsedForWrite() throws Exception {
+        serializer.write(kryo, output, graph);
+        verify(kryo, atLeastOnce()).getRegistration((Class) any());
+    }
+
+    @Test
+    public void shouldVerifyKryoUsedForRead() throws Exception {
+        // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
+        try {
+            serializer.read(kryo, input, TinkerGraph.class);
+        } catch (RuntimeException ex) {
+            verify(kryo, atLeastOnce()).readObject(any(), any());
+            verify(kryo, atLeastOnce()).readClassAndObject(any());
+        }
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV3d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV3d0Test.java
deleted file mode 100644
index 2b18c3b..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV3d0Test.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Registration;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import java.util.Arrays;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Unit tests for {@link TinkerIoRegistryV3d0.TinkerGraphGryoSerializer}.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class TinkerGraphGryoSerializerV3d0Test {
-
-    @Mock
-    private Kryo kryo;
-    @Mock
-    private Registration registration;
-    @Mock
-    private Output output;
-    @Mock
-    private Input input;
-
-    private TinkerGraph graph = TinkerGraph.open();
-    private TinkerIoRegistryV3d0.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV3d0.TinkerGraphGryoSerializer();
-
-    @Before
-    public void setUp() throws Exception {
-        when(kryo.getRegistration((Class) any())).thenReturn(registration);
-        when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
-    }
-
-    @Test
-    public void shouldVerifyKryoUsedForWrite() throws Exception {
-        serializer.write(kryo, output, graph);
-        verify(kryo, atLeastOnce()).getRegistration((Class) any());
-    }
-
-    @Test
-    public void shouldVerifyKryoUsedForRead() throws Exception {
-        // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
-        try {
-            serializer.read(kryo, input, TinkerGraph.class);
-        } catch (RuntimeException ex) {
-            verify(kryo, atLeastOnce()).readObject(any(), any());
-            verify(kryo, atLeastOnce()).readClassAndObject(any());
-        }
-    }
-}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 3489fcf..3560027 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -19,6 +19,7 @@
 package org.apache.tinkerpop.gremlin.tinkergraph.structure;
 
 import org.apache.tinkerpop.gremlin.process.computer.Computer;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -45,6 +46,7 @@
 
 import static org.apache.tinkerpop.gremlin.process.traversal.Operator.sum;
 import static org.apache.tinkerpop.gremlin.process.traversal.P.neq;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal.Symbols.values;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.choose;
@@ -56,6 +58,7 @@
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.union;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.valueMap;
+import static org.apache.tinkerpop.gremlin.structure.Column.keys;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
@@ -282,4 +285,34 @@
                         union(__.repeat(out().simplePath()).times(2).count(),
                                 __.repeat(in().simplePath()).times(2).count());
     }
+
+    @Test
+    @Ignore
+    public void WithinTest() {
+        final int count = 500;
+
+        final Graph graph = TinkerGraph.open();
+        final GraphTraversalSource g = graph.traversal();
+        for (int i = 0; i < count; i++) {
+            graph.addVertex(T.label, "person", T.id, i);
+        }
+
+        graph.vertices().forEachRemaining(a -> {
+            graph.vertices().forEachRemaining(b -> {
+                if (a != b && ((int) a.id() < 2 || (int) b.id() < 2)) {
+                    a.addEdge("knows", b);
+                }
+            });
+        });
+
+        final long start = System.currentTimeMillis();
+
+        final List result = g.
+                V().has(T.id,P.lt(count/2)).aggregate("v1").
+                V().where(P.without("v1")).
+                toList();
+
+        System.out.println(result.size());
+        System.out.printf("Done in %10d %n", System.currentTimeMillis() - start);
+    }
 }
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphServiceTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphServiceTest.java
index 66cb9c7..2901ef7 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphServiceTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphServiceTest.java
@@ -54,7 +54,7 @@
 import static org.apache.tinkerpop.gremlin.structure.service.Service.ServiceCallContext;
 import static org.apache.tinkerpop.gremlin.structure.service.Service.Type;
 import static org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerServiceRegistry.LambdaServiceFactory;
-import static org.apache.tinkerpop.gremlin.util.tools.CollectionFactory.asMap;
+import static org.apache.tinkerpop.gremlin.util.CollectionUtil.asMap;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index f19cca7..12d0fec 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -28,15 +28,9 @@
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.AbstractLambdaTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReservedKeysVerificationStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
 import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -52,11 +46,10 @@
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV1d0;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolverV1;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
 import org.apache.tinkerpop.shaded.kryo.ClassResolver;
@@ -76,7 +69,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -574,7 +566,7 @@
         final ArrayList<Color> colorList = new ArrayList<>(Arrays.asList(Color.RED, Color.GREEN));
 
         final Supplier<ClassResolver> classResolver = new CustomClassResolverSupplier();
-        final GryoMapper mapper = GryoMapper.build().version(GryoVersion.V3_0).addRegistry(TinkerIoRegistryV3d0.instance()).classResolver(classResolver).create();
+        final GryoMapper mapper = GryoMapper.build().version(GryoVersion.V3_0).addRegistry(TinkerIoRegistryV3.instance()).classResolver(classResolver).create();
         final Kryo kryo = mapper.createMapper();
         try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
             final Output out = new Output(stream);
@@ -602,7 +594,7 @@
         final ArrayList<Color> colorList = new ArrayList<>(Arrays.asList(Color.RED, Color.GREEN));
 
         final Supplier<ClassResolver> classResolver = new CustomClassResolverSupplier();
-        final GryoMapper mapper = GryoMapper.build().version(GryoVersion.V3_0).addRegistry(TinkerIoRegistryV3d0.instance()).classResolver(classResolver).create();
+        final GryoMapper mapper = GryoMapper.build().version(GryoVersion.V3_0).addRegistry(TinkerIoRegistryV3.instance()).classResolver(classResolver).create();
         final Kryo kryo = mapper.createMapper();
         try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
             final Output out = new Output(stream);
@@ -995,7 +987,7 @@
         }
     }
 
-    public static class CustomClassResolver extends GryoClassResolverV1d0 {
+    public static class CustomClassResolver extends GryoClassResolverV1 {
         private ColorToTinkerGraphSerializer colorToGraphSerializer = new ColorToTinkerGraphSerializer();
 
         public Registration getRegistration(final Class clazz) {
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleEdge.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleEdge.java
new file mode 100644
index 0000000..48e20e4
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleEdge.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.util.Iterator;
+
+import static org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerShuffleGraph.shuffleIterator;
+
+/**
+ * @author Cole Greer (https://github.com/Cole-Greer)
+ */
+public final class TinkerShuffleEdge extends TinkerEdge {
+    protected TinkerShuffleEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex) {
+       this(id, outVertex, label, inVertex, 0);
+    }
+
+    protected TinkerShuffleEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex, final long currentVersion) {
+        super(id, outVertex, label, inVertex, currentVersion);
+    }
+
+    @Override
+    public Iterator<Vertex> vertices(final Direction direction) {
+        return shuffleIterator(super.vertices(direction));
+    }
+
+    @Override
+    public <V> Iterator<Property<V>> properties(final String... propertyKeys) {
+        return shuffleIterator(super.properties(propertyKeys));
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleGraph.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleGraph.java
new file mode 100644
index 0000000..f12a156
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleGraph.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author Cole Greer (https://github.com/Cole-Greer)
+ */
+public class TinkerShuffleGraph extends TinkerGraph {
+
+    private static final Configuration EMPTY_CONFIGURATION = new BaseConfiguration() {{
+        this.setProperty(Graph.GRAPH, TinkerShuffleGraph.class.getName());
+    }};
+
+    private TinkerShuffleGraph(Configuration configuration) {
+        super(configuration);
+    }
+
+    public static TinkerShuffleGraph open() {
+        return open(EMPTY_CONFIGURATION);
+    }
+
+    public static TinkerShuffleGraph open(Configuration configuration) {
+        return new TinkerShuffleGraph(configuration);
+    }
+
+    @Override
+    public Iterator<Vertex> vertices(final Object... vertexIds) {
+        return shuffleIterator(super.vertices(vertexIds));
+    }
+
+    @Override
+    public Iterator<Edge> edges(final Object... edgeIds) {
+        return shuffleIterator(super.edges(edgeIds));
+    }
+
+    @Override
+    protected TinkerVertex createTinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph) {
+        return new TinkerShuffleVertex(id, label, graph);
+    }
+
+    protected TinkerVertex createTinkerVertex(final Object id, final String label, final AbstractTinkerGraph graph, final long currentVersion) {
+        return new TinkerShuffleVertex(id, label, graph, currentVersion);
+    }
+
+    protected TinkerEdge createTinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex) {
+        return new TinkerShuffleEdge(id, outVertex, label, inVertex);
+    }
+
+    protected TinkerEdge createTinkerEdge(final Object id, final Vertex outVertex, final String label, final Vertex inVertex, final long currentVersion) {
+        return new TinkerShuffleEdge(id, outVertex, label, inVertex, currentVersion);
+    }
+
+    static Iterator shuffleIterator(Iterator iter) {
+        List list = IteratorUtils.toList(iter);
+        Collections.shuffle(list);
+        return list.iterator();
+    }
+
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleGraphTest.java
new file mode 100644
index 0000000..577b824
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleGraphTest.java
@@ -0,0 +1,221 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
+
+/**
+ * @author Cole Greer (https://github.com/Cole-Greer)
+ */
+public class TinkerShuffleGraphTest {
+
+    Logger logger = LoggerFactory.getLogger(TinkerShuffleGraphTest.class);
+
+    // Tests are checking for random shuffling of results. If random shuffling happens to return sorted order, the test
+    // will fail. Worst case scenario are the tests which only return 2 results as these have a 50% chance of a failure.
+    // Tests are configured with up to 50 retries to drive the failure probability down to the order of 10^-16.
+    @Rule
+    public RetryRule retryRule = new RetryRule();
+
+    @Test
+    public void shouldShuffleVertices() {
+        GraphTraversalSource gShuff = createShuffleModern();
+        GraphTraversalSource gReg = TinkerFactory.createModern().traversal();
+
+        List<Vertex> resultRegular = gReg.V().toList();
+        Object[] resultShuffle = gShuff.V().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffleEdges() {
+        GraphTraversalSource gShuff = createShuffleModern();
+        GraphTraversalSource gReg = TinkerFactory.createModern().traversal();
+
+        List<Edge> resultRegular = gReg.E().toList();
+        Object[] resultShuffle = gShuff.E().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffle_g_V_both() {
+        GraphTraversalSource gShuff = createShuffleModern();
+        GraphTraversalSource gReg = TinkerFactory.createModern().traversal();
+
+        List<Vertex> resultRegular = gReg.V(1).both().toList();
+        Object[] resultShuffle = gShuff.V(1).both().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffle_g_V_bothE() {
+        GraphTraversalSource gShuff = createShuffleModern();
+        GraphTraversalSource gReg = TinkerFactory.createModern().traversal();
+
+        List<Edge> resultRegular = gReg.V(1).bothE().toList();
+        Object[] resultShuffle = gShuff.V(1).bothE().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffle_g_E_bothV() {
+        GraphTraversalSource gShuff = createShuffleModern();
+        GraphTraversalSource gReg = TinkerFactory.createModern().traversal();
+
+        List<Vertex> resultRegular = gReg.V(1).outE("knows").bothV().toList();
+        Object[] resultShuffle = gShuff.V(1).outE("knows").bothV().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffleVertexProperties() {
+        GraphTraversalSource gShuff = createShuffleModern();
+        GraphTraversalSource gReg = TinkerFactory.createModern().traversal();
+
+        List<Property<Object>> resultRegular = (List<Property<Object>>) gReg.V(1).properties().toList();
+        Object[] resultShuffle = gShuff.V(1).properties().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffleEdgeProperties() {
+        GraphTraversalSource gShuff = createShuffleModern();
+        GraphTraversalSource gReg = TinkerFactory.createModern().traversal();
+
+        gShuff.V(1).outE("knows").property("extraProp", "no toy graph has 2 props on an edge");
+        gReg.V(1).outE("knows").property("extraProp", "no toy graph has 2 props on an edge");
+
+        List<Property<Object>> resultRegular = (List<Property<Object>>) gReg.V(1).outE("knows").properties().toList();
+        Object[] resultShuffle = gShuff.V(1).outE("knows").properties().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffleMetaProperties() {
+        GraphTraversalSource gShuff = createShuffleTheCrew();
+        GraphTraversalSource gReg = TinkerFactory.createTheCrew().traversal();
+
+        List<Property<Object>> resultRegular = (List<Property<Object>>) gReg.V(1).properties("location").hasValue("san diego").properties().toList();
+        Object[] resultShuffle = gShuff.V(1).properties("location").hasValue("san diego").properties().toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    @Test
+    public void shouldShuffleMultiProperties() {
+        GraphTraversalSource gShuff = createShuffleTheCrew();
+        GraphTraversalSource gReg = TinkerFactory.createTheCrew().traversal();
+
+        List<Property<Object>> resultRegular = (List<Property<Object>>) gReg.V(1).properties("location").toList();
+        Object[] resultShuffle = gShuff.V(1).properties("location").toList().toArray();
+
+        //Assert contents are correct
+        assertThat(resultRegular, containsInAnyOrder(resultShuffle));
+        //Assert order is shuffled
+        assertThat(resultRegular, not(contains(resultShuffle)));
+    }
+
+    private GraphTraversalSource createShuffleModern() {
+        TinkerShuffleGraph graph = TinkerShuffleGraph.open();
+        TinkerFactory.generateModern(graph);
+        return traversal().withEmbedded(graph);
+    }
+
+    private GraphTraversalSource createShuffleTheCrew() {
+        TinkerShuffleGraph graph = TinkerShuffleGraph.open();
+        TinkerFactory.generateTheCrew(graph);
+        return traversal().withEmbedded(graph);
+    }
+
+    private class RetryRule implements TestRule {
+        final int maxRetries = 50;
+        @Override
+        public Statement apply(Statement base, Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    for(int i = 1; i <= maxRetries; i++) {
+                        try{
+                            base.evaluate();
+                            return;
+                        }
+                        catch(AssertionError e){
+                            String msg = String.format("Failed test %s.%s (attempt %s/%s): ", description.getClassName(), description.getMethodName(), i, maxRetries);
+                            if(i == maxRetries) {
+                                logger.warn(msg, e);
+                            } else {
+                                logger.debug(msg, e);
+                            }
+                        }
+                    }
+                }
+            };
+        }
+    }
+
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleVertex.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleVertex.java
new file mode 100644
index 0000000..b7ab5b6
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleVertex.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+
+import java.util.Iterator;
+
+import static org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerShuffleGraph.shuffleIterator;
+
+/**
+ * @author Cole Greer (https://github.com/Cole-Greer)
+ */
+public final class TinkerShuffleVertex extends TinkerVertex {
+    protected TinkerShuffleVertex(final Object id, final String label, final AbstractTinkerGraph graph) {
+        super(id, label, graph);
+    }
+
+    protected TinkerShuffleVertex(final Object id, final String label, final AbstractTinkerGraph graph, final long currentVersion) {
+        super(id, label, graph, currentVersion);
+    }
+
+    @Override
+    public Iterator<Edge> edges(final Direction direction, final String... edgeLabels) {
+        return shuffleIterator(super.edges(direction, edgeLabels));
+    }
+
+    @Override
+    public Iterator<Vertex> vertices(final Direction direction, final String... edgeLabels) {
+        return shuffleIterator(super.vertices(direction, edgeLabels));
+    }
+
+    @Override
+    public <V> Iterator<VertexProperty<V>> properties(final String... propertyKeys) {
+        return shuffleIterator(super.properties(propertyKeys));
+    }
+
+    @Override
+    protected <V> TinkerVertexProperty<V> createTinkerVertexProperty(final TinkerVertex vertex, final String key, final V value, final Object... propertyKeyValues) {
+        return new TinkerShuffleVertexProperty<V>(vertex, key, value, propertyKeyValues);
+    }
+
+    @Override
+    protected <V> TinkerVertexProperty<V> createTinkerVertexProperty(final Object id, final TinkerVertex vertex, final String key, final V value, final Object... propertyKeyValues) {
+        return new TinkerShuffleVertexProperty<V>(id, vertex, key, value, propertyKeyValues);
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleVertexProperty.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleVertexProperty.java
new file mode 100644
index 0000000..6c6128e
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerShuffleVertexProperty.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputerView;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.stream.Collectors;
+
+import static org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerShuffleGraph.shuffleIterator;
+
+/**
+ * @author Cole Greer (https://github.com/Cole-Greer)
+ */
+public class TinkerShuffleVertexProperty<V> extends TinkerVertexProperty<V> {
+
+
+    /**
+     * This constructor will not validate the ID type against the {@link Graph}.  It will always just use a
+     * {@code Long} for its identifier.  This is useful for constructing a {@link VertexProperty} for usage
+     * with {@link TinkerGraphComputerView}.
+     */
+    public TinkerShuffleVertexProperty(final TinkerVertex vertex, final String key, final V value, final Object... propertyKeyValues) {
+        super(vertex, key, value, propertyKeyValues);
+    }
+
+    /**
+     * Use this constructor to construct {@link VertexProperty} instances for {@link TinkerGraph} where the {@code id}
+     * can be explicitly set and validated against the expected data type.
+     */
+    public TinkerShuffleVertexProperty(final Object id, final TinkerVertex vertex, final String key, final V value, final Object... propertyKeyValues) {
+        super(id, vertex, key, value, propertyKeyValues);
+    }
+
+    @Override
+    public <U> Iterator<Property<U>> properties(final String... propertyKeys) {
+        return shuffleIterator(super.properties(propertyKeys));
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraphStructureStandardTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraphStructureStandardTest.java
new file mode 100644
index 0000000..d4ab215
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraphStructureStandardTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.GraphProviderClass;
+import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite;
+import org.apache.tinkerpop.gremlin.tinkergraph.TinkerTransactionGraphProvider;
+import org.junit.runner.RunWith;
+
+/**
+ * Executes the Standard Gremlin Structure Test Suite using TinkerTransactionGraph.
+ */
+@RunWith(StructureStandardSuite.class)
+@GraphProviderClass(provider = TinkerTransactionGraphProvider.class, graph = TinkerTransactionGraph.class)
+public class TinkerTransactionGraphStructureStandardTest {
+
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraphTest.java
new file mode 100644
index 0000000..9d24062
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerTransactionGraphTest.java
@@ -0,0 +1,1460 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.TransactionException;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TinkerTransactionGraphTest {
+
+    final Object vid = 100;
+
+    ///// vertex tests
+
+    @Test
+    public void shouldReturnSameVertexInstanceInsideTransaction() {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex vertex = gtx.addV().property(T.id, vid).next();
+        assertEquals(vertex, gtx.V().next());
+        assertEquals(vertex, gtx.V(vid).next());
+        assertEquals(vertex, gtx.V().toList().get(0));
+    }
+
+    @Test
+    public void shouldDeleteVertexOnCommit() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().iterate();
+        gtx.tx().commit();
+
+        assertEquals(1, (long) gtx.V().count().next());
+
+        gtx.V().drop().iterate();
+        assertEquals(0, (long) gtx.V().count().next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+
+        gtx.tx().commit();
+
+        assertEquals(0, (long) gtx.V().count().next());
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+    }
+
+    @Test
+    public void shouldDeleteCreatedVertexOnCommit() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        // create and drop Vertex in same transaction
+        gtx.addV().property(T.id, vid).iterate();
+        gtx.V(vid).drop().iterate();
+
+        assertEquals(0, (long) gtx.V().count().next());
+        countElementsInNewThreadTx(g, 0, 0);
+
+        gtx.tx().commit();
+
+        assertEquals(0, (long) gtx.V().count().next());
+        countElementsInNewThreadTx(g, 0, 0);
+        // should remove unused container
+        assertEquals(0, g.getVertices().size());
+    }
+
+    @Test
+    public void shouldCleanUpVertexContainerOnCommit() {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).iterate();
+        gtx.tx().commit();
+
+        // read vertex in new TX
+        final GraphTraversalSource gtx2 = g.tx().begin();
+        final Vertex v = gtx.V(vid).next();
+        gtx.V(vid).iterate();
+        // should be the same instance
+        assertEquals(v, g.getVertices().get(vid).getModified());
+        // commit without modifications
+        gtx.tx().commit();
+
+        // should clean up unused value in container
+        assertEquals(1, g.getVertices().size());
+        assertNull(g.getVertices().get(vid).getModified());
+    }
+
+    @Test
+    public void shouldCleanUpVertexContainerOnRollback() {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).iterate();
+        gtx.tx().commit();
+
+        // read vertex in new TX
+        final GraphTraversalSource gtx2 = g.tx().begin();
+        final Vertex v = gtx.V(vid).next();
+        gtx.V(vid).iterate();
+        // should be the same instance
+        assertEquals(v, g.getVertices().get(vid).getModified());
+        // rollback without modifications
+        gtx.tx().rollback();
+
+        // should clean up unused value in container
+        assertEquals(1, g.getVertices().size());
+        assertNull(g.getVertices().get(vid).getModified());
+    }
+
+    @Test
+    public void shouldDeleteUnusedVertexContainerOnCommit() {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).iterate();
+        gtx.tx().commit();
+
+        gtx.V(vid).drop().iterate();
+        gtx.tx().commit();
+
+        // should remove unused container
+        assertEquals(0, g.getVertices().size());
+    }
+
+    @Test
+    public void shouldDeleteUnusedVertexContainerOnRollback() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).iterate();
+        gtx.tx().commit();
+
+        gtx.V(vid).properties("test-property").iterate();
+        // 1 container for existing vertex
+        assertEquals(1, g.getVertices().size());
+
+        // other tx try to add new vertices and modify existing
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2.addV().addV().iterate();
+            gtx.V(vid).properties("test-property").iterate();
+
+            // 1 container for existing vertex + 2 for new ones
+            assertEquals(3, g.getVertices().size());
+
+            assertEquals(3, (long) gtx2.V().count().next());
+
+            gtx2.tx().rollback();
+            // containers for new vertices should be removed
+            assertEquals(1, g.getVertices().size());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().rollback();
+
+        // should keep container because vertex not created in this transaction
+        assertEquals(1, g.getVertices().size());
+    }
+
+    @Test
+    public void shouldDeleteUnusedVertexContainerOnConcurrentVertexDelete() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        gtx.tx().commit();
+
+        gtx.V(v1.id()).drop().iterate();
+
+        // other tx try to remove same vertex
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2.V(v1.id()).drop().iterate();
+
+            // should be ok
+            assertEquals(0, (long) gtx2.V().count().next());
+            assertEquals(0, (long) gtx2.E().count().next());
+
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        // try do delete in initial tx
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        // should remove unused container
+        assertEquals(0, g.getVertices().size());
+    }
+
+    ///// Edge tests
+
+    @Test
+    public void shouldRemoveContainerAndReferenceFromVertexOnDeleteEdge() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        final TinkerVertex v2 = (TinkerVertex) gtx.addV().next();
+        gtx.addE("tests").from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(1, (long) gtx.E().count().next());
+
+        gtx.E().hasLabel("tests").drop().iterate();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        // test count in other thread transaction
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(2L, (long) gtx2.V().count().next());
+            assertEquals(1L, (long) gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        // should remove reference from edge to parent vertices
+        final TinkerVertex v1afterTx = g.getVertices().get(v1.id()).get();
+        final TinkerVertex v2afterTx = g.getVertices().get(v2.id()).get();
+        assertNull(v1afterTx.inEdgesId);
+        assertEquals(0, v1afterTx.outEdgesId.get("tests").size());
+        assertEquals(0, v2afterTx.inEdgesId.get("tests").size());
+        assertNull(v2afterTx.outEdgesId);
+
+        // should remove unused container
+        assertEquals(0, g.getEdges().size());
+
+        countElementsInNewThreadTx(g, 2, 0);
+    }
+
+    @Test
+    public void shouldRemoveContainerAndReferenceFromVertexOnConcurrentDeleteEdge() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        final TinkerVertex v2 = (TinkerVertex) gtx.addV().next();
+        gtx.addE("tests").from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(1, (long) gtx.E().count().next());
+
+        gtx.E().hasLabel("tests").drop().iterate();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        // other tx try to remove same edge
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(2L, (long) gtx2.V().count().next());
+            assertEquals(1L, (long) gtx2.E().count().next());
+
+            // try to remove edge
+            gtx2.E().hasLabel("tests").drop().iterate();
+
+            // should be ok
+            assertEquals(2, (long) gtx2.V().count().next());
+            assertEquals(0, (long) gtx2.E().count().next());
+
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        // try do delete in initial tx
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        // should remove unused container
+        assertEquals(0, g.getEdges().size());
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        // should remove reference from edge to parent vertices
+        final TinkerVertex v1afterTx = g.getVertices().get(v1.id()).get();
+        final TinkerVertex v2afterTx = g.getVertices().get(v2.id()).get();
+        assertNull(v1afterTx.inEdgesId);
+        assertEquals(0, v1afterTx.outEdgesId.get("tests").size());
+        assertEquals(0, v2afterTx.inEdgesId.get("tests").size());
+        assertNull(v2afterTx.outEdgesId);
+
+        countElementsInNewThreadTx(g, 2, 0);
+    }
+
+    // index tests for vertex
+
+    @Test
+    public void shouldCreateIndexForNewVertex() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Vertex.class);
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).property("test-property", 1).iterate();
+        gtx.addV().property("test-property", 2).iterate();
+
+        assertEquals(1L, (long) gtx.V().has("test-property", 1).count().next());
+        assertEquals(vid, gtx.V().has("test-property", 1).id().next());
+        assertEquals(0L, (long) gtx.V().has("test-property", 3).count().next());
+        assertEquals(2L, (long) gtx.V().count().next());
+
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(0L, (long) gtx2.V().has("test-property", 1).count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(1L, (long) gtx3.V().has("test-property", 1).count().next());
+        assertEquals(vid, gtx3.V().has("test-property", 1).id().next());
+        assertEquals(0L, (long) gtx3.V().has("test-property", 3).count().next());
+        assertEquals(2L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 2, 0);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.vertexIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(1, index.get(1).size());
+        assertEquals(vid, index.get(1).iterator().next().get().id());
+    }
+
+    @Test
+    public void shouldCreateIndexForNullVertexProperty() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Vertex.class);
+        g.allowNullPropertyValues = true;
+        final Integer nullValue = null;
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).property("test-property", nullValue).iterate();
+        gtx.addV().property("test-property", 2).iterate();
+
+        assertEquals(1L, (long) gtx.V().has("test-property", nullValue).count().next());
+        assertEquals(vid, gtx.V().has("test-property", nullValue).id().next());
+        assertEquals(0L, (long) gtx.V().has("test-property", 1).count().next());
+        assertEquals(2L, (long) gtx.V().count().next());
+
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(0L, (long) gtx2.V().has("test-property", nullValue).count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(1L, (long) gtx3.V().has("test-property", nullValue).count().next());
+        assertEquals(vid, gtx3.V().has("test-property", nullValue).id().next());
+        assertEquals(0L, (long) gtx3.V().has("test-property", 1).count().next());
+        assertEquals(2L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 2, 0);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.vertexIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(1, index.get(AbstractTinkerIndex.IndexedNull.instance()).size());
+        assertEquals(vid, index.get(AbstractTinkerIndex.IndexedNull.instance()).iterator().next().get().id());
+    }
+
+    @Test
+    public void shouldRemoveIndexForRemovedVertex() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Vertex.class);
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).property("test-property", 1).iterate();
+
+        gtx.tx().commit();
+
+        gtx.V(vid).drop().iterate();
+
+        assertEquals(0L, (long) gtx.V().has("test-property", 1).count().next());
+        assertEquals(0L, (long) gtx.V().count().next());
+
+        // in another thread elements exists before commit
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(1L, (long) gtx2.V().has("test-property", 1).count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.V().has("test-property", 1).count().next());
+        assertEquals(0L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.vertexIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(0, index.size());
+     }
+
+    @Test
+    public void shouldRemoveIndexForRemovedVertexProperty() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Vertex.class);
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property(T.id, vid).property("test-property", 1).iterate();
+
+        gtx.tx().commit();
+
+        gtx.V(vid).properties("test-property").drop().iterate();
+
+        assertEquals(0L, (long) gtx.V().has("test-property", 1).count().next());
+        assertEquals(1L, (long) gtx.V().count().next());
+
+        // in another thread elements exists before commit
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(1L, (long) gtx2.V().has("test-property", 1).count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.V().has("test-property", 1).count().next());
+        assertEquals(1L, (long) gtx3.V().count().next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.vertexIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(0, index.size());
+    }
+
+    // index tests for edge
+
+    @Test
+    public void shouldCreateIndexForNewEdge() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Edge.class);
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        final TinkerVertex v2 = (TinkerVertex) gtx.addV().next();
+        final TinkerEdge edge = (TinkerEdge) gtx.addE("tests").property("test-property", 1).from(v1).to(v2).next();
+
+        assertEquals(1L, (long) gtx.E().has("test-property", 1).count().next());
+        assertEquals(1L, (long) gtx.E().count().next());
+
+        // in another thread index not updated yet
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(0L, (long) gtx2.E().has("test-property", 1).count().next());
+            assertEquals(0L, (long) gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(1L, (long) gtx.E().has("test-property", 1).count().next());
+        assertEquals(1L, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 1);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.edgeIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(1, index.size());
+        assertEquals(1, index.get(1).size());
+        assertEquals(edge.id(), index.get(1).iterator().next().get().id());
+    }
+
+    @Test
+    public void shouldChangeIndexForChangedEdge() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Edge.class);
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        final TinkerVertex v2 = (TinkerVertex) gtx.addV().next();
+        final TinkerEdge edge = (TinkerEdge) gtx.addE("tests").property("test-property", 1).from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        gtx.E(edge.id()).property("test-property", 2).iterate();
+
+        assertEquals(0L, (long) gtx.E().has("test-property", 1).count().next());
+        assertEquals(1L, (long) gtx.E().has("test-property", 2).count().next());
+        assertEquals(1L, (long) gtx.E().count().next());
+
+        // in another thread index not updated yet
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(1L, (long) gtx2.E().has("test-property", 1).count().next());
+            assertEquals(0L, (long) gtx2.E().has("test-property", 2).count().next());
+            assertEquals(1L, (long) gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx.E().has("test-property", 1).count().next());
+        assertEquals(1L, (long) gtx.E().has("test-property", 2).count().next());
+        assertEquals(1L, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 1);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.edgeIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(1, index.size());
+        assertNull(index.get(1));
+        assertEquals(1, index.get(2).size());
+        assertEquals(edge.id(), index.get(2).iterator().next().get().id());
+    }
+
+    @Test
+    public void shouldRemoveIndexForRemovedEdge() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Edge.class);
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        final TinkerVertex v2 = (TinkerVertex) gtx.addV().next();
+        final TinkerEdge edge = (TinkerEdge) gtx.addE("tests").property("test-property", 1).from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        gtx.E(edge.id()).drop().iterate();
+
+        assertEquals(0L, (long) gtx.E().has("test-property", 1).count().next());
+        assertEquals(0L, (long) gtx.E().count().next());
+
+        // in another thread elements exists before commit
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(1L, (long) gtx2.E().has("test-property", 1).count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.E().has("test-property", 1).count().next());
+        assertEquals(0L, (long) gtx3.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 0);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.edgeIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(0, index.size());
+    }
+
+    @Test
+    public void shouldCreateIndexForNullProperty() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Edge.class);
+        g.allowNullPropertyValues = true;
+        final Integer nullValue = null;
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        final TinkerVertex v2 = (TinkerVertex) gtx.addV().next();
+        final TinkerEdge edge = (TinkerEdge) gtx.addE("tests").property("test-property", nullValue).
+                from(v1).to(v2).next();
+
+        assertEquals(1L, (long) gtx.E().has("test-property", nullValue).count().next());
+        assertEquals(1L, (long) gtx.E().count().next());
+
+        // in another thread index not updated yet
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(0L, (long) gtx2.E().has("test-property", nullValue).count().next());
+            assertEquals(0L, (long) gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(1L, (long) gtx3.E().has("test-property", nullValue).count().next());
+        assertEquals(1L, (long) gtx3.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 1);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.edgeIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(1, index.size());
+        assertEquals(1, index.get(AbstractTinkerIndex.IndexedNull.instance()).size());
+        assertEquals(edge.id(), index.get(AbstractTinkerIndex.IndexedNull.instance()).iterator().next().get().id());
+    }
+
+    @Test
+    public void shouldRemoveIndexForNullProperty() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        g.createIndex("test-property", Edge.class);
+        final Integer nullValue = null;
+
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        // create initial edge with indexed property
+        final TinkerVertex v1 = (TinkerVertex) gtx.addV().next();
+        final TinkerVertex v2 = (TinkerVertex) gtx.addV().next();
+        final TinkerEdge edge = (TinkerEdge) gtx.addE("tests").property("test-property", 1).
+                from(v1).to(v2).next();
+
+        gtx.tx().commit();
+
+        // remove property from index
+        gtx.E(edge.id()).property("test-property", nullValue).iterate();
+
+        assertEquals(0L, (long) gtx.E().has("test-property", 1).count().next());
+        assertEquals(1L, (long) gtx.E().count().next());
+
+        // in another thread index not updated yet
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(1L, (long) gtx2.E().has("test-property", 1).count().next());
+            assertEquals(1L, (long) gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx3 = g.tx().begin();
+        assertEquals(0L, (long) gtx3.E().has("test-property", nullValue).count().next());
+        assertEquals(1L, (long) gtx3.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 1);
+
+        final Map<Object, Set<TinkerElementContainer<?>>> index =
+                (Map<Object, Set<TinkerElementContainer<?>>>) ((TinkerTransactionalIndex) g.edgeIndex).index.get("test-property");
+        assertNotNull(index);
+        // should be only vertex vid in set
+        assertEquals(0, index.size());
+    }
+
+    // tests for cloning elements
+
+    @Test
+    public void vertexCloneTest() {
+        final TinkerVertex vertex = new TinkerVertex(123, "label", TinkerTransactionGraph.open());
+        final TinkerVertexProperty vp = new TinkerVertexProperty(vertex, "test", "qq");
+        final TinkerEdge edge = new TinkerEdge(1, vertex, "label", vertex);
+        vertex.properties = new ConcurrentHashMap<>();
+        vertex.properties.put("test", new ArrayList<>());
+        vertex.properties.get("test").add(vp);
+        vertex.inEdgesId = new ConcurrentHashMap<>();
+        vertex.inEdgesId.put("label", ConcurrentHashMap.newKeySet());
+        vertex.inEdgesId.get("label").add(edge);
+
+        final TinkerVertex copy = (TinkerVertex) vertex.clone();
+        vertex.properties.get("test").remove(vp);
+        assertEquals(1, copy.properties.get("test").size());
+        vertex.inEdgesId.get("label").remove(edge);
+        assertEquals(1, copy.inEdgesId.get("label").size());
+    }
+
+    @Test
+    public void edgeCloneTest() {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final TinkerVertex v1 = (TinkerVertex) g.addVertex();
+        final TinkerVertex v2 = (TinkerVertex) g.addVertex();
+        final TinkerEdge edge = new TinkerEdge(3, v1, "label", v2);
+        final TinkerProperty property = new TinkerProperty(edge, "test", "qq");
+        edge.properties = new ConcurrentHashMap<>();
+        edge.properties.put(property.key(), property);
+
+        final TinkerEdge copy = (TinkerEdge) edge.clone();
+        edge.properties.remove(property.key());
+        assertEquals(1, copy.properties.size());
+    }
+
+    // utility methods
+
+    private void countElementsInNewThreadTx(final TinkerTransactionGraph g, final long verticesCount, final long edgesCount) throws InterruptedException {
+        final AtomicLong vCount = new AtomicLong(-1);
+        final AtomicLong eCount = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx = g.tx().begin();
+            vCount.set(gtx.V().count().next());
+            eCount.set(gtx.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(verticesCount, vCount.get());
+        assertEquals(edgesCount, eCount.get());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfVertexForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().next();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.V().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(0, gtx2Read.get());
+        assertEquals(1, (long) gtx.V().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfVertexDropForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().next();
+        gtx.tx().commit();
+
+        gtx.V().drop().iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.V().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(1, gtx2Read.get());
+        assertEquals(0, (long) gtx.V().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfEdgeForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("test").from(v1).to(v2).iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(0, gtx2Read.get());
+        assertEquals(1, (long) gtx.E().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfEdgeDropForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("test").from(v1).to(v2).iterate();
+        gtx.tx().commit();
+
+        gtx.E().drop().iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(1, gtx2Read.get());
+        assertEquals(0, (long) gtx.E().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfVertexPropertyAddForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property("a", 1).iterate();
+        gtx.tx().commit();
+
+        gtx.V().property("b", 2).iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.V().properties().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(1, gtx2Read.get());
+        assertEquals(2, (long) gtx.V().properties().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfVertexPropertyDropForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property("a", 1).iterate();
+        gtx.tx().commit();
+
+        gtx.V().properties().drop().iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.V().properties().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(1, gtx2Read.get());
+        assertEquals(0, (long) gtx.V().properties().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfVertexPropertyUpdateForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        gtx.addV().property("a", 1L).iterate();
+        gtx.tx().commit();
+
+        gtx.V().property("a", 2L).iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set((long) gtx2.V().values("a").next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(1, gtx2Read.get());
+        assertEquals(2, (long) gtx.V().values("a").next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfEdgePropertyAddForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("test").from(v1).to(v2).iterate();
+        gtx.tx().commit();
+
+        gtx.E().property("a", 1).iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.E().properties().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(0, gtx2Read.get());
+        assertEquals(1, (long) gtx.E().properties().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfEdgePropertyDropForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("test").from(v1).to(v2).property("a", 1).iterate();
+        gtx.tx().commit();
+
+        gtx.E().properties().drop().iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set(gtx2.E().properties().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(1, gtx2Read.get());
+        assertEquals(0, (long) gtx.E().properties().count().next());
+    }
+
+    @Test
+    public void shouldNotAllowDirtyReadsOfEdgePropertyUpdateForReadOnlyTransaction() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("test").from(v1).to(v2).property("a", 1L).iterate();
+        gtx.tx().commit();
+
+        gtx.E().property("a", 2L).iterate();
+
+        final AtomicLong gtx2Read = new AtomicLong(-1);
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2Read.set((long) gtx2.E().values("a").next());
+        });
+        thread.start();
+        thread.join();
+
+        assertEquals(1, gtx2Read.get());
+        assertEquals(2, (long) gtx.E().values("a").next());
+    }
+
+    @Test
+    public void shouldHandleAddingPropertyWhenOtherTxDeleteEdge() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        final Edge edge = gtx.addE("tests").from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        // tx1 try to add property
+        gtx.E(edge.id()).property("test", 1).iterate();
+
+        // tx2 in same time delete edge used by tx1
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.E(edge.id()).drop().iterate();
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 0);
+    }
+
+    //tx1 adds a property to v1, tx2 deletes v1
+    @Test
+    public void shouldHandleAddingPropertyWhenOtherTxDeleteVertex() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        gtx.tx().commit();
+
+        // tx1 try to add property
+        gtx.V(v1.id()).property("test", 1).iterate();
+
+        // tx2 in same time delete vertex used by tx1
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.V(v1.id()).drop().iterate();
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        assertEquals(0, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+    }
+
+    @Test
+    public void shouldDeleteEdgeOnCommit() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("tests").from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(1, (long) gtx.E().count().next());
+
+        gtx.E().hasLabel("tests").drop().iterate();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        // test count in other thread transaction
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(2L, (long) gtx2.V().count().next());
+            assertEquals(1L, (long) gtx2.E().count().next());
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 0);
+    }
+
+    @Test
+    public void shouldHandleConcurrentChangeForProperty() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        final Edge edge = gtx.addE("tests").from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        // change test property
+        gtx.E(edge.id()).property("test", 1).iterate();
+
+        // change property in other tx
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.E(edge.id()).property("test", 2).iterate();
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        // should be only 1 edge with updated property
+        assertEquals(1L, (long) gtx.E(edge.id()).count().next());
+        assertEquals(2, gtx.E(edge.id()).values("test").next());
+    }
+
+    // tx1 adds an edge from v1 to v2, tx2 deletes v1 or v2
+    @Test
+    public void shouldHandleAddingEdgeWhenOtherTxDeleteVertex() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.tx().commit();
+
+        // tx1 try to add Edge
+        gtx.addE("test").from(v1).to(v2).iterate();
+
+        // tx2 in same time delete one of vertices used by tx1
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.V(v1.id()).drop().iterate();
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        assertEquals(1, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+    }
+
+    @Test
+    public void shouldHandleConcurrentChangeForVertexProperty() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        gtx.tx().commit();
+
+        // change test property
+        gtx.V(v1.id()).property("test", 1).iterate();
+
+        // change property in other tx
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.V(v1.id()).property("test", 2).iterate();
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        // should be only 1 vertex with updated property
+        assertEquals(1L, (long) gtx.V().count().next());
+        assertEquals(2, gtx.V(v1.id()).values("test").next());
+    }
+
+    @Test
+    public void shouldHandleConcurrentDeleteEdge() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        final Vertex v2 = gtx.addV().next();
+        gtx.addE("tests").from(v1).to(v2).next();
+        gtx.tx().commit();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(1, (long) gtx.E().count().next());
+
+        gtx.E().hasLabel("tests").drop().iterate();
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        // other tx try to remove same edge
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            assertEquals(2L, (long) gtx2.V().count().next());
+            assertEquals(1L, (long) gtx2.E().count().next());
+
+            // try to remove edge
+            gtx2.E().hasLabel("tests").drop().iterate();
+
+            // should be ok
+            assertEquals(2, (long) gtx2.V().count().next());
+            assertEquals(0, (long) gtx2.E().count().next());
+
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        // try do delete in initial tx
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        assertEquals(2, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 2, 0);
+    }
+
+    // tx1 adds a new vertex v1, tx2 adds the same vertex
+    @Test
+    public void shouldHandleAddingSameVertexInDifferentTx() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+
+        // tx2 in same time add vertex with same id
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.addV().property(T.id, v1.id()).iterate();
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        assertEquals(1, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionWhenTryToAddVertexWithUsedId() {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        // add vertex
+        final Vertex v1 = gtx.addV().next();
+        gtx.tx().commit();
+
+        // try to add vertex with same id
+        gtx.addV().property(T.id, v1.id()).iterate();
+        gtx.tx().commit();
+    }
+
+    @Test
+    public void shouldHandleConcurrentVertexDelete() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        gtx.tx().commit();
+
+        gtx.V(v1.id()).drop().iterate();
+
+        // other tx try to remove same vertex
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+
+            gtx2.V(v1.id()).drop().iterate();
+
+            // should be ok
+            assertEquals(0, (long) gtx2.V().count().next());
+            assertEquals(0, (long) gtx2.E().count().next());
+
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        // try do delete in initial tx
+        try {
+            gtx.tx().commit();
+            fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+        assertEquals(0, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 0, 0);
+    }
+
+    @Test
+    public void shouldHandleConcurrentChangeForVertexMetaProperty() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().property("test", 1).next();
+        gtx.tx().commit();
+
+        // change meta property
+        gtx.V(v1.id()).properties("test").property("meta1", "tx1").iterate();
+
+        // change same property in other tx
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.V(v1.id()).properties("test").property("meta2", "tx2").iterate();
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        try {
+            gtx.tx().commit();
+            //fail("should throw TransactionException");
+        } catch (TransactionException e) {
+
+        }
+
+        // should be only 1 vertex with updated property
+        assertEquals(1L, (long) gtx.V().count().next());
+        assertEquals("tx2", gtx.V(v1.id()).properties("test").values("meta1", "meta2").next());
+    }
+
+    @Test
+    public void shouldReopenClosedTransaction() {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+        gtx.addV().iterate();
+        gtx.tx().commit();
+
+        gtx.addV().iterate();
+        assertTrue(gtx.tx().isOpen());
+        gtx.tx().commit();
+
+        final GraphTraversalSource gtx2 = g.tx().begin();
+        assertEquals(2L, (long) gtx2.V().count().next());
+    }
+
+    @Test
+    public void shouldHandleAddingPropertyWhenOtherTxAttemptsDeleteThenRollsback() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+        gtx.tx().commit();
+
+        // tx1 try to add property
+        gtx.V(v1.id()).property("test", 1).iterate();
+
+        // tx2 in same time delete vertex used by tx1
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.V(v1.id()).drop().iterate();
+            gtx2.tx().rollback();
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        assertEquals(1, (long) gtx.V().count().next());
+        assertEquals(1, gtx.V(v1.id()).values("test").next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+    }
+
+    // tx1 adds vertex v1, tx2 removes vertex v1
+    @Test
+    public void shouldHandleAddingVertexWhenOtherTxTryToDeleteSameVertex() throws InterruptedException {
+        final TinkerTransactionGraph g = TinkerTransactionGraph.open();
+        final GraphTraversalSource gtx = g.tx().begin();
+
+        final Vertex v1 = gtx.addV().next();
+
+        // tx2 in same time try to delete same vertex
+        final Thread thread = new Thread(() -> {
+            final GraphTraversalSource gtx2 = g.tx().begin();
+            gtx2.V(v1.id()).drop().iterate();
+
+            assertEquals(0, (long) gtx.V().count().next());
+            assertEquals(0, (long) gtx.E().count().next());
+            gtx2.tx().commit();
+        });
+        thread.start();
+        thread.join();
+
+        gtx.tx().commit();
+
+        assertEquals(1, (long) gtx.V().count().next());
+        assertEquals(0, (long) gtx.E().count().next());
+
+        countElementsInNewThreadTx(g, 1, 0);
+    }
+}
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
index 4a8c5f1..c86ba01 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
@@ -28,8 +28,9 @@
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3d0;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -53,10 +54,10 @@
         final GraphSONMapper mapper;
         if (version == GraphSONVersion.V2_0) {
             mapper = GraphSONMapper.build()
-                    .addCustomModule(GraphSONXModuleV2d0.build().create(false)).version(GraphSONVersion.V2_0).create();
+                    .addCustomModule(GraphSONXModuleV2.build()).version(GraphSONVersion.V2_0).create();
         } else if (version == GraphSONVersion.V3_0) {
             mapper = GraphSONMapper.build()
-                    .addCustomModule(GraphSONXModuleV3d0.build().create(false)).version(GraphSONVersion.V3_0).create();
+                    .addCustomModule(GraphSONXModuleV3.build()).version(GraphSONVersion.V3_0).create();
         } else {
             throw new IllegalArgumentException("GraphSONVersion." + version.name() + " is not supported for testing");
         }
diff --git a/tinkergraph-gremlin/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory b/tinkergraph-gremlin/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory
index 54484d4..1e9b622 100644
--- a/tinkergraph-gremlin/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory
+++ b/tinkergraph-gremlin/src/test/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory
@@ -1,3 +1,7 @@
 org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphFeatureTest$TinkerGraphGuiceFactory
 org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphComputerFeatureTest$TinkerGraphGuiceFactory
-org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphAllowNullFeatureTest$TinkerGraphGuiceFactory
\ No newline at end of file
+org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphAllowNullFeatureTest$TinkerGraphGuiceFactory
+org.apache.tinkerpop.gremlin.tinkergraph.TinkerTransactionGraphFeatureTest$TinkerGraphGuiceFactory
+org.apache.tinkerpop.gremlin.tinkergraph.TinkerTransactionGraphComputerFeatureTest$TinkerGraphGuiceFactory
+org.apache.tinkerpop.gremlin.tinkergraph.TinkerTransactionGraphAllowNullFeatureTest$TinkerGraphGuiceFactory
+org.apache.tinkerpop.gremlin.tinkergraph.TinkerShuffleGraphFeatureTest$TinkerShuffleGraphGuiceFactory